upgrade nimble and nim highlight

README.md

@@ -28,5 +28,5 @@ Official VS Code plugin for use HappyX
   HappyX provides code snippets for `components`, `mounts`, `request models` and other constructions
 
 
-![Preview](https://github.com/HapticX/hpx-vs-code/blob/master/images/preview.gif)
+![Preview](images/preview.gif)
 

happyx.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version     = "3.4.2"
+version     = "3.5.0"
 author      = "HapticX"
 description = "HappyX"
 license     = "MIT"

icons/hpx_icons.json

@@ -5,11 +5,18 @@
     },
     "nimja_template": {
       "iconPath": "./nimja.svg"
+    },
+    "nim_config": {
+      "iconPath": "./settings.svg"
     }
   },
   "fileExtensions": {
     "nim": "nim_lang",
     "nimble": "nim_lang",
-    "nimja": "nimja_template"
+    "nimja": "nimja_template",
+    "nim.cfg": "nim_config"
+  },
+  "fileNames": {
+    "nim.cfg": "nim_config"
   }
 }

package.json

@@ -2,7 +2,7 @@
   "name": "happyx",
   "displayName": "HappyX",
   "description": "HappyX web framework for Visual Studio Code",
-  "version": "3.4.2",
+  "version": "3.5.0",
   "publisher": "HapticX",
   "license": "MIT",
   "icon": "logo.png",
@@ -57,7 +57,11 @@
           "nimble"
         ],
         "extensions": [
-          ".nimble"
+          ".nimble",
+          ".nim.cfg"
+        ],
+        "filenames": [
+          "nim.cfg"
         ],
         "configuration": "./configurations/nimble-configuration.json"
       },

syntaxes/nim.tmLanguage.json

@@ -129,22 +129,22 @@
 			"patterns": [
 				{
 					"name": "entity.name.class.nim",
-					"match": "(?<=\\{[a-zA-Z][a-zA-Z0-9_]*(:[a-zA-Z][a-zA-Z0-9_]*)?\\[)m(?=\\])"
+					"match": "(?<=\\{[a-zA-Z][a-zA-Z0-9_]*\\??(:[a-zA-Z][a-zA-Z0-9_]*)?\\[)m(?=\\])"
 				}, {
 					"name": "entity.name.class.nim",
-					"match": "(?<=\\$[a-zA-Z][a-zA-Z0-9_]*(:[a-zA-Z][a-zA-Z0-9_]*)?\\[)m(?=\\])"
+					"match": "(?<=\\$[a-zA-Z][a-zA-Z0-9_]*\\??(:[a-zA-Z][a-zA-Z0-9_]*)?\\[)m(?=\\])"
 				}, {
 					"name": "entity.name.class.nim",
-					"match": "(?<=\\$[a-zA-Z][a-zA-Z0-9_]*:)[a-zA-Z][a-zA-Z0-9_]*"
+					"match": "(?<=\\$[a-zA-Z][a-zA-Z0-9_]*\\??:)[a-zA-Z][a-zA-Z0-9_]*"
 				}, {
 					"name": "entity.name.class.nim",
-					"match": "(?<=\\{[a-zA-Z][a-zA-Z0-9_]*:)[a-zA-Z][a-zA-Z0-9_]*"
+					"match": "(?<=\\{[a-zA-Z][a-zA-Z0-9_]*\\??:)[a-zA-Z][a-zA-Z0-9_]*"
 				}, {
 					"name": "entity.name.function.nim",
-					"match": "\\$[a-zA-Z][a-zA-Z0-9_]*"
+					"match": "\\$[a-zA-Z][a-zA-Z0-9_]*\\??"
 				}, {
 					"name": "entity.name.function.nim",
-					"match": "(?<=\\{)[a-zA-Z][a-zA-Z0-9_]*"
+					"match": "(?<=\\{)[a-zA-Z][a-zA-Z0-9_]*\\??"
 				}, {
 					"name": "entity.name.function.nim",
 					"match": "<[a-zA-Z][a-zA-Z0-9_]*>"

syntaxes/nimble.tmLanguage.json

@@ -3,8 +3,8 @@
 	"name": "Nimble",
 	"scopeName": "source.nimble",
   "patterns": [
-    {"include": "#keywords"},
     {"include": "#strings"},
+    {"include": "#keywords"},
     {"include": "#comments"}
   ],
 	"repository": {
@@ -13,6 +13,9 @@
         {
           "name": "markup.bold.nimble",
           "match": "\\b(name|version|author|description|license|requires)\\b"
+        }, {
+          "name": "keyword.control.nimble",
+          "match": "(?<=:\\s*).*?$"
         }, {
           "name": "markup.changed.nimble",
           "match": "\\b(skipDirs|skipFiles|installDirs|installFiles|installExt|bin|namedBin|srcDir|binDir|backend)\\b"