@angular/language-server 13.1.1 → 13.2.0

package/index.js

@@ -3084,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");
@@ -3165,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;
+    }
   }
 });
 
@@ -4327,8 +4364,14 @@ var require_session = __commonJS({
           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;
+            range = (0, utils_1.tsTextSpanToLspRange)(scriptInfo, mappedInfo.textSpan);
+          }
+          const targetUri = (0, utils_1.filePathToUri)(mappedInfo.fileName);
           results.push({
             originSelectionRange,
             targetUri,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "13.1.1",
+  "version": "13.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/vscode-ng-language-service.git"
@@ -15,7 +15,7 @@
     "ngserver": "./bin/ngserver"
   },
   "dependencies": {
-    "@angular/language-service": "13.1.2",
+    "@angular/language-service": "13.2.0",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.3"