@angular/language-server 13.0.0 → 13.2.2

package/index.js

@@ -1,5 +1,8 @@
+"use strict";
+"use strict";
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
 // dist/banner/cmdline_utils.js
@@ -281,7 +284,6 @@ var require_version_provider = __commonJS({
 });
 
 // dist/banner/banner.js
-"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireOverride = void 0;
 var cmdline_utils_1 = require_cmdline_utils();
@@ -309,8 +311,9 @@ requireOverride.resolve = originalRequire.resolve;
  */
 require = requireOverride;
 
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __commonJS = (cb, mod) => function __require() {
-  return mod || (0, cb[Object.keys(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
 // dist/server/cmdline_utils.js
@@ -1203,7 +1206,7 @@ var require_main = __commonJS({
       }();
       var ChangeAnnotations = function() {
         function ChangeAnnotations2(annotations) {
-          this._annotations = annotations === void 0 ? Object.create(null) : annotations;
+          this._annotations = annotations === void 0 ? /* @__PURE__ */ Object.create(null) : annotations;
           this._counter = 0;
           this._size = 0;
         }
@@ -1244,7 +1247,7 @@ var require_main = __commonJS({
       var WorkspaceChange = function() {
         function WorkspaceChange2(workspaceEdit) {
           var _this = this;
-          this._textEditChanges = Object.create(null);
+          this._textEditChanges = /* @__PURE__ */ Object.create(null);
           if (workspaceEdit !== void 0) {
             this._workspaceEdit = workspaceEdit;
             if (workspaceEdit.documentChanges) {
@@ -1324,7 +1327,7 @@ var require_main = __commonJS({
         };
         WorkspaceChange2.prototype.initChanges = function() {
           if (this._workspaceEdit.documentChanges === void 0 && this._workspaceEdit.changes === void 0) {
-            this._workspaceEdit.changes = Object.create(null);
+            this._workspaceEdit.changes = /* @__PURE__ */ Object.create(null);
           }
         };
         WorkspaceChange2.prototype.createFile = function(uri, optionsOrAnnotation, options) {
@@ -3081,7 +3084,7 @@ var require_utils = __commonJS({
       return result;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.tsDisplayPartsToText = exports2.MruTracker = exports2.isConfiguredProject = exports2.tsRelatedInformationToLspRelatedInformation = exports2.lspRangeToTsPositions = exports2.lspPositionToTsPosition = exports2.tsTextSpanToLspRange = exports2.filePathToUri = exports2.uriToFilePath = exports2.isDebugMode = void 0;
+    exports2.getMappedDefinitionInfo = exports2.tsDisplayPartsToText = exports2.MruTracker = exports2.isConfiguredProject = exports2.tsRelatedInformationToLspRelatedInformation = exports2.lspRangeToTsPositions = exports2.lspPositionToTsPosition = exports2.tsTextSpanToLspRange = exports2.filePathToUri = exports2.uriToFilePath = exports2.isDebugMode = void 0;
     var ts = __importStar(require("typescript/lib/tsserverlibrary"));
     var lsp = __importStar(require("vscode-languageserver"));
     var vscode_uri_1 = require("vscode-uri");
@@ -3142,7 +3145,7 @@ var require_utils = __commonJS({
     exports2.isConfiguredProject = isConfiguredProject;
     var MruTracker = class {
       constructor() {
-        this.set = new Set();
+        this.set = /* @__PURE__ */ new Set();
       }
       update(item) {
         if (this.set.has(item)) {
@@ -3162,6 +3165,43 @@ var require_utils = __commonJS({
       return parts.map((dp) => dp.text).join("");
     }
     exports2.tsDisplayPartsToText = tsDisplayPartsToText;
+    function getMappedDefinitionInfo(info, project) {
+      try {
+        const mappedDocumentSpan = getMappedDocumentSpan(info, project);
+        return Object.assign(Object.assign({}, info), mappedDocumentSpan);
+      } catch (_a) {
+        return info;
+      }
+    }
+    exports2.getMappedDefinitionInfo = getMappedDefinitionInfo;
+    function getMappedDocumentSpan(documentSpan, project) {
+      const newPosition = getMappedLocation(documentSpanLocation(documentSpan), project);
+      if (!newPosition)
+        return void 0;
+      return {
+        fileName: newPosition.fileName,
+        textSpan: { start: newPosition.pos, length: documentSpan.textSpan.length },
+        originalFileName: documentSpan.fileName,
+        originalTextSpan: documentSpan.textSpan,
+        contextSpan: getMappedContextSpan(documentSpan, project),
+        originalContextSpan: documentSpan.contextSpan
+      };
+    }
+    function getMappedLocation(location, project) {
+      const mapsTo = project.getSourceMapper().tryGetSourcePosition(location);
+      return mapsTo && project.projectService.fileExists(ts.server.toNormalizedPath(mapsTo.fileName)) ? mapsTo : void 0;
+    }
+    function documentSpanLocation({ fileName, textSpan }) {
+      return { fileName, pos: textSpan.start };
+    }
+    function getMappedContextSpan(documentSpan, project) {
+      const contextSpanStart = documentSpan.contextSpan && getMappedLocation({ fileName: documentSpan.fileName, pos: documentSpan.contextSpan.start }, project);
+      const contextSpanEnd = documentSpan.contextSpan && getMappedLocation({
+        fileName: documentSpan.fileName,
+        pos: documentSpan.contextSpan.start + documentSpan.contextSpan.length
+      }, project);
+      return contextSpanStart && contextSpanEnd ? { start: contextSpanStart.pos, length: contextSpanEnd.pos - contextSpanStart.pos } : void 0;
+    }
   }
 });
 
@@ -3684,12 +3724,12 @@ var require_session = __commonJS({
     var setImmediateP = (0, util_1.promisify)(setImmediate);
     var Session = class {
       constructor(options) {
-        this.configuredProjToExternalProj = new Map();
+        this.configuredProjToExternalProj = /* @__PURE__ */ new Map();
         this.openFiles = new utils_1.MruTracker();
         this.projectNgccQueue = [];
         this.diagnosticsTimeout = null;
         this.isProjectLoading = false;
-        this.renameDisabledProjects = new WeakSet();
+        this.renameDisabledProjects = /* @__PURE__ */ new WeakSet();
         this.clientCapabilities = {};
         this.includeAutomaticOptionalChainCompletions = options.includeAutomaticOptionalChainCompletions;
         this.includeCompletionsWithSnippetText = options.includeCompletionsWithSnippetText;
@@ -4318,14 +4358,22 @@ var require_session = __commonJS({
         });
       }
       tsDefinitionsToLspLocationLinks(definitions, originSelectionRange) {
+        var _a;
         const results = [];
         for (const d of definitions) {
           const scriptInfo = this.projectService.getScriptInfo(d.fileName);
           if (!scriptInfo && d.textSpan.length > 0) {
             continue;
           }
-          const range = scriptInfo ? (0, utils_1.tsTextSpanToLspRange)(scriptInfo, d.textSpan) : EMPTY_RANGE;
-          const targetUri = (0, utils_1.filePathToUri)(d.fileName);
+          let mappedInfo = d;
+          let range = EMPTY_RANGE;
+          if (scriptInfo) {
+            const project = this.getDefaultProjectForScriptInfo(scriptInfo);
+            mappedInfo = project ? (0, utils_1.getMappedDefinitionInfo)(d, project) : mappedInfo;
+            const originalScriptInfo = (_a = this.projectService.getScriptInfo(mappedInfo.fileName)) !== null && _a !== void 0 ? _a : scriptInfo;
+            range = (0, utils_1.tsTextSpanToLspRange)(originalScriptInfo, mappedInfo.textSpan);
+          }
+          const targetUri = (0, utils_1.filePathToUri)(mappedInfo.fileName);
           results.push({
             originSelectionRange,
             targetUri,
@@ -4551,7 +4599,6 @@ var require_session = __commonJS({
 });
 
 // dist/server/server.js
-"use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var cmdline_utils_1 = require_cmdline_utils();
 var logger_1 = require_logger();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "13.0.0",
+  "version": "13.2.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/vscode-ng-language-service.git"
@@ -15,10 +15,10 @@
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "13.0.0",
+    "@angular/language-service": "13.2.1",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
-    "vscode-uri": "3.0.2"
+    "vscode-uri": "3.0.3"
   },
   "publishConfig": {
     "registry": "https://wombat-dressing-room.appspot.com"