@artel/artc 0.6.25228 → 0.6.25230

package/build/Cli.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import {
   CommandLineCompiler
-} from "./chunk-FHJJX7JY.js";
-import "./chunk-F5OW64UA.js";
+} from "./chunk-3LHZOXTJ.js";
+import "./chunk-WS3ILL2L.js";
 import {
   __async
-} from "./chunk-5GSDYTF6.js";
+} from "./chunk-ZUIGWNN5.js";
 
 // source/Cli.ts
 function main() {

package/build/api/Api.js

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "../chunk-F5OW64UA.js";
+} from "../chunk-WS3ILL2L.js";
 import {
   AccessKind,
   AccessedFunctionValueParameter,
@@ -226,7 +226,6 @@ import {
   TypeMemberLookup,
   TypeMemberLookupOptions,
   TypeParameterConstraint,
-  TypeUtils,
   UnfinishedIntrinsicAnonymousFunctionTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageFunctionTypeEntity,
@@ -313,7 +312,7 @@ import {
   withoutQuotes,
   withoutTemplateQuotes,
   yieldExecution
-} from "../chunk-5GSDYTF6.js";
+} from "../chunk-ZUIGWNN5.js";
 export {
   AccessKind,
   AccessedFunctionValueParameter,
@@ -536,7 +535,6 @@ export {
   TypeMemberLookup,
   TypeMemberLookupOptions,
   TypeParameterConstraint,
-  TypeUtils,
   UnfinishedIntrinsicAnonymousFunctionTypeEntity,
   UnfinishedIntrinsicAnonymousStructuredTypeEntity,
   UnfinishedIntrinsicPackageFunctionTypeEntity,

package/build/api/ApiNodeJS.js

@@ -6,9 +6,9 @@ import {
   PhysicalFileSystem,
   PhysicalTypeScriptLibrariesProvider,
   PrintingDiagnosticAcceptor
-} from "../chunk-FHJJX7JY.js";
-import "../chunk-F5OW64UA.js";
-import "../chunk-5GSDYTF6.js";
+} from "../chunk-3LHZOXTJ.js";
+import "../chunk-WS3ILL2L.js";
+import "../chunk-ZUIGWNN5.js";
 export {
   CommandLineCompiler,
   FileSystemUri,

package/build/api/ApiServices.js

@@ -182,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-5GSDYTF6.js";
+} from "../chunk-ZUIGWNN5.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -545,7 +545,7 @@ var SyntaxFactory = class {
   static packageVariableGetterDeclaration(tags, modifiers, name, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(59 /* Get */);
+    const getKeyword = this.keyword(58 /* Get */);
     const nameIdentifier = this.createIdentifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new PackageVariableGetterDeclaration(
@@ -560,7 +560,7 @@ var SyntaxFactory = class {
   static packageVariableSetterDeclaration(tags, modifiers, name, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const setKeyword = this.keyword(60 /* Set */);
+    const setKeyword = this.keyword(59 /* Set */);
     const nameIdentifier = this.createIdentifier(name);
     return new PackageVariableSetterDeclaration(tagList, modifierList, setKeyword, nameIdentifier, body);
   }
@@ -607,7 +607,7 @@ var SyntaxFactory = class {
   static fieldGetterDeclaration(tags, modifiers, name, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(59 /* Get */);
+    const getKeyword = this.keyword(58 /* Get */);
     const nameIdentifier = this.createIdentifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new FieldGetterDeclaration(
@@ -622,7 +622,7 @@ var SyntaxFactory = class {
   static fieldSetterDeclaration(tags, modifiers, name, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const setKeyword = this.keyword(60 /* Set */);
+    const setKeyword = this.keyword(59 /* Set */);
     const nameIdentifier = this.createIdentifier(name);
     return new FieldSetterDeclaration(tagList, modifierList, setKeyword, nameIdentifier, body);
   }
@@ -655,14 +655,14 @@ var SyntaxFactory = class {
   static destructorDeclaration(tags, modifiers, parameters, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const destructionKeyword = this.keyword(48 /* Destruction */);
+    const destructionKeyword = this.keyword(47 /* Destruction */);
     const parameterClause = this.parameterClause(parameters);
     return new DestructorDeclaration(tagList, modifierList, destructionKeyword, parameterClause, body);
   }
   static indexedElementGetterDeclaration(tags, modifiers, parameters, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(59 /* Get */);
+    const getKeyword = this.keyword(58 /* Get */);
     const parameterClause = this.indexParameterClause(parameters);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new IndexedElementGetterDeclaration(
@@ -677,7 +677,7 @@ var SyntaxFactory = class {
   static indexedElementSetterDeclaration(tags, modifiers, parameters, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(60 /* Set */);
+    const getKeyword = this.keyword(59 /* Set */);
     const parameterClause = this.indexParameterClause(parameters);
     return new IndexedElementSetterDeclaration(tagList, modifierList, getKeyword, parameterClause, body);
   }
@@ -845,7 +845,7 @@ var SyntaxFactory = class {
     return new FunctionBlock(openBraceToken, statementList, closeBraceToken);
   }
   static noneLiteral() {
-    return new KeywordExpression(this.keyword(58 /* None */));
+    return new KeywordExpression(this.keyword(57 /* None */));
   }
   static integerLiteral(value) {
     return new TokenExpression(this.token(2 /* IntegerLiteral */, value.toString()));
@@ -853,7 +853,7 @@ var SyntaxFactory = class {
   static translationsDeclaration(translations) {
     const tagList = new TagList([]);
     const modifierList = new ModifierList([]);
-    const translationsKeyword = this.keyword(56 /* Translations */);
+    const translationsKeyword = this.keyword(55 /* Translations */);
     const openBraceToken = this.token(43 /* OpenBrace */);
     const translationList = new TopLevelTranslationList(translations);
     const closeBraceToken = this.token(20 /* CloseBrace */);
@@ -2163,13 +2163,12 @@ var SyntaxToCode = class _SyntaxToCode {
 };
 var modifierSortOrder = {
   [37 /* Hidden */]: 0,
-  [42 /* Static */]: 1,
+  [41 /* Static */]: 1,
   [17 /* Basic */]: 2,
-  [39 /* Redefinable */]: 3,
-  [38 /* Abstract */]: 4,
-  [40 /* Redefined */]: 5,
-  [41 /* Async */]: 6,
-  [36 /* Const */]: 7
+  [38 /* Abstract */]: 3,
+  [39 /* Override */]: 4,
+  [40 /* Async */]: 5,
+  [36 /* Const */]: 6
 };
 
 // source/services/TreeUtils.ts
@@ -2349,7 +2348,7 @@ var TranslationsGenerationService = class {
         result = generator.generateMissingTypeMemberTranslations(tokenOrKeyword.parent);
       }
     }
-    if (result === void 0 && tokenOrKeyword.isKeyword(56 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */) {
+    if (result === void 0 && tokenOrKeyword.isKeyword(55 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */) {
       const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
       if (translationPackage !== void 0) {
         const generator = new TranslationsGenerator(
@@ -2375,7 +2374,7 @@ var TranslationsGenerationService = class {
     if (tokenOrKeyword === void 0) {
       return false;
     }
-    if (!(tokenOrKeyword.isKeyword(56 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */)) {
+    if (!(tokenOrKeyword.isKeyword(55 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */)) {
       return false;
     }
     const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
@@ -3650,22 +3649,22 @@ var CompletionService = class {
     }
     const kinds = /* @__PURE__ */ new Set();
     if (syntaxContext.isPackageMemberDeclarationListContext) {
-      kinds.add(18 /* Import */).add(7 /* Run */).add(31 /* Creation */).add(12 /* Function */).add(17 /* Basic */).add(16 /* Type */).add(59 /* Get */).add(60 /* Set */).add(56 /* Translations */);
+      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(42 /* Static */).add(39 /* Redefinable */).add(38 /* Abstract */).add(40 /* Redefined */).add(41 /* 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(48 /* Destruction */).add(59 /* Get */).add(60 /* Set */);
+      kinds.add(31 /* Creation */).add(12 /* Function */).add(47 /* Destruction */).add(58 /* Get */).add(59 /* Set */);
     }
     if (syntaxContext.isStatementContext) {
-      kinds.add(7 /* Run */).add(35 /* For */).add(25 /* While */).add(26 /* Loop */).add(15 /* Return */).add(20 /* Error */).add(19 /* Important */).add(28 /* Yield */).add(33 /* BreakLoop */).add(34 /* ContinueLoop */).add(13 /* If */).add(45 /* Switch */).add(1 /* Let */).add(36 /* Const */).add(47 /* Dispose */).add(8 /* Try */).add(12 /* Function */).add(41 /* Async */);
+      kinds.add(7 /* Run */).add(35 /* For */).add(25 /* While */).add(26 /* Loop */).add(15 /* Return */).add(20 /* Error */).add(19 /* Important */).add(28 /* Yield */).add(33 /* BreakLoop */).add(34 /* ContinueLoop */).add(13 /* If */).add(44 /* Switch */).add(1 /* Let */).add(36 /* Const */).add(46 /* Dispose */).add(8 /* Try */).add(12 /* Function */).add(40 /* Async */);
     }
     if (this.isFromKeywordContext(positionDescription)) {
       kinds.add(9 /* From */);
     }
     if (syntaxContext.isExpressionContext !== void 0) {
-      kinds.add(44 /* Not */).add(53 /* Yes */).add(54 /* No */).add(58 /* None */).add(41 /* Async */).add(12 /* Function */).add(55 /* Reference */).add(2 /* Autotype */).add(30 /* Cond */);
+      kinds.add(43 /* Not */).add(52 /* Yes */).add(53 /* No */).add(57 /* None */).add(40 /* Async */).add(12 /* Function */).add(54 /* Reference */).add(2 /* Autotype */).add(30 /* Cond */);
       if (positionDescription.kind === "after-token-or-keyword") {
         const container = semanticContext.getContainingTypeOrTypeExtension();
         if (container !== void 0) {
@@ -3673,17 +3672,17 @@ var CompletionService = class {
           if (container.kind === "type") {
             const typeEntity = container.value;
             if (typeEntity?.typeEntityKind === 1 /* Structured */ && typeEntity.getBaseObjectType() !== void 0 || typeEntity?.typeEntityKind === 3 /* Variant */ || typeEntity?.typeEntityKind === 4 /* Alias */) {
-              kinds.add(57 /* Base */);
+              kinds.add(56 /* Base */);
             }
           }
         }
       }
     }
     if (this.isTypeKindCompletionContext(positionDescription)) {
-      kinds.add(4 /* Object */).add(5 /* PlainObject */).add(3 /* Aspect */).add(6 /* Variant */).add(12 /* Function */).add(41 /* Async */);
+      kinds.add(4 /* Object */).add(5 /* PlainObject */).add(3 /* Aspect */).add(6 /* Variant */).add(12 /* Function */).add(40 /* Async */);
     }
     if (this.isCaseKeywordContext(positionDescription, syntaxContext)) {
-      kinds.add(46 /* Case */);
+      kinds.add(45 /* Case */);
     }
     if (this.isCatchKeywordContext(positionDescription)) {
       kinds.add(32 /* Catch */);
@@ -3695,18 +3694,18 @@ var CompletionService = class {
       kinds.add(10 /* Else */).add(11 /* ElseIf */);
     }
     if (syntaxContext.precedingExpression !== void 0) {
-      kinds.add(43 /* As */).add(14 /* Is */).add(22 /* And */).add(23 /* Or */).add(24 /* Xor */).add(29 /* When */);
+      kinds.add(42 /* As */).add(14 /* Is */).add(22 /* And */).add(23 /* Or */).add(24 /* Xor */).add(29 /* When */);
     }
     if (this.isModifierLevelContext(positionDescription)) {
-      kinds.add(52 /* InType */).add(49 /* InHierarchy */).add(50 /* InFile */).add(51 /* InPackage */);
+      kinds.add(51 /* InType */).add(48 /* InHierarchy */).add(49 /* InFile */).add(50 /* InPackage */);
     }
     if (this.isRepeatWhileKeywordContext(positionDescription)) {
       kinds.add(27 /* RepeatWhile */);
     }
     if (syntaxContext.isUnqualifiedTypeContext?.allowsAnonymousTypes === true) {
-      kinds.add(5 /* PlainObject */).add(4 /* Object */).add(6 /* Variant */).add(3 /* Aspect */).add(12 /* Function */).add(41 /* Async */);
+      kinds.add(5 /* PlainObject */).add(4 /* Object */).add(6 /* Variant */).add(3 /* Aspect */).add(12 /* Function */).add(40 /* Async */);
     }
-    if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(41 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 58 /* NestedFunctionDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 74 /* FunctionLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 29 /* FunctionTypeDeclarationBody */)) {
+    if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(40 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 58 /* NestedFunctionDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 74 /* FunctionLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 29 /* FunctionTypeDeclarationBody */)) {
       kinds.add(12 /* Function */);
     }
     return Query.from(kinds.values()).map(
@@ -4070,7 +4069,7 @@ var CompletionService = class {
             m.name,
             m.requiresExplicitOriginalName
           );
-        case "variable":
+        case "field":
           return new FieldCompletionItemInfo(
             this.completionItemInfoContext,
             m.value,
@@ -4605,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() {
@@ -5423,7 +5422,7 @@ var SyntaxContextFactory = class {
         return { isExpressionContext: void 0, isStatementContext: false };
       }
     }
-    if (tokenOrKeyword.isKeyword(46 /* Case */) && tokenOrKeyword.parent.kind === 121 /* CaseClause */) {
+    if (tokenOrKeyword.isKeyword(45 /* Case */) && tokenOrKeyword.parent.kind === 121 /* CaseClause */) {
       const expressionRole = new ExpressionRole_matchListElement(tokenOrKeyword.parent.parent.parent);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
@@ -5439,7 +5438,7 @@ var SyntaxContextFactory = class {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(45 /* Switch */) && tokenOrKeyword.parent.kind === 119 /* SwitchStatement */) {
+    if (tokenOrKeyword.isKeyword(44 /* Switch */) && tokenOrKeyword.parent.kind === 119 /* SwitchStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
@@ -5609,7 +5608,7 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isKeyword(14 /* Is */) && tokenOrKeyword.parent.kind === 73 /* IsExpression */) {
       return { allowsAnonymousTypes: true };
     }
-    if (tokenOrKeyword.isKeyword(43 /* As */) && tokenOrKeyword.parent.kind === 65 /* AsExpression */) {
+    if (tokenOrKeyword.isKeyword(42 /* As */) && tokenOrKeyword.parent.kind === 65 /* AsExpression */) {
       return { allowsAnonymousTypes: true };
     }
     if (tokenOrKeyword.isToken(17 /* Bar */) && tokenOrKeyword.parent.kind === 11 /* UnionTypeSpecifier */) {
@@ -5822,7 +5821,7 @@ var NodeSemanticInfoService = class {
       return this.ofDefaultMatchExpression(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 86 /* ObjectExpression */) {
       return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options6);
-    } else if (tokenOrKeyword.isKeyword(57 /* Base */) && tokenOrKeyword.parent.kind === 87 /* BaseExpression */) {
+    } else if (tokenOrKeyword.isKeyword(56 /* Base */) && tokenOrKeyword.parent.kind === 87 /* BaseExpression */) {
       return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options6);
     } else if ((tokenOrKeyword.isToken(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 49 /* IndexParameterClause */) {
       return this.ofIndexedElementAccessorDeclaration(analyzer, tokenOrKeyword.parent.parent);
@@ -6078,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;
       }
@@ -6091,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;
       }
@@ -6802,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 {
@@ -7106,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":
@@ -7144,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":
@@ -7558,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)
           );
@@ -8024,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
         );
@@ -8076,7 +8075,7 @@ var HoverService = class {
           const typeText = this._displayService.displayType(firstTarget.value.type);
           return new Hover(`${keywordText}: ${typeText}`, range);
         } else if (firstTarget.value.typeContextKind === "base") {
-          const keywordText = this._displayService.displayKeyword(57 /* Base */);
+          const keywordText = this._displayService.displayKeyword(56 /* Base */);
           const typeText = this._displayService.displayType(firstTarget.value.type);
           return new Hover(`${keywordText}: ${typeText}`, range);
         } else {
@@ -8403,21 +8402,21 @@ var SourceFileItemsService = class {
       case 10 /* Constructor */:
         return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(31 /* Creation */, this.locale, this.dialect);
       case 11 /* Destructor */:
-        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(48 /* Destruction */, this.locale, this.dialect);
+        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(47 /* Destruction */, this.locale, this.dialect);
       case 9 /* Variant */:
         return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(6 /* Variant */, this.locale, this.dialect)}>`;
       case 18 /* TypeParameter */:
         return name ?? `<${LocalizationHelper.localizeHelperPhrase(2 /* TypeParameter */, this.locale)}>`;
       case 2 /* PackageVariableGetter */:
       case 13 /* FieldGetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
       case 3 /* PackageVariableSetter */:
       case 14 /* FieldSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(60 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
       case 16 /* IndexedElementGetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Get */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Get */, this.locale, this.dialect)} []`;
       case 17 /* IndexedElementSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(60 /* Set */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} []`;
       default:
         Debug.never(kind);
     }
@@ -8512,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());
@@ -8716,7 +8715,7 @@ 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(
@@ -11902,7 +11901,7 @@ var EntityToSyntax = class {
     const tags = this.convertTags(entity.getTags());
     const modifiers = new Array();
     if (entity.isAsync()) {
-      modifiers.push(SyntaxFactory.modifier(41 /* Async */));
+      modifiers.push(SyntaxFactory.modifier(40 /* Async */));
     }
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
@@ -11987,16 +11986,16 @@ var EntityToSyntax = class {
       commonModifiers.push(SyntaxFactory.modifier(36 /* Const */));
     }
     if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(42 /* Static */));
+      commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
-    if (entity.isRedefinable()) {
-      commonModifiers.push(SyntaxFactory.modifier(39 /* Redefinable */));
+    if (entity.markedBasic()) {
+      commonModifiers.push(SyntaxFactory.modifier(17 /* Basic */));
     }
-    if (entity.isRedefined()) {
-      commonModifiers.push(SyntaxFactory.modifier(40 /* Redefined */));
+    if (entity.isOverride()) {
+      commonModifiers.push(SyntaxFactory.modifier(39 /* Override */));
     }
     const name = this.getEntityName(entity);
     const type = this.convertType(entity.getType());
@@ -12042,16 +12041,16 @@ var EntityToSyntax = class {
       modifiers.push(this.createHidingModifier(isHidden));
     }
     if (entity.isStatic()) {
-      modifiers.push(SyntaxFactory.modifier(42 /* Static */));
+      modifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
-    if (entity.isRedefinable()) {
-      modifiers.push(SyntaxFactory.modifier(39 /* Redefinable */));
+    if (entity.markedBasic()) {
+      modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
     }
-    if (entity.isRedefined()) {
-      modifiers.push(SyntaxFactory.modifier(40 /* Redefined */));
+    if (entity.isOverride()) {
+      modifiers.push(SyntaxFactory.modifier(39 /* Override */));
     }
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
@@ -12066,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());
@@ -12079,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());
@@ -12088,9 +12087,9 @@ var EntityToSyntax = class {
   convertIndexer(entity) {
     const commonModifiers = new Array();
     if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(42 /* Static */));
+      commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.isAbstract()) {
+    if (entity.markedAbstract()) {
       commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
@@ -12205,16 +12204,16 @@ var EntityToSyntax = class {
     let levelKeyword;
     switch (hiding.kind) {
       case "type":
-        levelKeyword = 52 /* InType */;
+        levelKeyword = 51 /* InType */;
         break;
       case "type-hierarchy":
-        levelKeyword = 49 /* InHierarchy */;
+        levelKeyword = 48 /* InHierarchy */;
         break;
       case "file":
-        levelKeyword = 50 /* InFile */;
+        levelKeyword = 49 /* InFile */;
         break;
       case "package":
-        levelKeyword = 51 /* InPackage */;
+        levelKeyword = 50 /* InPackage */;
         break;
       default:
         Debug.never(hiding);
@@ -12930,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-FHJJX7JY.js → chunk-3LHZOXTJ.js}

@@ -1,6 +1,6 @@
 import {
   Compiler
-} from "./chunk-F5OW64UA.js";
+} from "./chunk-WS3ILL2L.js";
 import {
   ArtelVersion,
   Cached,
@@ -14,7 +14,7 @@ import {
   __async,
   performanceMeasurementStageNames,
   performanceMeasurementStages
-} from "./chunk-5GSDYTF6.js";
+} from "./chunk-ZUIGWNN5.js";
 
 // source/executor/FileSystemUri.ts
 import { platform } from "os";

package/build/{chunk-F5OW64UA.js → chunk-WS3ILL2L.js}

@@ -10,7 +10,7 @@ import {
   WellKnownDeclarationsLoadError,
   __async,
   createTsInteropInputsForCompilation
-} from "./chunk-5GSDYTF6.js";
+} from "./chunk-ZUIGWNN5.js";
 
 // source/executor/Compiler.ts
 var Compiler = class {