@angular/language-server 13.2.4 → 13.3.0

package/index.js

@@ -74,9 +74,13 @@ var require_resolver = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -171,9 +175,13 @@ var require_version_provider = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -385,9 +393,13 @@ var require_logger = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -513,9 +525,13 @@ var require_server_host = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -703,24 +719,14 @@ var require_notifications = __commonJS({
   "dist/common/notifications.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.SuggestStrictMode = exports2.ProjectLanguageService = exports2.ProjectLoadingFinish = exports2.ProjectLoadingStart = void 0;
+    exports2.OpenOutputChannel = exports2.NgccProgressEnd = exports2.SuggestStrictMode = exports2.ProjectLanguageService = exports2.ProjectLoadingFinish = exports2.ProjectLoadingStart = void 0;
     var vscode_jsonrpc_1 = require("vscode-jsonrpc");
     exports2.ProjectLoadingStart = new vscode_jsonrpc_1.NotificationType0("angular/projectLoadingStart");
     exports2.ProjectLoadingFinish = new vscode_jsonrpc_1.NotificationType0("angular/projectLoadingFinish");
     exports2.ProjectLanguageService = new vscode_jsonrpc_1.NotificationType("angular/projectLanguageService");
     exports2.SuggestStrictMode = new vscode_jsonrpc_1.NotificationType("angular/suggestStrictMode");
-  }
-});
-
-// dist/common/progress.js
-var require_progress = __commonJS({
-  "dist/common/progress.js"(exports2) {
-    "use strict";
-    Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.NgccProgressType = exports2.NgccProgressToken = void 0;
-    var vscode_jsonrpc_1 = require("vscode-jsonrpc");
-    exports2.NgccProgressToken = "ngcc";
-    exports2.NgccProgressType = new vscode_jsonrpc_1.ProgressType();
+    exports2.NgccProgressEnd = new vscode_jsonrpc_1.NotificationType("angular/NgccProgressEnd");
+    exports2.OpenOutputChannel = new vscode_jsonrpc_1.NotificationType("angular/OpenOutputChannel");
   }
 });
 
@@ -3016,9 +3022,13 @@ var require_requests = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3058,9 +3068,13 @@ var require_utils = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3212,9 +3226,13 @@ var require_completion = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3340,9 +3358,13 @@ var require_diagnostic = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3401,9 +3423,13 @@ var require_resolver = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3498,9 +3524,13 @@ var require_version_provider = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3677,9 +3707,13 @@ var require_session = __commonJS({
     var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
-      Object.defineProperty(o, k2, { enumerable: true, get: function() {
-        return m[k];
-      } });
+      var desc = Object.getOwnPropertyDescriptor(m, k);
+      if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+        desc = { enumerable: true, get: function() {
+          return m[k];
+        } };
+      }
+      Object.defineProperty(o, k2, desc);
     } : function(o, m, k, k2) {
       if (k2 === void 0)
         k2 = k;
@@ -3709,7 +3743,6 @@ var require_session = __commonJS({
     var util_1 = require("util");
     var lsp = __importStar(require("vscode-languageserver/node"));
     var notifications_1 = require_notifications();
-    var progress_1 = require_progress();
     var requests_1 = require_requests();
     var completion_1 = require_completion();
     var diagnostic_1 = require_diagnostic();
@@ -3722,6 +3755,10 @@ var require_session = __commonJS({
     })(LanguageId || (LanguageId = {}));
     var EMPTY_RANGE = lsp.Range.create(0, 0, 0, 0);
     var setImmediateP = (0, util_1.promisify)(setImmediate);
+    var NgccErrorMessageAction;
+    (function(NgccErrorMessageAction2) {
+      NgccErrorMessageAction2[NgccErrorMessageAction2["showOutput"] = 0] = "showOutput";
+    })(NgccErrorMessageAction || (NgccErrorMessageAction = {}));
     var Session = class {
       constructor(options) {
         this.configuredProjToExternalProj = /* @__PURE__ */ new Map();
@@ -4534,37 +4571,32 @@ var require_session = __commonJS({
         }
         this.disableLanguageServiceForProject(project, "ngcc is running");
         const configFilePath = project.getConfigFilePath();
-        this.connection.sendProgress(progress_1.NgccProgressType, progress_1.NgccProgressToken, {
-          done: false,
-          configFilePath,
-          message: `Running ngcc for ${configFilePath}`
-        });
-        let success = false;
+        const progressReporter = await this.connection.window.createWorkDoneProgress();
+        progressReporter.begin("Angular", void 0, `Running ngcc for ${configFilePath}`);
         try {
           this.projectNgccQueue.push({ project, done: false });
           await (0, ngcc_1.resolveAndRunNgcc)(configFilePath, {
             report: (msg) => {
-              this.connection.sendProgress(progress_1.NgccProgressType, progress_1.NgccProgressToken, {
-                done: false,
-                configFilePath,
-                message: msg
-              });
+              progressReporter.report(msg);
             }
           });
-          success = true;
         } catch (e) {
           this.error(`Failed to run ngcc for ${configFilePath}, language service may not operate correctly:
     ${e.message}`);
+          this.connection.window.showErrorMessage(`Angular extension might not work correctly because ngcc operation failed. Try to invoke ngcc manually by running 'npm/yarn run ngcc'. Please see the extension output for more information.`, { title: "Show output", action: NgccErrorMessageAction.showOutput }).then((selection) => {
+            if ((selection === null || selection === void 0 ? void 0 : selection.action) === NgccErrorMessageAction.showOutput) {
+              this.connection.sendNotification(notifications_1.OpenOutputChannel, {});
+            }
+          });
         } finally {
           const loadingStatus = this.projectNgccQueue.find((p) => p.project === project);
           if (loadingStatus !== void 0) {
             loadingStatus.done = true;
           }
-          this.connection.sendProgress(progress_1.NgccProgressType, progress_1.NgccProgressToken, {
-            done: true,
-            configFilePath,
-            success
+          this.connection.sendNotification(notifications_1.NgccProgressEnd, {
+            configFilePath
           });
+          progressReporter.done();
         }
         for (let i = 0; i < this.projectNgccQueue.length && this.projectNgccQueue[i].done; i++) {
           this.enableLanguageServiceForProject(this.projectNgccQueue[i].project);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "13.2.4",
+  "version": "13.3.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.2.4",
+    "@angular/language-service": "13.3.0",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",
     "vscode-uri": "3.0.3"