Fix #117 Parent selector (&) not supported in variable declaration

Author: racodond

CONTRIBUTING.md

@@ -14,5 +14,5 @@ You feel like:
 
 ## Building / Testing / Releasing
 * Building and running unit tests: `mvn clean install`
-* Building and running unit tests and running integration tests: `mvn clean install -Pits -Dsonar.runtimeVersion=$VERSION` ($VERSION = 'LTS' or 'LATEST_RELEASE'). Behind a proxy, add `-Dhttps.proxyHost=localhost -Dhttps.proxyPort=3128 -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128`.
+* Building and running unit tests and running integration tests: `mvn clean install -Pits -Dsonar.runtimeVersion=$VERSION` ($VERSION = 'LATEST_RELEASE[X.X]' or 'DEV'). Behind a proxy, add `-Dhttps.proxyHost=localhost -Dhttps.proxyPort=3128 -Dhttp.proxyHost=localhost -Dhttp.proxyPort=3128`.
 * Releasing on Maven Central: `mvn clean deploy -Possrh`

appveyor.yml

@@ -12,8 +12,8 @@ install:
 
 environment:
   matrix:
-    - SQ_VERSION: "LTS"
-    - SQ_VERSION: "LATEST_RELEASE"
+    - SQ_VERSION: "LATEST_RELEASE[6.7]"
+    - SQ_VERSION: "DEV"
 
 platform:
   - x64

css-frontend/src/main/java/org/sonar/css/parser/scss/ScssGrammar.java

@@ -148,7 +148,9 @@ public Tree ANY_SASS_SCRIPT_EXPRESSION() {
         HASH(),
         UNICODE_RANGE(),
         IDENTIFIER(),
-        SCSS_VARIABLE()));
+        SCSS_VARIABLE(),
+        SCSS_PARENT_REFERENCING_SELECTOR(),
+        SCSS_PARENT_SELECTOR()));
   }
 
   public Tree ANY_SASS_SCRIPT_EXPRESSION_WITHOUT_COMMA_SEPARATED_LIST() {
@@ -172,7 +174,9 @@ public Tree ANY_SASS_SCRIPT_EXPRESSION_WITHOUT_COMMA_SEPARATED_LIST() {
         HASH(),
         UNICODE_RANGE(),
         IDENTIFIER(),
-        SCSS_VARIABLE()));
+        SCSS_VARIABLE(),
+        SCSS_PARENT_REFERENCING_SELECTOR(),
+        SCSS_PARENT_SELECTOR()));
   }
 
   // -----------------------

its/plugin/tests/src/test/java/org/sonar/css/Tests.java

@@ -22,6 +22,7 @@
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.MavenLocation;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -53,8 +54,9 @@ public class Tests {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(FileLocation.byWildcardFilename(new File("../../../sonar-css-plugin/target"), "sonar-css-plugin-*-SNAPSHOT.jar"))
-    .addPlugin(FileLocation.byWildcardFilename(new File("../plugins/css-custom-rules-plugin/target"), "css-custom-rules-plugin-*-SNAPSHOT.jar"))
+    .setSonarVersion(System.getProperty("sonar.runtimeVersion", "DEV"))
+    .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../../sonar-css-plugin/target"), "sonar-css-plugin-*-SNAPSHOT.jar"))
+    .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.6"))
     .restoreProfileAtStartup(FileLocation.ofClasspath("/org/sonar/css/profiles/css-zero-units-only-profile.xml"))
     .restoreProfileAtStartup(FileLocation.ofClasspath("/org/sonar/css/profiles/less-zero-units-only-profile.xml"))
     .restoreProfileAtStartup(FileLocation.ofClasspath("/org/sonar/css/profiles/scss-zero-units-only-profile.xml"))

its/ruling/tests/src/test/java/org/sonar/css/its/CssTest.java

@@ -23,6 +23,7 @@
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.MavenLocation;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -39,9 +40,9 @@ public class CssTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setSonarVersion(System.getProperty("sonar.runtimeVersion", "DEV"))
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../../sonar-css-plugin/target"), "sonar-css-plugin-*-SNAPSHOT.jar"))
-    .setOrchestratorProperty("litsVersion", "0.6")
-    .addPlugin("lits")
+    .addPlugin(MavenLocation.of("org.sonarsource.sonar-lits-plugin", "sonar-lits-plugin", "0.6"))
     .build();
 
   @Before
@@ -70,13 +71,11 @@ public void test() throws Exception {
       .setProjectKey("project")
       .setSourceDirs("./")
       .setSourceEncoding("UTF-8")
-      .setProperty("sonar.import_unknown_files", "true")
       .setProperty("sonar.analysis.mode", "preview")
-      .setProperty("sonar.issuesReport.html.enable", "true")
       .setProperty("dump.old", FileLocation.of("src/test/expected").getFile().getAbsolutePath())
       .setProperty("dump.new", FileLocation.of("target/actual").getFile().getAbsolutePath())
       .setProperty("lits.differences", litsDifferencesFile.getAbsolutePath())
-      .setProperty("sonar.cpd.skip", "true");
+      .setProperty("sonar.cpd.exclusions", "**/*");
     orchestrator.executeBuild(build);
 
     assertThat(Files.asCharSource(litsDifferencesFile, StandardCharsets.UTF_8).read()).isEmpty();

pom.xml

@@ -127,7 +127,7 @@
       <dependency>
         <groupId>org.sonarsource.orchestrator</groupId>
         <artifactId>sonar-orchestrator</artifactId>
-        <version>3.15.2.1322</version>
+        <version>3.22.0.1791</version>
         <exclusions>
           <exclusion>
             <groupId>com.oracle</groupId>

travis.sh

@@ -6,7 +6,7 @@ git fetch --unshallow
 
 mvn -B clean install -Pits -Dsonar.runtimeVersion=$SQ_VERSION
 
-if [ "$SQ_VERSION" == "LTS" ]; then
+if [ "$SQ_VERSION" == "DEV" ]; then
 
     mvnCommand='mvn -B sonar:sonar'
     commonArgs="-Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.organization=racodond-github"