@spyglassmc/language-server 0.4.7 → 0.4.8

package/lib/server.js

@@ -53,7 +53,7 @@ connection.onInitialize(async (params) => {
     }
     try {
         service = new core.Service({
-            isDebugging: initializationOptions?.inDevelopmentMode && false,
+            isDebugging: initializationOptions?.inDevelopmentMode,
             logger,
             profilers: new core.ProfilerFactory(logger, [
                 'cache#load',
@@ -69,20 +69,18 @@ connection.onInitialize(async (params) => {
                 projectRoot: core.fileUtil.ensureEndingSlash(workspaceFolders[0].uri),
             },
         });
-        service.project
-            .on('documentErrored', async ({ errors, uri, version }) => {
+        service.project.on('documentErrored', async ({ errors, uri, version }) => {
             try {
                 await connection.sendDiagnostics({
                     diagnostics: toLS.diagnostics(errors),
-                    uri: uri,
-                    version: version,
+                    uri,
+                    version,
                 });
             }
             catch (e) {
                 console.error('[sendDiagnostics]', e);
             }
-        })
-            .on('ready', () => {
+        }).on('ready', () => {
             progressReporter?.done();
         });
         await service.project.init();
@@ -96,24 +94,19 @@ connection.onInitialize(async (params) => {
         showCacheRoot: true,
     };
     const ans = {
-        serverInfo: {
-            name: 'Spyglass Language Server',
-        },
+        serverInfo: { name: 'Spyglass Language Server' },
         capabilities: {
             colorProvider: {},
-            completionProvider: {
-                triggerCharacters: service.project.meta.getTriggerCharacters(),
-            },
+            completionProvider: { triggerCharacters: service.project.meta.getTriggerCharacters() },
             declarationProvider: {},
             definitionProvider: {},
             implementationProvider: {},
-            documentFormattingProvider: {},
+            // TODO: re-enable this
+            // documentFormattingProvider: {},
             referencesProvider: {},
             typeDefinitionProvider: {},
             documentHighlightProvider: {},
-            documentSymbolProvider: {
-                label: 'Spyglass',
-            },
+            documentSymbolProvider: { label: 'Spyglass' },
             hoverProvider: {},
             inlayHintProvider: {},
             semanticTokensProvider: {
@@ -122,25 +115,15 @@ connection.onInitialize(async (params) => {
                 full: { delta: false },
                 range: true,
             },
-            signatureHelpProvider: {
-                triggerCharacters: [' '],
-            },
-            textDocumentSync: {
-                change: ls.TextDocumentSyncKind.Incremental,
-                openClose: true,
-            },
+            signatureHelpProvider: { triggerCharacters: [' '] },
+            textDocumentSync: { change: ls.TextDocumentSyncKind.Incremental, openClose: true },
             workspaceSymbolProvider: {},
-            experimental: {
-                spyglassmc: customCapabilities,
-            },
+            experimental: { spyglassmc: customCapabilities },
         },
     };
     if (capabilities.workspace?.workspaceFolders) {
         ans.capabilities.workspace = {
-            workspaceFolders: {
-                supported: true,
-                changeNotifications: true,
-            },
+            workspaceFolders: { supported: true, changeNotifications: true },
         };
     }
     return ans;
@@ -190,8 +173,7 @@ 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);
@@ -202,7 +184,10 @@ connection.onDeclaration(async ({ textDocument: { uri }, position }) => {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['declaration', 'definition']);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), [
+        'declaration',
+        'definition',
+    ]);
     return toLS.locationLink(ans, doc, capabilities.textDocument?.declaration?.linkSupport);
 });
 connection.onDefinition(async ({ textDocument: { uri }, position }) => {
@@ -211,7 +196,12 @@ connection.onDefinition(async ({ textDocument: { uri }, position }) => {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['definition', 'declaration', 'implementation', 'typeDefinition']);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), [
+        'definition',
+        'declaration',
+        'implementation',
+        'typeDefinition',
+    ]);
     return toLS.locationLink(ans, doc, capabilities.textDocument?.definition?.linkSupport);
 });
 connection.onImplementation(async ({ textDocument: { uri }, position }) => {
@@ -220,10 +210,13 @@ connection.onImplementation(async ({ textDocument: { uri }, position }) => {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['implementation', 'definition']);
+    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;
@@ -238,7 +231,9 @@ connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
         return undefined;
     }
     const { doc, node } = docAndNode;
-    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), ['typeDefinition']);
+    const ans = await service.getSymbolLocations(node, doc, toCore.offset(position, doc), [
+        'typeDefinition',
+    ]);
     return toLS.locationLink(ans, doc, capabilities.textDocument?.typeDefinition?.linkSupport);
 });
 connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
@@ -256,8 +251,7 @@ 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);

package/lib/util/toLS.js

@@ -35,9 +35,7 @@ export function diagnostic(error) {
         (ans.tags ??= [])?.push(ls.DiagnosticTag.Unnecessary);
     }
     if (error.info?.codeAction) {
-        ans.data = {
-            codeAction: error.info?.codeAction,
-        };
+        ans.data = { codeAction: error.info?.codeAction };
     }
     if (error.info?.related) {
         ans.relatedInformation = error.info?.related.map((v) => ({
@@ -63,14 +61,12 @@ export function diagnosticSeverity(severity) {
     }
 }
 export function documentHighlight(locations) {
-    return locations?.locations
-        ?.filter((loc) => loc.posRange)
-        ?.map((loc) => ({ range: loc.posRange }));
+    return locations?.locations?.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 = []) {
@@ -85,8 +81,7 @@ export function documentSymbol(symbol, symLoc, doc, hierarchicalSupport, support
     };
 }
 export function documentSymbols(map = {}, doc, hierarchicalSupport, supportedKinds = []) {
-    return Object.values(map)
-        .map((s) => [
+    return Object.values(map).map((s) => [
         s,
         [
             ...(s.declaration ?? []),
@@ -94,25 +89,17 @@ export function documentSymbols(map = {}, doc, hierarchicalSupport, supportedKin
             ...(s.implementation ?? []),
             ...(s.typeDefinition ?? []),
         ].find((l) => l.uri === doc.uri),
-    ])
-        .filter(([_s, l]) => !!l)
-        .map(([s, l]) => documentSymbol(s, l, doc, hierarchicalSupport, supportedKinds));
+    ]).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))
-        .flat();
+    return Object.values(table).map((m) => documentSymbols(m, doc, hierarchicalSupport, supportedKinds)).flat();
 }
 export function documentSymbolsFromTables(tables, doc, hierarchicalSupport, supportedKinds = []) {
-    return tables
-        .map((t) => documentSymbolsFromTable(t, doc, hierarchicalSupport, supportedKinds))
+    return tables.map((t) => documentSymbolsFromTable(t, doc, hierarchicalSupport, supportedKinds))
         .flat();
 }
 export function hover(hover, doc) {
-    const ans = {
-        contents: markupContent(hover.markdown),
-        range: range(hover.range, doc),
-    };
+    const ans = { contents: markupContent(hover.markdown), range: range(hover.range, doc) };
     return ans;
 }
 export function inlayHint(hint, doc) {
@@ -128,8 +115,8 @@ export function inlayHints(hints, doc) {
 }
 export function completionItem(completion, doc, requestedOffset, insertReplaceSupport) {
     const insertText = completion.insertText ?? completion.label;
-    const canInsertReplace = insertReplaceSupport &&
-        ![core.CR, core.LF, core.CRLF].includes(insertText);
+    const canInsertReplace = insertReplaceSupport
+        && ![core.CR, core.LF, core.CRLF].includes(insertText);
     const textEdit = canInsertReplace
         ? ls.InsertReplaceEdit.create(insertText, 
         /* insert  */ range(core.Range.create(completion.range.start, requestedOffset), doc), 
@@ -145,17 +132,12 @@ 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;
 }
 export function location(location) {
-    return {
-        uri: location.uri,
-        range: location.posRange,
-    };
+    return { uri: location.uri, range: location.posRange };
 }
 export function locationLink(locations, doc, linkSupport) {
     return locations?.locations
@@ -170,10 +152,7 @@ export function locationLink(locations, doc, linkSupport) {
         : undefined;
 }
 export function markupContent(value) {
-    return {
-        kind: ls.MarkupKind.Markdown,
-        value: value,
-    };
+    return { kind: ls.MarkupKind.Markdown, value };
 }
 export function position(offset, doc) {
     return doc.positionAt(offset);
@@ -204,10 +183,11 @@ export function semanticTokens(tokens, doc, multilineSupport) {
             builder.push(pos.line, pos.character, length, type, modifiers);
         }
         else {
-            const firstLineRemainingLength = doc.getText(ls.Range.create(pos.line, pos.character, pos.line, MaxCharacterNumber)).length;
+            const firstLineRemainingLength = doc.getText(ls.Range.create(pos.line, pos.character, pos.line, MaxCharacterNumber))
+                .length;
             const lastLineLeadingLength = doc.getText(ls.Range.create(endPos.line, 0, endPos.line, endPos.character)).length;
             builder.push(pos.line, pos.character, firstLineRemainingLength, type, modifiers);
-            for (let i = pos.line + 1; i < endPos.line - 1; i++) {
+            for (let i = pos.line + 1; i <= endPos.line - 1; i++) {
                 const lineLength = doc.getText(ls.Range.create(i, 0, i, MaxCharacterNumber)).length;
                 builder.push(i, 0, lineLength, type, modifiers);
             }
@@ -240,18 +220,14 @@ 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 = []) {
@@ -265,9 +241,7 @@ export function symbolInformation(symbol, symLoc, supportedKinds = []) {
     };
 }
 export function symbolInformationArray(map = {}, query, supportedKinds = []) {
-    return Object.values(map)
-        .filter((s) => s.identifier.includes(query))
-        .map((s) => [
+    return Object.values(map).filter((s) => s.identifier.includes(query)).map((s) => [
         s,
         [
             ...(s.declaration ?? []),
@@ -275,14 +249,10 @@ export function symbolInformationArray(map = {}, query, supportedKinds = []) {
             ...(s.implementation ?? []),
             ...(s.typeDefinition ?? []),
         ][0],
-    ])
-        .filter(([_s, l]) => !!l)
-        .map(([s, l]) => symbolInformation(s, l, supportedKinds));
+    ]).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))
-        .flat();
+    return Object.values(table).map((m) => symbolInformationArray(m, query, supportedKinds)).flat();
 }
 export function symbolKind(category, subcategory = '', supportedKinds = []) {
     const UltimateFallback = ls.SymbolKind.Variable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -21,10 +21,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11",
-    "@spyglassmc/core": "0.4.5",
-    "@spyglassmc/java-edition": "0.3.8",
-    "@spyglassmc/locales": "0.3.5",
-    "@spyglassmc/mcdoc": "0.3.8"
+    "@spyglassmc/core": "0.4.6",
+    "@spyglassmc/java-edition": "0.3.9",
+    "@spyglassmc/locales": "0.3.6",
+    "@spyglassmc/mcdoc": "0.3.9"
   },
   "publishConfig": {
     "access": "public"