@artel/artc 0.6.25228 → 0.6.25230

package/build/types/entities/FunctionTypeEntity.d.ts

@@ -54,7 +54,7 @@ export declare class PackageFunctionTypeDeclarationEntity implements PackageFunc
     private readonly _valueParameters;
     private readonly _members;
     private readonly _baseObjectType;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageFunctionTypeDeclaration);
     getNaming(): EntityNaming;

package/build/types/entities/GetterEntity.d.ts

@@ -26,7 +26,7 @@ export declare class PackageVariableGetterDeclarationEntity implements GetterEnt
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariableGetterDeclaration);
     getReturnType(): types.Type;
@@ -40,7 +40,7 @@ export declare class FieldGetterDeclarationEntity implements GetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: FieldGetterDeclaration);
     getReturnType(): types.Type;
@@ -54,7 +54,7 @@ export declare class IndexedElementGetterDeclarationEntity implements GetterEnti
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: IndexedElementGetterDeclaration);
     getReturnType(): types.Type;
@@ -68,7 +68,7 @@ export declare class DereferencedVariableGetterDeclarationEntity implements Gett
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Getter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: DereferencedVariableGetterDeclaration);
     getReturnType(): types.Type;

package/build/types/entities/IndexerEntity.d.ts

@@ -1,6 +1,6 @@
 import { Analyzer } from '../analysis/index.js';
 import { Tag } from '../analysis/Tags.js';
-import { ParameterDeclaration, IndexedElementGetterDeclaration, IndexedElementSetterDeclaration } from '../tree/index.js';
+import { IndexedElementGetterDeclaration, IndexedElementSetterDeclaration, ParameterDeclaration } from '../tree/index.js';
 import * as types from '../types/index.js';
 import { DefinitionKind, EntityHidingLevel, EntityKind, GetterEntity, ParameterVariableEntity, SetterEntity, TypeMemberEntityContainer } from './index.js';
 export interface IndexerEntity {
@@ -13,9 +13,9 @@ export interface IndexerEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Indexer[];
 }
@@ -38,7 +38,7 @@ export declare class IndexerDeclarationEntity implements SourceIndexerEntity {
     private readonly _getterOrSetterDeclaration;
     private readonly _parameters;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get parameters();
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: IndexedElementGetterDeclaration | undefined, setterDeclaration: IndexedElementSetterDeclaration | undefined);
@@ -51,9 +51,9 @@ export declare class IndexerDeclarationEntity implements SourceIndexerEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Indexer[];
     private createParameters;

package/build/types/entities/OperatorEntity.d.ts

@@ -11,9 +11,9 @@ export interface OperatorEntity {
     getDefinition(): OperatorDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Operator[];
@@ -29,7 +29,7 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     private readonly _operatorKind;
     private readonly _valueParameters;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: tree.OperatorDeclaration);
     getOperatorKind(): OperatorKind;
@@ -38,9 +38,9 @@ export declare class OperatorDeclarationEntity implements OperatorEntity {
     getDefinition(): OperatorDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Operator[];

package/build/types/entities/SetterEntity.d.ts

@@ -24,7 +24,7 @@ export declare class PackageVariableSetterDeclarationEntity implements SetterEnt
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -37,7 +37,7 @@ export declare class FieldSetterDeclarationEntity implements SetterEntity {
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: FieldSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -50,7 +50,7 @@ export declare class IndexedElementSetterDeclarationEntity implements SetterEnti
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: IndexedElementSetterDeclaration);
     getDefinition(): SetterEntityDefinition;
@@ -63,7 +63,7 @@ export declare class DereferencedVariableSetterDeclarationEntity implements Sett
     private readonly _analyzer;
     private readonly _node;
     readonly kind = EntityKind.Setter;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: DereferencedVariableSetterDeclaration);
     getDefinition(): SetterEntityDefinition;

package/build/types/entities/StructuredTypeEntity.d.ts

@@ -149,7 +149,7 @@ export declare class SourcePackageStructuredTypeDeclarationData {
     private readonly _baseObjectType;
     private readonly _baseAspectTypes;
     private readonly _members;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: PackageStructuredTypeDeclaration, entity: PackageStructuredTypeEntity);
     getNaming(): EntityNaming;

package/build/types/entities/TypeExtensionEntity.d.ts

@@ -21,7 +21,7 @@ export declare class SourceTypeExtensionEntity implements TypeExtensionEntity {
     private readonly _analyzer;
     private readonly _node;
     private readonly _members;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: TypeExtensionDeclaration);
     getMembers(): OriginalTypeEntityMembers;

package/build/types/entities/VariableEntity.d.ts

@@ -15,10 +15,10 @@ export interface FieldEntity extends IVariableEntity {
     readonly subkind: 'field';
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    isOverride(): boolean;
+    markedBasic(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export interface ParameterVariableEntity extends IVariableEntity {
@@ -109,7 +109,7 @@ export declare class PackageVariableDeclarationEntity implements PackageVariable
     readonly kind = EntityKind.Variable;
     readonly subkind = "package";
     private readonly _typeInferrer;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: tree.PackageVariableDeclaration);
@@ -132,7 +132,7 @@ export declare class ComputedPackageVariableDeclarationEntity implements Package
     private readonly _getterDeclaration;
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: tree.PackageVariableGetterDeclaration | undefined, setterDeclaration: tree.PackageVariableSetterDeclaration | undefined);
     getName(): Name;
@@ -153,7 +153,7 @@ export declare class FieldDeclarationEntity implements FieldEntity {
     private readonly _node;
     private readonly _typeInferrer;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private _hasReportedAllDiagnostics;
     private get modifierFlags();
     constructor(analyzer: Analyzer, node: tree.FieldDeclaration);
@@ -168,10 +168,10 @@ export declare class FieldDeclarationEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     ensureAllDiagnosticsReported(): void;
 }
@@ -183,7 +183,7 @@ export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     private readonly _setterDeclaration;
     private readonly _getterOrSetterDeclaration;
     private readonly _overriddenMembers;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(analyzer: Analyzer, getterDeclaration: tree.FieldGetterDeclaration | undefined, setterDeclaration: tree.FieldSetterDeclaration | undefined);
     getName(): Name;
@@ -192,15 +192,15 @@ export declare class ComputedFieldDeclarationEntity implements FieldEntity {
     isHidden(): EntityHidingLevel | undefined;
     isConstant(): boolean;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getDefinition(): VariableEntityDefinition;
     getGetter(): GetterEntity | undefined;
     getSetter(): SetterEntity | undefined;
     isSpecial(): SpecialVariableEntityInfo | undefined;
     getTags(): readonly Tag[];
-    getOverriddenMembers(): readonly types.Variable[];
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class VariantDeclarationEntity implements FieldEntity {
@@ -222,10 +222,10 @@ export declare class VariantDeclarationEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class LocalVariableDeclarationEntity implements LocalVariableEntity {
@@ -383,9 +383,9 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     private readonly _type;
     private readonly _container;
     private readonly _isStatic;
-    private readonly _isRedefinable;
-    private readonly _isRedefined;
-    private readonly _isAbstract;
+    private readonly _markedBasic;
+    private readonly _isOverride;
+    private readonly _markedAbstract;
     private readonly _isSpecial;
     private readonly _isHidden;
     private readonly _getter;
@@ -393,7 +393,7 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     private readonly _overriddenMembers;
     readonly kind = EntityKind.Variable;
     readonly subkind = "field";
-    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _isRedefinable: boolean, _isRedefined: boolean, _isAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMembers: readonly types.Variable[]);
+    constructor(_name: Name, _type: types.Type, _container: TypeMemberEntityContainer, _isStatic: boolean, _markedBasic: boolean, _isOverride: boolean, _markedAbstract: boolean, _isSpecial: SpecialVariableEntityInfo | undefined, _isHidden: EntityHidingLevel | undefined, _getter: GetterEntity | undefined, _setter: SetterEntity | undefined, _overriddenMembers: readonly types.Field[]);
     getName(): Name;
     getType(): types.Type;
     getDefinition(): VariableEntityDefinition;
@@ -405,10 +405,10 @@ export declare class IntrinsicFieldEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
 }
 export declare class IntrinsicParameterVariableEntity implements ParameterVariableEntity {

package/build/types/entities/VariantTypeEntity.d.ts

@@ -49,7 +49,7 @@ export declare class PackageVariantTypeDeclarationEntity implements PackageVaria
     private readonly _members;
     private readonly _underlyingType;
     private readonly _baseObjectType;
-    private readonly _modifierFlags;
+    private _modifierFlags;
     private get modifierFlags();
     constructor(_analyzer: Analyzer, _node: PackageVariantTypeDeclaration);
     getNaming(): EntityNaming;

package/build/types/entities/index.d.ts

@@ -78,8 +78,36 @@ export declare function isEntityWithTags(entity: Entity): entity is EntityWithTa
 export type TypeMemberEntity = FieldEntity | MethodEntity | OperatorEntity | ConstructorEntity | DestructorEntity | IndexerEntity | DereferenceOperatorEntity;
 export declare function isTypeMemberEntity(entity: Entity): entity is TypeMemberEntity;
 export declare namespace TypeMemberEntity {
+    /**
+     * Возвращает `true`, если это член аспектного типа.
+     */
     function isAspectTypeMember(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление является всеобщим (помечено модификатором "всеобщее").
+     */
     function isStatic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление помечено модификатором "базовое".
+     */
+    function markedBasic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление можно заменить в производном типе.
+     *
+     * Объявление можно заменить в производном типе, если оно не всеобщее, и выполняется одно из условий:
+     * - объявление помечено модификатором "базовое"
+     * - объявление помечено модификатором "абстрактное"
+     * - объявление помечено модификатором "расширенное"
+     * - объявление является членом аспектного типа
+     */
+    function isBasic(entity: TypeMemberEntity): boolean;
+    /**
+     * Возвращает `true`, если объявление не имеет реализации.
+     *
+     * Объявление не имеет реализации, если выполняется одно из условий:
+     * - объявление помечено модификатором "абстрактное"
+     * - объявление является является членом аспекта, не помечено модификатором "базовое" и не является всеобщим.
+     */
+    function isAbstract(entity: TypeMemberEntity): boolean;
 }
 export declare function entityToStringDecorator<T extends {
     new (...args: any[]): Entity;

package/build/types/project/SourcePackage.d.ts

@@ -38,8 +38,10 @@ export declare class TranslationPackageConfiguration {
     readonly targetPackageName: PackageName;
     readonly translatedName: PackageName;
     readonly translationLocale: PackageLocale;
+    readonly locale: PackageLocale;
+    readonly dialect?: PackageDialect | undefined;
     get name(): PackageName;
-    constructor(targetPackageName: PackageName, translatedName: PackageName, translationLocale: PackageLocale);
+    constructor(targetPackageName: PackageName, translatedName: PackageName, translationLocale: PackageLocale, locale: PackageLocale, dialect?: PackageDialect | undefined);
 }
 export declare class ProgramPackageConfiguration {
     readonly name: PackageName;

package/build/types/project/configuration/ConfigurationConverter.d.ts

@@ -8,7 +8,7 @@ export declare class ConfigurationConverter {
     static convert(configurations: readonly origin.Configuration[], packageOrGroupUri?: Uri, defaultLocale?: PackageLocale, defaultDialect?: PackageDialect): ConvertedConfiguration;
     static convertPackageConfiguration(configuration: origin.Package, packageOrGroupUri?: Uri, defaultLocale?: PackageLocale, defaultDialect?: PackageDialect): ProgramPackageConfiguration;
     static convertPackageGroupConfiguration(configuration: origin.PackageGroup): PackageGroupConfiguration;
-    static convertTranslationsConfiguration(configuration: origin.Translations): TranslationPackageConfiguration;
+    static convertTranslationsConfiguration(configuration: origin.Translations, defaultLocale?: PackageLocale, defaultDialect?: PackageDialect): TranslationPackageConfiguration;
     private static convertJavaScriptImplementation;
     private static convertLanguage;
     private static convertDialect;

package/build/types/project/configuration/types/PackageConfigurationEn.d.ts

@@ -21,6 +21,8 @@ export interface Translations {
     originalPackageName: string;
     translatedPackageName: string;
     translationLanguage: Language;
+    language?: Language;
+    dialect?: Dialect;
 }
 export declare enum Language {
     Russian = "russian",

package/build/types/project/configuration/types/PackageConfigurationRu.d.ts

@@ -21,6 +21,8 @@ export interface Переводы {
     имяПакетаИсходное: string;
     имяПакетаПереведённое: string;
     языкПеревода: Язык;
+    язык?: Язык;
+    диалект?: Диалект;
 }
 export declare enum Язык {
     Русский = "\u0440\u0443\u0441\u0441\u043A\u0438\u0439",

package/build/types/services/DisplayService.d.ts

@@ -86,11 +86,11 @@ export declare class VariableDeclaration_entity implements IVariableDeclaration
     getContainer(): DeclarationContainer | undefined;
 }
 export declare class VariableDeclaration_typeMember implements IVariableDeclaration {
-    readonly value: types.Variable;
+    readonly value: types.Field;
     readonly localization: Localization;
     readonly narrowedType?: types.Type | undefined;
     readonly kind = "type-member";
-    constructor(value: types.Variable, localization: Localization, narrowedType?: types.Type | undefined);
+    constructor(value: types.Field, localization: Localization, narrowedType?: types.Type | undefined);
     getEntity(): e.VariableEntity;
     getLocalization(): Localization;
     getType(): types.Type;

package/build/types/services/NodeSemanticInfo.d.ts

@@ -63,11 +63,11 @@ export declare class EntityReferenceTarget {
     constructor(entity: Entity, accessKind: AccessKind, narrowedType?: types.Type | undefined);
 }
 export declare class FieldReferenceTarget {
-    readonly variable: types.Variable;
+    readonly field: types.Field;
     readonly accessKind: AccessKind;
     readonly narrowedType: types.Type | undefined;
-    readonly kind = "type-variable";
-    constructor(variable: types.Variable, accessKind: AccessKind, narrowedType: types.Type | undefined);
+    readonly kind = "field";
+    constructor(field: types.Field, accessKind: AccessKind, narrowedType: types.Type | undefined);
 }
 export declare class TypeValueParameterReferenceTarget {
     readonly parameter: types.ValueParameter;

package/build/types/tree/KeywordKind.d.ts

@@ -38,26 +38,25 @@ export declare enum KeywordKind {
     Const = 36,
     Hidden = 37,
     Abstract = 38,
-    Redefinable = 39,
-    Redefined = 40,
-    Async = 41,
-    Static = 42,
-    As = 43,
-    Not = 44,
-    Switch = 45,
-    Case = 46,
-    Dispose = 47,
-    Destruction = 48,
-    InHierarchy = 49,
-    InFile = 50,
-    InPackage = 51,
-    InType = 52,
-    Yes = 53,
-    No = 54,
-    Reference = 55,
-    Translations = 56,
-    Base = 57,
-    None = 58,
-    Get = 59,
-    Set = 60
+    Override = 39,
+    Async = 40,
+    Static = 41,
+    As = 42,
+    Not = 43,
+    Switch = 44,
+    Case = 45,
+    Dispose = 46,
+    Destruction = 47,
+    InHierarchy = 48,
+    InFile = 49,
+    InPackage = 50,
+    InType = 51,
+    Yes = 52,
+    No = 53,
+    Reference = 54,
+    Translations = 55,
+    Base = 56,
+    None = 57,
+    Get = 58,
+    Set = 59
 }

package/build/types/tree/green/BaseNode.d.ts

@@ -1,4 +1,4 @@
-import { Node } from './index.js';
+import { Node, Token } from './index.js';
 export declare abstract class BaseNode {
     protected _rangeLength: number;
     protected abstract thisAsNode: Node;
@@ -9,4 +9,6 @@ export declare abstract class BaseNode {
      * Информация для оценки размера дерева при отладке.
      */
     get descendantCount(): number;
+    findLeftmostToken(): Token | undefined;
+    private countDescendants;
 }

package/build/types/tree/green/Nodes.d.ts

@@ -2104,7 +2104,7 @@ export declare class Modifier extends BaseNode {
     toRed(rangeStart: number, parent: red.ModifierParent): red.Modifier;
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
-export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Redefinable | KeywordKind.Abstract | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Const;
+export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Override | KeywordKind.Async | KeywordKind.Const;
 export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export declare class ParameterClause extends BaseNode {
     readonly kind = NodeKind.ParameterClause;

package/build/types/tree/red/BaseNode.d.ts

@@ -1,6 +1,6 @@
 import { Range } from '../../common/index.js';
 import * as green from '../green/index.js';
-import { Node } from './index.js';
+import { Node, Token } from './index.js';
 export declare abstract class BaseNode {
     readonly green: green.Node;
     readonly rangeStart: number;
@@ -12,4 +12,5 @@ export declare abstract class BaseNode {
     get debuggerDisplay(): string;
     get descendantCount(): number;
     constructor(green: green.Node, rangeStart: number, parent: Node | undefined);
+    findLeftmostToken(): Token | undefined;
 }

package/build/types/tree/red/Nodes.d.ts

@@ -2085,7 +2085,7 @@ export declare class Modifier extends BaseNode {
     private createChildren;
 }
 export type ModifierKeyword = Keyword<ModifierKeywordKind>;
-export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Redefinable | KeywordKind.Abstract | KeywordKind.Redefined | KeywordKind.Async | KeywordKind.Const;
+export type ModifierKeywordKind = KeywordKind.Hidden | KeywordKind.Basic | KeywordKind.Static | KeywordKind.Abstract | KeywordKind.Override | KeywordKind.Async | KeywordKind.Const;
 export type ModifierLevelKeyword = Keyword<KeywordKind.InType> | Keyword<KeywordKind.InHierarchy> | Keyword<KeywordKind.InFile> | Keyword<KeywordKind.InPackage>;
 export type ParameterClauseParent = PackageFunctionDeclaration | NestedFunctionDeclaration | FunctionLiteral | ConstructorDeclaration | DestructorDeclaration | MethodDeclaration | OperatorDeclaration | FunctionTypeDeclarationBody;
 export declare class ParameterClause extends BaseNode {

package/build/types/ts-interop/Entities.d.ts

@@ -310,10 +310,10 @@ export declare class TsPropertyEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     private getDeclaration;
 }
@@ -340,10 +340,10 @@ export declare class TsAccessorEntity implements FieldEntity {
     getTags(): readonly Tag[];
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     private getGetAccessorDeclaration;
 }
@@ -375,7 +375,7 @@ export declare class TsSetAccessorEntity implements SetterEntity {
     isHidden(): EntityHidingLevel | undefined;
     getTags(): readonly Tag[];
 }
-export declare class TsFunctionEntity implements MethodEntity {
+export declare class TsMethodEntity implements MethodEntity {
     private readonly _tsctx;
     private readonly _symbol;
     private readonly _declaration;
@@ -395,9 +395,9 @@ export declare class TsFunctionEntity implements MethodEntity {
     getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
@@ -423,9 +423,9 @@ export declare class TsIteratorFunctionEntity implements MethodEntity {
     getDefinition(): FunctionEntityDefinition;
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     isModifyingOwningPlainObject(): boolean;
     isAsync(): boolean;
     isHidden(): EntityHidingLevel | undefined;
@@ -499,9 +499,9 @@ export declare class TsIndexSignatureEntity implements IndexerEntity {
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
     isHidden(): EntityHidingLevel | undefined;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
     getOverriddenMembers(): readonly types.Indexer[];
 }
@@ -518,7 +518,7 @@ export declare class TsConstructorEntity implements ConstructorEntity {
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class TsSignatureBasedDefaultConstructorEntity implements ConstructorEntity {
@@ -533,7 +533,7 @@ export declare class TsSignatureBasedDefaultConstructorEntity implements Constru
     getContainer(): TypeMemberEntityContainer;
     isDefault(): DefaultConstructorEntityInfo | undefined;
     isHidden(): EntityHidingLevel | undefined;
-    isAbstract(): boolean;
+    markedAbstract(): boolean;
     getTags(): readonly Tag[];
 }
 export declare class TsEnumEntity implements PackageVariantTypeEntity {
@@ -571,10 +571,10 @@ export declare class TsEnumMemberEntity implements FieldEntity {
     constructor(_tsctx: TsInteropContext, _symbol: ts.Symbol, _variantTypeEntity: VariantTypeEntity);
     getContainer(): TypeMemberEntityContainer;
     isStatic(): boolean;
-    isRedefinable(): boolean;
-    isRedefined(): boolean;
-    isAbstract(): boolean;
-    getOverriddenMembers(): readonly types.Variable[];
+    markedBasic(): boolean;
+    isOverride(): boolean;
+    markedAbstract(): boolean;
+    getOverriddenMembers(): readonly types.Field[];
     isVariant(): boolean;
     getType(): types.Type;
     getGetter(): GetterEntity | undefined;