Closes #159, #149. Update prettydiff to fix LESS and SCSS.

- SCSS Interpolated text variables - LESS &:extend
Glavin001 · Jan 1, 2015 · 3550280 · 3550280
1 parent 259bb70
commit 3550280
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 4 deletions.
diff --git a/examples/simple-jsbeautifyrc/less/expected/test3.less b/examples/simple-jsbeautifyrc/less/expected/test3.less
@@ -1,14 +1,14 @@
 // Breaks (fixed now)
 .mixin(@variable, @anotherVariable) {
-
+  
 
 }
 // Works
 .mixin(@variable; @anotherVariable) {
-
+  
 
 }
 // Ok
 .mixin(@variable) {
-
+  
 }
diff --git a/...le-jsbeautifyrc/less/original/_test3.less → ...ple-jsbeautifyrc/less/original/test3.less b/...le-jsbeautifyrc/less/original/_test3.less → ...ple-jsbeautifyrc/less/original/test3.less
diff --git a/...le-jsbeautifyrc/less/original/_test5.less → ...ple-jsbeautifyrc/less/original/test5.less b/...le-jsbeautifyrc/less/original/_test5.less → ...ple-jsbeautifyrc/less/original/test5.less
diff --git a/examples/simple-jsbeautifyrc/sass/expected/interpolated-text-vars.scss b/examples/simple-jsbeautifyrc/sass/expected/interpolated-text-vars.scss
@@ -0,0 +1,8 @@
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent;} {
+    color: $color;
+  }
+  a#{$parent;}:hover {
+    color: darken($color, 10%);
+  }
+}
diff --git a/examples/simple-jsbeautifyrc/sass/original/interpolated-text-vars.scss b/examples/simple-jsbeautifyrc/sass/original/interpolated-text-vars.scss
@@ -0,0 +1,8 @@
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent} {
+    color: $color;
+  }
+  a#{$parent}:hover {
+    color: darken($color, 10%);
+  }
+}
diff --git a/package.json b/package.json
@@ -94,7 +94,7 @@
     "lodash": "2.4.1",
     "loophole": "^1.0.0",
     "node-uuid": "^1.4.1",
-    "prettydiff": "^1.6.11",
+    "prettydiff": "^1.6.12",
     "space-pen": "^4.3.0",
     "strip-json-comments": "^0.1.3",
     "temp": "^0.8.0",