Enable kv file detection by default

Author: StefanH-AT

package.json

@@ -316,29 +316,9 @@
             "title": "Source Engine",
             "properties": {
                 "sourceEngine.kvAutoDetect.enabled": {
-                    "type": "boolean",
-                    "default": false,
-                    "description": "Enable automatic detection of KeyValues files."
-                },
-                "sourceEngine.kvAutoDetect.onlyInSourceEngineWorkspaces": {
                     "type": "boolean",
                     "default": true,
-                    "description": "Enable automatic detection of KeyValues files only in workspaces."
-                },
-                "sourceEngine.sourceEngineWorkspaces": {
-                    "type": "array",
-                    "default": [
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Portal 2",
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Half Life 2",
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Counter Strike Global Offensive",
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Team Fortress 2",
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Left 4 Dead 2",
-                        "C:\\Program Files (x86)\\Steam\\SteamApps\\common\\Alien Swarm"
-                    ],
-                    "description": "List of Source Engine workspaces. Some features are only enabled for files which are located in these workspaces.",
-                    "items": {
-                        "type": "string"
-                    }
+                    "description": "Enable automatic detection of KeyValues files."
                 },
                 "sourceEngine.performance.log": {
                     "type": "boolean",

src/KvFileDetection.ts

@@ -1,22 +1,13 @@
 import path from "path";
 import * as vscode from "vscode";
 import * as main from "./main";
-import * as shared from "./language/Shared";
 
 function isAutoDetectEnabled(): boolean {
     return main.config.get<boolean>("kvAutoDetect.enabled", false);
 }
 
-function isAutoDetectEnabledOnlyInWorkspaces(): boolean {
-    return main.config.get<boolean>("kvAutoDetect.onlyInSourceEngineWorkspaces", true);
-}
-
-function getSourceEngineWorkspaces(): string[] {
-    return main.config.get<string[]>("sourceEngineWorkspaces", []);
-}
-
-
 type DetectableLanguageId = "keyvalue3" | "soundscript" | "captions";
+
 interface CommonFileName {
     regex: RegExp;
     languageId: DetectableLanguageId;
@@ -93,15 +84,6 @@ function detectKeyvalueFile(editor: vscode.TextEditor, context: vscode.Extension
 }
 
 function getPotentialKvFileLanguageId(document: vscode.TextDocument): DetectableLanguageId | undefined {
-    if(isAutoDetectEnabledOnlyInWorkspaces()) {
-
-        if(!isDocumentInSourceEngineWorkspace(document)) {
-            main.debugOutput.appendLine(`Auto detect is enabled only in source engine workspaces, but the document (${document.uri.fsPath}) is not in a source engine workspace.`);
-            return undefined;
-        }
-
-    }
-
     const documentFileName = path.basename(document.uri.fsPath);
 
     main.debugOutput.appendLine(`Auto detect is enabled. Checking if filename (${documentFileName}) is in list of common kv file names.`);
@@ -113,29 +95,3 @@ function getPotentialKvFileLanguageId(document: vscode.TextDocument): Detectable
     main.debugOutput.appendLine(`! File (${document.uri.fsPath}) has a common file name and is associated with LanguageId: ${match.languageId}`);
     return match.languageId;
 }
-
-function isDocumentInSourceEngineWorkspace(document: vscode.TextDocument): boolean {
-    let fileUri: string = document.uri.fsPath;
-    let sourceEngineWorkspaces: string[] = getSourceEngineWorkspaces();
-
-    // Make paths lower case on windows
-    if(process.platform === "win32") {
-        fileUri = fileUri.toLowerCase();
-        sourceEngineWorkspaces = sourceEngineWorkspaces.map((workspace) => workspace.toLowerCase());
-    }
-
-    main.debugOutput.appendLine(`Checking if file (${fileUri}) is in any source engine workspace.`);
-
-    for(const workspace of sourceEngineWorkspaces) {
-        main.debugOutput.appendLine(`- Checking if file (${fileUri}) is in workspace (${workspace})`);
-        if(fileUri.startsWith(workspace)) {
-            main.debugOutput.appendLine(`! File (${fileUri}) is in workspace (${workspace})`);
-            return true;
-        }
-    }
-
-    main.debugOutput.appendLine(`! File (${fileUri}) is not in any source engine workspace.`);
-
-    return false;
-}
-