Merge branch 'master' of https://github.com/Glavin001/atom-beautify

appveyor.yml

@@ -119,4 +119,4 @@ build_script:
   # Show current PATH
   - echo %PATH%
   # Run tests on package
-  - apm test --one --path %LOCALAPPDATA%/atom/bin/atom.cmd
+  - apm test --path %LOCALAPPDATA%/atom/bin/atom.cmd

build-package.sh

@@ -39,6 +39,6 @@ if [ -f ./node_modules/.bin/coffeelint ]; then
 fi
 
 echo "Running specs..."
-ATOM_PATH=./atom atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm test --one --path atom/Atom.app/Contents/Resources/app/atom.sh
+ATOM_PATH=./atom atom/Atom.app/Contents/Resources/app/apm/node_modules/.bin/apm test --path atom/Atom.app/Contents/Resources/app/atom.sh
 
 exit

examples/nested-jsbeautifyrc/less/expected/test.less

@@ -3,27 +3,21 @@ a {
   display: block;
   padding: 0 15px;
   font-size: 16px;
-  
   button {
     font-size: 16px;
   }
-  
   &:link {
     color: @white;
     text-decoration: none;
   }
-  
   &:visited {
     color: @white;
   }
-  
   &:hover {
     color: @orange;
   }
-  
   &.green {
     color: @green;
-    
     &:hover {
       color: @white;
       background-color: @green;

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,25 +18,21 @@
     -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 {
       width: @container-width;
@@ -47,11 +41,9 @@
       padding: 10px 25px;
       background-color: gainsboro;
       border-radius: 4px;
-      
       h2 {
         margin: 0 0 7px;
       }
-      
       div {
         height: 70%;
         overflow-y: scroll;
@@ -59,21 +51,18 @@
         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;
@@ -83,86 +72,69 @@
     //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;
     display: none;

examples/nested-jsbeautifyrc/less/expected/test4.less

@@ -2,16 +2,13 @@ section#photo-details {
   width: 1140px;
   margin: 60px auto 70px;
 }
-
 div.photo-view {
   text-align: center;
-  
   figure {
     box-shadow: 0 0 3px 1px rgba(0,0,0,0.75);
     display: inline-block;
     margin: 0 0 60px;
     padding: 0;
-    
     img {
       display: block;
     }

examples/nested-jsbeautifyrc/less/expected/test5.less

@@ -1,10 +1,8 @@
 .animal {
   color: red;
 }
-
 .dog {
   &:extend(.animal);
-  
   &:hover {
     color: green;
   }

examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss

@@ -2,7 +2,6 @@
   #{$parent} {
     color: $color;
   }
-  
   a#{$parent}:hover {
     color: darken($color, 10%);
   }

examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss

@@ -6,16 +6,13 @@
   background-color: $gray-light;
   box-shadow: none;
 }
-
 .k-slider-selection {
   background-color: $brand-primary;
 }
-
 .k-button {
   border: 1px solid $brand-primary;
   background-color: transparent;
   color: $brand-primary;
-  
   &:hover {
     border-color: $brand-primary;
     background-color: $brand-primary;

examples/nested-jsbeautifyrc/sass/expected/test.sass

@@ -1,6 +1,5 @@
 a {
   line-height: 56px;
-  
   &:hover {
     color: blue;
   }

examples/nested-jsbeautifyrc/sass/expected/test.scss

@@ -5,7 +5,6 @@
         
         //whatever
       }
-      
       &::before {
         
         //whatever

examples/nested-jsbeautifyrc/xml/expected/test.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">]>
+
+<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" encoding="utf-8" indent="yes" method="html"/>
+
+  <xsl:template match="/">
+    <html>
+      <head>
+        <title>Sample xml transformation</title>
+      </head>
+      <body>
+
+        <xsl:for-each select="/letter">
+          <div>
+            <div><xsl:value-of select="./title"/></div>
+            <div><xsl:value-of select="./salutation"/></div>
+            <div><xsl:value-of select="./text"/></div>
+            <div><xsl:value-of select="./greetings"/></div>
+            <div><xsl:value-of select="./signature"/></div>
+            <div><xsl:value-of select="./address"/></div>
+          </div>
+        </xsl:for-each>
+      </body>
+    </html>
+  </xsl:template>
+</xsl:stylesheet>

examples/nested-jsbeautifyrc/xml/original/test.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE stylesheet [<!ENTITY nbsp "<xsl:text disable-output-escaping='yes'>&amp;nbsp;</xsl:text>">]>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+    <xsl:output method="html" indent="yes" encoding="utf-8" doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"/>
+<xsl:template match="/">
+<html>
+<head>
+      <title>Sample xml transformation</title>
+</head>
+<body>
+      <xsl:for-each select="/letter">
+        <div><div><xsl:value-of select="./title" /></div>
+        <div><xsl:value-of select="./salutation" /></div>
+        <div><xsl:value-of select="./text" /></div>
+        <div><xsl:value-of select="./greetings" /></div>
+        <div><xsl:value-of select="./signature" /></div>
+        <div><xsl:value-of select="./address" /></div></div>
+      </xsl:for-each>
+</body>
+</html>
+</xsl:template>
+</xsl:stylesheet>

examples/simple-jsbeautifyrc/jsx/expected/test.jsx

@@ -1,6 +1,9 @@
 var Mist = React.createClass({
   renderList: function() {
-    return this.props.items.map(function(item) {
+    return this
+      .props
+      .items
+      .map(function(item) {
         return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
       });
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "atom-beautify",
   "main": "./src/beautify",
-  "version": "0.28.12",
+  "version": "0.28.14",
   "private": true,
   "description": "Beautify HTML, CSS, JavaScript, PHP, Python, Ruby, Java, C, C++, C#, Objective-C, CoffeeScript, TypeScript, and SQL in Atom",
   "repository": {

src/beautifiers/prettydiff.coffee

@@ -16,8 +16,8 @@ module.exports = class PrettyDiff extends Beautifier
       ]
       cssinsertlines: "newline_between_rules"
       comments: ["indent_comments", (indent_comments) ->
-        if (indent_comments is true) then \
+        if (indent_comments is false) then \
-          "indent" else "noindent"
+          "noindent" else "indent"
       ]
       force: "force_indentation"
       quoteConvert: "convert_quotes"

src/beautifiers/uncrustify/cfg.coffee

@@ -21,9 +21,7 @@ module.exports = (options, cb) ->
   # jshint ignore: start
   ic = options.indent_char
   if options.indent_with_tabs is 0 or options.indent_with_tabs is 1 or options.indent_with_tabs is 2
-
+    null # Ignore indent_char option
-
-  # Ignore indent_char option
   else if ic is " "
     options.indent_with_tabs = 0 # Spaces only
   else if ic is "\t"

src/languages/xml.coffee

@@ -9,14 +9,14 @@ module.exports = {
   Supported Grammars
   ###
   grammars: [
-    "XML"
+    "XML", "XSD", "XSL"
   ]
 
   ###
   Supported extensions
   ###
   extensions: [
-    'xml'
+    'xml', 'xsd', 'xsl'
   ]
 
   defaultBeautifier: "Pretty Diff"