Port language extensions to use new document filter schemes

Author: Tewan

src/language/lang-captions.ts

@@ -3,16 +3,25 @@
 // Implementations of language utility providers for the captions language.
 // ==========================================================================
 
-import { TextDocument, CancellationToken, DocumentColorProvider, Color, ColorPresentation, Range, ColorInformation, languages, SemanticTokensLegend, SemanticTokensBuilder, ExtensionContext, DocumentSelector } from "vscode";
+import { TextDocument, CancellationToken, DocumentColorProvider, Color, ColorPresentation, Range, ColorInformation, languages, SemanticTokensLegend, SemanticTokensBuilder, ExtensionContext, DocumentSelector, DocumentFilter } from "vscode";
 import { getDocument, KeyvalueDocumentFormatter, KvTokensProviderBase, legend, Processor } from "../keyvalue-document";
 import { populateColorTagMatches } from "../kv-core/kv-caption-tag-matches";
 
-export const selector: DocumentSelector = "captions";
+export const filterCaptionsSaved: DocumentFilter = {
+    language: "captions",
+    scheme: "file"
+};
+export const filterCaptionsUnsaved: DocumentFilter = {
+    language: "captions",
+    scheme: "untitled"
+};
+
+export const selectorAll: ReadonlyArray<DocumentFilter> = [filterCaptionsSaved, filterCaptionsUnsaved];
 
 export function init(context: ExtensionContext): void {
-    const captionsColors = languages.registerColorProvider(selector, new CaptionColorsProvider());
-    const captionsTokenProvider = languages.registerDocumentSemanticTokensProvider(selector, new CaptionsSemanticTokenProvider(), legend);
-    const captionsFormatter = languages.registerDocumentFormattingEditProvider(selector, new KeyvalueDocumentFormatter());
+    const captionsColors = languages.registerColorProvider(selectorAll, new CaptionColorsProvider());
+    const captionsTokenProvider = languages.registerDocumentSemanticTokensProvider(selectorAll, new CaptionsSemanticTokenProvider(), legend);
+    const captionsFormatter = languages.registerDocumentFormattingEditProvider(selectorAll, new KeyvalueDocumentFormatter());
     context.subscriptions.push(captionsColors, captionsTokenProvider, captionsFormatter);
 }
 

src/language/lang-keyvalue.ts

@@ -5,15 +5,31 @@
 // This is NOT a base for other formats!
 // ==========================================================================
 
-import { Range, SemanticTokensBuilder, SemanticTokensLegend, languages, TextDocument, ExtensionContext, DocumentSelector } from "vscode";
+import { Range, SemanticTokensBuilder, SemanticTokensLegend, languages, TextDocument, ExtensionContext, DocumentSelector, DocumentFilter } from "vscode";
 import { KeyvalueDocumentFormatter, KvTokensProviderBase, legend, Processor } from "../keyvalue-document";
 
-export const selector: DocumentSelector = [ "keyvalue3", "soundscript" ];
+export const filterKvSaved: DocumentFilter = {
+    language: "keyvalue3",
+    scheme: "file"
+};
+export const filterKvUnsaved: DocumentFilter = {
+    language: "keyvalue3",
+    scheme: "untitled"
+};
+export const filterSoundscriptSaved: DocumentFilter = {
+    language: "soundscript",
+    scheme: "file"
+};
+export const filterSoundscriptUnsaved: DocumentFilter = {
+    language: "soundscript",
+    scheme: "untitled"
+};
+export const selectorAll: ReadonlyArray<DocumentFilter> = [ filterKvSaved, filterKvUnsaved, filterSoundscriptSaved, filterSoundscriptUnsaved ];
 
 export function init(context: ExtensionContext): void {
     const kvTokenProvider = new KeyvalueSemanticTokensProvider();
-    const kvSemantics = languages.registerDocumentSemanticTokensProvider(selector, kvTokenProvider, kvTokenProvider.legend);
-    const kvFormatter = languages.registerDocumentFormattingEditProvider(selector, new KeyvalueDocumentFormatter());
+    const kvSemantics = languages.registerDocumentSemanticTokensProvider(selectorAll, kvTokenProvider, kvTokenProvider.legend);
+    const kvFormatter = languages.registerDocumentFormattingEditProvider(selectorAll, new KeyvalueDocumentFormatter());
     context.subscriptions.push(kvSemantics, kvTokenProvider.diagnosticCollection, kvFormatter);
 }
 

src/language/lang-vmt.ts

@@ -3,7 +3,7 @@
 // Implementations of language utility providers for the vmt language.
 // ==========================================================================
 
-import { CompletionItemProvider, TextDocument, Position, CancellationToken, CompletionItem, CompletionList, Range, SemanticTokensBuilder, SemanticTokensLegend, languages, HoverProvider, Hover, ProviderResult, Diagnostic, DiagnosticSeverity, DocumentColorProvider, Color, ColorInformation, ColorPresentation, CompletionItemKind, SnippetString, MarkdownString, ExtensionContext, DocumentSelector } from "vscode";
+import { CompletionItemProvider, TextDocument, Position, CancellationToken, CompletionItem, CompletionList, Range, SemanticTokensBuilder, SemanticTokensLegend, languages, HoverProvider, Hover, ProviderResult, Diagnostic, DiagnosticSeverity, DocumentColorProvider, Color, ColorInformation, ColorPresentation, CompletionItemKind, SnippetString, MarkdownString, ExtensionContext, DocumentSelector, DocumentFilter } from "vscode";
 import { KeyvalueDocument, getDocument, KeyValue, KeyvalueDocumentFormatter, KvTokensProviderBase, Processor, legend } from "../keyvalue-document";
 import { Token } from "../kv-core/kv-tokenizer";
 import { ShaderParam } from "../kv-core/shader-param";
@@ -13,7 +13,15 @@ import { config } from "../main";
 import { isFloatValue, isScalarValue } from "../kv-core/kv-string-util";
 
 
-export const selector: DocumentSelector = "vmt";
+export const filterVmtSaved: DocumentFilter = {
+    language: "vmt",
+    scheme: "file"
+};
+export const filterVmtUnsaved: DocumentFilter = {
+    language: "vmt",
+    scheme: "untitled"
+};
+export const selectorAll: ReadonlyArray<DocumentFilter> = [filterVmtSaved, filterVmtUnsaved];
 
 export let shaderParams: ShaderParam[];
 export let internalTextures: string[];
@@ -22,11 +30,11 @@ export function init(context: ExtensionContext): void {
     shaderParams = config.get("shaderParameters") ?? [];
     internalTextures = config.get("internalTextures") ?? [];
 
-    const vmtSemantics = languages.registerDocumentSemanticTokensProvider(selector, new VmtSemanticTokenProvider(), legend);
-    const vmtCompletion = languages.registerCompletionItemProvider(selector, new ShaderParamCompletionItemProvider(), "$", "%");
-    const vmtHover = languages.registerHoverProvider(selector, new ShaderParamHoverProvider());
-    const vmtColors = languages.registerColorProvider(selector, new ShaderParamColorsProvider());
-    const vmtFormatter = languages.registerDocumentFormattingEditProvider(selector, new KeyvalueDocumentFormatter());
+    const vmtSemantics = languages.registerDocumentSemanticTokensProvider(selectorAll, new VmtSemanticTokenProvider(), legend);
+    const vmtCompletion = languages.registerCompletionItemProvider(selectorAll, new ShaderParamCompletionItemProvider(), "$", "%");
+    const vmtHover = languages.registerHoverProvider(selectorAll, new ShaderParamHoverProvider());
+    const vmtColors = languages.registerColorProvider(selectorAll, new ShaderParamColorsProvider());
+    const vmtFormatter = languages.registerDocumentFormattingEditProvider(selectorAll, new KeyvalueDocumentFormatter());
     context.subscriptions.push(vmtSemantics, vmtCompletion, vmtHover, vmtColors, vmtFormatter);
 }