vscode: updated syntax defintion for better outline and sticky scroll

diff --git a/misc/vscode/onyx-0.1.5.vsix b/misc/vscode/onyx-0.1.5.vsix
new file mode 100644 (file)
index 0000000..ddeb215
Binary files /dev/null and b/misc/vscode/onyx-0.1.5.vsix differ

diff --git a/misc/vscode/package.json b/misc/vscode/package.json
index 5978baf6fea86061502d0b9151bad9c3d59ae313..371a5dc65bfedb716dc7e5bf651d891b6b48089e 100644 (file)
--- a/misc/vscode/package.json
+++ b/misc/vscode/package.json
@@ -2,7 +2,7 @@
     "name": "onyx",
     "displayName": "Onyx",
     "description": "Onyx syntax highlighting.",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "publisher": "brendanfh",
     "license": "BSD-2-Clause",
     "engines": {

diff --git a/misc/vscode/syntaxes/onyx.tmLanguage b/misc/vscode/syntaxes/onyx.tmLanguage
index 236b2be9f8bc7c42c5e2cda397620b8e43a37f0f..43605084f07d971f9801804203da5bbeae14f0c3 100644 (file)
--- a/misc/vscode/syntaxes/onyx.tmLanguage
+++ b/misc/vscode/syntaxes/onyx.tmLanguage
@@ -38,6 +38,10 @@
                        <key>include</key>
                        <string>#string_escaped_char</string>
                </dict>
+               <dict>
+                       <key>include</key>
+                       <string>#generic_tags</string>
+               </dict>
        </array>
        <key>repository</key>
        <dict>
@@ -59,6 +63,7 @@
                                </dict>
                        </array>
                </dict>
+
                <key>line_comment</key>
                <dict>
                        <key>begin</key>
@@ -127,6 +132,7 @@
                                </dict>
                        </array>
                </dict>
+
                <key>comments</key>
                <dict>
                        <key>patterns</key>
@@ -148,6 +154,7 @@
                                </dict>
                        </array>
                </dict>
+               
                <key>keywords</key>
                <dict>
                        <key>patterns</key>
@@ -172,7 +179,7 @@
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b(it|it_index)\b</string>
+                                       <string>\b(it)\b</string>
                                        <key>name</key>
                                        <string>keyword.other.onyx</string>
                                </dict>
@@ -212,20 +219,15 @@
                                        <key>name</key>
                                        <string>keyword.function.onyx</string>
                                </dict>
-                               <dict>
-                                       <key>match</key>
-                                       <string>([#]\s*\b([[:alpha:]_]+[[:alnum:]_]*)\b)</string>
-                                       <key>name</key>
-                                       <string>keyword.tag.onyx</string>
-                               </dict>
-                               <dict>
+                               <!-- <dict>
                                        <key>match</key>
-                                       <string>@[^\n]+</string>
+                                       <string>([#]\s*\binject.+\b)</string>
                                        <key>name</key>
-                                       <string>keyword.tag.onyx</string>
-                               </dict>
+                                       <string>keyword.tag.onyx entity.name.function.onyx</string>
+                               </dict> -->
                        </array>
                </dict>
+
                <key>types</key>
                <dict>
                        <key>patterns</key>
@@ -287,6 +289,7 @@
                                </dict>
                        </array>
                </dict>
+
                <key>functions_and_declarations</key>
                <dict>
                        <key>patterns</key>
@@ -360,13 +363,47 @@
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b(\b[[:alpha:]_]+[[:alnum:]_]*\b)\s*[:]\s*[:]\s*(struct|enum|interface)</string>
+                                       <string>\b(\b[[:alpha:]_]+[[:alnum:]_]*\b)\s*[:]\s*[:]\s*(struct)</string>
                                        <key>captures</key>
                                        <dict>
                                                <key>1</key>
                                                <dict>
                                                        <key>name</key>
-                                                       <string>meta.type.onyx entity.name.type.onyx</string>
+                                                       <string>meta.type.onyx entity.name.type.class.onyx</string>
+                                               </dict>
+                                               <key>2</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>storage.type.onyx</string>
+                                               </dict>
+                                       </dict>
+                               </dict>
+                               <dict>
+                                       <key>match</key>
+                                       <string>\b(\b[[:alpha:]_]+[[:alnum:]_]*\b)\s*[:]\s*[:]\s*(interface)</string>
+                                       <key>captures</key>
+                                       <dict>
+                                               <key>1</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>meta.type.onyx entity.name.type.interface.onyx</string>
+                                               </dict>
+                                               <key>2</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>storage.type.onyx</string>
+                                               </dict>
+                                       </dict>
+                               </dict>
+                               <dict>
+                                       <key>match</key>
+                                       <string>\b(\b[[:alpha:]_]+[[:alnum:]_]*\b)\s*[:]\s*[:]\s*(enum)</string>
+                                       <key>captures</key>
+                                       <dict>
+                                               <key>1</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>meta.type.onyx entity.name.type.enum.onyx</string>
                                                </dict>
                                                <key>2</key>
                                                <dict>
@@ -406,13 +443,35 @@
                                </dict>
                                <dict>
                                        <key>match</key>
-                                       <string>\b([#]\s*foreign)</string>
+                                       <string>([#]\s*\b(?:foreign|local|package)\b).+({)</string>
                                        <key>captures</key>
                                        <dict>
                                                <key>1</key>
                                                <dict>
                                                        <key>name</key>
-                                                       <string>keyword.tag.onyx entity.name.block.onyx</string>
+                                                       <string>keyword.tag.onyx entity.name.type.namespace.onyx</string>
+                                               </dict>
+                                               <key>2</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>punctuation.block.start.onyx</string>
+                                               </dict>
+                                       </dict>
+                               </dict>
+                               <dict>
+                                       <key>match</key>
+                                       <string>([#]\s*\binject\b)\s+(\b[^{]+\b)</string>
+                                       <key>captures</key>
+                                       <dict>
+                                               <key>1</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>keyword.tag.onyx</string>
+                                               </dict>
+                                               <key>2</key>
+                                               <dict>
+                                                       <key>name</key>
+                                                       <string>entity.name.type.namespace.onyx</string>
                                                </dict>
                                        </dict>
                                </dict>
@@ -430,6 +489,7 @@
                                </dict>
                        </array>
                </dict>
+
                <key>string_escaped_char</key>
                <dict>
                        <key>patterns</key>
@@ -448,6 +508,7 @@
                                </dict>
                        </array>
                </dict>
+
                <key>strings</key>
                <dict>
                        <key>patterns</key>
@@ -485,6 +546,25 @@
                                </dict>
                        </array>
                </dict>
+
+               <key>generic_tags</key>
+               <dict>
+                       <key>patterns</key>
+                       <array>
+                               <dict>
+                                       <key>match</key>
+                                       <string>([#]\s*\b([[:alpha:]_]+[[:alnum:]_]*)\b)</string>
+                                       <key>name</key>
+                                       <string>keyword.tag.onyx</string>
+                               </dict>
+                               <dict>
+                                       <key>match</key>
+                                       <string>@[^\n]+</string>
+                                       <key>name</key>
+                                       <string>keyword.tag.onyx</string>
+                               </dict>
+                       </array>
+               </dict>
        </dict>
 </dict>
 </plist>

diff --git a/misc/vscode/textmate-configuration.json b/misc/vscode/textmate-configuration.json
index 23901782624b7865233ac1b58689c0bc6b48b07f..0797dc354e95f5ff0c8e679384f8870824d8aa53 100644 (file)
--- a/misc/vscode/textmate-configuration.json
+++ b/misc/vscode/textmate-configuration.json
@@ -22,7 +22,12 @@
     "declarations": [
         "entity.name.function.onyx",
         "entity.name.type.onyx",
-        "entity.name.block.onyx"
+        "entity.name.type.class.onyx",
+        "entity.name.type.interface.onyx",
+        "entity.name.type.enum.onyx",
+        "entity.name.type.namespace.onyx",
+        "entity.name.block.onyx",
+        "entity.name.tag.onyx"
     ],
     "indentation": {
       "punctuation.block.begin.onyx": 1,
@@ -38,6 +43,10 @@
     },
     "symbols": {
         "entity.name.function.onyx": 11,
+        "entity.name.type.namespace.onyx": 2,
+        "entity.name.type.class.onyx": 4,
+        "entity.name.type.interface.onyx": 10,
+        "entity.name.type.enum.onyx": 9,
         "entity.name.type.onyx": 22
     }
 }
\ No newline at end of file