Fixed several problems related to @extend directive (Ticket #10976)

Change-Id: I5e409856601aa514965319453c11946028b08dda

12 files changed, 104 insertions, 0 deletions

diff --git a/theme-compiler/tests/resources/automatic/css/extend-in-nested-block.css b/theme-compiler/tests/resources/automatic/css/extend-in-nested-block.css
new file mode 100644
index 0000000000..29f1550dd7
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/extend-in-nested-block.css
@@ -0,0 +1,7 @@
+.test .error, .test .seriousError {
+	border: 1px #f00;
+	background-color: #fdd; 
+}
+.test .seriousError {
+	border-width: 3px; 
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/extend-selector-in-different-levels.css b/theme-compiler/tests/resources/automatic/css/extend-selector-in-different-levels.css
new file mode 100644
index 0000000000..4de05d8d82
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/extend-selector-in-different-levels.css
@@ -0,0 +1,15 @@
+.test .middle .error, .test .middle .seriousError {
+	border: 1px #f00;
+	background-color: #fdd; 
+}
+.test .seriousError {
+	border-width: 3px; 
+}
+
+.test1 .error1, .test1 .middle1 .seriousError1 {
+	border: 1px #f00;
+	background-color: #fdd; 
+}
+.test1 .middle1 .seriousError1 {
+	border-width: 3px;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/extending-non-exist-selector-with-same-beginning.css b/theme-compiler/tests/resources/automatic/css/extending-non-exist-selector-with-same-beginning.css
new file mode 100644
index 0000000000..d138a79e4a
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/extending-non-exist-selector-with-same-beginning.css
@@ -0,0 +1,7 @@
+.test1 {
+	color: blue;
+}
+
+.test2 {
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/extending-same-selector.css b/theme-compiler/tests/resources/automatic/css/extending-same-selector.css
new file mode 100644
index 0000000000..1a85c0c23e
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/extending-same-selector.css
@@ -0,0 +1,7 @@
+.test {
+	color: blue;
+}
+
+.test {
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/css/extending-selector-with-same-beginning.css b/theme-compiler/tests/resources/automatic/css/extending-selector-with-same-beginning.css
new file mode 100644
index 0000000000..097d7a8655
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/extending-selector-with-same-beginning.css
@@ -0,0 +1,7 @@
+.test1, .test2 {
+	color: blue;
+}
+
+.test2 {
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/extend-in-nested-block.scss b/theme-compiler/tests/resources/automatic/scss/extend-in-nested-block.scss
new file mode 100644
index 0000000000..d62ead937e
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/extend-in-nested-block.scss
@@ -0,0 +1,11 @@
+.test{
+ .error {
+  		border: 1px #f00;
+  		background-color: #fdd;
+	}
+
+ .seriousError {
+  		@extend .error;
+  		border-width: 3px;
+	}
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/extend-selector-in-different-levels.scss b/theme-compiler/tests/resources/automatic/scss/extend-selector-in-different-levels.scss
new file mode 100644
index 0000000000..977ead8d62
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/extend-selector-in-different-levels.scss
@@ -0,0 +1,26 @@
+.test{
+	.middle{
+ 		.error {
+  			border: 1px #f00;
+  			background-color: #fdd;
+		}
+	}
+
+ 	.seriousError {
+  		@extend .error;
+  		border-width: 3px;
+	}
+}
+
+.test1{
+ 	.error1 {
+  		border: 1px #f00;
+  		background-color: #fdd;
+	}
+	.middle1{
+ 		.seriousError1 {
+  			@extend .error1;
+  			border-width: 3px;
+		}
+	}
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/extending-non-exist-selector-with-same-beginning.scss b/theme-compiler/tests/resources/automatic/scss/extending-non-exist-selector-with-same-beginning.scss
new file mode 100644
index 0000000000..538f17da1d
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/extending-non-exist-selector-with-same-beginning.scss
@@ -0,0 +1,8 @@
+.test1 {
+	color: blue;
+}
+
+.test2 {
+	@extend .test;
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/extending-same-selector.scss b/theme-compiler/tests/resources/automatic/scss/extending-same-selector.scss
new file mode 100644
index 0000000000..fbfaed9b20
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/extending-same-selector.scss
@@ -0,0 +1,8 @@
+.test {
+	color: blue;
+}
+
+.test {
+	@extend .test;
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/automatic/scss/extending-selector-with-same-beginning.scss b/theme-compiler/tests/resources/automatic/scss/extending-selector-with-same-beginning.scss
new file mode 100644
index 0000000000..c7a9e5e921
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/extending-selector-with-same-beginning.scss
@@ -0,0 +1,8 @@
+.test1 {
+	color: blue;
+}
+
+.test2 {
+	@extend .test1;
+	background: red;
+}
\ No newline at end of file
diff --git a/theme-compiler/tests/resources/sasslangbroken/css/19-test_control_flow_if.css b/theme-compiler/tests/resources/sasslang/css/19-test_control_flow_if.css
index 14a1c6ef3c..14a1c6ef3c 100644
--- a/theme-compiler/tests/resources/sasslangbroken/css/19-test_control_flow_if.css
+++ b/theme-compiler/tests/resources/sasslang/css/19-test_control_flow_if.css
diff --git a/theme-compiler/tests/resources/sasslangbroken/scss/19-test_control_flow_if.scss b/theme-compiler/tests/resources/sasslang/scss/19-test_control_flow_if.scss
index be53e52341..be53e52341 100644
--- a/theme-compiler/tests/resources/sasslangbroken/scss/19-test_control_flow_if.scss
+++ b/theme-compiler/tests/resources/sasslang/scss/19-test_control_flow_if.scss