refactoring

Author: Kenichi Hoshi

urobosql_formatter.py

@@ -11,14 +11,15 @@
 
 
 class UroborosqlFormatCommand(sublime_plugin.TextCommand):
-    """SQL Format Command class"""
+
+    """SQL format command class"""
 
     def run(self, edit):
         view = self.view
+        view.window().status_message('formatting...')
         self.settings = view.settings()
         self.user_settings = sublime.load_settings(
             'sublime-uroborosql-formatter.sublime-settings')
-        regions = view.sel()
         # set syntax
         if self.settings.get('syntax') == \
                 "Packages/Text/Plain text.tmLanguage":
@@ -30,13 +31,13 @@ def run(self, edit):
 
         config = LocalConfig()
         config.set_uppercase(self.getval("uf_uppercase"))
-        uroborosqlfmt.config.glb.escape_sequence_u005c = self.getval("uf_escapesequence_u005c")
+        uroborosqlfmt.config.glb.escape_sequence_u005c = self.getval(
+            "uf_escapesequence_u005c")
         if str(self.getval("uf_comment_syntax")).upper() == "DOMA2":
             config.set_commentsyntax(Doma2CommentSyntax())
 
         raw_text = ""
-        region = None
-
+        regions = view.sel()
         # format selection
         if len(regions) > 1 or not regions[0].empty():
             for region in view.sel():
@@ -46,26 +47,27 @@ def run(self, edit):
             region = sublime.Region(0, view.size())
             raw_text = view.substr(region)
 
-        threading.Thread(target=self.run_format, args=(edit, raw_text, region, config, )).start()
+        threading.Thread(target=self.run_format, args=(
+            edit, raw_text, config, region.a, region.b)).start()
 
-    def run_format(self, edit, raw_text, region, config):
+    def run_format(self, edit, raw_text, config, region_a, region_b):
         formatted_text = uroborosqlfmt.format_sql(raw_text, config)
-        self.view.run_command("uroborosql_format_view", {"formatted_text": formatted_text})
+        self.view.run_command("uroborosql_format_replace", {
+            "region_a": region_a,
+            "region_b": region_b,
+            "formatted_text": formatted_text
+        })
 
     def getval(self, key):
         val = self.user_settings.get(key)
         return val if val != None else self.settings.get(key)
 
 
-class UroborosqlFormatViewCommand(sublime_plugin.TextCommand):
-    def run(self, edit, **args):
-        regions = self.view.sel()
-        # format selection
-        if len(regions) > 1 or not regions[0].empty():
-            for region in self.view.sel():
-                if not region.empty():
-                    break
-        else:  # format all
-            region = sublime.Region(0, self.view.size())
+class UroborosqlFormatReplaceCommand(sublime_plugin.TextCommand):
 
+    """SQL format replace command class"""
+
+    def run(self, edit, **args):
+        region = sublime.Region(args["region_a"], args["region_b"])
         self.view.replace(edit, region, args["formatted_text"])
+        self.view.window().status_message('formatting... complete!!')