@spyglassmc/language-server 0.2.0 → 0.3.0

package/lib/server.js

@@ -7,7 +7,7 @@ import * as mcdoc from '@spyglassmc/mcdoc';
 import envPaths from 'env-paths';
 import url from 'url';
 import * as util from 'util';
-import * as ls from 'vscode-languageserver/node';
+import * as ls from 'vscode-languageserver/node.js';
 import { toCore, toLS } from './util/index.js';
 export * from './util/types.js';
 if (process.argv.length === 2) {
@@ -60,6 +60,7 @@ connection.onInitialize(async (params) => {
                 'cache#save',
                 'project#init',
                 'project#ready',
+                'project#ready#bind',
             ]),
             project: {
                 cacheRoot: fileUtil.ensureEndingSlash(url.pathToFileURL(cacheRoot).toString()),
@@ -155,10 +156,10 @@ connection.onInitialized(async () => {
     }
 });
 connection.onDidOpenTextDocument(({ textDocument: { text, uri, version, languageId: languageID } }) => {
-    service.project.onDidOpen(uri, languageID, version, text);
+    return service.project.onDidOpen(uri, languageID, version, text);
 });
 connection.onDidChangeTextDocument(({ contentChanges, textDocument: { uri, version } }) => {
-    service.project.onDidChange(uri, contentChanges, version);
+    return service.project.onDidChange(uri, contentChanges, version);
 });
 connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
     service.project.onDidClose(uri);
@@ -166,7 +167,7 @@ connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
 connection.workspace.onDidRenameFiles(({}) => {
 });
 connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -175,7 +176,7 @@ connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) =
     return toLS.colorPresentationArray(presentation, doc);
 });
 connection.onDocumentColor(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -184,7 +185,7 @@ connection.onDocumentColor(async ({ textDocument: { uri } }) => {
     return toLS.colorInformationArray(info, doc);
 });
 connection.onCompletion(async ({ textDocument: { uri }, position, context }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -197,7 +198,7 @@ connection.onRequest('spyglassmc/dataHackPubify', ({ initialism }) => {
     return service.dataHackPubify(initialism);
 });
 connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -206,7 +207,7 @@ connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
     return toLS.locationLink(ans, doc, capabilities.textDocument?.declaration?.linkSupport);
 });
 connection.onDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -215,7 +216,7 @@ connection.onDefinition(async ({ textDocument: { uri }, position }) => {
     return toLS.locationLink(ans, doc, capabilities.textDocument?.definition?.linkSupport);
 });
 connection.onImplementation(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -224,7 +225,7 @@ connection.onImplementation(async ({ textDocument: { uri }, position }) => {
     return toLS.locationLink(ans, doc, capabilities.textDocument?.implementation?.linkSupport);
 });
 connection.onReferences(async ({ textDocument: { uri }, position, context: { includeDeclaration } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -233,7 +234,7 @@ connection.onReferences(async ({ textDocument: { uri }, position, context: { inc
     return toLS.locationLink(ans, doc, false);
 });
 connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -242,7 +243,7 @@ connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
     return toLS.locationLink(ans, doc, capabilities.textDocument?.typeDefinition?.linkSupport);
 });
 connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -251,7 +252,7 @@ connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
     return toLS.documentHighlight(ans);
 });
 connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -259,7 +260,7 @@ connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
     return 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.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -268,7 +269,7 @@ connection.onHover(async ({ textDocument: { uri }, position }) => {
     return ans ? toLS.hover(ans, doc) : undefined;
 });
 connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return [];
     }
@@ -284,7 +285,7 @@ connection.onRequest('spyglassmc/showCacheRoot', async () => {
     return service.project.showCacheRoot();
 });
 connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return { data: [] };
     }
@@ -293,7 +294,7 @@ connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
     return toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
 });
 connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, range }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return { data: [] };
     }
@@ -302,7 +303,7 @@ connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, rang
     return toLS.semanticTokens(tokens, doc, capabilities.textDocument?.semanticTokens?.multilineTokenSupport);
 });
 connection.onSignatureHelp(async ({ textDocument: { uri }, position }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }
@@ -314,7 +315,7 @@ connection.onWorkspaceSymbol(({ query }) => {
     return toLS.symbolInformationArrayFromTable(service.project.symbols.global, query, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
 });
 connection.onDocumentFormatting(async ({ textDocument: { uri }, options }) => {
-    const docAndNode = await service.project.ensureParsedAndCheckedOnlyWhenReady(uri);
+    const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
     }

package/lib/util/toCore.d.ts

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type * as ls from 'vscode-languageserver/node';
+import type * as ls from 'vscode-languageserver/node.js';
 export declare function offset(position: ls.Position, doc: TextDocument): number;
 export declare function range(range: ls.Range, doc: TextDocument): core.Range;
 export declare function color(color: ls.Color): core.Color;

package/lib/util/toLS.d.ts

@@ -1,6 +1,6 @@
 import * as core from '@spyglassmc/core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import * as ls from 'vscode-languageserver/node';
+import * as ls from 'vscode-languageserver/node.js';
 import type { MyLspInlayHint } from './types.js';
 export declare function color(color: core.Color): ls.Color;
 export declare function colorInformation(info: core.ColorInfo, doc: TextDocument): ls.ColorInformation;

package/lib/util/toLS.js

@@ -4,8 +4,8 @@
  * Functions are named after types in `vscode-languageserver`.
  */
 import * as core from '@spyglassmc/core';
-import * as ls from 'vscode-languageserver/node';
-import { InsertTextFormat } from 'vscode-languageserver/node';
+import * as ls from 'vscode-languageserver/node.js';
+import { InsertTextFormat } from 'vscode-languageserver/node.js';
 const ZeroPosition = { line: 0, character: 0 };
 const ZeroRange = { start: ZeroPosition, end: ZeroPosition };
 export function color(color) {

package/lib/util/types.d.ts

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -21,10 +21,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "@spyglassmc/core": "0.2.0",
-    "@spyglassmc/java-edition": "0.2.0",
-    "@spyglassmc/locales": "0.2.0",
-    "@spyglassmc/mcdoc": "0.2.0"
+    "@spyglassmc/core": "0.3.0",
+    "@spyglassmc/java-edition": "0.3.0",
+    "@spyglassmc/locales": "0.3.0",
+    "@spyglassmc/mcdoc": "0.3.0"
   },
   "publishConfig": {
     "access": "public"