@spyglassmc/language-server 0.1.0 → 0.1.1

package/lib/server.js

@@ -54,13 +54,16 @@ const logger = {
 };
 let service;
 connection.onInitialize(async (params) => {
+    const initializationOptions = params.initializationOptions;
     logger.info(`[onInitialize] processId = ${JSON.stringify(params.processId)}`);
     logger.info(`[onInitialize] clientInfo = ${JSON.stringify(params.clientInfo)}`);
-    logger.info(`[onInitialize] initializationOptions = ${JSON.stringify(params.initializationOptions)}`);
+    logger.info(`[onInitialize] initializationOptions = ${JSON.stringify(initializationOptions)}`);
     capabilities = params.capabilities;
     workspaceFolders = params.workspaceFolders ?? [];
-    await new Promise(resolve => setTimeout(resolve, 3000));
-    logger.warn('Delayed 3 seconds manually. If you see this in production, it means SPGoding messed up.');
+    if (initializationOptions?.inDevelopmentMode) {
+        await new Promise(resolve => setTimeout(resolve, 3000));
+        logger.warn('Delayed 3 seconds manually. If you see this in production, it means SPGoding messed up.');
+    }
     if (params.workDoneToken) {
         progressReporter = connection.window.attachWorkDoneProgress(params.workDoneToken);
         progressReporter.begin(locales.localize('server.progress.preparing.title'));
@@ -171,10 +174,10 @@ connection.onInitialized(async () => {
         });
     }
 });
-connection.onDidOpenTextDocument(async ({ textDocument: { text, uri, version, languageId: languageID } }) => {
+connection.onDidOpenTextDocument(({ textDocument: { text, uri, version, languageId: languageID } }) => {
     service.project.onDidOpen(uri, languageID, version, text);
 });
-connection.onDidChangeTextDocument(async ({ contentChanges, textDocument: { uri, version } }) => {
+connection.onDidChangeTextDocument(({ contentChanges, textDocument: { uri, version } }) => {
     service.project.onDidChange(uri, contentChanges, version);
 });
 connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
@@ -183,7 +186,7 @@ connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
 connection.workspace.onDidRenameFiles(({}) => {
 });
 connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -192,7 +195,7 @@ connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) =
     return util_1.toLS.colorPresentationArray(presentation, doc);
 });
 connection.onDocumentColor(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -201,7 +204,7 @@ connection.onDocumentColor(async ({ textDocument: { uri } }) => {
     return util_1.toLS.colorInformationArray(info, doc);
 });
 connection.onCompletion(async ({ textDocument: { uri }, position, context }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -214,7 +217,7 @@ connection.onRequest('spyglassmc/dataHackPubify', ({ initialism }) => {
     return service.dataHackPubify(initialism);
 });
 connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -223,7 +226,7 @@ connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
     return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.declaration?.linkSupport);
 });
 connection.onDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -232,7 +235,7 @@ connection.onDefinition(async ({ textDocument: { uri }, position }) => {
     return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.definition?.linkSupport);
 });
 connection.onImplementation(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -241,7 +244,7 @@ connection.onImplementation(async ({ textDocument: { uri }, position }) => {
     return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.implementation?.linkSupport);
 });
 connection.onReferences(async ({ textDocument: { uri }, position, context: { includeDeclaration } }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -250,7 +253,7 @@ connection.onReferences(async ({ textDocument: { uri }, position, context: { inc
     return util_1.toLS.locationLink(ans, doc, false);
 });
 connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -259,7 +262,7 @@ connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
     return util_1.toLS.locationLink(ans, doc, capabilities.textDocument?.typeDefinition?.linkSupport);
 });
 connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -268,7 +271,7 @@ connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
     return util_1.toLS.documentHighlight(ans);
 });
 connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -276,7 +279,7 @@ connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
     return util_1.toLS.documentSymbolsFromTables([service.project.symbols.global, ...core.AstNode.getLocalsToLeaves(node)], doc, capabilities.textDocument?.documentSymbol?.hierarchicalDocumentSymbolSupport, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
 });
 connection.onHover(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -285,7 +288,7 @@ connection.onHover(async ({ textDocument: { uri }, position }) => {
     return ans ? util_1.toLS.hover(ans, doc) : undefined;
 });
 connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return [];
     }
@@ -301,7 +304,7 @@ connection.onRequest('spyglassmc/showCacheRoot', async () => {
     return service.project.showCacheRoot();
 });
 connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return { data: [] };
     }
@@ -310,7 +313,7 @@ connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
     return util_1.toLS.semanticTokens(tokens, doc);
 });
 connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return { data: [] };
     }
@@ -319,7 +322,7 @@ connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, rang
     return util_1.toLS.semanticTokens(tokens, doc);
 });
 connection.onSignatureHelp(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -331,7 +334,7 @@ connection.onWorkspaceSymbol(({ query }) => {
     return util_1.toLS.symbolInformationArrayFromTable(service.project.symbols.global, query, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
 });
 connection.onDocumentFormatting(async ({ textDocument: { uri }, options }) => {
-    const docAndNode = await service.project.ensureParsedAndChecked(uri);
+    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
     if (!docAndNode) {
         return undefined;
     }

package/lib/util/types.d.ts

@@ -1,4 +1,7 @@
 import type * as ls from 'vscode-languageserver/node';
+export interface CustomInitializationOptions {
+    inDevelopmentMode?: boolean;
+}
 export interface CustomServerCapabilities {
     dataHackPubify?: boolean;
     inlayHints?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
   "author": "SPGoding",
@@ -20,10 +20,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "@spyglassmc/core": "0.1.0",
-    "@spyglassmc/java-edition": "0.1.0",
-    "@spyglassmc/locales": "0.1.0",
-    "@spyglassmc/nbtdoc": "0.1.0"
+    "@spyglassmc/core": "0.1.1",
+    "@spyglassmc/java-edition": "0.1.1",
+    "@spyglassmc/locales": "0.1.1",
+    "@spyglassmc/nbtdoc": "0.1.1"
   },
   "publishConfig": {
     "access": "public"