cleaned up directory and added \u{...} syntax

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

Hide file tree

Showing 8 changed files with 34 additions and 16 deletions.
diff --git a/Comments.YAML-tmPreferences → Support/Comments.YAML-tmPreferences b/Comments.YAML-tmPreferences → Support/Comments.YAML-tmPreferences
diff --git a/Comments.tmPreferences → Support/Comments.tmPreferences b/Comments.tmPreferences → Support/Comments.tmPreferences
diff --git a/Support/Main.sublime-menu b/Support/Main.sublime-menu
@@ -0,0 +1,28 @@
+[
+    {
+        "id": "preferences",
+        "children":
+        [
+            {
+                "id": "package-settings",
+                "children":
+                [
+                    {
+                        "caption": "Zig",
+                        "children":
+                        [
+                            {
+                                "command": "edit_settings", "args":
+                                {
+                                    "base_file": "${packages}/User/Zig.sublime-settings",
+                                    "default": "{\n\t$0\n}\n"
+                                },
+                                "caption": "Settings"
+                            },
+                        ]
+                    }
+                ]
+            }
+        ]
+    }
+]
diff --git a/Zig.sublime-build → Support/Zig.sublime-build b/Zig.sublime-build → Support/Zig.sublime-build
diff --git a/Zig.YAML-tmLanguage → Syntaxes/Zig.YAML-tmLanguage b/Zig.YAML-tmLanguage → Syntaxes/Zig.YAML-tmLanguage
@@ -156,9 +156,7 @@ repository:
       - name: string.quoted.escape.hexidecimal.zig
         match: \\x[a-fA-F0-9]{2}
       - name: string.quoted.escape.hexidecimal.zig
-        match: \\u[a-fA-F0-9]{4}
-      - name: string.quoted.escape.hexidecimal.zig
-        match: \\U[a-fA-F0-9]{6}
+        match: \\u\{[a-fA-F0-9]{1,6}\}
 
   character:
     begin: (\')

diff --git a/Zig.tmLanguage → Syntaxes/Zig.tmLanguage b/Zig.tmLanguage → Syntaxes/Zig.tmLanguage
@@ -269,13 +269,7 @@
 				</dict>
 				<dict>
 					<key>match</key>
-					<string>\\u[a-fA-F0-9]{4}</string>
-					<key>name</key>
-					<string>string.quoted.escape.hexidecimal.zig</string>
-				</dict>
-				<dict>
-					<key>match</key>
-					<string>\\U[a-fA-F0-9]{6}</string>
+					<string>\\u\{[a-fA-F0-9]{1,6}\}</string>
 					<key>name</key>
 					<string>string.quoted.escape.hexidecimal.zig</string>
 				</dict>

diff --git a/Zig.py b/Zig.py
@@ -7,10 +7,8 @@ def fmt(fmt, dic):
   return fmt
 
 class Zig(sublime_plugin.EventListener):
-    def on_post_save(self, view):
-        global_settings = sublime.load_settings(fmt("{package}.sublime-settings", {
-            "package": self.__class__.__name__,
-        }))
+    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"})
diff --git a/Zig.sublime-settings b/Zig.sublime-settings
@@ -1,4 +1,4 @@
 {
-    "zig": "zig",
-    "fmt.on_save.enabled": false,
+    "zig.executable": "zig",
+    "zig.fmt.on_save": true,
 }