fixed broken settings menu and added config options

ziglang · Jul 7, 2019 · ecf2bb1 · ecf2bb1
1 parent aeab9e2
commit ecf2bb1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/Support/Zig.sublime-build → Build Systems/Zig.sublime-build b/Support/Zig.sublime-build → Build Systems/Zig.sublime-build
@@ -1,8 +1,9 @@
 {
     "cmd": ["zig", "build"],
     "selector": "source.zig",
-    "file_regex": "^(.+.zig):(\\d+):(\\d+): error: (.+)$",
-    "line_regex": "^.+.zig:(\\d+):(\\d+): error: (.+)$",
+    "working_dir": "$folder",
+    "file_regex": "^(\\S.*):(\\d*):(\\d*): (?:[^:]*): (.*)$",
+    "line_regex": "^(?:\\S.*):(\\d*):(\\d*): (?:[^:]*): (.*)$",
 
     "variants": [
         {

diff --git a/Support/Main.sublime-menu → Menus/Main.sublime-menu b/Support/Main.sublime-menu → Menus/Main.sublime-menu
@@ -12,12 +12,12 @@
                         "children":
                         [
                             {
-                                "command": "edit_settings", "args":
-                                {
-                                    "base_file": "${packages}/User/Zig.sublime-settings",
-                                    "default": "{\n\t$0\n}\n"
+                                "caption": "Settings",
+                                "command": "edit_settings",
+                                "args": {
+                                    "base_file": "${packages}/Zig Language/Settings/Zig.sublime-settings",
+                                    "default": "// Settings in here override those in \"Zig Language/Settings/Zig.sublime-settings\",\n\n{\n\t$0\n}\n"
                                 },
-                                "caption": "Settings"
                             },
                         ]
                     }

diff --git a/Zig.sublime-settings → Settings/Zig.sublime-settings b/Zig.sublime-settings → Settings/Zig.sublime-settings
@@ -1,4 +1,6 @@
 {
     "zig.executable": "zig",
+    "zig.build.on_save": false,
     "zig.fmt.on_save": true,
+    "zig.fmt.mode": "file",
 }
diff --git a/Zig.py b/Zig.py
@@ -1,14 +1,24 @@
 import sublime
 import sublime_plugin
 
-def fmt(fmt, dic):
-  for k in dic:
-    fmt = fmt.replace("{" + k + "}", str(dic[k]))
-  return fmt
+settings = sublime.load_settings('Zig.sublime-settings')
+
+
+def get_setting(view, opt, default):
+    return view.settings().get(opt, settings.get(opt, default))
+
 
 class Zig(sublime_plugin.EventListener):
     def on_post_save_async(self, view):
-        global_settings = sublime.load_settings(fmt("{name}.sublime-settings", { "name": self.__class__.__name__ }))
-        should_fmt = view.settings().get('fmt.on_save.enabled', global_settings.get('fmt.on_save.enabled'))
-        if (should_fmt):
-            view.window().run_command("build", {"variant": "Format File"})
+        sel = view.sel()[0]
+        region = view.word(sel)
+        scope = view.scope_name(region.b)
+        if scope.find('source.zig') != -1:
+            should_fmt = get_setting(view, 'zig.fmt.on_save', True)
+            should_build = get_setting(view, 'zig.build.on_save', False)
+
+            if (should_fmt and not should_build):
+                mode = get_setting(view, 'zig.fmt.mode', 'File').title()
+                view.window().run_command('build', {'variant': 'Format ' + mode})
+            elif (should_build and not should_fmt):
+                view.window().run_command('build')