@spyglassmc/language-server 0.4.2 → 0.4.3

package/lib/server.js

@@ -70,12 +70,17 @@ connection.onInitialize(async (params) => {
             },
         });
         service.project
-            .on('documentErrored', ({ errors, uri, version }) => {
-            connection.sendDiagnostics({
-                diagnostics: toLS.diagnostics(errors),
-                uri: uri,
-                version: version,
-            });
+            .on('documentErrored', async ({ errors, uri, version }) => {
+            try {
+                await connection.sendDiagnostics({
+                    diagnostics: toLS.diagnostics(errors),
+                    uri: uri,
+                    version: version,
+                });
+            }
+            catch (e) {
+                console.error('[sendDiagnostics]', e);
+            }
         })
             .on('ready', () => {
             progressReporter?.done();
@@ -87,7 +92,6 @@ connection.onInitialize(async (params) => {
     }
     const customCapabilities = {
         dataHackPubify: true,
-        inlayHints: true,
         resetProjectCache: true,
         showCacheRoot: true,
     };
@@ -111,6 +115,7 @@ connection.onInitialize(async (params) => {
                 label: 'Spyglass',
             },
             hoverProvider: {},
+            inlayHintProvider: {},
             semanticTokensProvider: {
                 documentSelector: toLS.documentSelector(service.project.meta),
                 legend: toLS.semanticTokensLegend(),
@@ -263,7 +268,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.languages.inlayHint.on(async ({ textDocument: { uri }, range }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
     if (!docAndNode) {
         return [];

package/lib/util/toLS.d.ts

@@ -1,7 +1,6 @@
 import * as core from '@spyglassmc/core';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 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;
 export declare function colorInformationArray(info: core.ColorInfo[], doc: TextDocument): ls.ColorInformation[];
@@ -17,8 +16,8 @@ export declare function documentSymbols(map: core.SymbolMap | undefined, doc: Te
 export declare function documentSymbolsFromTable(table: core.SymbolTable, doc: TextDocument, hierarchicalSupport: boolean | undefined, supportedKinds?: ls.SymbolKind[]): ls.DocumentSymbol[];
 export declare function documentSymbolsFromTables(tables: core.SymbolTable[], doc: TextDocument, hierarchicalSupport: boolean | undefined, supportedKinds?: ls.SymbolKind[]): ls.DocumentSymbol[];
 export declare function hover(hover: core.Hover, doc: TextDocument): ls.Hover;
-export declare function inlayHint(hint: core.InlayHint, doc: TextDocument): MyLspInlayHint;
-export declare function inlayHints(hints: core.InlayHint[], doc: TextDocument): MyLspInlayHint[];
+export declare function inlayHint(hint: core.InlayHint, doc: TextDocument): ls.InlayHint;
+export declare function inlayHints(hints: core.InlayHint[], doc: TextDocument): ls.InlayHint[];
 export declare function completionItem(completion: core.CompletionItem, doc: TextDocument, requestedOffset: number, insertReplaceSupport: boolean | undefined): ls.CompletionItem;
 export declare function location(location: {
     uri: string;

package/lib/util/toLS.js

@@ -118,7 +118,9 @@ export function hover(hover, doc) {
 export function inlayHint(hint, doc) {
     return {
         position: doc.positionAt(hint.offset),
-        text: hint.text,
+        label: hint.label,
+        ...hint.paddingLeft ? { paddingLeft: hint.paddingLeft } : {},
+        ...hint.paddingRight ? { paddingRight: hint.paddingRight } : {},
     };
 }
 export function inlayHints(hints, doc) {

package/lib/util/types.d.ts

@@ -1,24 +1,12 @@
-import type * as ls from 'vscode-languageserver/node.js';
 export interface CustomInitializationOptions {
     inDevelopmentMode?: boolean;
 }
 export interface CustomServerCapabilities {
     dataHackPubify?: boolean;
-    inlayHints?: boolean;
     resetProjectCache?: boolean;
     showCacheRoot?: boolean;
 }
 export interface MyLspDataHackPubifyRequestParams {
     initialism: string;
 }
-export interface MyLspInlayHint {
-    position: ls.Position;
-    text: string;
-}
-export interface MyLspInlayHintRequestParams {
-    textDocument: {
-        uri: string;
-    };
-    range: ls.Range;
-}
 //# sourceMappingURL=types.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -19,12 +19,12 @@
   },
   "dependencies": {
     "env-paths": "^2.2.1",
-    "vscode-languageserver": "^7.0.0",
-    "vscode-languageserver-textdocument": "^1.0.1",
-    "@spyglassmc/core": "0.4.2",
-    "@spyglassmc/java-edition": "0.3.3",
-    "@spyglassmc/locales": "0.3.2",
-    "@spyglassmc/mcdoc": "0.3.3"
+    "vscode-languageserver": "^9.0.1",
+    "vscode-languageserver-textdocument": "^1.0.11",
+    "@spyglassmc/core": "0.4.3",
+    "@spyglassmc/java-edition": "0.3.4",
+    "@spyglassmc/locales": "0.3.3",
+    "@spyglassmc/mcdoc": "0.3.4"
   },
   "publishConfig": {
     "access": "public"