@artel/artc 0.6.25229 → 0.6.25231

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-4UBNOTKC.js";
-import "./chunk-2FHW6RUS.js";
+} from "./chunk-BG2YEIQO.js";
+import "./chunk-VQ5GGKF7.js";
 import {
   __async
-} from "./chunk-6YPLDA76.js";
+} from "./chunk-S7CAJWX2.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-2FHW6RUS.js";
+} from "../chunk-VQ5GGKF7.js";
 import {
   AccessKind,
   AccessedFunctionValueParameter,
@@ -17,6 +17,7 @@ import {
   AnonymousFunctionTypeDeclarationEntity,
   AnonymousStructuredTypeDeclarationEntity,
   AnonymousVariantTypeDeclarationEntity,
+  ArrayUtils,
   ArtelSourceAndConfigurationFileExtensionSet,
   ArtelSourceFileExtensionSet,
   ArtelSourceFileExtensions,
@@ -226,7 +227,6 @@ import {
   TypeMemberLookup,
   TypeMemberLookupOptions,
   TypeParameterConstraint,
-  TypeUtils,
   UnfinishedIntrinsicAnonymousFunctionTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageFunctionTypeEntity,
@@ -285,6 +285,7 @@ import {
   keywordKindByOperatorKind,
   localeToString,
   locales,
+  modifierToModifierFlag,
   operatorKindsBySyntacticalOperatorKind,
   parseBinaryInteger,
   parseCyrillicHexInteger,
@@ -313,7 +314,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldExecution
-} from "../chunk-6YPLDA76.js";
+} from "../chunk-S7CAJWX2.js";
 export {
   AccessKind,
   AccessedFunctionValueParameter,
@@ -330,6 +331,7 @@ export {
   AnonymousFunctionTypeDeclarationEntity,
   AnonymousStructuredTypeDeclarationEntity,
   AnonymousVariantTypeDeclarationEntity,
+  ArrayUtils,
   ArtelSourceAndConfigurationFileExtensionSet,
   ArtelSourceFileExtensionSet,
   ArtelSourceFileExtensions,
@@ -536,7 +538,6 @@ export {
   TypeMemberLookup,
   TypeMemberLookupOptions,
   TypeParameterConstraint,
-  TypeUtils,
   UnfinishedIntrinsicAnonymousFunctionTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageFunctionTypeEntity,
@@ -598,6 +599,7 @@ export {
   keywordKindByOperatorKind,
   localeToString,
   locales,
+  modifierToModifierFlag,
   operatorKindsBySyntacticalOperatorKind,
   PackageContent_exports as packageContent,
   parseBinaryInteger,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-4UBNOTKC.js";
-import "../chunk-2FHW6RUS.js";
-import "../chunk-6YPLDA76.js";
+} from "../chunk-BG2YEIQO.js";
+import "../chunk-VQ5GGKF7.js";
+import "../chunk-S7CAJWX2.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -182,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-6YPLDA76.js";
+} from "../chunk-S7CAJWX2.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -2166,7 +2166,7 @@ var modifierSortOrder = {
   [41 /* Static */]: 1,
   [17 /* Basic */]: 2,
   [38 /* Abstract */]: 3,
-  [39 /* Redefined */]: 4,
+  [39 /* Override */]: 4,
   [40 /* Async */]: 5,
   [36 /* Const */]: 6
 };
@@ -3226,9 +3226,9 @@ var CompletionService = class {
       return new PackageImportCompletionContext([], void 0);
     }
     if (tokenOrKeyword.isToken(26 /* Dot */) && tokenOrKeyword.parent.kind === 78 /* MemberAccessExpression */) {
-      const propertyAccess = tokenOrKeyword.parent;
+      const memberAccess = tokenOrKeyword.parent;
       {
-        const info = this._analyzer.checkExpressionDenotesPackageNameSegment(propertyAccess.expression);
+        const info = this._analyzer.checkExpressionDenotesPackageNameSegment(memberAccess.expression);
         if (info !== void 0) {
           let lookup;
           if (info.packageTreeNode.package !== void 0) {
@@ -3242,7 +3242,7 @@ var CompletionService = class {
         }
       }
       {
-        const info = this._analyzer.checkExpressionDenotesPackageAlias(propertyAccess.expression);
+        const info = this._analyzer.checkExpressionDenotesPackageAlias(memberAccess.expression);
         if (info !== void 0) {
           const package_ = info.packageAlias.getPackage();
           if (package_ !== void 0) {
@@ -3253,9 +3253,9 @@ var CompletionService = class {
           return { kind: "none" };
         }
       }
-      const type = this._analyzer.type.ofExpression(propertyAccess.expression);
+      const type = this._analyzer.type.ofExpression(memberAccess.expression);
       const localizationContext = semanticContext.getLocalizationContext();
-      const isStaticAccess = this._analyzer.checkExpressionDenotesType(propertyAccess.expression) !== void 0;
+      const isStaticAccess = this._analyzer.checkExpressionDenotesType(memberAccess.expression) !== void 0;
       const hidingMatcher = semanticContext.getHidingMatcher();
       return new TypeMemberCompletionContext(
         type,
@@ -3652,7 +3652,7 @@ var CompletionService = class {
       kinds.add(18 /* Import */).add(7 /* Run */).add(31 /* Creation */).add(12 /* Function */).add(17 /* Basic */).add(16 /* Type */).add(58 /* Get */).add(59 /* Set */).add(55 /* Translations */);
     }
     if (syntaxContext.isPackageMemberDeclarationListContext || syntaxContext.isTypeMemberDeclarationListContext) {
-      kinds.add(37 /* Hidden */).add(41 /* Static */).add(17 /* Basic */).add(38 /* Abstract */).add(39 /* Redefined */).add(40 /* Async */).add(36 /* Const */);
+      kinds.add(37 /* Hidden */).add(41 /* Static */).add(17 /* Basic */).add(38 /* Abstract */).add(39 /* Override */).add(40 /* Async */).add(36 /* Const */);
     }
     if (syntaxContext.isTypeMemberDeclarationListContext) {
       kinds.add(31 /* Creation */).add(12 /* Function */).add(47 /* Destruction */).add(58 /* Get */).add(59 /* Set */);
@@ -4069,7 +4069,7 @@ var CompletionService = class {
             m.name,
             m.requiresExplicitOriginalName
           );
-        case "variable":
+        case "field":
           return new FieldCompletionItemInfo(
             this.completionItemInfoContext,
             m.value,
@@ -4604,22 +4604,22 @@ var PackageAliasEntityCompletionItemInfo = class {
   }
 };
 var FieldCompletionItemInfo = class {
-  constructor(ctx, variable, name, isNameExplicitlyOriginal) {
+  constructor(ctx, field, name, isNameExplicitlyOriginal) {
     this.ctx = ctx;
-    this.variable = variable;
+    this.field = field;
     this.name = name;
     this.isNameExplicitlyOriginal = isNameExplicitlyOriginal;
-    this.kind = "type-variable";
+    this.kind = "field";
   }
   getLabel() {
     return `${this.isNameExplicitlyOriginal ? "~" : ""}${this.ctx.getInsertTextForName(this.name.value)}`;
   }
   getCompletionItemKind() {
-    return this.variable.isVariant() ? 12 /* Variant */ : 2 /* Field */;
+    return this.field.isVariant() ? 12 /* Variant */ : 2 /* Field */;
   }
   getDetails() {
     return this.ctx.displayService.displayVariableDeclaration(
-      new VariableDeclaration_typeMember(this.variable, this.name.localization)
+      new VariableDeclaration_typeMember(this.field, this.name.localization)
     );
   }
   getInsertText() {
@@ -5519,7 +5519,7 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */) {
       return true;
     }
-    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 44 /* TypeMemberGroupDeclaration */) {
+    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */ && tokenOrKeyword.parent.parent.kind === 44 /* TypeMemberGroupDeclaration */) {
       return true;
     }
     if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 54 /* FieldDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 55 /* FieldGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 56 /* FieldSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
@@ -6034,7 +6034,7 @@ var NodeSemanticInfoService = class {
         result = void 0;
         break;
       case 78 /* MemberAccessExpression */:
-        result = this.ofProperty(analyzer, parent, options6);
+        result = this.ofMember(analyzer, parent, options6);
         break;
       case 52 /* MethodDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofMethodDeclaration(parent));
@@ -6067,7 +6067,7 @@ var NodeSemanticInfoService = class {
     }
     return result;
   }
-  static ofProperty(analyzer, node, options6) {
+  static ofMember(analyzer, node, options6) {
     let result;
     const meaning = analyzer.resolveMemberAccessExpression(node).meaning;
     switch (meaning.kind) {
@@ -6077,10 +6077,10 @@ var NodeSemanticInfoService = class {
           narrowedType = analyzer.type.ofExpression(node);
         }
         const target = new SimpleWithLocalization(new FieldReferenceTarget(
-          meaning.variable.value,
+          meaning.field.value,
           meaning.accessKind,
           narrowedType
-        ), meaning.variable.localization);
+        ), meaning.field.localization);
         result = new ReferenceNodeSemanticInfo([target], false);
         break;
       }
@@ -6090,10 +6090,10 @@ var NodeSemanticInfoService = class {
           narrowedType = analyzer.type.ofExpression(node);
         }
         const target = new SimpleWithLocalization(new FieldReferenceTarget(
-          meaning.variable.value,
+          meaning.field.value,
           meaning.accessKind,
           narrowedType
-        ), meaning.variable.localization);
+        ), meaning.field.localization);
         result = new ReferenceNodeSemanticInfo([target], false);
         break;
       }
@@ -6801,11 +6801,11 @@ var EntityReferenceTarget = class {
   }
 };
 var FieldReferenceTarget = class {
-  constructor(variable, accessKind, narrowedType) {
-    this.variable = variable;
+  constructor(field, accessKind, narrowedType) {
+    this.field = field;
     this.accessKind = accessKind;
     this.narrowedType = narrowedType;
-    this.kind = "type-variable";
+    this.kind = "field";
   }
 };
 var TypeValueParameterReferenceTarget = class {
@@ -7105,8 +7105,8 @@ var DefinitionService = class {
           return this.getSourceLocationsOfVariableEntity(analyzer, target.entity);
         }
         return getEntitySourceLocations(analyzer, target.entity);
-      case "type-variable":
-        return this.getSourceLocationsOfVariableEntity(analyzer, target.variable.getEntity());
+      case "field":
+        return this.getSourceLocationsOfVariableEntity(analyzer, target.field.getEntity());
       case "type-constructor":
         return getEntitySourceLocations(analyzer, target.constructor_.getEntity());
       case "accessed-function":
@@ -7143,8 +7143,8 @@ var DefinitionService = class {
     switch (target.kind) {
       case "entity":
         return target.entity;
-      case "type-variable":
-        return target.variable.getEntity();
+      case "field":
+        return target.field.getEntity();
       case "type-value-parameter":
         return target.parameter.getEntity();
       case "type-constructor":
@@ -7557,9 +7557,9 @@ var ReferencesService = class {
             target.localization,
             accessKindToReferenceKind(target.value.accessKind)
           );
-        case "type-variable":
+        case "field":
           return new DefinitionInfo(
-            target.value.variable.getEntity(),
+            target.value.field.getEntity(),
             target.localization,
             accessKindToReferenceKind(target.value.accessKind)
           );
@@ -8023,9 +8023,9 @@ var HoverService = class {
           firstTarget.value.narrowedType,
           range
         );
-      case "type-variable": {
+      case "field": {
         const declaration = new VariableDeclaration_typeMember(
-          firstTarget.value.variable,
+          firstTarget.value.field,
           firstTarget.localization,
           firstTarget.value.narrowedType
         );
@@ -8511,8 +8511,8 @@ var RenameService = class {
           case "entity":
             canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.entity);
             break;
-          case "type-variable":
-            canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.variable.getEntity());
+          case "field":
+            canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.field.getEntity());
             break;
           case "type-value-parameter":
             canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.parameter.getEntity());
@@ -8715,11 +8715,11 @@ var SemanticTokensService = class {
           if (node.kind === 78 /* MemberAccessExpression */) {
             const meaning = analyzer.resolveMemberAccessExpression(node).meaning;
             if (meaning.kind === "static-field-access") {
-              const entity = meaning.variable.value.getEntity();
+              const entity = meaning.field.value.getEntity();
               if (entity.subkind === "field" && entity.isVariant()) {
                 result.push(
                   new SemanticToken(
-                    node.propertyName.rangeWithoutTrivia,
+                    node.memberName.rangeWithoutTrivia,
                     3 /* Variant */,
                     new SemanticTokenModifiers().makeConst()
                   )
@@ -8742,7 +8742,7 @@ var SemanticTokensService = class {
               const func = suitableFunctions[0];
               result.push(
                 new SemanticToken(
-                  node.propertyName.rangeWithoutTrivia,
+                  node.memberName.rangeWithoutTrivia,
                   this.getSemanticTokenKindForFunctionEntity(func.getEntity()),
                   new SemanticTokenModifiers().setCapitalized(this.isCapitalizedName(func.getName()))
                 )
@@ -8750,7 +8750,7 @@ var SemanticTokensService = class {
             }
             if (meaning.kind === "operator-access") {
               result.push(new SemanticToken(
-                node.propertyName.rangeWithoutTrivia,
+                node.memberName.rangeWithoutTrivia,
                 7 /* Operator */,
                 new SemanticTokenModifiers()
               ));
@@ -11988,14 +11988,14 @@ var EntityToSyntax = class {
     if (entity.isStatic()) {
       commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
-    if (entity.isBasic()) {
+    if (entity.markedBasic()) {
       commonModifiers.push(SyntaxFactory.modifier(17 /* Basic */));
     }
-    if (entity.isOverridden()) {
-      commonModifiers.push(SyntaxFactory.modifier(39 /* Redefined */));
+    if (entity.isOverride()) {
+      commonModifiers.push(SyntaxFactory.modifier(39 /* Override */));
     }
     const name = this.getEntityName(entity);
     const type = this.convertType(entity.getType());
@@ -12043,14 +12043,14 @@ var EntityToSyntax = class {
     if (entity.isStatic()) {
       modifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
-    if (entity.isBasic()) {
+    if (entity.markedBasic()) {
       modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
     }
-    if (entity.isOverridden()) {
-      modifiers.push(SyntaxFactory.modifier(39 /* Redefined */));
+    if (entity.isOverride()) {
+      modifiers.push(SyntaxFactory.modifier(39 /* Override */));
     }
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
@@ -12065,7 +12065,7 @@ var EntityToSyntax = class {
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
@@ -12078,7 +12078,7 @@ var EntityToSyntax = class {
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
@@ -12089,7 +12089,7 @@ var EntityToSyntax = class {
     if (entity.isStatic()) {
       commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
@@ -12929,7 +12929,7 @@ var LanguageServer = class {
       Logger.info("\u041D\u0430\u0447\u0430\u0442\u0430 \u0438\u043D\u0438\u0446\u0438\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044F \u0441\u0435\u0440\u0432\u0438\u0441\u043E\u0432.");
       const initializeStartTime = performance.now();
       this._clientCapabilities = params.capabilities;
-      setUserLocale("ru");
+      setUserLocale(params.initializationOptions?.localeOverride ?? params.locale ?? "en");
       let workspaceFolderUris;
       if (params.initializationOptions?.workspaceFoldersOverride !== void 0) {
         workspaceFolderUris = params.initializationOptions.workspaceFoldersOverride.map((f) => this.convertVscodeUriToUri(URI2.parse(f.uri)));

package/build/{chunk-4UBNOTKC.js → chunk-BG2YEIQO.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-2FHW6RUS.js";
+} from "./chunk-VQ5GGKF7.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-6YPLDA76.js";
+} from "./chunk-S7CAJWX2.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";