Remove S2814 (no-redeclare) for TypeScript (#4098)

SonarSource · Aug 25, 2023 · 74a17ae · 74a17ae
1 parent d8c8c2f
commit 74a17ae
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 105 deletions.
diff --git a/its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json b/its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json
diff --git a/its/ruling/src/test/expected/ts/ag-grid/typescript-S2814.json b/its/ruling/src/test/expected/ts/ag-grid/typescript-S2814.json
diff --git a/its/ruling/src/test/expected/ts/courselit/typescript-S2814.json b/its/ruling/src/test/expected/ts/courselit/typescript-S2814.json
diff --git a/its/ruling/src/test/expected/ts/eigen/typescript-S2814.json b/its/ruling/src/test/expected/ts/eigen/typescript-S2814.json
diff --git a/its/ruling/src/test/expected/ts/file-for-rules/typescript-S2814.json b/its/ruling/src/test/expected/ts/file-for-rules/typescript-S2814.json
diff --git a/its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json b/its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json
diff --git a/...in/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java b/...in/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java
@@ -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 {
 

diff --git a/...avascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json b/...avascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json
@@ -21,7 +21,6 @@
   "scope": "Main",
   "quickfix": "unknown",
   "compatibleLanguages": [
-    "JAVASCRIPT",
-    "TYPESCRIPT"
+    "JAVASCRIPT"
   ]
 }
diff --git a/...cript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java b/...cript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java
@@ -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);

diff --git a/...pt-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java b/...pt-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java
@@ -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;
@@ -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();
   }
 }
diff --git a/...t-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java b/...t-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java
@@ -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();
   }
@@ -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();
   }

diff --git a/...lugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java b/...lugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java
@@ -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;
@@ -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) {