@lvce-editor/extension-management-worker 4.28.1 → 4.29.0

package/dist/extensionManagementWorkerMain.js

@@ -2350,16 +2350,23 @@ const resolveLanguageServerUri = (extension, languageServerUri) => {
   const extensionPath = extension.uri || extension.path || '';
   return new URL(languageServerUri, toExtensionBaseUri(extensionPath)).href;
 };
-const getContribution = (extension, languageId) => {
-  return extension.languageServers?.find(contribution => contribution.languageId === languageId);
-};
-const getRegisteredLanguageServer = (snapshot, contribution, languageId) => {
+const resolveLanguageServer = async (rpc, extension, languageId) => {
+  const contribution = extension.languageServers?.find(item => item.languageId === languageId);
+  if (!contribution) {
+    return undefined;
+  }
+  const snapshot = await rpc.invoke('ExtensionApi.getLanguageServerRegistrySnapshot');
   const languageServer = snapshot.languageServers.find(registered => registered.id === contribution.id && registered.languageId === languageId);
   if (!languageServer) {
     throw new Error(`language server ${contribution.id || '<unknown>'} is contributed in extension.json but not registered`);
   }
-  return languageServer;
+  return {
+    argv: languageServer.argv,
+    id: `${extension.id || extension.uri || extension.path || 'extension'}.${languageServer.id}`,
+    uri: resolveLanguageServerUri(extension, languageServer.uri)
+  };
 };
+
 const sanitizeCompletionItem = item => {
   if (!item || typeof item !== 'object' || typeof item.label !== 'string') {
     return undefined;
@@ -2378,19 +2385,16 @@ const executeLanguageServerCompletion = async (rpc, extension, textDocument, off
   if (typeof textDocument.text !== 'string' || typeof textDocument.uri !== 'string') {
     return [];
   }
-  const contribution = getContribution(extension, textDocument.languageId);
-  if (!contribution) {
+  const languageServer = await resolveLanguageServer(rpc, extension, textDocument.languageId);
+  if (!languageServer) {
     return [];
   }
-  const snapshot = await rpc.invoke('ExtensionApi.getLanguageServerRegistrySnapshot');
-  const languageServer = getRegisteredLanguageServer(snapshot, contribution, textDocument.languageId);
-  const uri = resolveLanguageServerUri(extension, languageServer.uri);
   const result = await invoke$1('LanguageServer.complete', {
     argv: languageServer.argv,
-    id: `${extension.id || extension.uri || extension.path || 'extension'}.${languageServer.id}`,
+    id: languageServer.id,
     offset,
     textDocument,
-    uri
+    uri: languageServer.uri
   });
   return result.map(sanitizeCompletionItem).filter(item => item !== undefined);
 };
@@ -2420,18 +2424,18 @@ const getRpc$1 = async (extension, assetDir, platform) => {
 const contributesCompletionProvider = (extension, languageId) => {
   return Array.isArray(extension.completionProviders) && extension.completionProviders.some(provider => provider.languageId === languageId);
 };
-const contributesLanguageServer = (extension, languageId) => {
+const contributesLanguageServer$1 = (extension, languageId) => {
   return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
 };
 const getMatchingExtensions$5 = async (extensionsState, textDocument, assetDir, platform) => {
   const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
-  return extensions.filter(extension => isExtensionIsolated(extension) && (contributesCompletionProvider(extension, textDocument.languageId) || contributesLanguageServer(extension, textDocument.languageId)));
+  return extensions.filter(extension => isExtensionIsolated(extension) && (contributesCompletionProvider(extension, textDocument.languageId) || contributesLanguageServer$1(extension, textDocument.languageId)));
 };
 const executeRpcCompletionProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeCompletionProvider', textDocument, ...args);
 };
 const executeExtensionCompletionProvider = async (rpc, extension, textDocument, args) => {
-  if (contributesLanguageServer(extension, textDocument.languageId)) {
+  if (contributesLanguageServer$1(extension, textDocument.languageId)) {
     const offset = typeof args[0] === 'number' ? args[0] : 0;
     return executeLanguageServerCompletion(rpc, extension, textDocument, offset);
   }
@@ -2462,18 +2466,62 @@ const executeResolveCompletionItemProvider = async (extensionsState, textDocumen
   return results[0];
 };
 
+const sanitizeDiagnostic = diagnostic => {
+  const start = diagnostic?.range?.start;
+  const end = diagnostic?.range?.end;
+  if (typeof diagnostic?.message !== 'string' || typeof start?.line !== 'number' || typeof start.character !== 'number' || typeof end?.line !== 'number' || typeof end.character !== 'number') {
+    return undefined;
+  }
+  return {
+    columnIndex: start.character,
+    endColumnIndex: end.character,
+    endRowIndex: end.line,
+    message: diagnostic.message,
+    rowIndex: start.line,
+    ...(typeof diagnostic.source === 'string' && {
+      source: diagnostic.source
+    }),
+    type: diagnostic.severity === 1 ? 'error' : 'warning'
+  };
+};
+const executeLanguageServerDiagnostic = async (rpc, extension, textDocument) => {
+  if (typeof textDocument.text !== 'string' || typeof textDocument.uri !== 'string') {
+    return [];
+  }
+  const languageServer = await resolveLanguageServer(rpc, extension, textDocument.languageId);
+  if (!languageServer) {
+    return [];
+  }
+  const result = await invoke$1('LanguageServer.diagnostic', {
+    argv: languageServer.argv,
+    id: languageServer.id,
+    textDocument,
+    uri: languageServer.uri
+  });
+  return result.map(sanitizeDiagnostic).filter(diagnostic => diagnostic !== undefined);
+};
+
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 
 const contributesDiagnosticProvider = (extension, languageId) => {
   return Array.isArray(extension.diagnosticProviders) && extension.diagnosticProviders.some(provider => provider.languageId === languageId);
 };
+const contributesLanguageServer = (extension, languageId) => {
+  return Array.isArray(extension.languageServers) && extension.languageServers.some(languageServer => languageServer.languageId === languageId);
+};
 const getMatchingExtensions$4 = async (extensionsState, textDocument, assetDir, platform) => {
   const extensions = await getAllExtensionsWithState(extensionsState, assetDir, platform);
-  return extensions.filter(extension => isExtensionIsolated(extension) && contributesDiagnosticProvider(extension, textDocument.languageId));
+  return extensions.filter(extension => isExtensionIsolated(extension) && (contributesDiagnosticProvider(extension, textDocument.languageId) || contributesLanguageServer(extension, textDocument.languageId)));
 };
 const executeRpcDiagnosticProvider = async (rpc, textDocument, args) => {
   return rpc.invoke('ExtensionApi.executeDiagnosticProvider', textDocument, ...args);
 };
+const executeExtensionDiagnosticProvider = async (rpc, extension, textDocument, args) => {
+  if (contributesLanguageServer(extension, textDocument.languageId)) {
+    return executeLanguageServerDiagnostic(rpc, extension, textDocument);
+  }
+  return executeRpcDiagnosticProvider(rpc, textDocument, args);
+};
 const executeDiagnosticProvider = async (extensionsState, textDocument, ...args) => {
   const {
     assetDir,
@@ -2481,7 +2529,7 @@ const executeDiagnosticProvider = async (extensionsState, textDocument, ...args)
   } = await getRuntimeContext('', extensionsState.platform);
   const extensions = await getMatchingExtensions$4(extensionsState, textDocument, assetDir, platform);
   const rpcs = await Promise.all(extensions.map(extension => getRpc$1(extension, assetDir, platform)));
-  const results = await Promise.all(rpcs.map(rpc => executeRpcDiagnosticProvider(rpc, textDocument, args)));
+  const results = await Promise.all(rpcs.map((rpc, index) => executeExtensionDiagnosticProvider(rpc, extensions[index], textDocument, args)));
   return results.flat();
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/extension-management-worker",
-  "version": "4.28.1",
+  "version": "4.29.0",
   "description": "Webworker for the Extension Management functionality in Lvce Editor.",
   "keywords": [
     "web-worker"