Merge pull request #186 from mtxr/feature/format_all_file

Add new command to Format All File
mtxr · Jan 29, 2018 · 1fccdb0 · 1fccdb0
2 parents a0bff7f + e1d1c43
commit 1fccdb0
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/Default (Linux).sublime-keymap b/Default (Linux).sublime-keymap
@@ -10,6 +10,7 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries"},
-    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}}
+    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries", "args": {"mode" : "run"}},
+    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}},
+    { "keys": ["ctrl+e", "ctrl+i"], "command": "st_list_queries", "args": {"mode" : "insert"}}
 ]
diff --git a/Default (OSX).sublime-keymap b/Default (OSX).sublime-keymap
@@ -10,6 +10,7 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries"},
-    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}}
+    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries", "args": {"mode" : "run"}},
+    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}},
+    { "keys": ["ctrl+e", "ctrl+i"], "command": "st_list_queries", "args": {"mode" : "insert"}}
 ]
diff --git a/Default (Windows).sublime-keymap b/Default (Windows).sublime-keymap
@@ -10,7 +10,7 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries"},
+    { "keys": ["ctrl+e", "ctrl+l"], "command": "st_list_queries", "args": {"mode" : "run"}},
     { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}},
     { "keys": ["ctrl+e", "ctrl+i"], "command": "st_list_queries", "args": {"mode" : "insert"}}
 ]
diff --git a/Default.sublime-commands b/Default.sublime-commands
@@ -19,10 +19,6 @@
     "caption": "ST: History",
     "command": "st_history"
   },
-  {
-    "caption": "ST: Type Query",
-    "command": "st_query"
-  },
   {
     "caption": "ST: Show Table Records",
     "command": "st_show_records"
@@ -59,9 +55,13 @@
     "args"   :  {"mode": "insert"}
   },
   {
-    "caption": "ST: Format Current SQL File",
+    "caption": "ST: Format SQL",
     "command": "st_format"
   },
+  {
+    "caption": "ST: Format SQL All File",
+    "command": "st_format_all"
+  },
   {
     "caption": "ST: About",
     "command": "st_version"

diff --git a/SQLTools.py b/SQLTools.py
@@ -588,6 +588,14 @@ def run(edit):
             View().replace(edit, region, Utils.formatSql(textToFormat, settings.get('format', {})))
 
 
+class StFormatAll(TextCommand):
+    @staticmethod
+    def run(edit):
+        region = sublime.Region(0, View().size())
+        textToFormat = View().substr(region)
+        View().replace(edit, region, Utils.formatSql(textToFormat, settings.get('format', {})))
+
+
 class StVersion(WindowCommand):
     @staticmethod
     def run():