Adapt to sourcelib methods

Author: StefanH-AT

src/compiler/compiler-base.ts

@@ -1,5 +1,5 @@
 import vscode from "vscode";
-import { isWhitespace } from "@sourcelib/kv";
+import { isWhitespace } from "@sourcelib/kv/";
 import * as main from "../main";
 import * as fs from "fs";
 import { execFile } from "child_process";

src/language/KvDocument.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode";
 import { KvPair, KvPiece } from "../Kv";
-import { Tokenizer, TokenList, Token, TokenType } from "@sourcelib/kv";
+import { tokenize, TokenList, Token, TokenType } from "@sourcelib/kv";
 import { KvTokensProviderBase } from "./KvTokensProviderBase";
 
 export default class KvDocument {
@@ -16,18 +16,8 @@ export default class KvDocument {
         return this._tokens;
     }
 
-    private static tokenizer: Tokenizer = new Tokenizer();
-
-    public static tokenize(document: vscode.TextDocument): TokenList {
-        const text = document.getText();
-        this.tokenizer.tokenizeFile(text);
-        const tokens = this.tokenizer.tokens;
-    
-        return tokens;
-    }
-
     public static from(document: vscode.TextDocument): KvDocument {
-        return new KvDocument(document, this.tokenize(document));
+        return new KvDocument(document, tokenize(document.getText()));
     }
 
     public static tokenLegend = new vscode.SemanticTokensLegend([
@@ -80,7 +70,9 @@ export default class KvDocument {
     }
 
     public getTokenRange(token: Token): vscode.Range {
-        return new vscode.Range(this.document.positionAt(token.range.start), this.document.positionAt(token.range.end));
+        const start = new vscode.Position(token.line, token.range.getStart());
+        const end = new vscode.Position(token.line, token.range.getEnd());
+        return new vscode.Range(start, end);
     }
 
     private getUnquotedToken(token: Token): KvPiece {

src/language/KvFormatter.ts

@@ -1,19 +1,20 @@
+// TODO: Disabled until new formatter is implemented in sourcelib
+
+/*
 import vscode from "vscode";
-import { FormattingOptions, formatAll } from "@sourcelib/kv";
+import {  } from "@sourcelib/kv";
 import KvDocument from "./KvDocument";
 import * as main from "../main";
 
 export class KvDocumentFormatter implements vscode.DocumentFormattingEditProvider {
-
     protected createFormattingOptions(): FormattingOptions {
         return {
             braceOnNewline: main.config.get("keyvalueBracesOnNewline"),
             alwaysQuote: main.config.get("keyvalueAlwaysQuote")
         } as FormattingOptions;
     }
-
     provideDocumentFormattingEdits(document: vscode.TextDocument, options: vscode.FormattingOptions, token: vscode.CancellationToken): vscode.TextEdit[] {
-
+        
         const tokens = KvDocument.tokenize(document);
         if (tokens == null)
             return [];
@@ -32,3 +33,5 @@ export class KvDocumentFormatter implements vscode.DocumentFormattingEditProvide
     }
 
 }
+
+*/

src/language/KvTokensProviderBase.ts

@@ -78,11 +78,8 @@ export abstract class KvTokensProviderBase implements vscode.DocumentSemanticTok
                 continue;
             }
 
-            // We're a keyvalue's key. Process the value too and skip forward
             if (token.type === TokenType.Value) {
-
                 this.processKvValue(token, tokenRange, tokensBuilder, kvDoc, currentScope);
-                
                 continue;
             }            
 

src/language/LangCaptions.ts

@@ -5,7 +5,7 @@
 
 import vscode from "vscode";
 import KvDocument from "./KvDocument";
-import { KvDocumentFormatter } from "./KvFormatter";
+//import { KvDocumentFormatter } from "./KvFormatter";
 import { CaptionsColorsProvider } from "./CaptionsColorsProvider";
 import { CaptionsSemanticTokenProvider } from "./CaptionsSemanticTokenProvider";
 

src/language/LangKv.ts

@@ -7,7 +7,7 @@
 
 import * as vscode from "vscode";
 import { KvTokensProviderBase } from "./KvTokensProviderBase";
-import { KvDocumentFormatter } from "./KvFormatter";
+//import { KvDocumentFormatter } from "./KvFormatter";
 import { KvSemanticProcessor, KvSemanticProcessorParams } from "./KvSemanticProcessor";
 import KvDocument from "./KvDocument";
 import { matrixRegExp } from "@sourcelib/vmt";

src/language/LangVmt.ts

@@ -5,7 +5,7 @@
 
 import vscode from "vscode";
 import KvDocument from "./KvDocument";
-import { KvDocumentFormatter } from "./KvFormatter";
+//import { KvDocumentFormatter } from "./KvFormatter";
 import { ShaderParam } from "@sourcelib/vmt";
 import * as main from "../main";
 import { ShaderParamCompletionItemProvider } from "./ShaderParamCompletionItemProvider";

src/language/ShaderParamColorsProvider.ts

@@ -17,7 +17,7 @@ export class ShaderParamColorsProvider implements vscode.DocumentColorProvider {
         // TODO: This seems like it should be reusable.
         const valueTokens = kvDoc.tokens.getAllOfType(TokenType.Value);
         valueTokens.forEach(t => {
-            const line = document.positionAt(t.range.start).line;
+            const line = document.positionAt(t.range.getStart()).line;
             const kv = kvDoc.getKeyValueAt(line);
             if (kv == null)
                 return;