@spyglassmc/language-server 0.3.0 → 0.4.1

package/lib/server.js

@@ -38,7 +38,7 @@ connection.onInitialize(async (params) => {
     capabilities = params.capabilities;
     workspaceFolders = params.workspaceFolders ?? [];
     if (initializationOptions?.inDevelopmentMode) {
-        await new Promise(resolve => setTimeout(resolve, 3000));
+        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) {
@@ -65,23 +65,17 @@ connection.onInitialize(async (params) => {
             project: {
                 cacheRoot: fileUtil.ensureEndingSlash(url.pathToFileURL(cacheRoot).toString()),
                 externals,
-                initializers: [
-                    mcdoc.initialize,
-                    je.initialize,
-                ],
+                initializers: [mcdoc.initialize, je.initialize],
                 projectRoot: core.fileUtil.ensureEndingSlash(workspaceFolders[0].uri),
             },
         });
         service.project
-            .on('documentErrorred', ({ doc, errors }) => {
+            .on('documentErrored', ({ errors, uri, version }) => {
             connection.sendDiagnostics({
-                diagnostics: toLS.diagnostics(errors, doc),
-                uri: doc.uri,
-                version: doc.version,
+                diagnostics: toLS.diagnostics(errors),
+                uri: uri,
+                version: version,
             });
-        })
-            .on('documentRemoved', ({ uri }) => {
-            connection.sendDiagnostics({ uri, diagnostics: [] });
         })
             .on('ready', () => {
             progressReporter?.done();
@@ -164,8 +158,7 @@ connection.onDidChangeTextDocument(({ contentChanges, textDocument: { uri, versi
 connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
     service.project.onDidClose(uri);
 });
-connection.workspace.onDidRenameFiles(({}) => {
-});
+connection.workspace.onDidRenameFiles(({}) => { });
 connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
@@ -192,7 +185,8 @@ connection.onCompletion(async ({ textDocument: { uri }, position, context }) =>
     const { doc, node } = docAndNode;
     const offset = toCore.offset(position, doc);
     const items = service.complete(node, doc, offset, context?.triggerCharacter);
-    return items.map(item => toLS.completionItem(item, doc, offset, capabilities.textDocument?.completion?.completionItem?.insertReplaceSupport));
+    return items.map((item) => toLS.completionItem(item, doc, offset, capabilities.textDocument?.completion?.completionItem
+        ?.insertReplaceSupport));
 });
 connection.onRequest('spyglassmc/dataHackPubify', ({ initialism }) => {
     return service.dataHackPubify(initialism);
@@ -224,7 +218,7 @@ connection.onImplementation(async ({ textDocument: { uri }, position }) => {
     const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['implementation', 'definition']);
     return toLS.locationLink(ans, doc, capabilities.textDocument?.implementation?.linkSupport);
 });
-connection.onReferences(async ({ textDocument: { uri }, position, context: { includeDeclaration } }) => {
+connection.onReferences(async ({ textDocument: { uri }, position, context: { includeDeclaration }, }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return undefined;
@@ -257,7 +251,8 @@ connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    return toLS.documentSymbolsFromTables([service.project.symbols.global, ...core.AstNode.getLocalsToLeaves(node)], doc, capabilities.textDocument?.documentSymbol?.hierarchicalDocumentSymbolSupport, capabilities.textDocument?.documentSymbol?.symbolKind?.valueSet);
+    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.ensureClientManagedChecked(uri);
@@ -268,7 +263,7 @@ connection.onHover(async ({ textDocument: { uri }, position }) => {
     const ans = service.getHover(node, doc, toCore.offset(position, doc));
     return ans ? toLS.hover(ans, doc) : undefined;
 });
-connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, range }) => {
+connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, range, }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return [];
@@ -278,8 +273,7 @@ connection.onRequest('spyglassmc/inlayHints', async ({ textDocument: { uri }, ra
     return toLS.inlayHints(hints, doc);
 });
 connection.onRequest('spyglassmc/resetProjectCache', async () => {
-    service.project.resetCache();
-    return service.project.restart();
+    return service.project.resetCache();
 });
 connection.onRequest('spyglassmc/showCacheRoot', async () => {
     return service.project.showCacheRoot();

package/lib/util/toLS.d.ts

@@ -7,8 +7,8 @@ export declare function colorInformation(info: core.ColorInfo, doc: TextDocument
 export declare function colorInformationArray(info: core.ColorInfo[], doc: TextDocument): ls.ColorInformation[];
 export declare function colorPresentation(presentation: core.ColorPresentation, doc: TextDocument): ls.ColorPresentation;
 export declare function colorPresentationArray(presentation: core.ColorPresentation[], doc: TextDocument): ls.ColorPresentation[];
-export declare function diagnostic(error: core.LanguageError, doc: TextDocument): ls.Diagnostic;
-export declare function diagnostics(errors: readonly core.LanguageError[], doc: TextDocument): ls.Diagnostic[];
+export declare function diagnostic(error: core.PosRangeLanguageError): ls.Diagnostic;
+export declare function diagnostics(errors: readonly core.PosRangeLanguageError[]): ls.Diagnostic[];
 export declare function diagnosticSeverity(severity: core.ErrorSeverity): ls.DiagnosticSeverity;
 export declare function documentHighlight(locations: core.SymbolLocations | undefined): ls.DocumentHighlight[] | undefined;
 export declare function documentSelector(meta: core.MetaRegistry): ls.DocumentSelector;

package/lib/util/toLS.js

@@ -15,21 +15,23 @@ export function colorInformation(info, doc) {
     return ls.ColorInformation.create(range(info.range, doc), color(info.color));
 }
 export function colorInformationArray(info, doc) {
-    return info.map(i => colorInformation(i, doc));
+    return info.map((i) => colorInformation(i, doc));
 }
 export function colorPresentation(presentation, doc) {
     const edit = ls.TextEdit.replace(range(presentation.range, doc), presentation.text);
     return ls.ColorPresentation.create(presentation.label, edit);
 }
 export function colorPresentationArray(presentation, doc) {
-    return presentation.map(p => colorPresentation(p, doc));
+    return presentation.map((p) => colorPresentation(p, doc));
 }
-export function diagnostic(error, doc) {
-    const ans = ls.Diagnostic.create(range(error.range, doc), error.message, diagnosticSeverity(error.severity), undefined, 'spyglassmc');
+export function diagnostic(error) {
+    const ans = ls.Diagnostic.create(error.posRange, error.message, diagnosticSeverity(error.severity), undefined, 'spyglassmc');
     if (error.info?.deprecated) {
+        ;
         (ans.tags ??= [])?.push(ls.DiagnosticTag.Deprecated);
     }
     if (error.info?.unnecessary) {
+        ;
         (ans.tags ??= [])?.push(ls.DiagnosticTag.Unnecessary);
     }
     if (error.info?.codeAction) {
@@ -38,15 +40,15 @@ export function diagnostic(error, doc) {
         };
     }
     if (error.info?.related) {
-        ans.relatedInformation = error.info?.related.map(v => ({
+        ans.relatedInformation = error.info?.related.map((v) => ({
             location: location(v.location),
             message: v.message,
         }));
     }
     return ans;
 }
-export function diagnostics(errors, doc) {
-    return errors.map(e => diagnostic(e, doc));
+export function diagnostics(errors) {
+    return errors.map((e) => diagnostic(e));
 }
 export function diagnosticSeverity(severity) {
     switch (severity) {
@@ -62,11 +64,13 @@ export function diagnosticSeverity(severity) {
 }
 export function documentHighlight(locations) {
     return locations?.locations
-        ?.filter(loc => loc.posRange)
-        ?.map(loc => ({ range: loc.posRange }));
+        ?.filter((loc) => loc.posRange)
+        ?.map((loc) => ({ range: loc.posRange }));
 }
 export function documentSelector(meta) {
-    const ans = meta.getLanguages().map(id => ({ language: id }));
+    const ans = meta
+        .getLanguages()
+        .map((id) => ({ language: id }));
     return ans;
 }
 export function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, supportedKinds = []) {
@@ -75,23 +79,33 @@ export function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, support
         kind: symbolKind(symbol.category, symbol.subcategory, supportedKinds),
         range: symLoc.fullPosRange ?? symLoc.posRange ?? ZeroRange,
         selectionRange: symLoc.posRange ?? ZeroRange,
-        children: hierarchicalSupport ? documentSymbols(symbol.members, doc, hierarchicalSupport, supportedKinds) : undefined,
+        children: hierarchicalSupport
+            ? documentSymbols(symbol.members, doc, hierarchicalSupport, supportedKinds)
+            : undefined,
     };
 }
 export function documentSymbols(map = {}, doc, hierarchicalSupport, supportedKinds = []) {
     return Object.values(map)
-        .map(s => [s, [...s.declaration ?? [], ...s.definition ?? [], ...s.implementation ?? [], ...s.typeDefinition ?? []].find(l => l.uri === doc.uri)])
+        .map((s) => [
+        s,
+        [
+            ...(s.declaration ?? []),
+            ...(s.definition ?? []),
+            ...(s.implementation ?? []),
+            ...(s.typeDefinition ?? []),
+        ].find((l) => l.uri === doc.uri),
+    ])
         .filter(([_s, l]) => !!l)
         .map(([s, l]) => documentSymbol(s, l, doc, hierarchicalSupport, supportedKinds));
 }
 export function documentSymbolsFromTable(table, doc, hierarchicalSupport, supportedKinds = []) {
     return Object.values(table)
-        .map(m => documentSymbols(m, doc, hierarchicalSupport, supportedKinds))
+        .map((m) => documentSymbols(m, doc, hierarchicalSupport, supportedKinds))
         .flat();
 }
 export function documentSymbolsFromTables(tables, doc, hierarchicalSupport, supportedKinds = []) {
     return tables
-        .map(t => documentSymbolsFromTable(t, doc, hierarchicalSupport, supportedKinds))
+        .map((t) => documentSymbolsFromTable(t, doc, hierarchicalSupport, supportedKinds))
         .flat();
 }
 export function hover(hover, doc) {
@@ -108,7 +122,7 @@ export function inlayHint(hint, doc) {
     };
 }
 export function inlayHints(hints, doc) {
-    return hints.map(h => inlayHint(h, doc));
+    return hints.map((h) => inlayHint(h, doc));
 }
 export function completionItem(completion, doc, requestedOffset, insertReplaceSupport) {
     const insertText = completion.insertText ?? completion.label;
@@ -128,7 +142,9 @@ export function completionItem(completion, doc, requestedOffset, insertReplaceSu
         textEdit,
         insertTextFormat: InsertTextFormat.Snippet,
         insertTextMode: ls.InsertTextMode.adjustIndentation,
-        ...completion.deprecated ? { tags: [ls.CompletionItemTag.Deprecated] } : {},
+        ...(completion.deprecated
+            ? { tags: [ls.CompletionItemTag.Deprecated] }
+            : {}),
     };
     return ans;
 }
@@ -141,13 +157,13 @@ export function location(location) {
 export function locationLink(locations, doc, linkSupport) {
     return locations?.locations
         ? linkSupport
-            ? locations.locations.map(loc => ({
+            ? locations.locations.map((loc) => ({
                 originSelectionRange: range(locations.range, doc),
                 targetUri: loc.uri,
                 targetRange: loc.fullPosRange ?? loc.posRange ?? ZeroRange,
                 targetSelectionRange: loc.posRange ?? ZeroRange,
             }))
-            : (locations.locations).map(loc => location({ uri: loc.uri, posRange: loc.posRange ?? ZeroRange }))
+            : locations.locations.map((loc) => location({ uri: loc.uri, posRange: loc.posRange ?? ZeroRange }))
         : undefined;
 }
 export function markupContent(value) {
@@ -221,33 +237,48 @@ export function signatureInformation(info) {
     return {
         label: info.label,
         activeParameter: info.activeParameter,
-        documentation: info.documentation ? markupContent(info.documentation) : undefined,
+        documentation: info.documentation
+            ? markupContent(info.documentation)
+            : undefined,
         parameters: info.parameters.map(parameterInformation),
     };
 }
 export function parameterInformation(info) {
     return {
         label: info.label,
-        documentation: info.documentation ? markupContent(info.documentation) : undefined,
+        documentation: info.documentation
+            ? markupContent(info.documentation)
+            : undefined,
     };
 }
 export function symbolInformation(symbol, symLoc, supportedKinds = []) {
     return {
         name: symbol.identifier,
         kind: symbolKind(symbol.category, symbol.subcategory, supportedKinds),
-        location: location({ uri: symLoc.uri, posRange: symLoc.fullPosRange ?? symLoc.posRange ?? ZeroRange }),
+        location: location({
+            uri: symLoc.uri,
+            posRange: symLoc.fullPosRange ?? symLoc.posRange ?? ZeroRange,
+        }),
     };
 }
 export function symbolInformationArray(map = {}, query, supportedKinds = []) {
     return Object.values(map)
-        .filter(s => s.identifier.includes(query))
-        .map(s => [s, [...s.declaration ?? [], ...s.definition ?? [], ...s.implementation ?? [], ...s.typeDefinition ?? []][0]])
+        .filter((s) => s.identifier.includes(query))
+        .map((s) => [
+        s,
+        [
+            ...(s.declaration ?? []),
+            ...(s.definition ?? []),
+            ...(s.implementation ?? []),
+            ...(s.typeDefinition ?? []),
+        ][0],
+    ])
         .filter(([_s, l]) => !!l)
         .map(([s, l]) => symbolInformation(s, l, supportedKinds));
 }
 export function symbolInformationArrayFromTable(table, query, supportedKinds = []) {
     return Object.values(table)
-        .map(m => symbolInformationArray(m, query, supportedKinds))
+        .map((m) => symbolInformationArray(m, query, supportedKinds))
         .flat();
 }
 export function symbolKind(category, subcategory = '', supportedKinds = []) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -11,7 +11,7 @@
     "test": "test"
   },
   "bin": {
-    "spyglassmc-language-server": "./bin/server"
+    "spyglassmc-language-server": "./bin/server.js"
   },
   "scripts": {
     "release": "npm publish",
@@ -21,10 +21,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^7.0.0",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "@spyglassmc/core": "0.3.0",
-    "@spyglassmc/java-edition": "0.3.0",
-    "@spyglassmc/locales": "0.3.0",
-    "@spyglassmc/mcdoc": "0.3.0"
+    "@spyglassmc/core": "0.4.1",
+    "@spyglassmc/java-edition": "0.3.2",
+    "@spyglassmc/locales": "0.3.1",
+    "@spyglassmc/mcdoc": "0.3.2"
   },
   "publishConfig": {
     "access": "public"