SonarSource · ilia-kebets-sonarsource · Oct 25, 2023 · Oct 23, 2023 · Oct 23, 2023 · Oct 24, 2023
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This SonarSource project is a [static code analyzer](https://en.wikipedia.org/wi
 - [25 CSS rules](https://rules.sonarsource.com/css)
 - Compatible with ECMAScript 2015-2020
 - React JSX, Flow, Vue, and AWS lambda functions support for JavaScript and TypeScript
-- CSS, SCSS, Less, also 'style' inside PHP, HTML, and VueJS files
+- CSS, SCSS, SASS, Less, also 'style' inside HTML and VueJS files
 - Metrics (complexity, number of lines, etc.)
 - Import of test coverage reports
 - Import of ESLint, TSLint, and Stylelint issues

diff --git a/...in/projects/css-php-project/src/index.php → .../projects/css-html-project/src/index.html b/...in/projects/css-php-project/src/index.php → .../projects/css-html-project/src/index.html
@@ -8,6 +8,6 @@
   </style>
 </head>
 <body>
-  <?= "Hello World!" ?>
+  "Hello World!
 </body>
 </html>
diff --git a/its/plugin/projects/css-metrics-project/src/file4.sass b/its/plugin/projects/css-metrics-project/src/file4.sass
@@ -0,0 +1,12 @@
+$firstValue: 62.5%
+
+$firstValue: 24px !default
+
+body
+  font-size: $firstValue
+  foo: "some text"
+
+
+// body font size = 62.5%
+
+/* some comment */
diff --git a/...ojects/css-metrics-project/src/file4.html → ...ojects/css-metrics-project/src/file5.html b/...ojects/css-metrics-project/src/file4.html → ...ojects/css-metrics-project/src/file5.html
diff --git a/its/plugin/projects/css-metrics-project/src/file6.htm b/its/plugin/projects/css-metrics-project/src/file6.htm
@@ -0,0 +1,6 @@
+<!doctype html>
+<title>Example</title>
+<style>
+  p { }
+</style>
+<p>Hello World!</p>
diff --git a/its/plugin/projects/css-metrics-project/src/file7.xhtml b/its/plugin/projects/css-metrics-project/src/file7.xhtml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <title>Example</title>
+  <style>
+    p {
+      font-size: 5vw;
+      padding: 0 5vw;
+      line-height: 1.8em;
+    }
+  </style>
+</head>
+</html>
diff --git a/its/plugin/projects/css-metrics-project/src/ignored/file8.php b/its/plugin/projects/css-metrics-project/src/ignored/file8.php
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>PHP Test</title>
+    </head>
+    <body>
+        <?php echo '<p>Hello World</p>'; ?>
+    </body>
+</html>
diff --git a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssIssuesTest.java
@@ -62,7 +62,6 @@ public static void prepare() {
 
     SonarScanner scanner = CssTestsUtils.createScanner(PROJECT_KEY);
     scanner.setProperty("sonar.exclusions", "**/file-with-parsing-error-excluded.css");
-    scanner.setProperty("sonar.html.file.suffixes", ".htm");
     buildResult = orchestrator.executeBuild(scanner);
   }
 
@@ -168,7 +167,8 @@ void issue_list() {
         tuple("css:S1116", "css-issues-project:src/file6.vue"),
         tuple("css:S5362", "css-issues-project:src/file1.css"),
         tuple("css:S5362", "css-issues-project:src/file2.less"),
-        tuple("css:S5362", "css-issues-project:src/file3.scss")
+        tuple("css:S5362", "css-issues-project:src/file3.scss"),
+        tuple("css:S1116", "css-issues-project:src/file5-1.html")
       );
   }
 }
diff --git a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssMetricsTest.java b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssMetricsTest.java
@@ -42,11 +42,11 @@ public static void prepare() {
 
   @Test
   void test() {
-    assertThat(getMeasureAsDouble(PROJECT_KEY, "lines")).isEqualTo(43);
-    assertThat(getMeasureAsDouble(PROJECT_KEY, "ncloc")).isEqualTo(32);
+    assertThat(getMeasureAsDouble(PROJECT_KEY, "lines")).isEqualTo(89);
+    assertThat(getMeasureAsDouble(PROJECT_KEY, "ncloc")).isEqualTo(52);
     assertThat(getMeasure(PROJECT_KEY, "ncloc_language_distribution").getValue())
-      .isEqualTo("css=22;web=10");
-    assertThat(getMeasureAsDouble(PROJECT_KEY, "comment_lines")).isEqualTo(4);
+      .isEqualTo("css=27;php=1;web=24");
+    assertThat(getMeasureAsDouble(PROJECT_KEY, "comment_lines")).isEqualTo(6);
 
     assertThat(getMeasure(PROJECT_KEY + ":src/file1.css", "ncloc_data").getValue())
       .contains("1=1;", "2=1;", "3=1;", "4=1;", "5=1;", "6=1;", "7=1");
@@ -56,5 +56,31 @@ void test() {
 
     assertThat(getMeasure(PROJECT_KEY + ":src/file3.scss", "ncloc_data").getValue())
       .contains("1=1;", "3=1;", "5=1;", "6=1;", "7=1;", "8=1");
+
+    assertThat(getMeasure(PROJECT_KEY + ":src/file4.sass", "ncloc_data").getValue())
+      .contains("1=1", "3=1", "5=1", "6=1", "7=1");
+
+    assertThat(getMeasure(PROJECT_KEY + ":src/file5.html", "ncloc_data").getValue())
+      .contains("1=1", "2=1", "3=1", "4=1", "5=1", "6=1", "7=1", "8=1", "9=1", "10=1");
+
+    // .htm is not part of sonar-HTML languages. When it is, an assertion should be added for file6.htm
+
+    assertThat(getMeasure(PROJECT_KEY + ":src/file7.xhtml", "ncloc_data").getValue())
+      .contains(
+        "1=1",
+        "2=1",
+        "4=1",
+        "5=1",
+        "6=1",
+        "7=1",
+        "8=1",
+        "9=1",
+        "10=1",
+        "11=1",
+        "12=1",
+        "13=1",
+        "14=1",
+        "15=1"
+      );
   }
 }
diff --git a/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java b/its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/CssNoCssFileProjectTest.java
@@ -37,7 +37,7 @@
 @ExtendWith(OrchestratorStarter.class)
 class CssNoCssFileProjectTest {
 
-  private static final String PROJECT_KEY = "css-php-project";
+  private static final String PROJECT_KEY = "css-html-project";
 
   private static final Orchestrator orchestrator = OrchestratorStarter.ORCHESTRATOR;
 
@@ -62,6 +62,6 @@ void test() {
 
     assertThat(issuesList)
       .extracting(Issues.Issue::getRule, Issues.Issue::getLine, Issues.Issue::getComponent)
-      .containsExactlyInAnyOrder(tuple("css:S4658", 7, "css-php-project:src/index.php"));
+      .containsExactlyInAnyOrder(tuple("css:S4658", 7, PROJECT_KEY + ":src/index.html"));
   }
 }