make plugin actually use scss formatter

akalongman · Feb 25, 2017 · 3c20fa0 · 3c20fa0
1 parent 426fcc9
commit 3c20fa0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/CodeFormatter.sublime-settings b/CodeFormatter.sublime-settings
@@ -62,16 +62,17 @@
         "eol": "\n" // EOL symbol
     },
 
-	"codeformatter_scss_options":
-	{
+    "codeformatter_scss_options":
+    {
         "syntaxes": "scss", // Indentation size
         "format_on_save": false, // Format on save. Either a boolean (true/false) or a string regexp tested on filename. Example : "^((?!.min.|vendor).)*$"
-		"indent_size": 2, // Indentation size
-		"indent_char": " ", // Indentation character
-		"indent_with_tabs": false, // Indent with one tab (overrides indent_size and indent_char options)
-		"selector_separator_newline": true, // Add new lines after selector separators
-		"end_with_newline": true // Add new line of end in file
-	},
+        "indent_size": 2, // Indentation size
+        "indent_char": " ", // Indentation character
+        "indent_with_tabs": false, // Indent with one tab (overrides indent_size and indent_char options)
+        "selector_separator_newline": true, // Add new lines after selector separators
+        "newline_between_rules": true, // Add new line between rules
+        "end_with_newline": true // Add new line of end in file
+    },
 
     "codeformatter_html_options":
     {

diff --git a/README.md b/README.md
@@ -183,6 +183,7 @@ Language specific options:
         "indent_char": " ", // Indentation character
         "indent_with_tabs": false, // Indent with one tab (overrides indent_size and indent_char options)
         "selector_separator_newline": true, // Add new lines after selector separators
+        "newline_between_rules": true, // Add new line between rules
         "end_with_newline": true // Add new line of end in file
     }
 ```

diff --git a/codeformatter/lib/scssbeautifier/__init__.py b/codeformatter/lib/scssbeautifier/__init__.py
@@ -40,15 +40,17 @@ def __init__(self):
         self.indent_char = ' '
         self.selector_separator_newline = True
         self.end_with_newline = True
+        self.newline_between_rules = True
 
     def __repr__(self):
         return \
 """indent_size = %d
 indent_char = [%s]
 separate_selectors_newline = [%s]
 end_with_newline = [%s]
+newline_between_rules = [%s]
 """ % (self.indent_size, self.indent_char,
-       self.separate_selectors, self.end_with_newline)
+       self.separate_selectors, self.end_with_newline, self.newline_between_rules)
 
 
 def default_options():
@@ -259,13 +261,18 @@ def beautify(self):
                 if self.peek() == '}':
                     self.next()
                     printer.push(" {}")
+                    printer.newLine()
+                    if self.opts.newline_between_rules:
+                        printer.newLine(True)
                 else:
                     printer.indent()
                     printer.openBracket()
             elif self.ch == '}':
                 printer.outdent()
                 printer.closeBracket()
                 insideRule = False
+                if self.opts.newline_between_rules:
+                    printer.newLine(True)
             elif self.ch == ":":
                 self.eatWhitespace()
                 addWhitespace = not self.nextIsPseudoClass()
@@ -330,4 +337,3 @@ def beautify(self):
             sweet_code = sweet_code[:-1]
 
         return sweet_code
-
diff --git a/codeformatter/scssformatter.py b/codeformatter/scssformatter.py
@@ -8,7 +8,7 @@
 import sublime
 import subprocess
 
-import cssbeautifier
+import scssbeautifier
 
 class ScssFormatter:
     def __init__(self, formatter):
@@ -22,7 +22,7 @@ def format(self, text):
 
         stderr = ""
         stdout = ""
-        options = cssbeautifier.default_options()
+        options = scssbeautifier.default_options()
 
         if ("indent_size" in self.opts and self.opts["indent_size"]):
             options.indent_size = self.opts["indent_size"]
@@ -50,11 +50,16 @@ def format(self, text):
         else:
             options.end_with_newline = False
 
+        if ("newline_between_rules" in self.opts and self.opts["newline_between_rules"]):
+            options.newline_between_rules = True
+        else:
+            options.newline_between_rules = False
+
 
 
 
         try:
-              stdout = cssbeautifier.beautify(text, options)
+              stdout = scssbeautifier.beautify(text, options)
         except Exception as e:
              stderr = str(e)
 

diff --git a/messages/install.txt b/messages/install.txt
@@ -178,6 +178,7 @@ Language specific options:
         "indent_char": " ", // Indentation character
         "indent_with_tabs": false, // Indent with one tab (overrides indent_size and indent_char options)
         "selector_separator_newline": true, // Add new lines after selector separators
+        "newline_between_rules": true, // Add new line between rules
         "end_with_newline": true // Add new line of end in file
     }
 ```