typescript-language-server 4.3.1 → 4.3.2

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.3.2](https://github.com/typescript-language-server/typescript-language-server/compare/v4.3.1...v4.3.2) (2024-02-02)
+
+
+### Bug Fixes
+
+* restore handling of zipfile: schema for neovim + yarn berry ([#862](https://github.com/typescript-language-server/typescript-language-server/issues/862)) ([caca007](https://github.com/typescript-language-server/typescript-language-server/commit/caca0071095557ecc43d8695d922a4cf5e38a2ad))
+
 ## [4.3.1](https://github.com/typescript-language-server/typescript-language-server/compare/v4.3.0...v4.3.1) (2024-01-12)
 
 

package/lib/cli.mjs

@@ -17645,14 +17645,24 @@ class LspDocuments {
 
 const file = 'file';
 
+const untitled = 'untitled';
+
 const git = 'git';
 
 const github = 'github';
 
 const azurerepos = 'azurerepos';
 
+const buffer = 'buffer';
+
+const zipfile = 'zipfile';
+
 const vsls = 'vsls';
 
+function getSemanticSupportedSchemes() {
+  return [ file, untitled, buffer, zipfile ];
+}
+
 const disabledSchemes = new Set([ git, vsls, github, azurerepos ]);
 
 var TypeScriptServerPlugin;
@@ -18866,6 +18876,20 @@ class Tracer {
   }
 }
 
+class ZipfileURI extends URI {
+  constructor(uri, components) {
+    super(components);
+    this._originalUri = uri;
+  }
+  toString(_skipEncoding = false) {
+    return this._originalUri;
+  }
+  static parse(value, _strict = false) {
+    const uri = URI.parse(value, _strict);
+    return new ZipfileURI(value, uri);
+  }
+}
+
 var ServerState;
 
 (function(ServerState) {
@@ -18937,11 +18961,18 @@ class ServerInitializingIndicator {
   }
 }
 
+const emptyAuthority = 'ts-nul-authority';
+
+const inMemoryResourcePrefix = '^';
+
+const RE_IN_MEMORY_FILEPATH = /^\^\/([^/]+)\/([^/]*)\/(.+)$/;
+
 class TsClient {
   constructor(onCaseInsensitiveFileSystem, logger, lspClient) {
     this.apiVersion = API.defaultVersion;
     this.typescriptVersionSource = 'bundled';
     this.serverState = ServerState.None;
+    this.isNeovimHost = false;
     this.workspaceFolders = [];
     this.useSyntaxServer = 2;
     this.pluginManager = new PluginManager;
@@ -18967,7 +18998,7 @@ class TsClient {
     return this.documents.files[0] || this.workspaceFolders[0]?.uri.fsPath;
   }
   toTsFilePath(stringUri) {
-    if (stringUri.startsWith('zipfile:')) {
+    if (this.isNeovimHost && stringUri.startsWith('zipfile:')) {
       return stringUri;
     }
     const resource = URI.parse(stringUri);
@@ -18977,7 +19008,7 @@ class TsClient {
     if (resource.scheme === file) {
       return resource.fsPath;
     }
-    return undefined;
+    return inMemoryResourcePrefix + '/' + resource.scheme + '/' + (resource.authority || emptyAuthority) + (resource.path.startsWith('/') ? resource.path : '/' + resource.path) + (resource.fragment ? '#' + resource.fragment : '');
   }
   toOpenDocument(textDocumentUri, options = {}) {
     const filepath = this.toTsFilePath(textDocumentUri);
@@ -18998,13 +19029,25 @@ class TsClient {
     return this.documents.hasPendingDiagnostics(resource);
   }
   toResource(filepath) {
-    if (filepath.startsWith('zipfile:')) {
-      return URI.parse(filepath);
+    if (this.isNeovimHost && filepath.startsWith('zipfile:')) {
+      return ZipfileURI.parse(filepath);
+    }
+    if (filepath.startsWith(inMemoryResourcePrefix)) {
+      const parts = filepath.match(RE_IN_MEMORY_FILEPATH);
+      if (parts) {
+        const resource = URI.parse(parts[1] + '://' + (parts[2] === emptyAuthority ? '' : parts[2]) + '/' + parts[3]);
+        const tsFilepath = this.toTsFilePath(resource.toString());
+        const document = tsFilepath && this.documents.get(tsFilepath);
+        return document ? document.uri : resource;
+      }
     }
     const fileUri = URI.file(filepath);
     const document = this.documents.get(fileUri.fsPath);
     return document ? document.uri : fileUri;
   }
+  toResourceUri(filepath) {
+    return this.toResource(filepath).toString();
+  }
   getWorkspaceRootForResource(resource) {
     for (const root of this.workspaceFolders.sort(((a, b) => a.uri.fsPath.length - b.uri.fsPath.length))) {
       if (root.uri.scheme === resource.scheme && root.uri.authority === resource.authority) {
@@ -19031,7 +19074,7 @@ class TsClient {
     switch (capability) {
      case ClientCapability.Semantic:
       {
-        return [ 'file', 'untitled' ].includes(resource.scheme);
+        return getSemanticSupportedSchemes().includes(resource.scheme);
       }
 
      case ClientCapability.Syntax:
@@ -19052,6 +19095,7 @@ class TsClient {
   start(workspaceRoot, options) {
     this.apiVersion = options.typescriptVersion.version || API.defaultVersion;
     this.typescriptVersionSource = options.typescriptVersion.source;
+    this.isNeovimHost = options.hostInfo === 'neovim';
     this.tracer = new Tracer(this.tsserverLogger, options.trace);
     this.workspaceFolders = workspaceRoot ? [ {
       uri: URI.file(workspaceRoot)
@@ -19391,9 +19435,9 @@ var Location;
 })(Location || (Location = {}));
 
 function toLocation(fileSpan, client) {
-  const uri = client.toResource(fileSpan.file);
+  const uri = client.toResourceUri(fileSpan.file);
   return {
-    uri: uri.toString(),
+    uri: uri,
     range: {
       start: Position.fromLocation(fileSpan.start),
       end: Position.fromLocation(fileSpan.end)
@@ -19505,11 +19549,11 @@ function toTextEdit(edit) {
 }
 
 function toTextDocumentEdit(change, client) {
-  const uri = client.toResource(change.fileName);
-  const document = client.toOpenDocument(uri.toString());
+  const uri = client.toResourceUri(change.fileName);
+  const document = client.toOpenDocument(uri);
   return {
     textDocument: {
-      uri: uri.toString(),
+      uri: uri,
       version: document?.version ?? null
     },
     edits: change.textChanges.map((c => toTextEdit(c)))
@@ -19607,7 +19651,7 @@ class DiagnosticEventQueue {
     if (this.ignoredDiagnosticCodes.size) {
       diagnostics = diagnostics.filter((diagnostic => !this.isDiagnosticIgnored(diagnostic)));
     }
-    const uri = this.client.toResource(file).toString();
+    const uri = this.client.toResourceUri(file);
     const diagnosticsForFile = this.diagnostics.get(uri) || new FileDiagnostics(uri, this.publishDiagnostics, this.client, this.features);
     diagnosticsForFile.update(kind, diagnostics);
     this.diagnostics.set(uri, diagnosticsForFile);
@@ -19616,17 +19660,17 @@ class DiagnosticEventQueue {
     this.ignoredDiagnosticCodes = new Set(ignoredCodes);
   }
   getDiagnosticsForFile(file) {
-    const uri = this.client.toResource(file).toString();
+    const uri = this.client.toResourceUri(file);
     return this.diagnostics.get(uri)?.getDiagnostics() || [];
   }
   onDidCloseFile(file) {
-    const uri = this.client.toResource(file).toString();
+    const uri = this.client.toResourceUri(file);
     const diagnosticsForFile = this.diagnostics.get(uri);
     diagnosticsForFile?.onDidClose();
     this.diagnostics.delete(uri);
   }
   async waitForDiagnosticsForTesting(file) {
-    const uri = this.client.toResource(file).toString();
+    const uri = this.client.toResourceUri(file);
     let diagnosticsForFile = this.diagnostics.get(uri);
     if (diagnosticsForFile) {
       diagnosticsForFile.onDidClose();
@@ -19656,7 +19700,7 @@ class SourceDefinitionCommand {
       lspClient.showErrorMessage('Go to Source Definition failed. No resource provided.');
       return;
     }
-    const document = client.toOpenDocument(client.toResource(file).toString());
+    const document = client.toOpenDocument(client.toResourceUri(file));
     if (!document) {
       lspClient.showErrorMessage('Go to Source Definition failed. File not opened in the editor.');
       return;
@@ -20741,7 +20785,7 @@ function fromProtocolCallHierarchyItem(item, client, workspaceRoot) {
     kind: fromProtocolScriptElementKind(item.kind),
     name: name,
     detail: detail,
-    uri: client.toResource(item.file).toString(),
+    uri: client.toResourceUri(item.file),
     range: Range.fromTextSpan(item.span),
     selectionRange: Range.fromTextSpan(item.selectionSpan)
   };
@@ -21510,7 +21554,7 @@ class TypeScriptImplementationsCodeLensProvider extends TypeScriptBaseCodeLensPr
       codeLens.command = response.type === 'cancelled' ? TypeScriptBaseCodeLensProvider.cancelledCommand : TypeScriptBaseCodeLensProvider.errorCommand;
       return codeLens;
     }
-    const locations = response.body.map((reference => main$2.Location.create(this.client.toResource(reference.file).toString(), reference.start.line === reference.end.line ? Range.fromTextSpan(reference) : main$2.Range.create(Position.fromLocation(reference.start), main$2.Position.create(reference.start.line, 0))))).filter((location => !(location.uri.toString() === codeLens.data.uri && location.range.start.line === codeLens.range.start.line && location.range.start.character === codeLens.range.start.character)));
+    const locations = response.body.map((reference => main$2.Location.create(this.client.toResourceUri(reference.file), reference.start.line === reference.end.line ? Range.fromTextSpan(reference) : main$2.Range.create(Position.fromLocation(reference.start), main$2.Position.create(reference.start.line, 0))))).filter((location => !(location.uri.toString() === codeLens.data.uri && location.range.start.line === codeLens.range.start.line && location.range.start.character === codeLens.range.start.character)));
     codeLens.command = this.getCommand(locations, codeLens);
     return codeLens;
   }
@@ -21565,7 +21609,7 @@ class TypeScriptReferencesCodeLensProvider extends TypeScriptBaseCodeLensProvide
       codeLens.command = response.type === 'cancelled' ? TypeScriptBaseCodeLensProvider.cancelledCommand : TypeScriptBaseCodeLensProvider.errorCommand;
       return codeLens;
     }
-    const locations = response.body.refs.filter((reference => !reference.isDefinition)).map((reference => Location.fromTextSpan(this.client.toResource(reference.file).toString(), reference)));
+    const locations = response.body.refs.filter((reference => !reference.isDefinition)).map((reference => Location.fromTextSpan(this.client.toResourceUri(reference.file), reference)));
     codeLens.command = {
       title: this.getCodeLensLabel(locations),
       command: locations.length ? 'editor.action.showReferences' : '',
@@ -22387,6 +22431,7 @@ class LspServer {
       disableAutomaticTypingAcquisition: disableAutomaticTypingAcquisition,
       maxTsServerMemory: maxTsServerMemory,
       npmLocation: npmLocation,
+      hostInfo: hostInfo,
       locale: locale,
       plugins: plugins || [],
       onEvent: this.onTsEvent.bind(this),
@@ -22708,7 +22753,7 @@ class LspServer {
   }
   async completionResolve(item, token) {
     item.data = item.data?.cacheId !== undefined ? this.completionDataCache.get(item.data.cacheId) : item.data;
-    const uri = this.tsClient.toResource(item.data.file).toString();
+    const uri = this.tsClient.toResourceUri(item.data.file);
     const document = item.data?.file ? this.tsClient.toOpenDocument(uri) : undefined;
     if (!document) {
       return item;
@@ -22781,7 +22826,7 @@ class LspServer {
     }
     const changes = {};
     result.locs.forEach((spanGroup => {
-      const uri = this.tsClient.toResource(spanGroup.file).toString();
+      const uri = this.tsClient.toResourceUri(spanGroup.file);
       const textEdits = changes[uri] || (changes[uri] = []);
       spanGroup.locs.forEach((textSpan => {
         textEdits.push({
@@ -22977,7 +23022,7 @@ class LspServer {
       if (renameLocation) {
         await this.options.lspClient.rename({
           textDocument: {
-            uri: this.tsClient.toResource(args.file).toString()
+            uri: this.tsClient.toResourceUri(args.file)
           },
           position: Position.fromLocation(renameLocation)
         });
@@ -22987,7 +23032,7 @@ class LspServer {
       this.tsClient.configurePlugin(pluginName, configuration);
     } else if (params.command === Commands.ORGANIZE_IMPORTS && params.arguments) {
       const file = params.arguments[0];
-      const uri = this.tsClient.toResource(file).toString();
+      const uri = this.tsClient.toResourceUri(file);
       const document = this.tsClient.toOpenDocument(uri);
       if (!document) {
         return;
@@ -23044,7 +23089,7 @@ class LspServer {
     }
     const changes = {};
     for (const edit of edits) {
-      changes[this.tsClient.toResource(edit.fileName).toString()] = edit.textChanges.map(toTextEdit);
+      changes[this.tsClient.toResourceUri(edit.fileName)] = edit.textChanges.map(toTextEdit);
     }
     const {applied: applied} = await this.options.lspClient.applyWorkspaceEdit({
       edit: {
@@ -23058,7 +23103,7 @@ class LspServer {
     for (const rename of params.files) {
       const codeEdits = await this.getEditsForFileRename(rename.oldUri, rename.newUri, token);
       for (const codeEdit of codeEdits) {
-        const uri = this.tsClient.toResource(codeEdit.fileName).toString();
+        const uri = this.tsClient.toResourceUri(codeEdit.fileName);
         const textEdits = changes[uri] || (changes[uri] = []);
         textEdits.push(...codeEdit.textChanges.map(toTextEdit));
       }
@@ -23134,7 +23179,7 @@ class LspServer {
     }
     return response.body.map((item => ({
       location: {
-        uri: this.tsClient.toResource(item.file).toString(),
+        uri: this.tsClient.toResourceUri(item.file),
         range: {
           start: Position.fromLocation(item.start),
           end: Position.fromLocation(item.end)