Merge pull request #82 from Vi-brance/master

Many small improvements

Author: Frederisk

.vscode/extensions.json

@@ -9,6 +9,7 @@
         "dbaeumer.vscode-eslint",
         // "pedro-w.tmlanguage",
         "redhat.vscode-yaml",
-        "gamunu.vscode-yarn"
+        "gamunu.vscode-yarn",
+        "editorconfig.editorconfig"
     ]
 }

language-configuration.yaml renamed to languages/language-configuration.yaml

@@ -20,7 +20,6 @@ brackets:
 autoClosingPairs:
   - ['{', '}']
   - ['[', ']']
-  - ['<', '>']
   - ['-{', '}-']
   - ['<!--', '-->']
   # more tags: https://www.mediawiki.org/wiki/Parser_extension_tags

media/preview-dark.svg

@@ -41,10 +41,7 @@
         "command": "wikitext.getPreview",
         "title": "Get preview",
         "category": "Wikitext",
-        "icon": {
-          "light": "./media/preview-light.svg",
-          "dark": "./media/preview-dark.svg"
-        }
+        "icon": "$(open-preview)"
       },
       {
         "command": "wikitext.login",
@@ -153,7 +150,7 @@
         "mimetypes": [
           "text/x-wiki"
         ],
-        "configuration": "./language-configuration.json"
+        "configuration": "./languages/language-configuration.json"
       }
     ],
     "grammars": [
@@ -271,7 +268,7 @@
     "test": "yarn run test-node && yarn run test-web",
     "test-node": "node ./dist/test/runTest.js",
     "test-web": "vscode-test-web --browserType=chromium --extensionDevelopmentPath=. --extensionTestsPath=./dist/test/suite/index-web.js",
-    "convert": "js-yaml snippets/snippets.yaml > snippets/snippets.json && js-yaml syntaxes/wikitext.tmLanguage.yaml > syntaxes/wikitext.tmLanguage.json && js-yaml language-configuration.yaml > language-configuration.json",
+    "convert": "js-yaml snippets/snippets.yaml > snippets/snippets.json && js-yaml syntaxes/wikitext.tmLanguage.yaml > syntaxes/wikitext.tmLanguage.json && js-yaml languages/language-configuration.yaml > languages/language-configuration.json",
     "package": "vsce package --yarn"
   },
   "devDependencies": {

media/preview-light.svg

@@ -2306,8 +2306,8 @@ repository:
                 name: punctuation.definition.tag.end.wikitext
             name: meta.tag.metedata.void.wikitext
           normal-wiki-tags:
-            match: (?i)(</?)(includeonly|onlyinclude)(\s+[^>]+)?\s*(>)
-            #          1</ 12     includeonly       23   x=y  3    4>4
+            match: (?i)(</?)(includeonly|onlyinclude|noinclude)(\s+[^>]+)?\s*(>)
+            #          1</ 12          includeonly            23   x=y  3    4>4
             #
             captures:
               1: