diff --git a/README.md b/README.md index 5e08742..fabd38f 100644 --- a/README.md +++ b/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) diff --git a/happyx.nimble b/happyx.nimble index 3316fa3..b67566d 100644 --- a/happyx.nimble +++ b/happyx.nimble @@ -1,6 +1,6 @@ # Package -version = "3.4.2" +version = "3.5.0" author = "HapticX" description = "HappyX" license = "MIT" diff --git a/icons/hpx_icons.json b/icons/hpx_icons.json index 948e737..98076b1 100644 --- a/icons/hpx_icons.json +++ b/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" } } \ No newline at end of file diff --git a/icons/settings.svg b/icons/settings.svg new file mode 100644 index 0000000..50a6739 --- /dev/null +++ b/icons/settings.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/package.json b/package.json index b5abe97..7a86d97 100644 --- a/package.json +++ b/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" }, diff --git a/syntaxes/nim.tmLanguage.json b/syntaxes/nim.tmLanguage.json index 91bfdf3..4eb79d5 100644 --- a/syntaxes/nim.tmLanguage.json +++ b/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_]*>" diff --git a/syntaxes/nimble.tmLanguage.json b/syntaxes/nimble.tmLanguage.json index 73e60ba..ac3c20d 100644 --- a/syntaxes/nimble.tmLanguage.json +++ b/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"