Rename keyvalue3 to keyvalue. Fixes #110

Author: StefanH-AT

lang-config-kv3.json lang-config-kv.jsonlang-config-kv3.json renamed to lang-config-kv.json

@@ -44,7 +44,7 @@
     },
     "main": "./out/main.js",
     "activationEvents": [
-        "onLanguage:keyvalue3",
+        "onLanguage:keyvalue",
         "onLanguage:vmt",
         "onLanguage:captions",
         "onLanguage:qc",
@@ -62,7 +62,7 @@
                 "path": "./snippets/vmt-snippets.json"
             },
             {
-                "language": "keyvalue3",
+                "language": "keyvalue",
                 "path": "./snippets/gameinfo-snippets.json"
             },
             {
@@ -84,11 +84,12 @@
         ],
         "languages": [
             {
-                "id": "keyvalue3",
-                "configuration": "./lang-config-kv3.json",
+                "id": "keyvalue",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
-                    "Valve Keyvalue 3",
-                    "keyvalue3"
+                    "Valve KeyValue",
+                    "keyvalue",
+                    "KV"
                 ],
                 "extensions": [
                     ".kv",
@@ -100,15 +101,11 @@
                     ".vmf",
                     ".vmm",
                     ".vmx"
-                ],
-                "filenames": [
-                    "gameinfo.txt"
-                ],
-                "firstLine": "^([\\w ]+|\"[\\w ]+\")"
+                ]
             },
             {
                 "id": "vmt",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Valve Material Type",
                     "vmt"
@@ -119,7 +116,7 @@
             },
             {
                 "id": "fgd",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "FGD",
                     "Forge Game Data",
@@ -131,7 +128,7 @@
             },
             {
                 "id": "captions",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Source Engine Captions",
                     "Source Engine Subtitles"
@@ -144,7 +141,7 @@
             },
             {
                 "id": "cfg",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Source Engine Configuration",
                     "Source Engine Commands"
@@ -155,7 +152,7 @@
             },
             {
                 "id": "vpc",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Valve Project Creator"
                 ],
@@ -166,7 +163,7 @@
             },
             {
                 "id": "qc",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Valve QC",
                     "Valve MC",
@@ -188,7 +185,7 @@
             },
             {
                 "id": "soundscript",
-                "configuration": "./lang-config-kv3.json",
+                "configuration": "./lang-config-kv.json",
                 "aliases": [
                     "Valve Soundscript",
                     "Source Soundscript"
@@ -222,14 +219,14 @@
         ],
         "grammars": [
             {
-                "language": "keyvalue3",
+                "language": "keyvalue",
                 "scopeName": "source.kv",
-                "path": "./syntaxes/keyvalue3.tmLanguage.json"
+                "path": "./syntaxes/keyvalue.tmLanguage.json"
             },
             {
                 "language": "soundscript",
                 "scopeName": "source.kv",
-                "path": "./syntaxes/keyvalue3.tmLanguage.json"
+                "path": "./syntaxes/keyvalue.tmLanguage.json"
             },
             {
                 "language": "vmt",
@@ -389,7 +386,7 @@
             }
         },
         "configurationDefaults": {
-            "[keyvalue3]": {
+            "[keyvalue]": {
                 "editor.semanticHighlighting.enabled": true
             }
         }

package.json

@@ -6,28 +6,28 @@ function isAutoDetectEnabled(): boolean {
     return main.config.get<boolean>("kvAutoDetect.enabled", false);
 }
 
-type DetectableLanguageId = "keyvalue3" | "soundscript" | "captions";
+type DetectableLanguageId = "keyvalue" | "soundscript" | "captions";
 
 interface CommonFileName {
     regex: RegExp;
     languageId: DetectableLanguageId;
 }
 
 const commonKvFileNames: CommonFileName[] = [
-    { regex: /gameinfo\.txt/i, languageId: "keyvalue3" },
+    { regex: /gameinfo\.txt/i, languageId: "keyvalue" },
     { regex: /subtitles_.+\.txt/i, languageId: "captions" },
     { regex: /captions_.+\.txt/i, languageId: "captions" },
-    { regex: /basemodui_.+\.txt/i, languageId: "keyvalue3" },
-    { regex: /instructor_lessons\.txt/i, languageId: "keyvalue3" },
-    { regex: /instructor_textures\.txt/i, languageId: "keyvalue3" },
+    { regex: /basemodui_.+\.txt/i, languageId: "keyvalue" },
+    { regex: /instructor_lessons\.txt/i, languageId: "keyvalue" },
+    { regex: /instructor_textures\.txt/i, languageId: "keyvalue" },
     { regex: /game_sounds_.+\.txt/i, languageId: "soundscript" },
     { regex: /npc_sounds_.+\.txt/i, languageId: "soundscript" },
     { regex: /level_sounds_.+\.txt/i, languageId: "soundscript" },
     { regex: /soundscapes_.+\.txt/i, languageId: "soundscript" },
-    { regex: /surfaceproperties_.+\.txt/i, languageId: "keyvalue3" },
-    { regex: /weapon_.+\.txt/i, languageId: "keyvalue3" },
-    { regex: /vgui_screens\.txt/i, languageId: "keyvalue3" },
-    { regex: /credits\.txt/i, languageId: "keyvalue3" }
+    { regex: /surfaceproperties_.+\.txt/i, languageId: "keyvalue" },
+    { regex: /weapon_.+\.txt/i, languageId: "keyvalue" },
+    { regex: /vgui_screens\.txt/i, languageId: "keyvalue" },
+    { regex: /credits\.txt/i, languageId: "keyvalue" }
 ];
 
 function getCommonFileNameMatch(fileName: string): CommonFileName | undefined {
@@ -78,7 +78,7 @@ function detectKeyvalueFile(editor: vscode.TextEditor, context: vscode.Extension
             return;
         }
 
-        main.debugOutput.appendLine(`Changing document language of (${editor.document.uri.fsPath}) to keyvalue3`);
+        main.debugOutput.appendLine(`Changing document language of (${editor.document.uri.fsPath}) to keyvalue`);
         vscode.languages.setTextDocumentLanguage(editor.document, langId);
     }
 }

src/KvFileDetection.ts

@@ -36,7 +36,7 @@ export class KeyvalueSemanticTokensProvider extends KvTokensProviderBase {
     ];
 
     constructor() {
-        super(KvDocument.tokenLegend, vscode.languages.createDiagnosticCollection("keyvalue3"));
+        super(KvDocument.tokenLegend, vscode.languages.createDiagnosticCollection("keyvalue"));
     }
 
     processValueNumber(params: KvSemanticProcessorParams): boolean {

src/language/LangKv.ts

@@ -1,6 +1,6 @@
 import { DocumentFilter } from "vscode";
 
-export const languageIdKeyvalue = "keyvalue3";
+export const languageIdKeyvalue = "keyvalue";
 export const languageIdVmt = "vmt";
 export const languageIdSoundscript = "soundscript";
 export const languageIdCaptions = "captions";

src/language/Shared.ts

@@ -30,7 +30,7 @@
                 },
                 {
                     "match": "\"?(?i)tokens(?-i)\"?",
-                    "name": "variable.name.keyvalue3"
+                    "name": "variable.name.keyvalue"
                 },
                 {
                     "include": "#data"

syntaxes/captions.tmLanguage.json

@@ -21,23 +21,23 @@
 	],
 	"repository": {
 		"comment": {
-			"name": "comment.line.keyvalue3",
+			"name": "comment.line.keyvalue",
 			"match": "//.*"
 		},
 		"boolean": {
-			"name": "constant.numeric.keyvalue3",
+			"name": "constant.numeric.keyvalue",
 			"match": "\\b(true|false)\\b"
 		},
 		"number": {
-			"name": "constant.numeric.keyvalue3",
+			"name": "constant.numeric.keyvalue",
 			"match": "-?([0-9]+)?\\.?[0-9]+"
 		},
 		"stringUnquoted": {
-			"name": "string.unquoted.keyvalue3",
+			"name": "string.unquoted.keyvalue",
 			"match": "[\\w|\\*\\.\\\\/$%#-\\[\\]]+"
 		},
 		"stringQuoted": {
-			"name": "string.quoted.double.keyvalue3",
+			"name": "string.quoted.double.keyvalue",
 			"begin": "\"",
 			"end": "\"",
 			"patterns": [{

syntaxes/keyvalue3.tmLanguage.json syntaxes/keyvalue.tmLanguage.jsonsyntaxes/keyvalue3.tmLanguage.json renamed to syntaxes/keyvalue.tmLanguage.json

@@ -4,7 +4,7 @@
 
 * This folder contains all of the files necessary for your extension.
 * `package.json` - this is the manifest file in which you declare your language support and define the location of the grammar file that has been copied into your extension.
-* `syntaxes/keyvalue3.tmLanguage.json` - this is the Text mate grammar file that is used for tokenization.
+* `syntaxes/keyvalue.tmLanguage.json` - this is the Text mate grammar file that is used for tokenization.
 * `language-configuration.json` - this is the language configuration, defining the tokens that are used for comments and brackets.
 
 ## Get up and running straight away