@spyglassmc/language-server 0.4.51 → 0.4.53

package/lib/server.js

@@ -30,6 +30,14 @@ const logger = {
     warn: (msg, ...args) => connection.console.warn(util.format(msg, ...args)),
 };
 let service;
+function buildSemanticTokensCapability() {
+    return {
+        documentSelector: toLS.documentSelector(service.project.meta),
+        legend: toLS.semanticTokensLegend(),
+        full: { delta: false },
+        range: true,
+    };
+}
 connection.onInitialize(async (params) => {
     const initializationOptions = params.initializationOptions;
     logger.info(`[onInitialize] processId = ${JSON.stringify(params.processId)}`);
@@ -90,6 +98,11 @@ connection.onInitialize(async (params) => {
     catch (e) {
         logger.error('[new Service]', e);
     }
+    let semanticTokensProvider = undefined;
+    if (!capabilities.textDocument?.semanticTokens?.dynamicRegistration) {
+        logger.info("[startDynamicSemanticTokensRegistration] LanguageClient didn't permit dynamic registration for semantic tokens. Registering semantic tokens statically instead...");
+        semanticTokensProvider = buildSemanticTokensCapability();
+    }
     const customCapabilities = {
         dataHackPubify: true,
         resetProjectCache: true,
@@ -110,12 +123,7 @@ connection.onInitialize(async (params) => {
             documentSymbolProvider: { label: 'Spyglass' },
             hoverProvider: {},
             inlayHintProvider: {},
-            semanticTokensProvider: {
-                documentSelector: toLS.documentSelector(service.project.meta),
-                legend: toLS.semanticTokensLegend(),
-                full: { delta: false },
-                range: true,
-            },
+            semanticTokensProvider,
             signatureHelpProvider: { triggerCharacters: [' '] },
             textDocumentSync: { change: ls.TextDocumentSyncKind.Incremental, openClose: true },
             workspaceSymbolProvider: {},
@@ -133,6 +141,7 @@ connection.onInitialized(async () => {
     if (capabilities.textDocument?.formatting?.dynamicRegistration) {
         void connection.client.register(ls.DocumentFormattingRequest.type, { documentSelector: [{ language: 'mcdoc' }] });
     }
+    startDynamicSemanticTokensRegistration();
     await service.project.ready();
     if (capabilities.workspace?.workspaceFolders) {
         connection.workspace.onDidChangeWorkspaceFolders(async () => {
@@ -141,6 +150,39 @@ connection.onInitialized(async () => {
         });
     }
 });
+function startDynamicSemanticTokensRegistration() {
+    // If the client permits it, semantic tokens are registered dynamically, such that if they are disabled in the config, the language client
+    // knows that Spyglass won't be providing tokens instead of just receiving an empty tokens list.
+    // This could otherwise cause problems with other language servers if the client decides to override their semantic tokens
+    // with the empty tokens list provided by Spyglass.
+    if (!capabilities.textDocument?.semanticTokens?.dynamicRegistration) {
+        return;
+    }
+    let dynamicSemanticTokensDiposable = undefined;
+    function registerDynamicSemanticTokens() {
+        if (dynamicSemanticTokensDiposable !== undefined) {
+            return;
+        }
+        logger.info('[registerDynamicSemanticTokens] Registering dynamic semantic tokens');
+        dynamicSemanticTokensDiposable = connection.client.register(ls.SemanticTokensRegistrationType.type, buildSemanticTokensCapability());
+    }
+    function unregisterDynamicSemanticTokens() {
+        logger.info('[unregisterDynamicSemanticTokens] Unregistering dynamic semantic tokens');
+        void dynamicSemanticTokensDiposable?.then(disposable => disposable.dispose());
+        dynamicSemanticTokensDiposable = undefined;
+    }
+    if (service.project.config.env.feature.semanticColoring) {
+        registerDynamicSemanticTokens();
+    }
+    service.project.on('configChanged', config => {
+        if (config.env.feature.semanticColoring) {
+            registerDynamicSemanticTokens();
+        }
+        else {
+            unregisterDynamicSemanticTokens();
+        }
+    });
+}
 connection.onDidOpenTextDocument(({ textDocument: { text, uri, version, languageId: languageID } }) => {
     return service.project.onDidOpen(uri, languageID, version, text);
 });
@@ -153,7 +195,7 @@ connection.onDidCloseTextDocument(({ textDocument: { uri } }) => {
 connection.workspace.onDidRenameFiles(({}) => { });
 connection.onCodeAction(async ({ textDocument: { uri }, range }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.codeActions) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -171,7 +213,7 @@ connection.onColorPresentation(async ({ textDocument: { uri }, color, range }) =
 });
 connection.onDocumentColor(async ({ textDocument: { uri } }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.colors) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -180,7 +222,7 @@ connection.onDocumentColor(async ({ textDocument: { uri } }) => {
 });
 connection.onCompletion(async ({ textDocument: { uri }, position, context }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.completions) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -251,7 +293,7 @@ connection.onTypeDefinition(async ({ textDocument: { uri }, position }) => {
 });
 connection.onDocumentHighlight(async ({ textDocument: { uri }, position }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.documentHighlighting) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -268,7 +310,7 @@ connection.onDocumentSymbol(async ({ textDocument: { uri } }) => {
 });
 connection.onHover(async ({ textDocument: { uri }, position }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.hover) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -292,7 +334,7 @@ connection.onRequest('spyglassmc/showCacheRoot', async () => {
 });
 connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.semanticColoring) {
         return { data: [] };
     }
     const { doc, node } = docAndNode;
@@ -301,7 +343,7 @@ connection.languages.semanticTokens.on(async ({ textDocument: { uri } }) => {
 });
 connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, range }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.semanticColoring) {
         return { data: [] };
     }
     const { doc, node } = docAndNode;
@@ -310,7 +352,7 @@ connection.languages.semanticTokens.onRange(async ({ textDocument: { uri }, rang
 });
 connection.onSignatureHelp(async ({ textDocument: { uri }, position }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.signatures) {
         return undefined;
     }
     const { doc, node } = docAndNode;
@@ -322,7 +364,7 @@ connection.onWorkspaceSymbol(({ query }) => {
 });
 connection.onDocumentFormatting(async ({ textDocument: { uri }, options }) => {
     const docAndNode = await service.project.ensureClientManagedChecked(uri);
-    if (!docAndNode) {
+    if (!docAndNode || !service.project.config.env.feature.formatting) {
         return undefined;
     }
     const { doc, node } = docAndNode;

package/lib/util/toLS.js

@@ -50,13 +50,13 @@ export function diagnostics(errors) {
 }
 export function diagnosticSeverity(severity) {
     switch (severity) {
-        case 0 /* core.ErrorSeverity.Hint */:
+        case core.ErrorSeverity.Hint:
             return ls.DiagnosticSeverity.Hint;
-        case 1 /* core.ErrorSeverity.Information */:
+        case core.ErrorSeverity.Information:
             return ls.DiagnosticSeverity.Information;
-        case 2 /* core.ErrorSeverity.Warning */:
+        case core.ErrorSeverity.Warning:
             return ls.DiagnosticSeverity.Warning;
-        case 3 /* core.ErrorSeverity.Error */:
+        case core.ErrorSeverity.Error:
             return ls.DiagnosticSeverity.Error;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spyglassmc/language-server",
-  "version": "0.4.51",
+  "version": "0.4.53",
   "type": "module",
   "main": "lib/server.js",
   "types": "lib/server.d.ts",
@@ -15,7 +15,7 @@
   },
   "scripts": {
     "release": "npm publish",
-    "release:dry": "npm publish --dry-run",
+    "release:dry": "npm publish --tag latest --dry-run",
     "build": "wireit",
     "build:dev": "wireit"
   },
@@ -35,10 +35,10 @@
     "env-paths": "^2.2.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.11",
-    "@spyglassmc/core": "0.4.39",
-    "@spyglassmc/java-edition": "0.3.51",
-    "@spyglassmc/locales": "0.3.19",
-    "@spyglassmc/mcdoc": "0.3.43"
+    "@spyglassmc/core": "0.4.41",
+    "@spyglassmc/java-edition": "0.3.53",
+    "@spyglassmc/locales": "0.3.21",
+    "@spyglassmc/mcdoc": "0.3.45"
   },
   "publishConfig": {
     "access": "public"