update rainlang v4

- remove meta debounce
rainlanguage · Oct 14, 2023 · 88b857c · 88b857c
1 parent c60b29a
commit 88b857c
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 49 deletions.
diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -15,7 +15,7 @@
 		"url": "https://github.com/rainprotocol/rainlang-vscode/issues"
 	},
 	"dependencies": {
-		"@rainprotocol/rainlang": "github:rainprotocol/rainlang#bb4a348a7d71cb7013420a2a14a5ffb5ad3ff8f4",
+		"@rainprotocol/rainlang": "^4.1.0",
 		"vscode-languageserver": "^8.1.0"
 	}
 }
diff --git a/server/src/browserServer.ts b/server/src/browserServer.ts
@@ -54,7 +54,8 @@ connection.onInitialize(async(params: InitializeParams) => {
 
     langServices = getRainLanguageServices({
         clientCapabilities,
-        metaStore
+        metaStore,
+        noMetaSearch: true
     });
 
     const result: InitializeResult = {
@@ -129,21 +130,19 @@ connection.onDidChangeConfiguration(async() => {
         }
     }
     if (settings?.subgraphs) await metaStore.addSubgraphs(settings.subgraphs);
-    documents.all().forEach(async(v) => {
-        if (v.languageId === "rainlang") validate(v);
-    });
+    documents.all().forEach(async(v) => { validate(v, v.getText(), v.version); });
 });
 
 documents.onDidOpen(v => {
-    if (v.document.languageId === "rainlang") validate(v.document);
+    validate(v.document, v.document.getText(), v.document.version);
 });
 
 documents.onDidClose(v => {
     connection.sendDiagnostics({ uri: v.document.uri, diagnostics: []});
 });
 
 documents.onDidChangeContent(change => {
-    if (change.document.languageId === "rainlang") validate(change.document);
+    validate(change.document, change.document.getText(), change.document.version);
 });
 
 connection.onCompletion(params => {
@@ -170,8 +169,10 @@ connection.onHover(params => {
 connection.languages.semanticTokens.on(async(e: SemanticTokensParams) => {
     let data: number[];
     const _td = documents.get(e.textDocument.uri);
-    if (_td) {
-        const _rd = await RainDocument.create(_td, metaStore);
+    if (_td && _td.languageId === "rainlang") {
+        const _rd = new RainDocument(_td, metaStore);
+        (_rd as any)._shouldSearch = false;
+        await _rd.parse();
         let _lastLine = 0;
         let _lastChar = 0;
         data = _rd.bindings.filter(v => 
@@ -273,10 +274,15 @@ async function getSetting() {
 }
 
 // validate a document
-async function validate(textDocument: TextDocument): Promise<void> {
-    // Send the computed diagnostics to VSCode.
-    connection.sendDiagnostics({ 
-        uri: textDocument.uri, 
-        diagnostics: await langServices.doValidate(textDocument)
-    });
+async function validate(textDocument: TextDocument, text: string, version: number): Promise<void> {
+    if (textDocument.languageId === "rainlang") {
+        const diagnostics = await langServices.doValidate(
+            TextDocument.create("untitled", "rainlang", 0, text)
+        );
+        // check version of the text document before sending the diagnostics to VSCode
+        if (version === textDocument.version) connection.sendDiagnostics({ 
+            uri: textDocument.uri, 
+            diagnostics
+        });
+    }
 }
diff --git a/server/src/nodeServer.ts b/server/src/nodeServer.ts
@@ -53,7 +53,8 @@ connection.onInitialize(async(params) => {
 
     langServices = getRainLanguageServices({
         clientCapabilities,
-        metaStore
+        metaStore,
+        noMetaSearch: true
     });
 
     const result: InitializeResult = {
@@ -129,21 +130,19 @@ connection.onDidChangeConfiguration(async() => {
         }
     }
     if (settings?.subgraphs) await metaStore.addSubgraphs(settings.subgraphs);
-    documents.all().forEach(async(v) => {
-        if (v.languageId === "rainlang") validate(v);
-    });
+    documents.all().forEach(async(v) => { validate(v, v.getText(), v.version); });
 });
 
 documents.onDidOpen(v => {
-    if (v.document.languageId === "rainlang") validate(v.document);
+    validate(v.document, v.document.getText(), v.document.version);
 });
 
 documents.onDidClose(v => {
     connection.sendDiagnostics({ uri: v.document.uri, diagnostics: []});
 });
 
 documents.onDidChangeContent(change => {
-    if (change.document.languageId === "rainlang") validate(change.document);
+    validate(change.document, change.document.getText(), change.document.version);
 });
 
 connection.onDidChangeWatchedFiles(_change => {
@@ -175,8 +174,10 @@ connection.onHover(params => {
 connection.languages.semanticTokens.on(async(e: SemanticTokensParams) => {
     let data: number[];
     const _td = documents.get(e.textDocument.uri);
-    if (_td) {
-        const _rd = await RainDocument.create(_td, metaStore);
+    if (_td && _td.languageId === "rainlang") {
+        const _rd = new RainDocument(_td, metaStore);
+        (_rd as any)._shouldSearch = false;
+        await _rd.parse();
         let _lastLine = 0;
         let _lastChar = 0;
         data = _rd.bindings.filter(v => 
@@ -278,10 +279,15 @@ async function getSetting() {
 }
 
 // validate a document
-async function validate(textDocument: TextDocument): Promise<void> {
-    // Send the computed diagnostics to VSCode.
-    connection.sendDiagnostics({ 
-        uri: textDocument.uri, 
-        diagnostics: await langServices.doValidate(textDocument)
-    });
+async function validate(textDocument: TextDocument, text: string, version: number): Promise<void> {
+    if (textDocument.languageId === "rainlang") {
+        const diagnostics = await langServices.doValidate(
+            TextDocument.create("untitled", "rainlang", 0, text)
+        );
+        // check version of the text document before sending the diagnostics to VSCode
+        if (version === textDocument.version) connection.sendDiagnostics({ 
+            uri: textDocument.uri, 
+            diagnostics
+        });
+    }
 }