@artel/artc 0.6.26010 → 0.6.26012

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-WK4LR3UK.js";
-import "./chunk-CZDVEX34.js";
+} from "./chunk-FXUDXUOA.js";
+import "./chunk-OA77CG6M.js";
 import {
   __async
-} from "./chunk-HOEHBJ7R.js";
+} from "./chunk-GZUU2AYH.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-CZDVEX34.js";
+} from "../chunk-OA77CG6M.js";
 import {
   AccessKind,
   AccessedFunctionParameter,
@@ -20,6 +20,7 @@ import {
   ArtelSourceFileExtensions,
   ArtelVersion,
   BackingSpecialVariableEntityInfo,
+  BaseKeywordPart,
   BinaryExpressionOperatorClassificationResult,
   BoundTypeMemberLookup,
   Cached,
@@ -66,6 +67,7 @@ import {
   DisplayableOrPrimitive,
   Emitter,
   EmitterPackage,
+  EndKeywordPart,
   EntityHidingLevel_file,
   EntityHidingLevel_package,
   EntityHidingLevel_type,
@@ -122,7 +124,7 @@ import {
   JsonConfigurationFileNameSet,
   JsonConfigurationFileNamesByLocale,
   Keyword2 as Keyword,
-  KeywordPart,
+  KeywordPartKind,
   Lazy,
   LocalVariableDeclarationEntity,
   LocalVariableKind,
@@ -135,6 +137,7 @@ import {
   MatchResultParameter,
   MaybeLazy,
   MethodDeclarationEntity,
+  MiddleKeywordPart,
   Name,
   NameFlags,
   NestedFunctionDeclarationEntity,
@@ -340,7 +343,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldTask
-} from "../chunk-HOEHBJ7R.js";
+} from "../chunk-GZUU2AYH.js";
 export {
   AccessKind,
   AccessedFunctionParameter,
@@ -360,6 +363,7 @@ export {
   ArtelSourceFileExtensions,
   ArtelVersion,
   BackingSpecialVariableEntityInfo,
+  BaseKeywordPart,
   BinaryExpressionOperatorClassificationResult,
   BoundTypeMemberLookup,
   Cached,
@@ -407,6 +411,7 @@ export {
   DisplayableOrPrimitive,
   Emitter,
   EmitterPackage,
+  EndKeywordPart,
   EntityHidingLevel_file,
   EntityHidingLevel_package,
   EntityHidingLevel_type,
@@ -462,7 +467,7 @@ export {
   JsonConfigurationFileNameSet,
   JsonConfigurationFileNamesByLocale,
   Keyword,
-  KeywordPart,
+  KeywordPartKind,
   Lazy,
   LocalVariableDeclarationEntity,
   LocalVariableKind,
@@ -475,6 +480,7 @@ export {
   MatchResultParameter,
   MaybeLazy,
   MethodDeclarationEntity,
+  MiddleKeywordPart,
   Name,
   NameFlags,
   NestedFunctionDeclarationEntity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-WK4LR3UK.js";
-import "../chunk-CZDVEX34.js";
-import "../chunk-HOEHBJ7R.js";
+} from "../chunk-FXUDXUOA.js";
+import "../chunk-OA77CG6M.js";
+import "../chunk-GZUU2AYH.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -166,6 +166,7 @@ import {
   isEntityWithParameters,
   isEntityWithTypeParameters,
   isIdentifier,
+  isNamedTypeEntity,
   isNarrowableReferenceExpression,
   isNonEmptyArray,
   isPackageMemberEntity,
@@ -184,7 +185,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-HOEHBJ7R.js";
+} from "../chunk-GZUU2AYH.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -790,7 +791,7 @@ var SyntaxFactory = class {
     );
   }
   static modifier(value, level) {
-    const valueKeyword = this.createKeyword(value, 1 /* Missing */ | 12296 /* SingularNeuAdjective */);
+    const valueKeyword = this.createKeyword(value, 1 /* Missing */ | 3158024 /* SingularNeuAdjective */);
     let openParenthesisToken;
     let levelKeyword;
     let closeParenthesisToken;
@@ -1163,7 +1164,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.modifiersOnSeparateLine = options7?.modifiersOnSeparateLine ?? false;
     this.keywordsLocale = options7?.keywordsLocale ?? 1 /* Ru */;
     this.keywordsDialect = options7?.keywordsDialect ?? DefaultDialect;
-    this.singleWordKeywordValues = Query.from(getOrCreateKeywordDictionary(this.keywordsLocale, this.keywordsDialect).values()).mapAndFilter((k) => k.keywordKind !== 0 /* Unknown */ ? k.value : void 0).uniqueToSet();
+    this.singleWordKeywordValues = Query.from(getOrCreateKeywordDictionary(this.keywordsLocale, this.keywordsDialect).values()).flatMap((k) => k).mapAndFilter((k) => k.kind === 1 /* EndKeywordPart */ ? k.value : void 0).uniqueToSet();
     this.indentation = options7?.initialIndentation ?? "";
   }
   static get writeFunctions() {
@@ -1666,7 +1667,7 @@ var SyntaxToCode = class _SyntaxToCode {
   }
   writeAnonymousFunctionTypeDeclaration(node) {
     if (node.asyncKeyword !== void 0) {
-      this.writeKeyword(node.asyncKeyword, 10242 /* SingularFemNoun */);
+      this.writeKeyword(node.asyncKeyword, 3155970 /* SingularFemNoun */);
       this.writeWhitespace();
     }
     this.writeKeyword(node.functionKeyword);
@@ -2042,7 +2043,7 @@ var SyntaxToCode = class _SyntaxToCode {
       }
     }
   }
-  writeKeyword(keyword, flags = 12290 /* SingularNeuNoun */) {
+  writeKeyword(keyword, flags = 3158018 /* SingularNeuNoun */) {
     if (keyword.isMissing) {
       this.writeCode(LocalizationHelper.localizeKeywordAndTakeBest(
         keyword.keywordKind,
@@ -2071,13 +2072,13 @@ var SyntaxToCode = class _SyntaxToCode {
       case 47 /* MethodDeclaration */:
       case 48 /* OperatorDeclaration */:
       case 22 /* PackageEntryPointDeclaration */:
-        return 10242 /* SingularFemNoun */;
+        return 3155970 /* SingularFemNoun */;
       case 19 /* PackageAliasTypeDeclaration */:
       case 27 /* PackageClassDeclaration */:
       case 29 /* PackageAspectDeclaration */:
       case 30 /* PackageReducedTypeDeclaration */:
       case 31 /* PackageVariantDeclaration */:
-        return 9218 /* SingularMasNoun */;
+        return 3154946 /* SingularMasNoun */;
       case 32 /* PackageVariableDeclaration */:
       case 33 /* PackageVariableGetterDeclaration */:
       case 35 /* TypeExtensionDeclaration */:
@@ -2091,11 +2092,11 @@ var SyntaxToCode = class _SyntaxToCode {
       case 145 /* VariantValueDeclaration */:
       case 38 /* MissingPackageMemberDeclaration */:
       case 52 /* MissingTypeMemberDeclaration */:
-        return 12290 /* SingularNeuNoun */;
+        return 3158018 /* SingularNeuNoun */;
       case 39 /* TypeMemberGroupDeclaration */:
       case 20 /* PackageMemberGroupDeclaration */:
       case 121 /* TranslationsDeclaration */:
-        return 16386 /* PluralNoun */;
+        return 3162114 /* PluralNoun */;
       default:
         Debug.never(modifierTarget);
     }
@@ -2373,8 +2374,8 @@ var modifierKindsInSortOrder = [
   2 /* HiddenInHierarchy */,
   1 /* HiddenInType */,
   5 /* Static */,
-  7 /* Basic */,
   6 /* Abstract */,
+  7 /* Basic */,
   8 /* Override */,
   9 /* Async */,
   10 /* Var */
@@ -3398,7 +3399,7 @@ var CompletionService = class {
       () => new CompletionItemInfoContext(
         new DisplayService(this.analyzer, this.locale, this.dialect, this.sourceFile),
         this.locale,
-        Query.from(getOrCreateKeywordDictionary(this.locale, this.dialect).values()).mapAndFilter((k) => k.keywordKind !== 0 /* Unknown */ ? k.value : void 0).uniqueToSet()
+        Query.from(getOrCreateKeywordDictionary(this.locale, this.dialect).values()).flatMap((k) => k).mapAndFilter((k) => k.kind === 1 /* EndKeywordPart */ ? k.value : void 0).uniqueToSet()
       )
     );
   }
@@ -7231,6 +7232,72 @@ var DefinitionService = class {
       return result;
     });
   }
+  getTypeDefinition(analyzer, sourceFile, offset, taskController) {
+    return __async(this, null, function* () {
+      const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
+        if (t.isToken(9 /* Identifier */) || t.isKeyword()) {
+          return 2;
+        } else if (t.isToken(21 /* Caret */) || t.isToken(48 /* OpenSquareBracket */) || t.isToken(24 /* CloseSquareBracket */)) {
+          return 1;
+        } else {
+          return 0;
+        }
+      });
+      if (tokenOrKeyword === void 0) {
+        return void 0;
+      }
+      const options7 = {
+        includeBetterReferenceTargets: false,
+        preferredTargetOfExplicitConstructorCall: "type-declaration"
+      };
+      const semanticInfo = NodeSemanticInfoService.ofTokenOrKeyword(analyzer, tokenOrKeyword, options7);
+      if (semanticInfo === void 0) {
+        return void 0;
+      }
+      let types;
+      switch (semanticInfo.kind) {
+        case "definition": {
+          if (semanticInfo.entity.kind === 0 /* Variable */) {
+            types = [semanticInfo.entity.getType()];
+          }
+          break;
+        }
+        case "reference": {
+          types = this.getTypesOfReference(semanticInfo);
+          break;
+        }
+        case "default-switch-match":
+          break;
+        default:
+          Debug.never(semanticInfo);
+      }
+      let result;
+      if (types !== void 0 && types.length > 0) {
+        const entities = types.flatMap((t) => this.getEntitiesThatMakeUpTheType(t));
+        if (entities.length > 0) {
+          const sourceLocations = entities.map((e) => getEntitySourceLocations(analyzer, e)).filter((l) => l !== void 0).flat();
+          if (this.sourceGenerationService !== void 0) {
+            for (const entity of entities) {
+              if (this.sourceGenerationService.entityDefinitionRequiresSourceGeneration(entity)) {
+                const locations = yield this.sourceGenerationService.getDefinitionInGeneratedCode(
+                  analyzer,
+                  entity,
+                  taskController
+                );
+                if (locations !== void 0) {
+                  sourceLocations.push(...locations);
+                }
+              }
+            }
+          }
+          if (sourceLocations.length > 0) {
+            result = new DefinitionsAndReferenceInfo(sourceLocations, tokenOrKeyword.value.rangeWithoutTrivia);
+          }
+        }
+      }
+      return result;
+    });
+  }
   getDefinitionOfReference(analyzer, reference, tokenOrKeyword, sourceFile) {
     const targets = reference.betterTargets ?? reference.targets;
     const sourceLocations = Query.from(targets).mapAndFilter((t) => this.getReferenceTargetSourceLocation(analyzer, t, tokenOrKeyword, sourceFile)).flatMap((l) => l).toArray();
@@ -7309,7 +7376,7 @@ var DefinitionService = class {
   }
   getSourceLocationsOfVariableEntity(analyzer, entity) {
     let result = getEntitySourceLocations(analyzer, entity);
-    if (result === void 0 && entity.kind === 0 /* Variable */) {
+    if (result === void 0) {
       const specialVariableInfo = entity.isSpecial();
       if (specialVariableInfo !== void 0) {
         result = this.getSourceLocationsOfSpecialVariable(analyzer, specialVariableInfo);
@@ -7384,6 +7451,67 @@ var DefinitionService = class {
     const sourceFile = TreeQuery.getSourceFile(node, analyzer);
     return new SourceLocation(sourceFile, range);
   }
+  getTypesOfReference(reference) {
+    const result = new Array();
+    const targets = reference.targets;
+    for (const target of targets) {
+      switch (target.kind) {
+        case "entity":
+          if (target.entity.kind === 0 /* Variable */) {
+            result.push(target.narrowedType ?? target.entity.getType());
+          }
+          break;
+        case "field":
+          result.push(target.field.getType() ?? target.narrowedType);
+          break;
+        case "type-value-parameter":
+          result.push(target.parameter.getType());
+          break;
+        case "match-result-value-parameter":
+          result.push(target.parameter.type);
+          break;
+        case "type-context":
+          result.push(target.type);
+          break;
+        case "type-constructor":
+        case "operator":
+        case "type-dereference-operator":
+        case "accessed-function":
+        case "type-indexer":
+        case "package":
+        case "package-name-tree-node":
+          break;
+        default:
+          Debug.never(target);
+      }
+    }
+    return result;
+  }
+  getEntitiesThatMakeUpTheType(type) {
+    let types;
+    if (type.kind === "union") {
+      types = type.originalTypes;
+    } else if (type.kind === "intersection") {
+      types = type.originalTypes;
+    } else {
+      types = [type];
+    }
+    const result = new Array();
+    for (const type2 of types) {
+      const entity = type2.getEntity();
+      if (entity !== void 0) {
+        result.push(entity);
+        if (isNamedTypeEntity(entity)) {
+          const substitutions = type2.getSubstitutions();
+          if (substitutions.size > 0) {
+            const typesOfTypeArgument = Query.from(substitutions.getTypes()).flatMap((t) => this.getEntitiesThatMakeUpTheType(t)).toArray();
+            result.push(...typesOfTypeArgument);
+          }
+        }
+      }
+    }
+    return result;
+  }
 };
 var DefinitionsAndReferenceInfo = class {
   constructor(definitionLocations, referenceRange) {
@@ -13476,6 +13604,8 @@ var _LanguageServer = class _LanguageServer {
     this.disposables.push(disposable);
     disposable = this.connection.onDefinition((params, token) => this.withTaskController(token, (taskController) => this.onDefinition(params, taskController)));
     this.disposables.push(disposable);
+    disposable = this.connection.onTypeDefinition((params, token) => this.withTaskController(token, (taskController) => this.onTypeDefinition(params, taskController)));
+    this.disposables.push(disposable);
     disposable = this.connection.onReferences((params, token) => this.withTaskController(token, (taskController) => this.onReferences(params, taskController)));
     this.disposables.push(disposable);
     disposable = this.connection.onDocumentHighlight((params, token) => this.withTaskController(token, (taskController) => this.onDocumentHighlight(params, taskController)));
@@ -13639,6 +13769,7 @@ var _LanguageServer = class _LanguageServer {
             }
           },
           definitionProvider: true,
+          typeDefinitionProvider: true,
           referencesProvider: true,
           documentHighlightProvider: true,
           renameProvider: {
@@ -13901,6 +14032,38 @@ var _LanguageServer = class _LanguageServer {
       return result;
     });
   }
+  onTypeDefinition(params, taskController) {
+    return __async(this, null, function* () {
+      const sourceFileContext = yield this.getSourceFileContext(URI.parse(params.textDocument.uri), taskController);
+      if (sourceFileContext === void 0) {
+        return;
+      }
+      const { analyzer, sourceFile } = sourceFileContext;
+      const position = new Position(params.position.line, params.position.character);
+      const offset = sourceFile.getOffsetAtPosition(position);
+      const definitionAndReferenceInfo = yield this.definitionService.getTypeDefinition(
+        analyzer,
+        sourceFile,
+        offset,
+        taskController
+      );
+      if (definitionAndReferenceInfo === void 0) {
+        return;
+      }
+      const { definitionLocations, referenceRange } = definitionAndReferenceInfo;
+      const originSelectionRange = this.convertSourceFileRange(sourceFile, referenceRange);
+      const result = definitionLocations.map((l) => {
+        const targetRange = this.convertSourceFileRange(l.sourceFile, l.range);
+        return {
+          targetUri: this.convertUriToVscodeUri(l.sourceFile.uri).toString(),
+          originSelectionRange,
+          targetRange,
+          targetSelectionRange: targetRange
+        };
+      });
+      return result;
+    });
+  }
   onReferences(params, taskController) {
     return __async(this, null, function* () {
       let result = new Array();

package/build/{chunk-WK4LR3UK.js → chunk-FXUDXUOA.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-CZDVEX34.js";
+} from "./chunk-OA77CG6M.js";
 import {
   ArtelVersion,
   Cached,
@@ -15,7 +15,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-HOEHBJ7R.js";
+} from "./chunk-GZUU2AYH.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";