@angular/language-server 20.0.1 → 20.1.0

package/index.js

@@ -17,6 +17,28 @@ var require_cmdline_utils = __commonJS({
       }
       return argv[index + 1];
     }
+    function findArgumentWithDefault(argv, argName, defaultValue) {
+      const index = argv.indexOf(argName);
+      if (index < 0) {
+        return defaultValue;
+      }
+      if (index === argv.length - 1) {
+        return void 0;
+      }
+      const argValue = argv[index + 1];
+      if (argValue.startsWith("-")) {
+        return void 0;
+      } else {
+        return argValue;
+      }
+    }
+    function parseBooleanArgument(argv, argName) {
+      const argValue = findArgumentWithDefault(argv, argName, "true");
+      if (argValue === void 0 || argValue === "true") {
+        return true;
+      }
+      return false;
+    }
     function parseStringArray(argv, argName) {
       const arg = findArgument(argv, argName);
       if (!arg) {
@@ -39,6 +61,7 @@ var require_cmdline_utils = __commonJS({
         tsdk: (_a = findArgument(argv, "--tsdk")) !== null && _a !== void 0 ? _a : null,
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
+        includeCompletionsForModuleExports: parseBooleanArgument(argv, "--includeCompletionsForModuleExports"),
         forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
         disableBlockSyntax: hasArgument(argv, "--disableBlockSyntax"),
         disableLetSyntax: hasArgument(argv, "--disableLetSyntax"),
@@ -396,6 +419,28 @@ var require_cmdline_utils = __commonJS({
       }
       return argv[index + 1];
     }
+    function findArgumentWithDefault(argv, argName, defaultValue) {
+      const index = argv.indexOf(argName);
+      if (index < 0) {
+        return defaultValue;
+      }
+      if (index === argv.length - 1) {
+        return void 0;
+      }
+      const argValue = argv[index + 1];
+      if (argValue.startsWith("-")) {
+        return void 0;
+      } else {
+        return argValue;
+      }
+    }
+    function parseBooleanArgument(argv, argName) {
+      const argValue = findArgumentWithDefault(argv, argName, "true");
+      if (argValue === void 0 || argValue === "true") {
+        return true;
+      }
+      return false;
+    }
     function parseStringArray(argv, argName) {
       const arg = findArgument(argv, argName);
       if (!arg) {
@@ -418,6 +463,7 @@ var require_cmdline_utils = __commonJS({
         tsdk: (_a = findArgument(argv, "--tsdk")) !== null && _a !== void 0 ? _a : null,
         includeAutomaticOptionalChainCompletions: hasArgument(argv, "--includeAutomaticOptionalChainCompletions"),
         includeCompletionsWithSnippetText: hasArgument(argv, "--includeCompletionsWithSnippetText"),
+        includeCompletionsForModuleExports: parseBooleanArgument(argv, "--includeCompletionsForModuleExports"),
         forceStrictTemplates: hasArgument(argv, "--forceStrictTemplates"),
         disableBlockSyntax: hasArgument(argv, "--disableBlockSyntax"),
         disableLetSyntax: hasArgument(argv, "--disableLetSyntax"),
@@ -771,9 +817,9 @@ var require_server_host = __commonJS({
   }
 });
 
-// ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@registry.npmjs.org+@angular+language-service@20.0.0-rc.2/node_modules/@angular/language-service/api_bundle.js
+// ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@registry.npmjs.org+@angular+language-service@20.1.0-rc.0/node_modules/@angular/language-service/api_bundle.js
 var require_api_bundle = __commonJS({
-  "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@registry.npmjs.org+@angular+language-service@20.0.0-rc.2/node_modules/@angular/language-service/api_bundle.js"(exports2, module2) {
+  "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/node_modules/.aspect_rules_js/@angular+language-service@registry.npmjs.org+@angular+language-service@20.1.0-rc.0/node_modules/@angular/language-service/api_bundle.js"(exports2, module2) {
     var __defProp2 = Object.defineProperty;
     var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames2 = Object.getOwnPropertyNames;
@@ -3461,7 +3507,8 @@ var require_completion = __commonJS({
       item.data = {
         kind: "ngCompletionOriginData",
         filePath: scriptInfo.fileName,
-        position
+        position,
+        tsData: entry.data
       };
       return item;
     }
@@ -217458,6 +217505,75 @@ var require_embedded_support = __commonJS({
   }
 });
 
+// ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/server/src/semantic_tokens.js
+var require_semantic_tokens = __commonJS({
+  "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/server/src/semantic_tokens.js"(exports2) {
+    "use strict";
+    var __createBinding = exports2 && exports2.__createBinding || (Object.create ? function(o, m, k, k2) {
+      if (k2 === void 0)
+        k2 = 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;
+      o[k2] = m[k];
+    });
+    var __setModuleDefault = exports2 && exports2.__setModuleDefault || (Object.create ? function(o, v) {
+      Object.defineProperty(o, "default", { enumerable: true, value: v });
+    } : function(o, v) {
+      o["default"] = v;
+    });
+    var __importStar = exports2 && exports2.__importStar || function(mod) {
+      if (mod && mod.__esModule)
+        return mod;
+      var result = {};
+      if (mod != null) {
+        for (var k in mod)
+          if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k))
+            __createBinding(result, mod, k);
+      }
+      __setModuleDefault(result, mod);
+      return result;
+    };
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.getSemanticTokens = void 0;
+    var lsp = __importStar(require("vscode-languageserver/node"));
+    function getSemanticTokens(languageService, classifications, script) {
+      const spans = classifications.spans;
+      const builder = new lsp.SemanticTokensBuilder();
+      for (let i = 0; i < spans.length; ) {
+        const offset = spans[i++];
+        const length = spans[i++];
+        const classification = spans[i++];
+        const tokenType = languageService.getTokenTypeFromClassification(classification);
+        if (tokenType === void 0) {
+          continue;
+        }
+        const tokenModifiers = languageService.getTokenModifierFromClassification(classification);
+        const startPos = script.positionToLineOffset(offset);
+        startPos.line -= 1;
+        startPos.offset -= 1;
+        const endPos = script.positionToLineOffset(offset + length);
+        endPos.line -= 1;
+        endPos.offset -= 1;
+        for (let line = startPos.line; line <= endPos.line; line++) {
+          const startCharacter = line === startPos.line ? startPos.offset : 0;
+          const endCharacter = line === endPos.line ? endPos.offset : script.lineToTextSpan(line - 1).length;
+          builder.push(line, startCharacter, endCharacter - startCharacter, tokenType, tokenModifiers);
+        }
+      }
+      return builder.build();
+    }
+    exports2.getSemanticTokens = getSemanticTokens;
+  }
+});
+
 // ../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/common/initialize.js
 var require_initialize = __commonJS({
   "../../../../../../../../execroot/__main__/bazel-out/darwin_arm64-fastbuild/bin/common/initialize.js"(exports2) {
@@ -217717,6 +217833,7 @@ var require_session = __commonJS({
     var completion_1 = require_completion();
     var diagnostic_1 = require_diagnostic();
     var embedded_support_1 = require_embedded_support();
+    var semantic_tokens_1 = require_semantic_tokens();
     var text_render_1 = require_text_render();
     var utils_1 = require_utils();
     var LanguageId;
@@ -217742,8 +217859,10 @@ var require_session = __commonJS({
         this.clientCapabilities = {};
         this.includeAutomaticOptionalChainCompletions = options2.includeAutomaticOptionalChainCompletions;
         this.includeCompletionsWithSnippetText = options2.includeCompletionsWithSnippetText;
+        this.includeCompletionsForModuleExports = options2.includeCompletionsForModuleExports;
         this.logger = options2.logger;
         this.logToConsole = options2.logToConsole;
+        defaultPreferences = Object.assign(Object.assign({}, defaultPreferences), { includeCompletionsForModuleExports: options2.includeCompletionsForModuleExports });
         this.connection = lsp.createConnection({
           // cancelUndispatched is a "middleware" to handle all cancellation requests.
           // LSP spec requires every request to send a response back, even if it is
@@ -217800,7 +217919,8 @@ var require_session = __commonJS({
           preferences: {
             // We don't want the AutoImportProvider projects to be created. See
             // https://devblogs.microsoft.com/typescript/announcing-typescript-4-0/#smarter-auto-imports
-            includePackageJsonAutoImports: "off"
+            includePackageJsonAutoImports: "off",
+            includeCompletionsForModuleExports: this.includeCompletionsForModuleExports
           },
           watchOptions: {
             // Used as watch options when not specified by user's `tsconfig`.
@@ -217857,6 +217977,30 @@ var require_session = __commonJS({
         conn.onCodeActionResolve((p) => __async(this, null, function* () {
           return yield this.onCodeActionResolve(p);
         }));
+        conn.onRequest(lsp.SemanticTokensRequest.type, (p) => this.onSemanticTokensRequest(p));
+        conn.onRequest(lsp.SemanticTokensRangeRequest.type, (p) => this.onSemanticTokensRangeRequest(p));
+      }
+      onSemanticTokensRequest(params) {
+        const lsInfo = this.getLSAndScriptInfo(params.textDocument);
+        if (lsInfo === null) {
+          return null;
+        }
+        const { languageService, scriptInfo } = lsInfo;
+        const span = { start: 0, length: scriptInfo.getSnapshot().getLength() };
+        const classifications = languageService.getEncodedSemanticClassifications(scriptInfo.fileName, span, ts.SemanticClassificationFormat.TwentyTwenty);
+        return (0, semantic_tokens_1.getSemanticTokens)(languageService, classifications, scriptInfo);
+      }
+      onSemanticTokensRangeRequest(params) {
+        const lsInfo = this.getLSAndScriptInfo(params.textDocument);
+        if (lsInfo === null) {
+          return null;
+        }
+        const { languageService, scriptInfo } = lsInfo;
+        const start = (0, utils_1.lspPositionToTsPosition)(lsInfo.scriptInfo, params.range.start);
+        const end = (0, utils_1.lspPositionToTsPosition)(lsInfo.scriptInfo, params.range.end);
+        const span = { start, length: end - start };
+        const classifications = languageService.getEncodedSemanticClassifications(scriptInfo.fileName, span, ts.SemanticClassificationFormat.TwentyTwenty);
+        return (0, semantic_tokens_1.getSemanticTokens)(languageService, classifications, scriptInfo);
       }
       onCodeAction(params) {
         const filePath = (0, utils_1.uriToFilePath)(params.textDocument.uri);
@@ -218330,6 +218474,17 @@ var require_session = __commonJS({
               // Find more info
               // [here](https://github.com/angular/vscode-ng-language-service/issues/1828)
               codeActionKinds: [lsp.CodeActionKind.QuickFix]
+            },
+            semanticTokensProvider: {
+              documentSelector: null,
+              legend: {
+                tokenTypes: [
+                  "class"
+                ],
+                tokenModifiers: []
+              },
+              full: true,
+              range: true
             }
           },
           serverOptions
@@ -218681,11 +218836,12 @@ var require_session = __commonJS({
         const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, params.position);
         let options2 = {};
         const includeCompletionsWithSnippetText = this.includeCompletionsWithSnippetText && this.snippetSupport;
-        if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText) {
+        if (this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText || this.includeCompletionsForModuleExports) {
           options2 = {
             includeAutomaticOptionalChainCompletions: this.includeAutomaticOptionalChainCompletions,
             includeCompletionsWithSnippetText,
-            includeCompletionsWithInsertText: this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText
+            includeCompletionsWithInsertText: this.includeAutomaticOptionalChainCompletions || includeCompletionsWithSnippetText,
+            includeCompletionsForModuleExports: this.includeCompletionsForModuleExports
           };
         }
         const completions = languageService.getCompletionsAtPosition(scriptInfo.fileName, offset, options2);
@@ -218707,7 +218863,7 @@ var require_session = __commonJS({
         }
         const { languageService, scriptInfo } = lsInfo;
         const offset = (0, utils_1.lspPositionToTsPosition)(scriptInfo, position);
-        const details = languageService.getCompletionEntryDetails(filePath, offset, (_a = item.insertText) !== null && _a !== void 0 ? _a : item.label, void 0, void 0, void 0, void 0);
+        const details = languageService.getCompletionEntryDetails(filePath, offset, (_a = item.insertText) !== null && _a !== void 0 ? _a : item.label, void 0, void 0, defaultPreferences, data.tsData);
         if (details === void 0) {
           return item;
         }
@@ -219121,6 +219277,7 @@ function main() {
     logToConsole: options.logToConsole,
     includeAutomaticOptionalChainCompletions: options.includeAutomaticOptionalChainCompletions,
     includeCompletionsWithSnippetText: options.includeCompletionsWithSnippetText,
+    includeCompletionsForModuleExports: options.includeCompletionsForModuleExports,
     forceStrictTemplates: isG3 || options.forceStrictTemplates,
     disableBlockSyntax: options.disableBlockSyntax,
     disableLetSyntax: options.disableLetSyntax,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@angular/language-server",
   "description": "LSP server for Angular Language Service",
-  "version": "20.0.1",
+  "version": "20.1.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": "20.0.0-rc.2",
+    "@angular/language-service": "20.1.0-rc.0",
     "vscode-html-languageservice": "^4.2.5",
     "vscode-jsonrpc": "6.0.0",
     "vscode-languageserver": "7.0.0",