diff --git a/its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json b/its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json deleted file mode 100644 index 996c6c8228..0000000000 --- a/its/ruling/src/test/expected/ts/TypeScript/typescript-S2814.json +++ /dev/null @@ -1,8 +0,0 @@ -{ -"TypeScript:scripts/processDiagnosticMessages.ts": [ -161 -], -"TypeScript:src/harness/harness.ts": [ -42 -] -} 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 deleted file mode 100644 index 22d1f77c15..0000000000 --- a/its/ruling/src/test/expected/ts/ag-grid/typescript-S2814.json +++ /dev/null @@ -1,10 +0,0 @@ -{ -"ag-grid:src/ts/headerRendering/headerContainer.ts": [ -141 -], -"ag-grid:src/ts/rendering/renderedRow.ts": [ -808, -815, -822 -] -} diff --git a/its/ruling/src/test/expected/ts/courselit/typescript-S2814.json b/its/ruling/src/test/expected/ts/courselit/typescript-S2814.json deleted file mode 100644 index d68b7edf1a..0000000000 --- a/its/ruling/src/test/expected/ts/courselit/typescript-S2814.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"courselit:apps/web/components/admin/courses/course-editor/group.tsx": [ -74 -] -} diff --git a/its/ruling/src/test/expected/ts/eigen/typescript-S2814.json b/its/ruling/src/test/expected/ts/eigen/typescript-S2814.json deleted file mode 100644 index fa689fc600..0000000000 --- a/its/ruling/src/test/expected/ts/eigen/typescript-S2814.json +++ /dev/null @@ -1,47 +0,0 @@ -{ -"eigen:src/app/Components/ArtworkFilter/components/ArtworkFilterApplyButton.tsx": [ -13 -], -"eigen:src/app/Components/Disappearable.tsx": [ -9 -], -"eigen:src/app/Components/FancyModal/FancyModalCard.tsx": [ -35 -], -"eigen:src/app/Components/Home/CardRailFlatList.tsx": [ -11 -], -"eigen:src/app/Components/StickyTabPage/SnappyHorizontalRail.tsx": [ -9 -], -"eigen:src/app/NativeModules/LegacyNativeModules.tsx": [ -186 -], -"eigen:src/app/Scenes/Artwork/Components/ImageCarousel/FullScreen/ImageZoomView.tsx": [ -117 -], -"eigen:src/app/Scenes/Artwork/Components/ImageCarousel/ImageCarouselContext.tsx": [ -140 -], -"eigen:src/app/Scenes/AuctionResult/ComparableWorks.tsx": [ -19 -], -"eigen:src/app/Scenes/MyAccount/Components/MyAccountFieldEditScreen.tsx": [ -38 -], -"eigen:src/app/Scenes/MyCollection/State/MyCollectionArtworkModel.tsx": [ -100 -], -"eigen:src/app/Scenes/Show/Components/ShowLocationHours.tsx": [ -14 -], -"eigen:src/app/utils/experiments/UnleashProvider.tsx": [ -11 -], -"eigen:src/palette/elements/CollapsibleMenuItem/CollapsibleMenuItem.tsx": [ -22 -], -"eigen:src/palette/elements/Input/Input.tsx": [ -81 -] -} 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 deleted file mode 100644 index 559eb4937c..0000000000 --- a/its/ruling/src/test/expected/ts/file-for-rules/typescript-S2814.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"file-for-rules:S2814.ts": [ -2 -] -} diff --git a/its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json b/its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json deleted file mode 100644 index ea215374fa..0000000000 --- a/its/ruling/src/test/expected/ts/vuetify/typescript-S2814.json +++ /dev/null @@ -1,11 +0,0 @@ -{ -"vuetify:packages/vuetify/src/components/VTextField/VTextField.tsx": [ -30 -], -"vuetify:packages/vuetify/src/composables/icons.tsx": [ -12 -], -"vuetify:packages/vuetify/src/util/helpers.ts": [ -547 -] -} diff --git a/sonar-plugin/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java b/sonar-plugin/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java index 3ed58d6c83..ea22f2faff 100644 --- a/sonar-plugin/javascript-checks/src/main/java/org/sonar/javascript/checks/RedeclaredSymbolCheck.java +++ b/sonar-plugin/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/sonar-plugin/javascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json b/sonar-plugin/javascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json index e07f2f458d..9954ea45f8 100644 --- a/sonar-plugin/javascript-checks/src/main/resources/org/sonar/l10n/javascript/rules/javascript/S2814.json +++ b/sonar-plugin/javascript-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/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java index 06f58b8efd..e714e67ad8 100644 --- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinition.java +++ b/sonar-plugin/sonar-javascript-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/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java b/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java index a285eb22c8..51166bdffd 100644 --- a/sonar-plugin/sonar-javascript-plugin/src/main/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinition.java +++ b/sonar-plugin/sonar-javascript-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/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java index 16659ab4fb..81e34bd67f 100644 --- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/JavaScriptProfilesDefinitionTest.java +++ b/sonar-plugin/sonar-javascript-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/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java b/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java index 00a253a3c8..3c61142152 100644 --- a/sonar-plugin/sonar-javascript-plugin/src/test/java/org/sonar/plugins/javascript/rules/TypeScriptRulesDefinitionTest.java +++ b/sonar-plugin/sonar-javascript-plugin/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) {