Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove S2814 (no-redeclare) for TypeScript #4098

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Remove S2814 (no-redeclare) for TypeScript #4098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b220aee
Revert "Deprecate S2814 (`no-redeclare`) for TypeScript (#3635)"
ilia-kebets-sonarsource Aug 24, 2023
10cce7a
Remove S2814 for TypeScript
ilia-kebets-sonarsource Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions its/ruling/src/test/expected/ts/ag-grid/typescript-S2814.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions its/ruling/src/test/expected/ts/courselit/typescript-S2814.json
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions its/ruling/src/test/expected/ts/eigen/typescript-S2814.json
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions its/ruling/src/test/expected/ts/file-for-rules/typescript-S2814.json
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...in/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@
import org.sonar.check.Rule;
import org.sonar.plugins.javascript.api.EslintBasedCheck;
import org.sonar.plugins.javascript.api.JavaScriptRule;
import org.sonar.plugins.javascript.api.TypeScriptRule;

@JavaScriptRule
@TypeScriptRule
@Rule(key = "S2814")
public class RedeclaredSymbolCheck implements EslintBasedCheck {

Expand Down
3 changes: 1 addition & 2 deletions ...avascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"scope": "Main",
"quickfix": "unknown",
"compatibleLanguages": [
"JAVASCRIPT",
"TYPESCRIPT"
"JAVASCRIPT"
]
}
2 changes: 0 additions & 2 deletions ...cript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ private static void createProfile(
keys
.stream()
.filter(activeKeysForBothLanguages::contains)
// deprecated for Typescript: https://github.com/SonarSource/SonarJS/issues/3580
.filter(key -> !TypeScriptLanguage.KEY.equals(language) || !"S2814".equals(key))
.forEach(key -> newProfile.activateRule(repositoryKey, key));

addSecurityRules(newProfile, language);
Expand Down
5 changes: 0 additions & 5 deletions ...pt-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import java.util.Collections;
import org.sonar.api.SonarRuntime;
import org.sonar.api.rule.RuleStatus;
import org.sonar.api.server.rule.RulesDefinition;
import org.sonar.javascript.checks.CheckList;
import org.sonar.plugins.javascript.JavaScriptProfilesDefinition;
Expand Down Expand Up @@ -57,10 +56,6 @@ public void define(Context context) {
NewRule commentRegularExpression = repository.rule("S124");
commentRegularExpression.setTemplate(true);

// deprecated for Typescript: https://github.com/SonarSource/SonarJS/issues/3580
NewRule redeclaredSymbol = repository.rule("S2814");
redeclaredSymbol.setStatus(RuleStatus.DEPRECATED);

repository.done();
}
}
6 changes: 0 additions & 6 deletions ...t-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,6 @@ void sonar_way_js() {
assertThat(profile.name()).isEqualTo(JavaScriptProfilesDefinition.SONAR_WAY);
assertThat(profile.rules()).extracting("repoKey").containsOnly(CheckList.JS_REPOSITORY_KEY);
assertThat(profile.rules().size()).isGreaterThan(100);
assertThat(profile.rules())
.extracting(BuiltInQualityProfilesDefinition.BuiltInActiveRule::ruleKey)
.contains("S2814");

assertThat(deprecatedRulesInProfile(profile, deprecatedJsRules)).isEmpty();
}
Expand Down Expand Up @@ -118,9 +115,6 @@ void sonar_way_ts() {
assertThat(profile.rules())
.extracting(BuiltInQualityProfilesDefinition.BuiltInActiveRule::ruleKey)
.contains("S5122");
assertThat(profile.rules())
.extracting(BuiltInQualityProfilesDefinition.BuiltInActiveRule::ruleKey)
.doesNotContain("S2814");

assertThat(deprecatedRulesInProfile(profile, deprecatedTsRules)).isEmpty();
}
Expand Down
2 changes: 0 additions & 2 deletions ...lugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.junit.jupiter.api.Test;
import org.sonar.api.SonarRuntime;
import org.sonar.api.internal.SonarRuntimeImpl;
import org.sonar.api.rule.RuleStatus;
import org.sonar.api.rules.RuleType;
import org.sonar.api.server.debt.DebtRemediationFunction.Type;
import org.sonar.api.server.rule.RulesDefinition.Param;
Expand Down Expand Up @@ -142,7 +141,6 @@ private void assertRuleProperties(Repository repository) {
assertThat(rule.debtRemediationFunction().type()).isEqualTo(Type.CONSTANT_ISSUE);
assertThat(rule.type()).isEqualTo(RuleType.BUG);
assertThat(repository.rule("S124").template()).isTrue();
assertThat(repository.rule("S2814").status()).isEqualTo(RuleStatus.DEPRECATED);
}

private void assertAllRuleParametersHaveDescription(Repository repository) {
Expand Down