Renamed sass -> theme-compiler for consistency (#9299)

131 files changed, 44 insertions, 44 deletions

diff --git a/build/build.xml b/build/build.xml
index d8938371a2..40b010f443 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -80,7 +80,7 @@
     		<path refid="gwt.dev.user.jars"/>
         	<path refid="ivy.compile.classpath.client-compiler" />
         </path>
-    	<path id="compile.classpath.sass">
+    	<path id="compile.classpath.theme-compiler">
     	     <path refid="additional.jar.path" />
     	     <path refid="ivy.compile.classpath.server" />
     		<path refid="gwt.dev.user.jars"/>
@@ -118,16 +118,16 @@
 		<property name="result-src-shared" value="${result-path}/src/shared"/>
 		<property name="result-src-junit" value="${result-path}/src/junit"/>
 		<property name="result-src-testbench" value="${result-path}/src/testbench"/>
-		<property name="result-src-sass" value="${result-path}/src/sass"/>
-		<property name="result-src-sass-junit" value="${result-path}/src/sass-junit"/>
+		<property name="result-src-theme-compiler" value="${result-path}/src/theme-compiler"/>
+		<property name="result-src-theme-compiler-junit" value="${result-path}/src/theme-compiler-junit"/>
 		<property name="result-classes-server" value="${result-path}/classes/server"/>
 		<property name="result-classes-client" value="${result-path}/classes/client"/>
 		<property name="result-classes-client-compiler" value="${result-path}/classes/client-compiler"/>
 		<property name="result-classes-shared" value="${result-path}/classes/shared"/>
 		<property name="result-classes-junit" value="${result-path}/classes/junit"/>
 		<property name="result-classes-testbench" value="${result-path}/classes/testbench"/>
-		<property name="result-classes-sass" value="${result-path}/classes/sass"/>
-		<property name="result-classes-sass-junit" value="${result-path}/classes/sass-junit"/>
+		<property name="result-classes-theme-compiler" value="${result-path}/classes/theme-compiler"/>
+		<property name="result-classes-theme-compiler-junit" value="${result-path}/classes/theme-compiler-junit"/>
 		<property name="result-precompiled-widgetsets" value="${result-path}/classes/widgetsets"/>
 		<property name="result-classes-gwt" value="${result-path}/classes/gwt" />
 
@@ -233,8 +233,8 @@
      	<property name="buildhelpers-classes" value="${result-path}/buildhelpers/classes" />
 
      	<!-- Sass -->
-     	<property name="sass-src" value="sass/src" />
-     	<property name="sass-classes" value="${result-classes-sass}" />
+     	<property name="theme-compiler-src" value="theme-compiler/src" />
+     	<property name="theme-compiler-classes" value="${result-classes-theme-compiler}" />
 
      	<!-- Create Output Directory Hierarchy -->
         <mkdir dir="${output-dir}/WebContent" />
@@ -346,20 +346,20 @@
         <!--
         Source directories in the project are
          * src (Vaadin core)
-         * sass/src (SASS compiler)
+         * theme-compiler/src (SASS compiler)
          * uitest/src (TestBench test cases)
          * server/tests/src (Server-side JUnit test cases)
          * client/tests/src (Client-side JUnit test cases)
 
         These are copied to 
          * ${result-path}/src/core
-         * ${result-path}/src/sass
+         * ${result-path}/src/theme-compiler
          * ${result-path}/src/tests
          * ${result-path}/src/junit
 
         And compiled to 
          * ${result-path}/classes/core
-         * ${result-path}/classes/sass
+         * ${result-path}/classes/theme-compiler
          * ${result-path}/classes/tests
          * ${result-path}/classes/junit
          
@@ -370,14 +370,14 @@
         <loadfile property="VaadinApache2LicenseForJavaFiles" srcFile="build/VaadinApache2LicenseForJavaFiles.txt" />
         
         <mkdir dir="${result-path}/src" />
-        <mkdir dir="${result-src-sass}/src" />
+        <mkdir dir="${result-src-theme-compiler}/src" />
         <mkdir dir="${result-src-server}" />
         <mkdir dir="${result-src-client}" />
         <mkdir dir="${result-src-client-compiler}" />
         <mkdir dir="${result-src-shared}" />
         <mkdir dir="${result-src-testbench}" />
         <mkdir dir="${result-src-junit}" />
-        <mkdir dir="${result-src-sass-junit}" />
+        <mkdir dir="${result-src-theme-compiler-junit}" />
 
         <patternset id="preprocessable-files">
             <include name="**/*.java" />
@@ -433,10 +433,10 @@
             </fileset>
         </copy>
 
-        <copy todir="${result-src-sass}" overwrite="yes">
+        <copy todir="${result-src-theme-compiler}" overwrite="yes">
             <filterset refid="version-and-license"/>
             <filterset refid="pre-css-style"/>
-            <fileset dir="sass/src">
+            <fileset dir="theme-compiler/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
@@ -456,9 +456,9 @@
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
-        <copy todir="${result-src-sass-junit}">
+        <copy todir="${result-src-theme-compiler-junit}">
             <filterset refid="version-and-license"/>
-            <fileset dir="sass/tests/src">
+            <fileset dir="theme-compiler/tests/src">
                 <patternset refid="preprocessable-files" />
             </fileset>
         </copy>
@@ -489,8 +489,8 @@
             </fileset>
         </copy>
         	
-        <copy todir="${result-src-sass}">
-            <fileset dir="${sass-src}">
+        <copy todir="${result-src-theme-compiler}">
+            <fileset dir="${theme-compiler-src}">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
         </copy>
@@ -507,11 +507,11 @@
                 <patternset refid="non-preprocessable-files" />
             </fileset>
         </copy>
-        <copy todir="${result-src-sass-junit}">
-            <fileset dir="sass/tests/src">
+        <copy todir="${result-src-theme-compiler-junit}">
+            <fileset dir="theme-compiler/tests/src">
                 <patternset refid="non-preprocessable-files" />
             </fileset>
-            <fileset dir="sass/tests/resources">
+            <fileset dir="theme-compiler/tests/resources">
             	<!-- test resources (files to compile and compare etc.) -->
             </fileset>
         </copy>
@@ -621,7 +621,7 @@
         </javac>
     </target>
 	
-    <target name="compile-tests" depends="compile-server,compile-client,compile-sass">
+    <target name="compile-tests" depends="compile-server,compile-client,compile-theme-compiler">
         <echo>Compiling src (Server and client side JUnit tests)</echo>
     	<!-- Compile server and client side JUnit tests -->
         <mkdir dir="${result-classes-junit}" />
@@ -634,10 +634,10 @@
     	
         <echo>Compiling SASS JUnit tests</echo>
     	<!-- Compile server and client side JUnit tests -->
-        <mkdir dir="${result-classes-sass-junit}" />
-        <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-sass-junit}" debug="true" encoding="UTF-8" includeantruntime="false">
-        	<classpath path="${result-classes-sass}"></classpath>
-            <src path="${result-src-sass-junit}"/>
+        <mkdir dir="${result-classes-theme-compiler-junit}" />
+        <javac source="${required.java.version}" target="${required.java.version}" classpathref="compile.classpath.server-tests" destdir="${result-classes-theme-compiler-junit}" debug="true" encoding="UTF-8" includeantruntime="false">
+        	<classpath path="${result-classes-theme-compiler}"></classpath>
+            <src path="${result-src-theme-compiler-junit}"/>
         </javac>
     	
         <echo>Compiling src (TestBench tests)</echo>
@@ -654,36 +654,36 @@
     	
     </target>
 
-    <target name="compile-helpers" depends="init, compile-sass">
+    <target name="compile-helpers" depends="init, compile-theme-compiler">
     	<mkdir dir="${buildhelpers-classes}" />
         <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" classpathref="compile.classpath.buildhelpers" destdir="${buildhelpers-classes}" debug="true" encoding="UTF-8" >
         	<!-- SASS -->
-            <classpath path="${result-classes-sass}" />
+            <classpath path="${result-classes-theme-compiler}" />
 
             <src path="${buildhelpers-src}"/>
 		</javac>
     </target>
     
-	<target name="compile-sass-parser">
+	<target name="compile-theme-compiler-parser">
 	<javacc target="${parserDir}/Parser.jj" javacchome="${JavaCChome}">
 	</javacc>
 	</target>
 	
-    <target name="compile-sass" depends="init, preprocess-src">
+    <target name="compile-theme-compiler" depends="init, preprocess-src">
     	<!-- TODO also perform javacc compilation of the parser -->
-        <mkdir dir="${result-classes-sass}" />
-        <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${result-src-sass}" 
-                	classpathref="compile.classpath.sass" destdir="${result-classes-sass}" debug="true" encoding="UTF-8" />
+        <mkdir dir="${result-classes-theme-compiler}" />
+        <javac source="${required.java.version}" target="${required.java.version}" includeantruntime="false" srcdir="${result-src-theme-compiler}" 
+                	classpathref="compile.classpath.theme-compiler" destdir="${result-classes-theme-compiler}" debug="true" encoding="UTF-8" />
     </target>
     
-    <target name="defaulttheme" depends="init, compile-sass, compile-helpers" description="Compile all included themes">
+    <target name="defaulttheme" depends="init, compile-theme-compiler, compile-helpers" description="Compile all included themes">
         <echo>Combining default themes css files</echo>
         <java classname="com.vaadin.buildhelpers.CompileDefaultTheme" failonerror="yes" fork="yes">
             <arg value="-version" />
             <arg value="${version.full}"/>
             <classpath>
             	<!-- SASS -->
-                <path path="${result-classes-sass}" />
+                <path path="${result-classes-theme-compiler}" />
                 <path location="${buildhelpers-classes}" />
             	<path refid="compile.classpath.buildhelpers" />
             </classpath>
@@ -884,13 +884,13 @@ gwt.svnrev=${git.revision}</echo>
             <fileset dir="${result-classes-server}"/>
             <fileset dir="${result-classes-client}"/>
             <fileset dir="${result-classes-shared}"/>
-            <fileset dir="${result-classes-sass}"/>
+            <fileset dir="${result-classes-theme-compiler}"/>
             <fileset dir="${result-classes-client-compiler}"/>
             <!-- add sources -->
             <fileset dir="${result-src-server}"/>
             <fileset dir="${result-src-client}"/>
             <fileset dir="${result-src-shared}"/>
-            <fileset dir="${result-src-sass}"/>
+            <fileset dir="${result-src-theme-compiler}"/>
             <fileset dir="${result-src-client-compiler}"/>
         	<fileset dir="${result-classes-gwt}"/>
             <fileset dir="${output-dir}/WebContent">
@@ -1026,7 +1026,7 @@ gwt.svnrev=${git.revision}</echo>
                     <include name="**/*.java" />
                 </patternset>
             </fileset>
-            <fileset dir="${result-src-sass}">
+            <fileset dir="${result-src-theme-compiler}">
                 <patternset>
                     <include name="**/*.java" />
                 </patternset>
@@ -1289,7 +1289,7 @@ gwt.svnrev=${git.revision}</echo>
         	</sequential>
             <antcall inheritrefs="true" inheritall="true" target="testbench-tests"></antcall>
             <antcall inheritrefs="true" inheritall="true" target="server-side-tests"></antcall>
-            <antcall inheritrefs="true" inheritall="true" target="sass-tests"></antcall>
+            <antcall inheritrefs="true" inheritall="true" target="theme-compiler-tests"></antcall>
         </parallel>
     </target>
     
@@ -1311,17 +1311,17 @@ gwt.svnrev=${git.revision}</echo>
     </target>
 
     <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task-->
-    <target name="sass-tests" unless="tests.serverside.skip" depends="compile-tests">
+    <target name="theme-compiler-tests" unless="tests.serverside.skip" depends="compile-tests">
         <junit printsummary="yes"> 
             <classpath> 
-                <pathelement path="${result-src-sass-junit}" />
-                <pathelement path="${result-classes-sass}" />
-                <pathelement path="${result-classes-sass-junit}" />
+                <pathelement path="${result-src-theme-compiler-junit}" />
+                <pathelement path="${result-classes-theme-compiler}" />
+                <pathelement path="${result-classes-theme-compiler-junit}" />
             	<path refid="compile.classpath.server-tests"></path>
             </classpath>
 
             <batchtest fork="yes">
-                <fileset dir="${result-src-sass-junit}" includes="**/*.java" excludes="**/Abstract*.java" />
+                <fileset dir="${result-src-theme-compiler-junit}" includes="**/*.java" excludes="**/Abstract*.java" />
             </batchtest>
         </junit>
     </target>
diff --git a/sass/README b/theme-compiler/README
index 4d9482763f..4d9482763f 100644
--- a/sass/README
+++ b/theme-compiler/README
diff --git a/sass/src/com/vaadin/sass/SassCompiler.java b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
index 555797066b..555797066b 100644
--- a/sass/src/com/vaadin/sass/SassCompiler.java
+++ b/theme-compiler/src/com/vaadin/sass/SassCompiler.java
diff --git a/sass/src/com/vaadin/sass/ScssServlet.java b/theme-compiler/src/com/vaadin/sass/ScssServlet.java
index a345ca1583..a345ca1583 100644
--- a/sass/src/com/vaadin/sass/ScssServlet.java
+++ b/theme-compiler/src/com/vaadin/sass/ScssServlet.java
diff --git a/sass/src/com/vaadin/sass/ScssStylesheet.java b/theme-compiler/src/com/vaadin/sass/ScssStylesheet.java
index b38cab82a0..b38cab82a0 100644
--- a/sass/src/com/vaadin/sass/ScssStylesheet.java
+++ b/theme-compiler/src/com/vaadin/sass/ScssStylesheet.java
diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
index c489a6a4a7..c489a6a4a7 100644
--- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandler.java
diff --git a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
index 0ed8b8d0f2..0ed8b8d0f2 100644
--- a/sass/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/handler/SCSSDocumentHandlerImpl.java
diff --git a/sass/src/com/vaadin/sass/parser/CharStream.java b/theme-compiler/src/com/vaadin/sass/parser/CharStream.java
index 004e3eb8fd..004e3eb8fd 100644
--- a/sass/src/com/vaadin/sass/parser/CharStream.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/CharStream.java
diff --git a/sass/src/com/vaadin/sass/parser/Generic_CharStream.java b/theme-compiler/src/com/vaadin/sass/parser/Generic_CharStream.java
index fd9c8a7c03..fd9c8a7c03 100644
--- a/sass/src/com/vaadin/sass/parser/Generic_CharStream.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/Generic_CharStream.java
diff --git a/sass/src/com/vaadin/sass/parser/JumpException.java b/theme-compiler/src/com/vaadin/sass/parser/JumpException.java
index 4d0f5923e9..4d0f5923e9 100644
--- a/sass/src/com/vaadin/sass/parser/JumpException.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/JumpException.java
diff --git a/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java b/theme-compiler/src/com/vaadin/sass/parser/LexicalUnitImpl.java
index a6b03a864c..a6b03a864c 100644
--- a/sass/src/com/vaadin/sass/parser/LexicalUnitImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/LexicalUnitImpl.java
diff --git a/sass/src/com/vaadin/sass/parser/LocatorImpl.java b/theme-compiler/src/com/vaadin/sass/parser/LocatorImpl.java
index d481459f17..d481459f17 100644
--- a/sass/src/com/vaadin/sass/parser/LocatorImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/LocatorImpl.java
diff --git a/sass/src/com/vaadin/sass/parser/MediaListImpl.java b/theme-compiler/src/com/vaadin/sass/parser/MediaListImpl.java
index 042e385cb3..042e385cb3 100644
--- a/sass/src/com/vaadin/sass/parser/MediaListImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/MediaListImpl.java
diff --git a/sass/src/com/vaadin/sass/parser/ParseException.java b/theme-compiler/src/com/vaadin/sass/parser/ParseException.java
index 482e5d3b3f..482e5d3b3f 100644
--- a/sass/src/com/vaadin/sass/parser/ParseException.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/ParseException.java
diff --git a/sass/src/com/vaadin/sass/parser/Parser.java b/theme-compiler/src/com/vaadin/sass/parser/Parser.java
index 68e0aa7231..68e0aa7231 100644
--- a/sass/src/com/vaadin/sass/parser/Parser.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/Parser.java
diff --git a/sass/src/com/vaadin/sass/parser/Parser.jj b/theme-compiler/src/com/vaadin/sass/parser/Parser.jj
index 717094a763..717094a763 100644
--- a/sass/src/com/vaadin/sass/parser/Parser.jj
+++ b/theme-compiler/src/com/vaadin/sass/parser/Parser.jj
diff --git a/sass/src/com/vaadin/sass/parser/ParserConstants.java b/theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java
index 41fb8ca030..41fb8ca030 100644
--- a/sass/src/com/vaadin/sass/parser/ParserConstants.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/ParserConstants.java
diff --git a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java b/theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java
index 7c176f2262..7c176f2262 100644
--- a/sass/src/com/vaadin/sass/parser/ParserTokenManager.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/ParserTokenManager.java
diff --git a/sass/src/com/vaadin/sass/parser/SCSSLexicalUnit.java b/theme-compiler/src/com/vaadin/sass/parser/SCSSLexicalUnit.java
index 8c2fa4018d..8c2fa4018d 100644
--- a/sass/src/com/vaadin/sass/parser/SCSSLexicalUnit.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/SCSSLexicalUnit.java
diff --git a/sass/src/com/vaadin/sass/parser/SelectorListImpl.java b/theme-compiler/src/com/vaadin/sass/parser/SelectorListImpl.java
index 634fe57647..634fe57647 100644
--- a/sass/src/com/vaadin/sass/parser/SelectorListImpl.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/SelectorListImpl.java
diff --git a/sass/src/com/vaadin/sass/parser/Selectors.java b/theme-compiler/src/com/vaadin/sass/parser/Selectors.java
index bec8d66294..bec8d66294 100644
--- a/sass/src/com/vaadin/sass/parser/Selectors.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/Selectors.java
diff --git a/sass/src/com/vaadin/sass/parser/ThrowedParseException.java b/theme-compiler/src/com/vaadin/sass/parser/ThrowedParseException.java
index 5c1a9e8f33..5c1a9e8f33 100644
--- a/sass/src/com/vaadin/sass/parser/ThrowedParseException.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/ThrowedParseException.java
diff --git a/sass/src/com/vaadin/sass/parser/Token.java b/theme-compiler/src/com/vaadin/sass/parser/Token.java
index 554b97896e..554b97896e 100644
--- a/sass/src/com/vaadin/sass/parser/Token.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/Token.java
diff --git a/sass/src/com/vaadin/sass/parser/TokenMgrError.java b/theme-compiler/src/com/vaadin/sass/parser/TokenMgrError.java
index 311bf0d9b3..311bf0d9b3 100644
--- a/sass/src/com/vaadin/sass/parser/TokenMgrError.java
+++ b/theme-compiler/src/com/vaadin/sass/parser/TokenMgrError.java
diff --git a/sass/src/com/vaadin/sass/resolver/ClassloaderResolver.java b/theme-compiler/src/com/vaadin/sass/resolver/ClassloaderResolver.java
index 84ac6dc530..84ac6dc530 100644
--- a/sass/src/com/vaadin/sass/resolver/ClassloaderResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/resolver/ClassloaderResolver.java
diff --git a/sass/src/com/vaadin/sass/resolver/FilesystemResolver.java b/theme-compiler/src/com/vaadin/sass/resolver/FilesystemResolver.java
index 2c6b92430f..2c6b92430f 100644
--- a/sass/src/com/vaadin/sass/resolver/FilesystemResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/resolver/FilesystemResolver.java
diff --git a/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java b/theme-compiler/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
index c3b0e75979..c3b0e75979 100644
--- a/sass/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/resolver/ScssStylesheetResolver.java
diff --git a/sass/src/com/vaadin/sass/resolver/VaadinResolver.java b/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java
index 93fdf6bfec..93fdf6bfec 100644
--- a/sass/src/com/vaadin/sass/resolver/VaadinResolver.java
+++ b/theme-compiler/src/com/vaadin/sass/resolver/VaadinResolver.java
diff --git a/sass/src/com/vaadin/sass/selector/CompositeSelector.java b/theme-compiler/src/com/vaadin/sass/selector/CompositeSelector.java
index f187cf8f6b..f187cf8f6b 100644
--- a/sass/src/com/vaadin/sass/selector/CompositeSelector.java
+++ b/theme-compiler/src/com/vaadin/sass/selector/CompositeSelector.java
diff --git a/sass/src/com/vaadin/sass/selector/SelectorUtil.java b/theme-compiler/src/com/vaadin/sass/selector/SelectorUtil.java
index d93f37c175..d93f37c175 100644
--- a/sass/src/com/vaadin/sass/selector/SelectorUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/selector/SelectorUtil.java
diff --git a/sass/src/com/vaadin/sass/tree/BlockNode.java b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
index e255b2a3e5..e255b2a3e5 100644
--- a/sass/src/com/vaadin/sass/tree/BlockNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/BlockNode.java
diff --git a/sass/src/com/vaadin/sass/tree/CommentNode.java b/theme-compiler/src/com/vaadin/sass/tree/CommentNode.java
index 5fb438bb08..5fb438bb08 100644
--- a/sass/src/com/vaadin/sass/tree/CommentNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/CommentNode.java
diff --git a/sass/src/com/vaadin/sass/tree/ExtendNode.java b/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
index 65ecb254bb..65ecb254bb 100644
--- a/sass/src/com/vaadin/sass/tree/ExtendNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/ExtendNode.java
diff --git a/sass/src/com/vaadin/sass/tree/ForNode.java b/theme-compiler/src/com/vaadin/sass/tree/ForNode.java
index 7c0239aa60..7c0239aa60 100644
--- a/sass/src/com/vaadin/sass/tree/ForNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/ForNode.java
diff --git a/sass/src/com/vaadin/sass/tree/FunctionNode.java b/theme-compiler/src/com/vaadin/sass/tree/FunctionNode.java
index 90b5458235..90b5458235 100644
--- a/sass/src/com/vaadin/sass/tree/FunctionNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/FunctionNode.java
diff --git a/sass/src/com/vaadin/sass/tree/IfNode.java b/theme-compiler/src/com/vaadin/sass/tree/IfNode.java
index e425538104..e425538104 100644
--- a/sass/src/com/vaadin/sass/tree/IfNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/IfNode.java
diff --git a/sass/src/com/vaadin/sass/tree/ImportNode.java b/theme-compiler/src/com/vaadin/sass/tree/ImportNode.java
index ac070d6ffc..ac070d6ffc 100644
--- a/sass/src/com/vaadin/sass/tree/ImportNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/ImportNode.java
diff --git a/sass/src/com/vaadin/sass/tree/MediaNode.java b/theme-compiler/src/com/vaadin/sass/tree/MediaNode.java
index 00a7442a24..00a7442a24 100644
--- a/sass/src/com/vaadin/sass/tree/MediaNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/MediaNode.java
diff --git a/sass/src/com/vaadin/sass/tree/MixinDefNode.java b/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
index b888d01971..b888d01971 100644
--- a/sass/src/com/vaadin/sass/tree/MixinDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/MixinDefNode.java
diff --git a/sass/src/com/vaadin/sass/tree/MixinNode.java b/theme-compiler/src/com/vaadin/sass/tree/MixinNode.java
index 0267b88e2d..0267b88e2d 100644
--- a/sass/src/com/vaadin/sass/tree/MixinNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/MixinNode.java
diff --git a/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java b/theme-compiler/src/com/vaadin/sass/tree/NestPropertiesNode.java
index 306a73ba87..306a73ba87 100644
--- a/sass/src/com/vaadin/sass/tree/NestPropertiesNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/NestPropertiesNode.java
diff --git a/sass/src/com/vaadin/sass/tree/Node.java b/theme-compiler/src/com/vaadin/sass/tree/Node.java
index 817327502b..817327502b 100644
--- a/sass/src/com/vaadin/sass/tree/Node.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/Node.java
diff --git a/sass/src/com/vaadin/sass/tree/RuleNode.java b/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
index 3b51468e1d..3b51468e1d 100644
--- a/sass/src/com/vaadin/sass/tree/RuleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/RuleNode.java
diff --git a/sass/src/com/vaadin/sass/tree/SimpleNode.java b/theme-compiler/src/com/vaadin/sass/tree/SimpleNode.java
index 39a5d17b48..39a5d17b48 100644
--- a/sass/src/com/vaadin/sass/tree/SimpleNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/SimpleNode.java
diff --git a/sass/src/com/vaadin/sass/tree/VariableNode.java b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java
index db014ae616..db014ae616 100644
--- a/sass/src/com/vaadin/sass/tree/VariableNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/VariableNode.java
diff --git a/sass/src/com/vaadin/sass/tree/WhileNode.java b/theme-compiler/src/com/vaadin/sass/tree/WhileNode.java
index 465fec061d..465fec061d 100644
--- a/sass/src/com/vaadin/sass/tree/WhileNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/WhileNode.java
diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java
index a6df1e744b..a6df1e744b 100644
--- a/sass/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlChildNode.java
diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java
index 4ead42eb0a..4ead42eb0a 100644
--- a/sass/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlDefNode.java
diff --git a/sass/src/com/vaadin/sass/tree/controldirective/ControlNode.java b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlNode.java
index 453593d4d2..453593d4d2 100644
--- a/sass/src/com/vaadin/sass/tree/controldirective/ControlNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/controldirective/ControlNode.java
diff --git a/sass/src/com/vaadin/sass/tree/controldirective/EachDefNode.java b/theme-compiler/src/com/vaadin/sass/tree/controldirective/EachDefNode.java
index 1dfa5892d9..1dfa5892d9 100644
--- a/sass/src/com/vaadin/sass/tree/controldirective/EachDefNode.java
+++ b/theme-compiler/src/com/vaadin/sass/tree/controldirective/EachDefNode.java
diff --git a/sass/src/com/vaadin/sass/util/Clonable.java b/theme-compiler/src/com/vaadin/sass/util/Clonable.java
index 639f158fb0..639f158fb0 100644
--- a/sass/src/com/vaadin/sass/util/Clonable.java
+++ b/theme-compiler/src/com/vaadin/sass/util/Clonable.java
diff --git a/sass/src/com/vaadin/sass/util/ColorUtil.java b/theme-compiler/src/com/vaadin/sass/util/ColorUtil.java
index 25e29ff9a2..25e29ff9a2 100644
--- a/sass/src/com/vaadin/sass/util/ColorUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/util/ColorUtil.java
diff --git a/sass/src/com/vaadin/sass/util/DeepCopy.java b/theme-compiler/src/com/vaadin/sass/util/DeepCopy.java
index 5d4e43c477..5d4e43c477 100644
--- a/sass/src/com/vaadin/sass/util/DeepCopy.java
+++ b/theme-compiler/src/com/vaadin/sass/util/DeepCopy.java
diff --git a/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java b/theme-compiler/src/com/vaadin/sass/util/FastByteArrayInputStream.java
index 1b3d0ea0f7..1b3d0ea0f7 100644
--- a/sass/src/com/vaadin/sass/util/FastByteArrayInputStream.java
+++ b/theme-compiler/src/com/vaadin/sass/util/FastByteArrayInputStream.java
diff --git a/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java b/theme-compiler/src/com/vaadin/sass/util/FastByteArrayOutputStream.java
index 24b386686f..24b386686f 100644
--- a/sass/src/com/vaadin/sass/util/FastByteArrayOutputStream.java
+++ b/theme-compiler/src/com/vaadin/sass/util/FastByteArrayOutputStream.java
diff --git a/sass/src/com/vaadin/sass/util/StringUtil.java b/theme-compiler/src/com/vaadin/sass/util/StringUtil.java
index bd39f1d41a..bd39f1d41a 100644
--- a/sass/src/com/vaadin/sass/util/StringUtil.java
+++ b/theme-compiler/src/com/vaadin/sass/util/StringUtil.java
diff --git a/sass/src/com/vaadin/sass/visitor/BlockVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/BlockVisitor.java
index 6d2489e494..6d2489e494 100644
--- a/sass/src/com/vaadin/sass/visitor/BlockVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/BlockVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/ControlVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/ControlVisitor.java
index cc736b307f..cc736b307f 100644
--- a/sass/src/com/vaadin/sass/visitor/ControlVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/ControlVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/ExtendVisitor.java
index 605c7930c3..605c7930c3 100644
--- a/sass/src/com/vaadin/sass/visitor/ExtendVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/ExtendVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/ImportVisitor.java
index bda040be39..bda040be39 100644
--- a/sass/src/com/vaadin/sass/visitor/ImportVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/ImportVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/MixinVisitor.java
index d6008526b4..d6008526b4 100644
--- a/sass/src/com/vaadin/sass/visitor/MixinVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/MixinVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java
index 82fbef42ef..82fbef42ef 100644
--- a/sass/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/NestPropertiesVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java
index f24d7ae09d..f24d7ae09d 100644
--- a/sass/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/ParentSelectorVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java b/theme-compiler/src/com/vaadin/sass/visitor/VariableVisitor.java
index 7fa62bd20f..7fa62bd20f 100644
--- a/sass/src/com/vaadin/sass/visitor/VariableVisitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/VariableVisitor.java
diff --git a/sass/src/com/vaadin/sass/visitor/Visitor.java b/theme-compiler/src/com/vaadin/sass/visitor/Visitor.java
index 046cb7c0d1..046cb7c0d1 100644
--- a/sass/src/com/vaadin/sass/visitor/Visitor.java
+++ b/theme-compiler/src/com/vaadin/sass/visitor/Visitor.java
diff --git a/sass/tests/resources/basic/empty_block.css b/theme-compiler/tests/resources/basic/empty_block.css
index 31c0b47032..31c0b47032 100644
--- a/sass/tests/resources/basic/empty_block.css
+++ b/theme-compiler/tests/resources/basic/empty_block.css
diff --git a/sass/tests/resources/basic/media.css b/theme-compiler/tests/resources/basic/media.css
index f1188835ba..f1188835ba 100644
--- a/sass/tests/resources/basic/media.css
+++ b/theme-compiler/tests/resources/basic/media.css
diff --git a/sass/tests/resources/basic/properties.css b/theme-compiler/tests/resources/basic/properties.css
index 13d096292c..13d096292c 100644
--- a/sass/tests/resources/basic/properties.css
+++ b/theme-compiler/tests/resources/basic/properties.css
diff --git a/sass/tests/resources/basic/reindeer.css b/theme-compiler/tests/resources/basic/reindeer.css
index 4f1cd47193..4f1cd47193 100644
--- a/sass/tests/resources/basic/reindeer.css
+++ b/theme-compiler/tests/resources/basic/reindeer.css
diff --git a/sass/tests/resources/basic/selectors.css b/theme-compiler/tests/resources/basic/selectors.css
index 50c5fb7cc5..50c5fb7cc5 100644
--- a/sass/tests/resources/basic/selectors.css
+++ b/theme-compiler/tests/resources/basic/selectors.css
diff --git a/sass/tests/resources/css/comments.css b/theme-compiler/tests/resources/css/comments.css
index 1c773f7974..1c773f7974 100644
--- a/sass/tests/resources/css/comments.css
+++ b/theme-compiler/tests/resources/css/comments.css
diff --git a/sass/tests/resources/css/control-directives.css b/theme-compiler/tests/resources/css/control-directives.css
index dbc44e886c..dbc44e886c 100644
--- a/sass/tests/resources/css/control-directives.css
+++ b/theme-compiler/tests/resources/css/control-directives.css
diff --git a/sass/tests/resources/css/extends.css b/theme-compiler/tests/resources/css/extends.css
index d1c903f166..d1c903f166 100644
--- a/sass/tests/resources/css/extends.css
+++ b/theme-compiler/tests/resources/css/extends.css
diff --git a/sass/tests/resources/css/functions.css b/theme-compiler/tests/resources/css/functions.css
index 0fef5d899f..0fef5d899f 100644
--- a/sass/tests/resources/css/functions.css
+++ b/theme-compiler/tests/resources/css/functions.css
diff --git a/sass/tests/resources/css/imports.css b/theme-compiler/tests/resources/css/imports.css
index 5b1001802a..5b1001802a 100644
--- a/sass/tests/resources/css/imports.css
+++ b/theme-compiler/tests/resources/css/imports.css
diff --git a/sass/tests/resources/css/microsoft-extensions.css b/theme-compiler/tests/resources/css/microsoft-extensions.css
index 69670969de..69670969de 100644
--- a/sass/tests/resources/css/microsoft-extensions.css
+++ b/theme-compiler/tests/resources/css/microsoft-extensions.css
diff --git a/sass/tests/resources/css/mixins.css b/theme-compiler/tests/resources/css/mixins.css
index 5c727c193b..5c727c193b 100644
--- a/sass/tests/resources/css/mixins.css
+++ b/theme-compiler/tests/resources/css/mixins.css
diff --git a/sass/tests/resources/css/nested-properties.css b/theme-compiler/tests/resources/css/nested-properties.css
index 79b21e632b..79b21e632b 100644
--- a/sass/tests/resources/css/nested-properties.css
+++ b/theme-compiler/tests/resources/css/nested-properties.css
diff --git a/sass/tests/resources/css/nesting.css b/theme-compiler/tests/resources/css/nesting.css
index b3861a0131..b3861a0131 100644
--- a/sass/tests/resources/css/nesting.css
+++ b/theme-compiler/tests/resources/css/nesting.css
diff --git a/sass/tests/resources/css/parent-import.css b/theme-compiler/tests/resources/css/parent-import.css
index f67d17f8b4..f67d17f8b4 100644
--- a/sass/tests/resources/css/parent-import.css
+++ b/theme-compiler/tests/resources/css/parent-import.css
diff --git a/sass/tests/resources/css/parent-selector.css b/theme-compiler/tests/resources/css/parent-selector.css
index 9c7140e313..9c7140e313 100644
--- a/sass/tests/resources/css/parent-selector.css
+++ b/theme-compiler/tests/resources/css/parent-selector.css
diff --git a/sass/tests/resources/css/semicolons.css b/theme-compiler/tests/resources/css/semicolons.css
index ba28e8cab4..ba28e8cab4 100644
--- a/sass/tests/resources/css/semicolons.css
+++ b/theme-compiler/tests/resources/css/semicolons.css
diff --git a/sass/tests/resources/css/var-guarded.css b/theme-compiler/tests/resources/css/var-guarded.css
index c4a8c49d12..c4a8c49d12 100644
--- a/sass/tests/resources/css/var-guarded.css
+++ b/theme-compiler/tests/resources/css/var-guarded.css
diff --git a/sass/tests/resources/css/variables.css b/theme-compiler/tests/resources/css/variables.css
index d54ae6cd30..d54ae6cd30 100644
--- a/sass/tests/resources/css/variables.css
+++ b/theme-compiler/tests/resources/css/variables.css
diff --git a/sass/tests/resources/scss/_partial-for-import.scss b/theme-compiler/tests/resources/scss/_partial-for-import.scss
index 32c3149a5b..32c3149a5b 100644
--- a/sass/tests/resources/scss/_partial-for-import.scss
+++ b/theme-compiler/tests/resources/scss/_partial-for-import.scss
diff --git a/sass/tests/resources/scss/comments.scss b/theme-compiler/tests/resources/scss/comments.scss
index de3fbe8e0d..de3fbe8e0d 100644
--- a/sass/tests/resources/scss/comments.scss
+++ b/theme-compiler/tests/resources/scss/comments.scss
diff --git a/sass/tests/resources/scss/control-directives.scss b/theme-compiler/tests/resources/scss/control-directives.scss
index 3da1d337cc..3da1d337cc 100644
--- a/sass/tests/resources/scss/control-directives.scss
+++ b/theme-compiler/tests/resources/scss/control-directives.scss
diff --git a/sass/tests/resources/scss/extends.scss b/theme-compiler/tests/resources/scss/extends.scss
index c9e0f85381..c9e0f85381 100644
--- a/sass/tests/resources/scss/extends.scss
+++ b/theme-compiler/tests/resources/scss/extends.scss
diff --git a/sass/tests/resources/scss/folder-test/parent-import.scss b/theme-compiler/tests/resources/scss/folder-test/parent-import.scss
index b3f6c8000e..b3f6c8000e 100644
--- a/sass/tests/resources/scss/folder-test/parent-import.scss
+++ b/theme-compiler/tests/resources/scss/folder-test/parent-import.scss
diff --git a/sass/tests/resources/scss/folder-test2/base-imported.scss b/theme-compiler/tests/resources/scss/folder-test2/base-imported.scss
index 17d801e4aa..17d801e4aa 100644
--- a/sass/tests/resources/scss/folder-test2/base-imported.scss
+++ b/theme-compiler/tests/resources/scss/folder-test2/base-imported.scss
diff --git a/sass/tests/resources/scss/folder-test2/base.scss b/theme-compiler/tests/resources/scss/folder-test2/base.scss
index 57ca0bb7a2..57ca0bb7a2 100644
--- a/sass/tests/resources/scss/folder-test2/base.scss
+++ b/theme-compiler/tests/resources/scss/folder-test2/base.scss
diff --git a/sass/tests/resources/scss/folder-test2/url.scss b/theme-compiler/tests/resources/scss/folder-test2/url.scss
index a4be967ad7..a4be967ad7 100644
--- a/sass/tests/resources/scss/folder-test2/url.scss
+++ b/theme-compiler/tests/resources/scss/folder-test2/url.scss
diff --git a/sass/tests/resources/scss/folder-test2/variables.scss b/theme-compiler/tests/resources/scss/folder-test2/variables.scss
index 2d06d36650..2d06d36650 100644
--- a/sass/tests/resources/scss/folder-test2/variables.scss
+++ b/theme-compiler/tests/resources/scss/folder-test2/variables.scss
diff --git a/sass/tests/resources/scss/functions.scss b/theme-compiler/tests/resources/scss/functions.scss
index abf6f6187d..abf6f6187d 100644
--- a/sass/tests/resources/scss/functions.scss
+++ b/theme-compiler/tests/resources/scss/functions.scss
diff --git a/sass/tests/resources/scss/imports.scss b/theme-compiler/tests/resources/scss/imports.scss
index 4d53a120d2..4d53a120d2 100644
--- a/sass/tests/resources/scss/imports.scss
+++ b/theme-compiler/tests/resources/scss/imports.scss
diff --git a/sass/tests/resources/scss/interpolation.scss b/theme-compiler/tests/resources/scss/interpolation.scss
index 5859a9838b..5859a9838b 100644
--- a/sass/tests/resources/scss/interpolation.scss
+++ b/theme-compiler/tests/resources/scss/interpolation.scss
diff --git a/sass/tests/resources/scss/microsoft-extensions.scss b/theme-compiler/tests/resources/scss/microsoft-extensions.scss
index 69670969de..69670969de 100644
--- a/sass/tests/resources/scss/microsoft-extensions.scss
+++ b/theme-compiler/tests/resources/scss/microsoft-extensions.scss
diff --git a/sass/tests/resources/scss/mixins.scss b/theme-compiler/tests/resources/scss/mixins.scss
index db972f6edc..db972f6edc 100644
--- a/sass/tests/resources/scss/mixins.scss
+++ b/theme-compiler/tests/resources/scss/mixins.scss
diff --git a/sass/tests/resources/scss/nested-properties.scss b/theme-compiler/tests/resources/scss/nested-properties.scss
index e12a83aa2d..e12a83aa2d 100644
--- a/sass/tests/resources/scss/nested-properties.scss
+++ b/theme-compiler/tests/resources/scss/nested-properties.scss
diff --git a/sass/tests/resources/scss/nesting.scss b/theme-compiler/tests/resources/scss/nesting.scss
index 0336c9e86d..0336c9e86d 100644
--- a/sass/tests/resources/scss/nesting.scss
+++ b/theme-compiler/tests/resources/scss/nesting.scss
diff --git a/sass/tests/resources/scss/parent-selector.scss b/theme-compiler/tests/resources/scss/parent-selector.scss
index 3d0f694801..3d0f694801 100644
--- a/sass/tests/resources/scss/parent-selector.scss
+++ b/theme-compiler/tests/resources/scss/parent-selector.scss
diff --git a/sass/tests/resources/scss/reference-parent-selector.css b/theme-compiler/tests/resources/scss/reference-parent-selector.css
index 733c8fd42d..733c8fd42d 100644
--- a/sass/tests/resources/scss/reference-parent-selector.css
+++ b/theme-compiler/tests/resources/scss/reference-parent-selector.css
diff --git a/sass/tests/resources/scss/semicolons.scss b/theme-compiler/tests/resources/scss/semicolons.scss
index a4a56043d5..a4a56043d5 100644
--- a/sass/tests/resources/scss/semicolons.scss
+++ b/theme-compiler/tests/resources/scss/semicolons.scss
diff --git a/sass/tests/resources/scss/var-guarded.scss b/theme-compiler/tests/resources/scss/var-guarded.scss
index 8f7aab8fa9..8f7aab8fa9 100644
--- a/sass/tests/resources/scss/var-guarded.scss
+++ b/theme-compiler/tests/resources/scss/var-guarded.scss
diff --git a/sass/tests/resources/scss/variables.scss b/theme-compiler/tests/resources/scss/variables.scss
index 60acc5dd10..60acc5dd10 100644
--- a/sass/tests/resources/scss/variables.scss
+++ b/theme-compiler/tests/resources/scss/variables.scss
diff --git a/sass/tests/src/com/vaadin/sass/AbstractTestBase.java b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
index a6b03fefb0..a6b03fefb0 100644
--- a/sass/tests/src/com/vaadin/sass/AbstractTestBase.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/AbstractTestBase.java
diff --git a/sass/tests/src/com/vaadin/sass/parser/ParserTest.java b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
index 34c365ea13..34c365ea13 100644
--- a/sass/tests/src/com/vaadin/sass/parser/ParserTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/parser/ParserTest.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java
index de8a45b9a9..de8a45b9a9 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/EmptyBlock.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/Interpolation.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
index 01d593db78..01d593db78 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Interpolation.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/Media.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java
index 04b8573154..04b8573154 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/Media.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Media.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/Properties.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Properties.java
index e0c07bc9c0..e0c07bc9c0 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/Properties.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Properties.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/Reindeer.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Reindeer.java
index 9bb4ed4570..9bb4ed4570 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/Reindeer.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Reindeer.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/css/Selectors.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
index cb865042b6..cb865042b6 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/css/Selectors.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/css/Selectors.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Comments.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
index c76bbb8458..c76bbb8458 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Comments.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Comments.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
index b829c0c665..b829c0c665 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ControlDirectives.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Extends.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
index f52a1d2f8b..f52a1d2f8b 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Extends.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Extends.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Functions.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
index d2e890c052..d2e890c052 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Functions.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Functions.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Imports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
index 8c609273a1..8c609273a1 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Imports.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Imports.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
index 5460700db4..5460700db4 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/MicrosoftExtensions.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Mixins.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
index 05b3d3c83e..05b3d3c83e 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Mixins.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
index 2f57934086..2f57934086 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/NestedProperties.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Nesting.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
index 55365c78e1..55365c78e1 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Nesting.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
index 8b12f3b7e9..8b12f3b7e9 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentImports.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
index 7ac2450bfc..7ac2450bfc 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/ParentSelector.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java
index 9dd8a38bfe..9dd8a38bfe 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Semicolons.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
index 2c37737e69..2c37737e69 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/VariableGuarded.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/scss/Variables.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
index 010a2085ba..010a2085ba 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/scss/Variables.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/scss/Variables.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
index 8459139b4b..8459139b4b 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/ImportVisitorTest.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
index 6b7cfcb2fb..6b7cfcb2fb 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/MixinVisitorTest.java
diff --git a/sass/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
index 3885869b72..3885869b72 100644
--- a/sass/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/testcases/visitor/NestedPropertiesVisitorTest.java
diff --git a/sass/tests/src/com/vaadin/sass/tree/ImportNodeTest.java b/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
index b3a1c8f318..b3a1c8f318 100644
--- a/sass/tests/src/com/vaadin/sass/tree/ImportNodeTest.java
+++ b/theme-compiler/tests/src/com/vaadin/sass/tree/ImportNodeTest.java