From 1942cf48f32ef16a81a692f98035f66a199d2a69 Mon Sep 17 00:00:00 2001
From: Owen Leonard <owenleonard@gmail.com>
Date: Sat, 2 Apr 2016 09:44:46 -0600
Subject: [PATCH 1/2] Add semicolons where they are missing so sass-convert
 does not error out

---
 SassBeautify.py | 19 +++++++++++++++++--
 tests/test.py   | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/SassBeautify.py b/SassBeautify.py
index d26f30e..fd429d9 100644
--- a/SassBeautify.py
+++ b/SassBeautify.py
@@ -173,11 +173,24 @@ def insert_newline_between_capturing_parentheses(m):
         content = re.sub(re.compile('(;.*|}.*)(\n +//.*\n.+[{,])$', re.MULTILINE), insert_newline_between_capturing_parentheses, content)
 
         return content
-        
+
     def use_single_quotes(self, content):
         content = content.replace('"', '\'')
         return content
 
+    def beautify_semicolons(self, content):
+        '''
+        Appends a semicolon to the lines missing one
+        '''
+        def remove_semicolon_from_end_of_comment(m):
+            return m.group(1) + m.group(2)
+
+        content = re.sub(re.compile('(?<!,)$', re.MULTILINE), ';', content) # add ; to all lines not ending in ,
+        content = re.sub(re.compile(';(?=$\s*\{)', re.MULTILINE), '', content) # remove ; if next line starts with {
+        content = re.sub(re.compile('(//|/\\*)(.*);$', re.MULTILINE), remove_semicolon_from_end_of_comment, content) # remove ; if at end of comment
+        # sass-convert removes all other cases of extra ;s, so don't worry about them here
+        return content
+
     def check_thread(self, thread, i=0, dir=1):
         '''
         Checks if the thread is still running.
@@ -229,7 +242,7 @@ def handle_process(self, returncode, output, error):
 
         if self.settings.get('newlineBetweenSelectors', False):
             output = self.beautify_newlines(output)
-        
+
         if self.settings.get('useSingleQuotes', False):
             output = self.use_single_quotes(output)
 
@@ -310,6 +323,8 @@ def mark_end_of_line_comment(m):
         '''
         content = self.view.substr(sublime.Region(0, self.view.size()))
 
+        content = self.beautify_semicolons(content)
+
         if self.settings.get('inlineComments', False):
             '''
             Mark comments at the end of lines so we can move them back to the end of the line after sass-convert has pushed them to a new line
diff --git a/tests/test.py b/tests/test.py
index 0fbc156..7056ea5 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -211,3 +211,45 @@ def test_skip_insert_newline_2(self):
             }
 
             """))
+
+class test_internal_function_beautify_semicolons(TestCase):
+
+    # Check that we add ;s to the end of lines, except for comments, lines ending in commas, and lines before an open {
+    # all other cases where we might introduce a double semicolon or where a semicolon isn't needed are cleaned up by
+    # sass-convert so we don't need to worry about them here
+    def test_semicolons(self):
+        beautified = SassBeautifyCommandInstance.beautify_semicolons(textwrap.dedent("""\
+
+            // @import '_common';
+            @import "_colors"
+
+            //TODO: eat pizza
+            //      and other things
+
+            .ClassA,
+            .ClassB
+            {
+                height: 14px
+                font-size: 2em;
+                margin: -3px 0 !important
+            }
+
+            """))
+
+        self.assertEqual(beautified, textwrap.dedent("""\
+
+            // @import '_common';
+            @import "_colors";
+            ;
+            //TODO: eat pizza
+            //      and other things
+            ;
+            .ClassA,
+            .ClassB
+            {;
+                height: 14px;
+                font-size: 2em;;
+                margin: -3px 0 !important;
+            };
+
+            """))
\ No newline at end of file

From d06b5e79187d76aeac1f83c1d842a5c58b1294d2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <owenleonard@gmail.com>
Date: Mon, 4 Apr 2016 18:03:24 -0600
Subject: [PATCH 2/2] fix unit test

---
 tests/test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test.py b/tests/test.py
index 7056ea5..edf6360 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -237,7 +237,7 @@ def test_semicolons(self):
             """))
 
         self.assertEqual(beautified, textwrap.dedent("""\
-
+            ;
             // @import '_common';
             @import "_colors";
             ;
@@ -251,5 +251,5 @@ def test_semicolons(self):
                 font-size: 2em;;
                 margin: -3px 0 !important;
             };
-
-            """))
\ No newline at end of file
+            ;
+            ;"""))
\ No newline at end of file