Clean up LESS/SCSS Unit Tests and update Prettydiff

Fixes #181 and fixes #180.
Glavin001 · Feb 2, 2015 · a50c5a3 · a50c5a3
1 parent 617317a
commit a50c5a3
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 40 deletions.
diff --git a/examples/nested-jsbeautifyrc/less/expected/test.less b/examples/nested-jsbeautifyrc/less/expected/test.less
@@ -1,6 +1,5 @@
 a {
   line-height: @headerHeight;
-
   display: block;
   padding: 0 15px;
   font-size: 16px;
@@ -9,23 +8,18 @@ a {
   }
   &:link {
     color: @white;
-
     text-decoration: none;
   }
   &:visited {
     color: @white;
-
   }
   &:hover {
     color: @orange;
-
   }
   &.green {
     color: @green;
-
     &:hover {
       color: @white;
-
       background-color: @green;
     }
   }

diff --git a/examples/nested-jsbeautifyrc/less/expected/test2.less b/examples/nested-jsbeautifyrc/less/expected/test2.less
@@ -1,7 +1,6 @@
 // main: style.less
 @import (reference)"variables.less";
 @import (reference)"mixins.less";
-
 .modal {
   position: fixed;
   height: 100%;
@@ -10,7 +9,6 @@
   z-index: 10;
   opacity: 0;
   display: none;
-
   .innerModal {
     margin: auto;
     background-color: @white;
@@ -20,24 +18,20 @@
     -ms-transform: translateY(-100%);
     -o-transform: translateY(-100%);
     transform: translateY(-100%);
-
     .fa {
       float: right;
       color: @white;
       background-color: firebrick;
       padding: 5px 7px;
       border-radius: 20px;
-
       &:hover {
         background-color: lighten(@black, 50%);
         cursor: pointer;
-
       }
       &:active {
         background-color: lighten(@black, 25%);
       }
     }
-
   }
   &.modal-2text {
     .innerModal {
@@ -47,121 +41,98 @@
       padding: 10px 25px;
       background-color: gainsboro;
       border-radius: 4px;
-
       h2 {
         margin: 0 0 7px;
-
       }
       div {
         height: 70%;
         overflow-y: scroll;
         background-color: @white;
         padding: 15px;
         border-radius: 4px;
-
       }
       .large-cta {
         margin-top: 25px;
       }
     }
   }
-
 }
 #modal-video {
   .innerModal {
     left: 10%;
     margin-top: 30px;
     width: 1000px;
     background-color: lighten(@black, 25%);
-
     iframe {
       width: 600px;
       height: 340px;
       margin: 2% auto;
-
     }
     //container
     > div {
       text-align: center;
-
       a {
         .styleLinks(@white, darken(@white, 10%));
         padding: 5px;
         text-transform: uppercase;
-
         &:hover {
           background-color: fade(@white, 15%);
-
         }
         &:active {
           background-color: fade(@white, 30%);
         }
-
       }
       h3 {
         color: @white;
         font-size: 3em;
         margin: 20px auto;
-
       }
       button {
         margin-bottom: 50px;
       }
     }
   }
-
 }
 .slideIn {
   .animation(SlideIn, 0.5s);
-
 }
 @-webkit-keyframes SlideIn {
   0% {
     .transform(translateY(-100%));
-
   }
   100% {
     .transform(translateY(0px));
   }
-
 }
 .fadeIn {
   display: block;
   .animation(FadeIn, 0.5s);
-
 }
 @-webkit-keyframes FadeIn {
   0% {
     opacity: 0;
-
   }
   100% {
     opacity: 1;
   }
-
 }
 .slideOut {
   .animation(SlideOut, 0.5s);
-
 }
 @-webkit-keyframes SlideOut {
   0% {
     .transform(translateY(0%));
-
   }
   100% {
     .transform(translateY(-100%));
   }
-
 }
 .fadeOut {
   .animation(FadeOut, 0.5s);
-
 }
 @-webkit-keyframes FadeOut {
   0% {
     opacity: 1;
-
   }
   100% {
     opacity: 0;

diff --git a/examples/nested-jsbeautifyrc/less/expected/test3.less b/examples/nested-jsbeautifyrc/less/expected/test3.less
@@ -1,12 +1,10 @@
 // Breaks (fixed now)
 .mixin(@variable, @anotherVariable) {
 
-
 }
 // Works
 .mixin(@variable; @anotherVariable) {
 
-
 }
 // Ok
 .mixin(@variable) {

diff --git a/examples/nested-jsbeautifyrc/less/expected/test4.less b/examples/nested-jsbeautifyrc/less/expected/test4.less
@@ -1,7 +1,6 @@
 section#photo-details {
   width: 1140px;
   margin: 60px auto 70px;
-
 }
 div.photo-view {
   text-align: center;

diff --git a/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss b/examples/nested-jsbeautifyrc/sass/expected/extra-line-test.scss
@@ -0,0 +1,11 @@
+// https://github.com/Glavin001/atom-beautify/issues/181
+.ttl {
+  margin-bottom: 10px;
+}
+// https://github.com/Glavin001/atom-beautify/issues/180
+.a {
+  color: #fff;
+  .b {
+    color: #999;
+  }
+}
diff --git a/examples/nested-jsbeautifyrc/sass/original/extra-line-test.scss b/examples/nested-jsbeautifyrc/sass/original/extra-line-test.scss
@@ -0,0 +1,14 @@
+// https://github.com/Glavin001/atom-beautify/issues/181
+.ttl {
+  margin-bottom: 10px;
+}
+
+
+// https://github.com/Glavin001/atom-beautify/issues/180
+.a {
+  color: #fff;
+
+  .b {
+    color: #999;
+  }
+}
diff --git a/lib/langs/less-beautify.coffee → lib/langs/css-prettydiff-beautify.coffee b/lib/langs/less-beautify.coffee → lib/langs/css-prettydiff-beautify.coffee
diff --git a/lib/language-options.coffee b/lib/language-options.coffee
@@ -422,7 +422,7 @@ module.exports =
         text = beautifyCSS(text, self.getOptions("css", allOptions))
         beautifyCompleted text
       when "Sass", "SCSS", "LESS"
-        beautifyLESS ?= require("./langs/less-beautify")
+        beautifyLESS ?= require("./langs/css-prettydiff-beautify")
         beautifyLESS text, self.getOptions("css", allOptions), beautifyCompleted
       when "SQL (Rails)", "SQL"
         beautifySQL ?= require("./langs/sql-beautify")

diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     "loophole": "^1.0.0",
     "node-dir": "^0.1.6",
     "node-uuid": "^1.4.1",
-    "prettydiff": "^1.6.13",
+    "prettydiff": "^1.8.8",
     "space-pen": "^4.3.0",
     "strip-json-comments": "^0.1.3",
     "temp": "^0.8.0",