@angular/language-server 14.1.0 → 14.2.0

package/index.js

@@ -5,9 +5,9 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// dist/banner/cmdline_utils.js
+// dist/server/src/cmdline_utils.js
 var require_cmdline_utils = __commonJS({
-  "dist/banner/cmdline_utils.js"(exports2) {
+  "dist/server/src/cmdline_utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.generateHelpMessage = exports2.parseCommandLine = void 0;
@@ -171,9 +171,9 @@ var require_resolver = __commonJS({
   }
 });
 
-// dist/banner/version_provider.js
+// dist/server/src/version_provider.js
 var require_version_provider = __commonJS({
-  "dist/banner/version_provider.js"(exports2) {
+  "dist/server/src/version_provider.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -294,7 +294,7 @@ var require_version_provider = __commonJS({
   }
 });
 
-// dist/banner/banner.js
+// dist/server/src/banner.js
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.requireOverride = void 0;
 var cmdline_utils_1 = require_cmdline_utils();
@@ -327,9 +327,9 @@ var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 
-// dist/server/cmdline_utils.js
+// dist/server/src/cmdline_utils.js
 var require_cmdline_utils = __commonJS({
-  "dist/server/cmdline_utils.js"(exports2) {
+  "dist/server/src/cmdline_utils.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.generateHelpMessage = exports2.parseCommandLine = void 0;
@@ -392,9 +392,9 @@ var require_cmdline_utils = __commonJS({
   }
 });
 
-// dist/server/logger.js
+// dist/server/src/logger.js
 var require_logger = __commonJS({
-  "dist/server/logger.js"(exports2) {
+  "dist/server/src/logger.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -524,9 +524,9 @@ var require_logger = __commonJS({
   }
 });
 
-// dist/server/server_host.js
+// dist/server/src/server_host.js
 var require_server_host = __commonJS({
-  "dist/server/server_host.js"(exports2) {
+  "dist/server/src/server_host.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3068,9 +3068,9 @@ var require_requests = __commonJS({
   }
 });
 
-// dist/server/utils.js
+// dist/server/src/utils.js
 var require_utils = __commonJS({
-  "dist/server/utils.js"(exports2) {
+  "dist/server/src/utils.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3105,7 +3105,7 @@ var require_utils = __commonJS({
       return result;
     };
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.getMappedDefinitionInfo = 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.tsFileTextChangesToLspWorkspaceEdit = 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");
@@ -3126,6 +3126,30 @@ var require_utils = __commonJS({
       return vscode_uri_1.URI.file(filePath).toString();
     }
     exports2.filePathToUri = filePathToUri;
+    function tsFileTextChangesToLspWorkspaceEdit(changes, getScriptInfo) {
+      const workspaceChanges = {};
+      for (const change of changes) {
+        const scriptInfo = getScriptInfo(change.fileName);
+        const uri = filePathToUri(change.fileName);
+        if (scriptInfo === void 0) {
+          continue;
+        }
+        if (!workspaceChanges[uri]) {
+          workspaceChanges[uri] = [];
+        }
+        for (const textChange of change.textChanges) {
+          const textEdit = {
+            newText: textChange.newText,
+            range: tsTextSpanToLspRange(scriptInfo, textChange.span)
+          };
+          workspaceChanges[uri].push(textEdit);
+        }
+      }
+      return {
+        changes: workspaceChanges
+      };
+    }
+    exports2.tsFileTextChangesToLspWorkspaceEdit = tsFileTextChangesToLspWorkspaceEdit;
     function tsTextSpanToLspRange(scriptInfo, textSpan) {
       const start = scriptInfo.positionToLineOffset(textSpan.start);
       const end = scriptInfo.positionToLineOffset(textSpan.start + textSpan.length);
@@ -3226,9 +3250,9 @@ var require_utils = __commonJS({
   }
 });
 
-// dist/server/completion.js
+// dist/server/src/completion.js
 var require_completion = __commonJS({
-  "dist/server/completion.js"(exports2) {
+  "dist/server/src/completion.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3358,9 +3382,9 @@ var require_completion = __commonJS({
   }
 });
 
-// dist/server/diagnostic.js
+// dist/server/src/diagnostic.js
 var require_diagnostic = __commonJS({
-  "dist/server/diagnostic.js"(exports2) {
+  "dist/server/src/diagnostic.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3524,9 +3548,9 @@ var require_resolver = __commonJS({
   }
 });
 
-// dist/server/version_provider.js
+// dist/server/src/version_provider.js
 var require_version_provider = __commonJS({
-  "dist/server/version_provider.js"(exports2) {
+  "dist/server/src/version_provider.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3647,9 +3671,9 @@ var require_version_provider = __commonJS({
   }
 });
 
-// dist/server/ngcc.js
+// dist/server/src/ngcc.js
 var require_ngcc = __commonJS({
-  "dist/server/ngcc.js"(exports2) {
+  "dist/server/src/ngcc.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.resolveAndRunNgcc = void 0;
@@ -3664,7 +3688,7 @@ var require_ngcc = __commonJS({
       if (!ngcc) {
         throw new Error(`Failed to resolve ngcc from ${directory}`);
       }
-      const index = ngcc.resolvedPath.lastIndexOf("node_modules");
+      const index = ngcc.resolvedPath.indexOf("node_modules");
       const cwd = index > 0 ? ngcc.resolvedPath.slice(0, index) : process.cwd();
       const args = [
         "--tsconfig",
@@ -3707,9 +3731,9 @@ var require_ngcc = __commonJS({
   }
 });
 
-// dist/server/session.js
+// dist/server/src/session.js
 var require_session = __commonJS({
-  "dist/server/session.js"(exports2) {
+  "dist/server/src/session.js"(exports2) {
     "use strict";
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
@@ -3766,6 +3790,8 @@ var require_session = __commonJS({
     (function(NgccErrorMessageAction2) {
       NgccErrorMessageAction2[NgccErrorMessageAction2["showOutput"] = 0] = "showOutput";
     })(NgccErrorMessageAction || (NgccErrorMessageAction = {}));
+    var defaultFormatOptions = {};
+    var defaultPreferences = {};
     var Session = class {
       constructor(options) {
         this.openFiles = new utils_1.MruTracker();
@@ -3863,6 +3889,49 @@ var require_session = __commonJS({
         conn.onCodeLens((p) => this.onCodeLens(p));
         conn.onCodeLensResolve((p) => this.onCodeLensResolve(p));
         conn.onSignatureHelp((p) => this.onSignatureHelp(p));
+        conn.onCodeAction((p) => this.onCodeAction(p));
+        conn.onCodeActionResolve((p) => this.onCodeActionResolve(p));
+      }
+      onCodeAction(params) {
+        const filePath = (0, utils_1.uriToFilePath)(params.textDocument.uri);
+        const lsInfo = this.getLSAndScriptInfo(params.textDocument);
+        if (!lsInfo) {
+          return null;
+        }
+        const start = (0, utils_1.lspPositionToTsPosition)(lsInfo.scriptInfo, params.range.start);
+        const end = (0, utils_1.lspPositionToTsPosition)(lsInfo.scriptInfo, params.range.end);
+        const errorCodes = params.context.diagnostics.map((diag) => diag.code).filter((code) => typeof code === "number");
+        const codeActions = lsInfo.languageService.getCodeFixesAtPosition(filePath, start, end, errorCodes, defaultFormatOptions, defaultPreferences);
+        const individualCodeFixes = codeActions.map((codeAction) => {
+          return {
+            title: codeAction.description,
+            kind: lsp.CodeActionKind.QuickFix,
+            diagnostics: params.context.diagnostics,
+            edit: (0, utils_1.tsFileTextChangesToLspWorkspaceEdit)(codeAction.changes, (path) => this.projectService.getScriptInfo(path))
+          };
+        });
+        const codeFixesAll = getCodeFixesAll(codeActions, params.textDocument);
+        return [...individualCodeFixes, ...codeFixesAll];
+      }
+      onCodeActionResolve(param) {
+        const codeActionResolve = param.data;
+        const isCodeFixesAll = codeActionResolve.fixId !== void 0;
+        if (!isCodeFixesAll) {
+          return param;
+        }
+        const filePath = (0, utils_1.uriToFilePath)(codeActionResolve.document.uri);
+        const lsInfo = this.getLSAndScriptInfo(codeActionResolve.document);
+        if (!lsInfo) {
+          return param;
+        }
+        const fixesAllChanges = lsInfo.languageService.getCombinedCodeFix({
+          type: "file",
+          fileName: filePath
+        }, codeActionResolve.fixId, defaultFormatOptions, defaultPreferences);
+        return {
+          title: param.title,
+          edit: (0, utils_1.tsFileTextChangesToLspWorkspaceEdit)(fixesAllChanges.changes, (path) => this.projectService.getScriptInfo(path))
+        };
       }
       isInAngularProject(params) {
         const filePath = (0, utils_1.uriToFilePath)(params.textDocument.uri);
@@ -4198,7 +4267,10 @@ var require_session = __commonJS({
             } : void 0,
             workspace: {
               workspaceFolders: { supported: true }
-            }
+            },
+            codeActionProvider: this.ivy ? {
+              resolveProvider: true
+            } : void 0
           },
           serverOptions
         };
@@ -4619,10 +4691,31 @@ var require_session = __commonJS({
     function isExternalTemplate(path) {
       return !isTypeScriptFile(path);
     }
+    function getCodeFixesAll(codeActions, document) {
+      const seenFixId = /* @__PURE__ */ new Set();
+      const lspCodeActions = [];
+      for (const codeAction of codeActions) {
+        const fixId = codeAction.fixId;
+        if (fixId === void 0 || codeAction.fixAllDescription === void 0 || seenFixId.has(fixId)) {
+          continue;
+        }
+        seenFixId.add(fixId);
+        const codeActionResolveData = {
+          fixId,
+          document
+        };
+        lspCodeActions.push({
+          title: codeAction.fixAllDescription,
+          kind: lsp.CodeActionKind.QuickFix,
+          data: codeActionResolveData
+        });
+      }
+      return lspCodeActions;
+    }
   }
 });
 
-// dist/server/server.js
+// dist/server/src/server.js
 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": "14.1.0",
+  "version": "14.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": "14.1.0",
+    "@angular/language-service": "14.2.0",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.3"