typescript-language-server 4.1.0 → 4.1.1

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.1.1](https://github.com/typescript-language-server/typescript-language-server/compare/v4.1.0...v4.1.1) (2023-11-13)
+
+
+### Bug Fixes
+
+* try to infer languageId from extension when invalid provided ([#799](https://github.com/typescript-language-server/typescript-language-server/issues/799)) ([994186e](https://github.com/typescript-language-server/typescript-language-server/commit/994186e629494545f855d0859f5a058529e64c95))
+
 ## [4.1.0](https://github.com/typescript-language-server/typescript-language-server/compare/v4.0.0...v4.1.0) (2023-11-08)
 
 

package/lib/cli.mjs

@@ -25,7 +25,7 @@ import require$$0$3 from 'url';
 
 import * as path$e from 'node:path';
 
-import path__default, { resolve as resolve$1 } from 'node:path';
+import path__default, { extname, resolve as resolve$1 } from 'node:path';
 
 import require$$0$5 from 'constants';
 
@@ -17409,6 +17409,24 @@ function mode2ScriptKind(mode) {
   return undefined;
 }
 
+function getModeFromFileUri(uri) {
+  const extension = extname(uri).toUpperCase();
+  switch (extension) {
+   case '.TS':
+    return typescript;
+
+   case '.TSX':
+    return typescriptreact;
+
+   case '.JS':
+    return javascript;
+
+   case '.JSX':
+    return javascriptreact;
+  }
+  return undefined;
+}
+
 class PendingDiagnostics extends ResourceMap {
   getOrderedFileSet() {
     const orderedResources = Array.from(this.entries()).sort(((a, b) => a.value - b.value)).map((entry => entry.resource));
@@ -17542,12 +17560,13 @@ class LspDocument {
 }
 
 class LspDocuments {
-  constructor(client, onCaseInsensitiveFileSystem) {
+  constructor(client, lspClient, onCaseInsensitiveFileSystem) {
     this._validateJavaScript = true;
     this._validateTypeScript = true;
     this._files = [];
     this.documents = new Map;
     this.client = client;
+    this.lspClient = lspClient;
     this.modeIds = new Set(jsTsLanguageModes);
     const pathNormalizer = path => this.client.toTsFilePath(path.toString());
     this.pendingDiagnostics = new PendingDiagnostics(pathNormalizer, {
@@ -17574,7 +17593,16 @@ class LspDocuments {
   }
   openTextDocument(textDocument) {
     if (!this.modeIds.has(textDocument.languageId)) {
-      return false;
+      const detectedLanguageId = getModeFromFileUri(textDocument.uri);
+      if (detectedLanguageId) {
+        this.lspClient.logMessage({
+          type: main$3.MessageType.Warning,
+          message: `Invalid langaugeId "${textDocument.languageId}" provided for uri "${textDocument.uri}". Correcting to "${detectedLanguageId}"`
+        });
+        textDocument.languageId = detectedLanguageId;
+      } else {
+        return false;
+      }
     }
     const resource = textDocument.uri;
     const filepath = this.client.toTsFilePath(resource);
@@ -19024,7 +19052,7 @@ class TsClient {
     this.serverState = ServerState.None;
     this.workspaceFolders = [];
     this.useSyntaxServer = 2;
-    this.documents = new LspDocuments(this, onCaseInsensitiveFileSystem);
+    this.documents = new LspDocuments(this, lspClient, onCaseInsensitiveFileSystem);
     this.logger = new PrefixingLogger(logger, '[tsclient]');
     this.tsserverLogger = new PrefixingLogger(this.logger, '[tsserver]');
     this.lspClient = lspClient;
@@ -22615,7 +22643,7 @@ class LspServer {
       throw new Error(`Can't open already open document: ${params.textDocument.uri}`);
     }
     if (!this.tsClient.openTextDocument(params.textDocument)) {
-      throw new Error(`Cannot open document '${params.textDocument.uri}'.`);
+      throw new Error(`Cannot open document '${params.textDocument.uri}' (languageId: ${params.textDocument.languageId}).`);
     }
   }
   didCloseTextDocument(params) {