diff options
10 files changed, 3 insertions, 80 deletions
diff --git a/its/plugin/projects/issues-project/src/file1.css b/its/plugin/projects/issues-project/src/file1.css index f595c3a..8a588b6 100644 --- a/its/plugin/projects/issues-project/src/file1.css +++ b/its/plugin/projects/issues-project/src/file1.css @@ -27,7 +27,6 @@ a:unknown { /* S4659 | selecto padding-left: 10px; padding: 20px; /* S4657 | declaration-block-no-shorthand-property-overrides */ top: calc(1px+2px); /* S4650 | function-calc-no-unspaced-operator */ /* S4653 | unit-no-unknown */ - width: calc(100% 80px); /* S5362 | function-calc-no-invalid */ } //color: pink; /* S4668 | no-invalid-double-slash-comments */ /* S4654 | property-no-unknown */ diff --git a/its/plugin/projects/issues-project/src/file2.less b/its/plugin/projects/issues-project/src/file2.less index a838bcd..1519d88 100644 --- a/its/plugin/projects/issues-project/src/file2.less +++ b/its/plugin/projects/issues-project/src/file2.less @@ -27,7 +27,6 @@ a:unknown { /* S4659 | selecto padding-left: 10px; padding: 20px; /* S4657 | declaration-block-no-shorthand-property-overrides */ top: calc(1px+2px); /* S4650 | function-calc-no-unspaced-operator */ /* S4653 | unit-no-unknown */ - width: calc(100% 80px); /* S5362 | function-calc-no-invalid */ } // color: pink; /* S4668 | no-invalid-double-slash-comments | Doesn't raise for LESS */ diff --git a/its/plugin/projects/issues-project/src/file3.scss b/its/plugin/projects/issues-project/src/file3.scss index 1d10479..6f19ae1 100644 --- a/its/plugin/projects/issues-project/src/file3.scss +++ b/its/plugin/projects/issues-project/src/file3.scss @@ -27,7 +27,6 @@ a:unknown { /* S4659 | selecto padding-left: 10px; padding: 20px; /* S4657 | declaration-block-no-shorthand-property-overrides */ top: calc(1px+2px); /* S4650 | function-calc-no-unspaced-operator */ /* S4653 | unit-no-unknown */ - width: calc(100% 80px); /* S5362 | function-calc-no-invalid */ } // color: pink; /* S4668 | no-invalid-double-slash-comments | Doesn't raise for SCSS */ diff --git a/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java b/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java index 81fd40c..09f0f32 100644 --- a/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java +++ b/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java @@ -70,7 +70,6 @@ public class IssuesTest { + 2 /* for html and vue files */ + 1 /* issue S4654 is raised for comment */ + 1 /* issue S4662 is raised for cssModules.css */ - + 6 /* S5362 raises at the same place as S4650 */ - 2 /* issue S4668 not raised on .less nor .scss */); } diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java index a4a47b4..ec7a27c 100644 --- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java +++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/CssRules.java @@ -44,7 +44,6 @@ import org.sonar.css.plugin.rules.DeclarationBlockNoDuplicateProperties; import org.sonar.css.plugin.rules.DeclarationBlockNoShorthandPropertyOverrides; import org.sonar.css.plugin.rules.FontFamilyNoDuplicateNames; import org.sonar.css.plugin.rules.FontFamilyNoMissingGenericFamilyKeyword; -import org.sonar.css.plugin.rules.FunctionCalcNoInvalid; import org.sonar.css.plugin.rules.FunctionCalcNoUnspacedOperator; import org.sonar.css.plugin.rules.FunctionLinearGradientNoNonstandardDirection; import org.sonar.css.plugin.rules.KeyframeDeclarationNoImportant; @@ -89,7 +88,6 @@ public class CssRules { FontFamilyNoDuplicateNames.class, FontFamilyNoMissingGenericFamilyKeyword.class, FunctionCalcNoUnspacedOperator.class, - FunctionCalcNoInvalid.class, FunctionLinearGradientNoNonstandardDirection.class, KeyframeDeclarationNoImportant.class, MediaFeatureNameNoUnknown.class, diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/FunctionCalcNoInvalid.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/FunctionCalcNoInvalid.java deleted file mode 100644 index e22a79c..0000000 --- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/FunctionCalcNoInvalid.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * SonarCSS - * Copyright (C) 2018-2019 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -package org.sonar.css.plugin.rules; - -import org.sonar.check.Rule; - -@Rule(key = "S5362") -public class FunctionCalcNoInvalid implements CssRule { - - @Override - public String stylelintKey() { - return "function-calc-no-invalid"; - } -} diff --git a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.html b/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.html deleted file mode 100644 index 66fa5cd..0000000 --- a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.html +++ /dev/null @@ -1,24 +0,0 @@ -<p>To perform calculations when specifying a CSS property <code>calc()</code> function can be used. This function takes single expression as -parameter. When writing this expression some rules must be respected:</p> -<ul> - <li> no empty <code>calc()</code> </li> - <li> there should be an operator between the arguments, spacing should be respected </li> - <li> there should not be any division by zero </li> - <li> the resolved type should be valid for where the expression is placed </li> -</ul> -<p>Otherwise <code>calc()</code> function will be invalid and the entire rule using it will be ignored.</p> -<h2>Noncompliant Code Example</h2> -<pre> -.btn { - border: solid black 1px; - width: calc(100% 80px); /* Noncompliant */ -} -</pre> -<h2>Compliant Solution</h2> -<pre> -.btn { - border: solid black 1px; - width: calc(100% - 80px); -} -</pre> - diff --git a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.json b/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.json deleted file mode 100644 index bde6f63..0000000 --- a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/S5362.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "title": "Expressions within \"calc\" should be valid", - "type": "BUG", - "status": "ready", - "remediation": { - "func": "Constant\/Issue", - "constantCost": "5min" - }, - "tags": [ - - ], - "defaultSeverity": "Critical", - "ruleSpecification": "RSPEC-5362", - "sqKey": "S5362", - "scope": "All" -} diff --git a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/Sonar_way_profile.json b/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/Sonar_way_profile.json index 7834cba..9b98de0 100644 --- a/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/Sonar_way_profile.json +++ b/sonar-css-plugin/src/main/resources/org/sonar/l10n/css/rules/css/Sonar_way_profile.json @@ -6,6 +6,7 @@ "S4647", "S4648", "S4649", + "S4650", "S4651", "S4652", "S4653", @@ -22,7 +23,6 @@ "S4666", "S4667", "S4668", - "S4670", - "S5362" + "S4670" ] } diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/SonarWayProfileTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/SonarWayProfileTest.java index 0717e95..d622b79 100644 --- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/SonarWayProfileTest.java +++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/SonarWayProfileTest.java @@ -38,7 +38,7 @@ public class SonarWayProfileTest { assertThat(profile.language()).isEqualTo(CssLanguage.KEY); assertThat(profile.name()).isEqualTo(SonarWayProfile.PROFILE_NAME); assertThat(profile.rules()).extracting("repoKey").containsOnly(CssRulesDefinition.REPOSITORY_KEY); - assertThat(profile.rules()).extracting("ruleKey").hasSize(CssRules.getRuleClasses().size() - 2); + assertThat(profile.rules()).extracting("ruleKey").hasSize(CssRules.getRuleClasses().size() - 1); } } |