@artel/artc 0.6.25219 → 0.6.25221

package/build/types/parser/Scanner.d.ts

@@ -37,6 +37,7 @@ export declare class Scanner {
     private scanBinaryDigitSequence;
     private scanMeasureUnits;
     private scanSingleLineComment;
+    private scanMultilineLineComment;
     private scanIdentifier;
     private scanQuotedIdentifier;
     static isWhitespaceOrTab(char: string): boolean;

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

@@ -24,7 +24,8 @@ export declare class CompletionService {
     private isRepeatWhileKeywordContext;
     private isModifierLevelContext;
     private isElseOrElseIfKeywordContext;
-    private isRunStatementAccessorListContext;
+    private isCatchKeywordContext;
+    private isFinallyKeywordContext;
     private isTypeKindCompletionContext;
     private isFromKeywordContext;
     private isCaseKeywordContext;

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

@@ -74,8 +74,9 @@ export type VariableDeclaration = VariableDeclaration_entity | VariableDeclarati
 export declare class VariableDeclaration_entity implements IVariableDeclaration {
     readonly value: e.VariableEntity;
     readonly localization: Localization;
+    readonly narrowedType?: types.Type | undefined;
     readonly kind = "entity";
-    constructor(value: e.VariableEntity, localization: Localization);
+    constructor(value: e.VariableEntity, localization: Localization, narrowedType?: types.Type | undefined);
     getEntity(): e.VariableEntity;
     getLocalization(): Localization;
     getType(): types.Type;
@@ -85,8 +86,9 @@ export declare class VariableDeclaration_entity implements IVariableDeclaration
 export declare class VariableDeclaration_typeMember implements IVariableDeclaration {
     readonly value: types.Variable;
     readonly localization: Localization;
+    readonly narrowedType?: types.Type | undefined;
     readonly kind = "type-member";
-    constructor(value: types.Variable, localization: Localization);
+    constructor(value: types.Variable, localization: Localization, narrowedType?: types.Type | undefined);
     getEntity(): e.VariableEntity;
     getLocalization(): Localization;
     getType(): types.Type;

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

@@ -57,15 +57,17 @@ export type ReferenceTarget = EntityReferenceTarget | TypeVariableReferenceTarge
 export declare class EntityReferenceTarget {
     readonly entity: ReferencedEntity;
     readonly accessKind: AccessKind;
+    readonly narrowedType?: types.Type | undefined;
     readonly kind = "entity";
-    constructor(entity: ReferencedEntity, accessKind: AccessKind);
+    constructor(entity: ReferencedEntity, accessKind: AccessKind, narrowedType?: types.Type | undefined);
 }
 export type ReferencedEntity = VariableEntity | VariantTypeEntity | MethodEntity | TypeParameterEntity | MethodTypeEntity | StructuredTypeEntity | PackageAliasEntity | AliasTypeEntity;
 export declare class TypeVariableReferenceTarget {
     readonly variable: types.Variable;
     readonly accessKind: AccessKind;
+    readonly narrowedType: types.Type | undefined;
     readonly kind = "type-variable";
-    constructor(variable: types.Variable, accessKind: AccessKind);
+    constructor(variable: types.Variable, accessKind: AccessKind, narrowedType: types.Type | undefined);
 }
 export declare class TypeValueParameterReferenceTarget {
     readonly parameter: types.ValueParameter;

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

@@ -109,48 +109,49 @@ export declare enum NodeKind {
     IfStatement = 107,
     ElseIfClauseList = 108,
     ElseIfClause = 109,
-    InvalidStatement = 110,
-    NestedMethodDeclarationStatement = 111,
-    LocalVariableDeclarationStatement = 112,
-    LoopStatement = 113,
-    ReturnStatement = 114,
-    CaseClauseList = 115,
-    SwitchStatement = 116,
-    MatchExpressionList = 117,
-    SwitchStatementCaseClause = 118,
-    WhileStatement = 119,
-    YieldStatement = 120,
-    TranslationParameterList = 121,
-    TranslationParameterClause = 122,
-    ConstructorTranslation = 123,
-    IndexerTranslationParameterClause = 124,
-    IndexerTranslation = 125,
-    TranslationTypeParameterList = 126,
-    TranslationTypeParameterClause = 127,
-    PackageMethodTranslation = 128,
-    TypeMethodTranslation = 129,
-    MethodTypeTranslation = 130,
-    PackageImportTranslation = 131,
-    QualifiedName = 132,
-    PackageVariableTranslation = 133,
-    TypeVariableOrVariantTranslation = 134,
-    TypeMemberTranslationList = 135,
-    TypeTranslation = 136,
-    TextLiteralTranslation = 137,
-    TextTemplateLiteralTranslation = 138,
-    VariantDeclaration = 139,
-    TypeParameterDeclaration = 140,
-    ParameterDeclaration = 141,
-    Argument = 142,
-    TagList = 143,
-    Tag = 144,
-    ModifierList = 145,
-    Modifier = 146,
-    ParameterClause = 147,
-    ParameterList = 148,
-    TypeArgumentClause = 149,
-    TypeArgumentList = 150,
-    TypeParameterClause = 151,
-    TypeParameterList = 152,
-    TypeAnnotation = 153
+    ElseClause = 110,
+    InvalidStatement = 111,
+    NestedMethodDeclarationStatement = 112,
+    LocalVariableDeclarationStatement = 113,
+    LoopStatement = 114,
+    ReturnStatement = 115,
+    CaseClauseList = 116,
+    SwitchStatement = 117,
+    MatchExpressionList = 118,
+    CaseClause = 119,
+    WhileStatement = 120,
+    YieldStatement = 121,
+    TranslationParameterList = 122,
+    TranslationParameterClause = 123,
+    ConstructorTranslation = 124,
+    IndexerTranslationParameterClause = 125,
+    IndexerTranslation = 126,
+    TranslationTypeParameterList = 127,
+    TranslationTypeParameterClause = 128,
+    PackageMethodTranslation = 129,
+    TypeMethodTranslation = 130,
+    MethodTypeTranslation = 131,
+    PackageImportTranslation = 132,
+    QualifiedName = 133,
+    PackageVariableTranslation = 134,
+    TypeVariableOrVariantTranslation = 135,
+    TypeMemberTranslationList = 136,
+    TypeTranslation = 137,
+    TextLiteralTranslation = 138,
+    TextTemplateLiteralTranslation = 139,
+    VariantDeclaration = 140,
+    TypeParameterDeclaration = 141,
+    ParameterDeclaration = 142,
+    Argument = 143,
+    TagList = 144,
+    Tag = 145,
+    ModifierList = 146,
+    Modifier = 147,
+    ParameterClause = 148,
+    ParameterList = 149,
+    TypeArgumentClause = 150,
+    TypeArgumentList = 151,
+    TypeParameterClause = 152,
+    TypeParameterList = 153,
+    TypeAnnotation = 154
 }

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

@@ -310,9 +310,9 @@ export declare class PackageConstructorDeclaration extends BaseNode {
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get creationKeyword(): Keyword<KeywordKind.Creation>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, creationKeyword: Keyword<KeywordKind.Creation>, body: StatementBlock);
+    constructor(tagList: TagList, modifierList: ModifierList, creationKeyword: Keyword<KeywordKind.Creation>, block: StatementBlock);
     toRed(rangeStart: number, parent: red.PackageMemberDeclarationParent): red.PackageConstructorDeclaration;
 }
 export declare class PackageEntryPointDeclaration extends BaseNode {
@@ -326,9 +326,9 @@ export declare class PackageEntryPointDeclaration extends BaseNode {
     get tagList(): TagList;
     get modifierList(): ModifierList;
     get runKeyword(): Keyword<KeywordKind.Run>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, runKeyword: Keyword<KeywordKind.Run>, body: StatementBlock);
+    constructor(tagList: TagList, modifierList: ModifierList, runKeyword: Keyword<KeywordKind.Run>, block: StatementBlock);
     toRed(rangeStart: number, parent: red.PackageMemberDeclarationParent): red.PackageEntryPointDeclaration;
 }
 export declare class PackageMethodDeclaration extends BaseNode {
@@ -350,9 +350,9 @@ export declare class PackageMethodDeclaration extends BaseNode {
     get typeParameterClause(): TypeParameterClause | undefined;
     get parameterClause(): ParameterClause;
     get returnTypeAnnotation(): TypeAnnotation | undefined;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.PackageMemberDeclarationParent): red.PackageMethodDeclaration;
 }
 export declare class PackageMethodTypeDeclaration extends BaseNode {
@@ -497,9 +497,9 @@ export declare class PackageVariableGetterDeclaration extends BaseNode {
     get getKeyword(): Keyword<KeywordKind.Get>;
     get name(): Identifier;
     get typeAnnotation(): TypeAnnotation;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, name: Identifier, typeAnnotation: TypeAnnotation, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, name: Identifier, typeAnnotation: TypeAnnotation, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.PackageMemberDeclarationParent): red.PackageVariableGetterDeclaration;
 }
 export declare class PackageVariableSetterDeclaration extends BaseNode {
@@ -515,9 +515,9 @@ export declare class PackageVariableSetterDeclaration extends BaseNode {
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get name(): Identifier;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, name: Identifier, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, name: Identifier, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.PackageMemberDeclarationParent): red.PackageVariableSetterDeclaration;
 }
 export declare class PackageVariantTypeDeclaration extends BaseNode {
@@ -640,9 +640,9 @@ export declare class TypeConstructorDeclaration extends BaseNode {
     get modifierList(): ModifierList;
     get creationKeyword(): Keyword<KeywordKind.Creation>;
     get parameterClause(): ParameterClause;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, creationKeyword: Keyword<KeywordKind.Creation>, parameterClause: ParameterClause, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, creationKeyword: Keyword<KeywordKind.Creation>, parameterClause: ParameterClause, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeConstructorDeclaration;
 }
 export declare class TypeDestructorDeclaration extends BaseNode {
@@ -658,9 +658,9 @@ export declare class TypeDestructorDeclaration extends BaseNode {
     get modifierList(): ModifierList;
     get destructionKeyword(): Keyword<KeywordKind.Destruction>;
     get parameterClause(): ParameterClause;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, destructionKeyword: Keyword<KeywordKind.Destruction>, parameterClause: ParameterClause, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, destructionKeyword: Keyword<KeywordKind.Destruction>, parameterClause: ParameterClause, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeDestructorDeclaration;
 }
 export declare class TypeIndexedGetterDeclaration extends BaseNode {
@@ -678,9 +678,9 @@ export declare class TypeIndexedGetterDeclaration extends BaseNode {
     get getKeyword(): Keyword<KeywordKind.Get>;
     get parameterClause(): TypeIndexerParameterClause;
     get typeAnnotation(): TypeAnnotation;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, parameterClause: TypeIndexerParameterClause, typeAnnotation: TypeAnnotation, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, parameterClause: TypeIndexerParameterClause, typeAnnotation: TypeAnnotation, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeIndexedGetterDeclaration;
 }
 export declare class TypeIndexedSetterDeclaration extends BaseNode {
@@ -696,9 +696,9 @@ export declare class TypeIndexedSetterDeclaration extends BaseNode {
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get parameterClause(): TypeIndexerParameterClause;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, parameterClause: TypeIndexerParameterClause, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, parameterClause: TypeIndexerParameterClause, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeIndexedSetterDeclaration;
 }
 export declare class TypeIndexerParameterClause extends BaseNode {
@@ -730,9 +730,9 @@ export declare class TypeDereferencedVariableGetterDeclaration extends BaseNode
     get getKeyword(): Keyword<KeywordKind.Get>;
     get caretToken(): Token<TokenKind.Caret>;
     get typeAnnotation(): TypeAnnotation;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, caretToken: Token<TokenKind.Caret>, typeAnnotation: TypeAnnotation, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, caretToken: Token<TokenKind.Caret>, typeAnnotation: TypeAnnotation, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeDereferencedVariableGetterDeclaration;
 }
 export declare class TypeDereferencedVariableSetterDeclaration extends BaseNode {
@@ -748,9 +748,9 @@ export declare class TypeDereferencedVariableSetterDeclaration extends BaseNode
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get caretToken(): Token<TokenKind.Caret>;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, caretToken: Token<TokenKind.Caret>, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, caretToken: Token<TokenKind.Caret>, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeDereferencedVariableSetterDeclaration;
 }
 export declare class TypeMethodDeclaration extends BaseNode {
@@ -772,9 +772,9 @@ export declare class TypeMethodDeclaration extends BaseNode {
     get typeParameterClause(): TypeParameterClause | undefined;
     get parameterClause(): ParameterClause;
     get returnTypeAnnotation(): TypeAnnotation | undefined;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeMethodDeclaration;
 }
 export declare class OperatorDeclaration extends BaseNode {
@@ -795,9 +795,9 @@ export declare class OperatorDeclaration extends BaseNode {
     get name(): Identifier;
     get parameterClause(): ParameterClause;
     get returnTypeAnnotation(): TypeAnnotation | undefined;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, body: StatementBlock | undefined, operatorKind: OperatorKind);
+    constructor(tagList: TagList, modifierList: ModifierList, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, block: StatementBlock | undefined, operatorKind: OperatorKind);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.OperatorDeclaration;
 }
 export declare class TypeVariableDeclaration extends BaseNode {
@@ -835,9 +835,9 @@ export declare class TypeVariableGetterDeclaration extends BaseNode {
     get getKeyword(): Keyword<KeywordKind.Get>;
     get name(): Identifier;
     get typeAnnotation(): TypeAnnotation;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, name: Identifier, typeAnnotation: TypeAnnotation, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, getKeyword: Keyword<KeywordKind.Get>, name: Identifier, typeAnnotation: TypeAnnotation, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeVariableGetterDeclaration;
 }
 export declare class TypeVariableSetterDeclaration extends BaseNode {
@@ -853,9 +853,9 @@ export declare class TypeVariableSetterDeclaration extends BaseNode {
     get modifierList(): ModifierList;
     get setKeyword(): Keyword<KeywordKind.Set>;
     get name(): Identifier;
-    get body(): StatementBlock | undefined;
+    get block(): StatementBlock | undefined;
     protected get thisAsNode(): Node;
-    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, name: Identifier, body: StatementBlock | undefined);
+    constructor(tagList: TagList, modifierList: ModifierList, setKeyword: Keyword<KeywordKind.Set>, name: Identifier, block: StatementBlock | undefined);
     toRed(rangeStart: number, parent: red.TypeMemberDeclarationParent): red.TypeVariableSetterDeclaration;
 }
 export declare class InvalidTypeMemberDeclaration extends BaseNode {
@@ -887,9 +887,9 @@ export declare class NestedMethodDeclaration extends BaseNode {
     get typeParameterClause(): TypeParameterClause | undefined;
     get parameterClause(): ParameterClause;
     get returnTypeAnnotation(): TypeAnnotation | undefined;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(asyncKeyword: Keyword<KeywordKind.Async> | undefined, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, body: StatementBlock);
+    constructor(asyncKeyword: Keyword<KeywordKind.Async> | undefined, functionKeyword: Keyword<KeywordKind.Function>, name: Identifier, typeParameterClause: TypeParameterClause | undefined, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, block: StatementBlock);
     toRed(rangeStart: number, parent: red.NestedMethodDeclarationParent): red.NestedMethodDeclaration;
 }
 export declare class LocalVariableDeclaration extends BaseNode {
@@ -1002,9 +1002,9 @@ export declare class MethodBlockLiteral extends BaseNode {
     readonly children: readonly [
         StatementBlock
     ];
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(body: StatementBlock);
+    constructor(block: StatementBlock);
     toRed(rangeStart: number, parent: red.ExpressionParent): red.MethodBlockLiteral;
 }
 export type ArgumentListElement = Argument | Comma;
@@ -1098,9 +1098,9 @@ export declare class MethodLiteral extends BaseNode {
     get functionKeyword(): Keyword<KeywordKind.Function>;
     get parameterClause(): ParameterClause;
     get returnTypeAnnotation(): TypeAnnotation | undefined;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(asyncKeyword: Keyword<KeywordKind.Async> | undefined, functionKeyword: Keyword<KeywordKind.Function>, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, body: StatementBlock);
+    constructor(asyncKeyword: Keyword<KeywordKind.Async> | undefined, functionKeyword: Keyword<KeywordKind.Function>, parameterClause: ParameterClause, returnTypeAnnotation: TypeAnnotation | undefined, block: StatementBlock);
     toRed(rangeStart: number, parent: red.ExpressionParent): red.MethodLiteral;
 }
 export declare class ParenthesizedExpression extends BaseNode {
@@ -1377,9 +1377,9 @@ export declare class RunStatement extends BaseNode {
         StatementBlock
     ];
     get runKeyword(): Keyword<KeywordKind.Run>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(runKeyword: Keyword<KeywordKind.Run>, body: StatementBlock);
+    constructor(runKeyword: Keyword<KeywordKind.Run>, block: StatementBlock);
     toRed(rangeStart: number, parent: red.StatementParent): red.RunStatement;
 }
 export declare class TryStatement extends BaseNode {
@@ -1391,11 +1391,11 @@ export declare class TryStatement extends BaseNode {
         FinallyClause | undefined
     ];
     get tryKeyword(): Keyword<KeywordKind.Try>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     get catchClause(): CatchClause | undefined;
     get finallyClause(): FinallyClause | undefined;
     protected get thisAsNode(): Node;
-    constructor(tryKeyword: Keyword<KeywordKind.Try>, body: StatementBlock, catchClause: CatchClause | undefined, finallyClause: FinallyClause | undefined);
+    constructor(tryKeyword: Keyword<KeywordKind.Try>, block: StatementBlock, catchClause: CatchClause | undefined, finallyClause: FinallyClause | undefined);
     toRed(rangeStart: number, parent: red.TryStatementParent): red.TryStatement;
 }
 export declare class CatchClause extends BaseNode {
@@ -1407,9 +1407,9 @@ export declare class CatchClause extends BaseNode {
     ];
     get catchKeyword(): Keyword<KeywordKind.Catch>;
     get errorVariable(): ErrorVariableDeclaration | undefined;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(catchKeyword: Keyword<KeywordKind.Catch>, errorVariable: ErrorVariableDeclaration | undefined, body: StatementBlock);
+    constructor(catchKeyword: Keyword<KeywordKind.Catch>, errorVariable: ErrorVariableDeclaration | undefined, block: StatementBlock);
     toRed(rangeStart: number, parent: red.CatchClauseParent): red.CatchClause;
 }
 export declare class ErrorVariableDeclaration extends BaseNode {
@@ -1431,9 +1431,9 @@ export declare class FinallyClause extends BaseNode {
         StatementBlock
     ];
     get finallyKeyword(): Keyword<KeywordKind.Finally>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(finallyKeyword: Keyword<KeywordKind.Finally>, body: StatementBlock);
+    constructor(finallyKeyword: Keyword<KeywordKind.Finally>, block: StatementBlock);
     toRed(rangeStart: number, parent: red.FinallyClauseParent): red.FinallyClause;
 }
 export declare class EmptyStatement extends BaseNode {
@@ -1490,9 +1490,9 @@ export declare class ForStatement extends BaseNode {
     get enumerationVariableList(): EnumerationVariableList;
     get fromKeyword(): Keyword<KeywordKind.From>;
     get enumeratedExpression(): Expression;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(forKeyword: Keyword<KeywordKind.For>, enumerationVariableList: EnumerationVariableList, fromKeyword: Keyword<KeywordKind.From>, enumeratedExpression: Expression, body: StatementBlock);
+    constructor(forKeyword: Keyword<KeywordKind.For>, enumerationVariableList: EnumerationVariableList, fromKeyword: Keyword<KeywordKind.From>, enumeratedExpression: Expression, block: StatementBlock);
     toRed(rangeStart: number, parent: red.StatementParent): red.ForStatement;
 }
 export declare class IfStatement extends BaseNode {
@@ -1502,17 +1502,15 @@ export declare class IfStatement extends BaseNode {
         Expression,
         StatementBlock,
         ElseIfClauseList,
-        Keyword<KeywordKind.Else> | undefined,
-        StatementBlock | undefined
+        ElseClause | undefined
     ];
     get ifKeyword(): Keyword<KeywordKind.If>;
     get condition(): Expression;
-    get thenBlock(): StatementBlock;
+    get block(): StatementBlock;
     get elseIfClauseList(): ElseIfClauseList;
-    get elseKeyword(): Keyword<KeywordKind.Else> | undefined;
-    get elseBlock(): StatementBlock | undefined;
+    get elseClause(): ElseClause | undefined;
     protected get thisAsNode(): Node;
-    constructor(ifKeyword: Keyword<KeywordKind.If>, condition: Expression, thenBlock: StatementBlock, elseIfClauseList: ElseIfClauseList, elseKeyword: Keyword<KeywordKind.Else> | undefined, elseBlock: StatementBlock | undefined);
+    constructor(ifKeyword: Keyword<KeywordKind.If>, condition: Expression, block: StatementBlock, elseIfClauseList: ElseIfClauseList, elseClause: ElseClause | undefined);
     toRed(rangeStart: number, parent: red.StatementParent): red.IfStatement;
 }
 export declare class ElseIfClauseList extends BaseNode {
@@ -1532,11 +1530,23 @@ export declare class ElseIfClause extends BaseNode {
     ];
     get elseIfKeyword(): Keyword<KeywordKind.ElseIf>;
     get condition(): Expression;
-    get thenBlock(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(elseIfKeyword: Keyword<KeywordKind.ElseIf>, condition: Expression, thenBlock: StatementBlock);
+    constructor(elseIfKeyword: Keyword<KeywordKind.ElseIf>, condition: Expression, block: StatementBlock);
     toRed(rangeStart: number, parent: red.ElseIfClauseParent): red.ElseIfClause;
 }
+export declare class ElseClause extends BaseNode {
+    readonly kind = NodeKind.ElseClause;
+    readonly children: readonly [
+        Keyword<KeywordKind.Else>,
+        StatementBlock
+    ];
+    get elseKeyword(): Keyword<KeywordKind.Else>;
+    get block(): StatementBlock;
+    protected get thisAsNode(): Node;
+    constructor(elseKeyword: Keyword<KeywordKind.Else>, block: StatementBlock);
+    toRed(rangeStart: number, parent: red.ElseClauseParent): red.ElseClause;
+}
 export declare class InvalidStatement extends BaseNode {
     readonly kind = NodeKind.InvalidStatement;
     readonly children: never[];
@@ -1573,11 +1583,11 @@ export declare class LoopStatement extends BaseNode {
         Expression | undefined
     ];
     get loopKeyword(): Keyword<KeywordKind.Loop>;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     get repeatWhileKeyword(): Keyword<KeywordKind.RepeatWhile> | undefined;
     get condition(): Expression | undefined;
     protected get thisAsNode(): Node;
-    constructor(loopKeyword: Keyword<KeywordKind.Loop>, body: StatementBlock, repeatWhileKeyword: Keyword<KeywordKind.RepeatWhile> | undefined, condition: Expression | undefined);
+    constructor(loopKeyword: Keyword<KeywordKind.Loop>, block: StatementBlock, repeatWhileKeyword: Keyword<KeywordKind.RepeatWhile> | undefined, condition: Expression | undefined);
     toRed(rangeStart: number, parent: red.StatementParent): red.LoopStatement;
 }
 export declare class ReturnStatement extends BaseNode {
@@ -1594,10 +1604,10 @@ export declare class ReturnStatement extends BaseNode {
 }
 export declare class CaseClauseList extends BaseNode {
     readonly kind = NodeKind.CaseClauseList;
-    readonly children: readonly SwitchStatementCaseClause[];
-    get caseClauses(): readonly SwitchStatementCaseClause[];
+    readonly children: readonly CaseClause[];
+    get caseClauses(): readonly CaseClause[];
     protected get thisAsNode(): Node;
-    constructor(caseClauses: readonly SwitchStatementCaseClause[]);
+    constructor(caseClauses: readonly CaseClause[]);
     toRed(rangeStart: number, parent: red.CaseClauseListParent): red.CaseClauseList;
 }
 export declare class SwitchStatement extends BaseNode {
@@ -1623,8 +1633,8 @@ export declare class MatchExpressionList extends BaseNode {
     constructor(elements: readonly MatchExpressionListElement[]);
     toRed(rangeStart: number, parent: red.MatchExpressionListParent): red.MatchExpressionList;
 }
-export declare class SwitchStatementCaseClause extends BaseNode {
-    readonly kind = NodeKind.SwitchStatementCaseClause;
+export declare class CaseClause extends BaseNode {
+    readonly kind = NodeKind.CaseClause;
     readonly children: readonly [
         Keyword<KeywordKind.Case>,
         MatchExpressionList,
@@ -1632,10 +1642,10 @@ export declare class SwitchStatementCaseClause extends BaseNode {
     ];
     get caseKeyword(): Keyword<KeywordKind.Case>;
     get matchExpressionList(): MatchExpressionList;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(caseKeyword: Keyword<KeywordKind.Case>, matchExpressionList: MatchExpressionList, body: StatementBlock);
-    toRed(rangeStart: number, parent: red.SwitchStatementCaseClauseParent): red.SwitchStatementCaseClause;
+    constructor(caseKeyword: Keyword<KeywordKind.Case>, matchExpressionList: MatchExpressionList, block: StatementBlock);
+    toRed(rangeStart: number, parent: red.CaseClauseParent): red.CaseClause;
 }
 export declare class WhileStatement extends BaseNode {
     readonly kind = NodeKind.WhileStatement;
@@ -1646,9 +1656,9 @@ export declare class WhileStatement extends BaseNode {
     ];
     get whileKeyword(): Keyword<KeywordKind.While>;
     get condition(): Expression;
-    get body(): StatementBlock;
+    get block(): StatementBlock;
     protected get thisAsNode(): Node;
-    constructor(whileKeyword: Keyword<KeywordKind.While>, condition: Expression, body: StatementBlock);
+    constructor(whileKeyword: Keyword<KeywordKind.While>, condition: Expression, block: StatementBlock);
     toRed(rangeStart: number, parent: red.StatementParent): red.WhileStatement;
 }
 export declare class YieldStatement extends BaseNode {
@@ -2147,4 +2157,4 @@ export declare class TypeAnnotation extends BaseNode {
     constructor(colonToken: Token<TokenKind.Colon>, typeSpecifier: TypeSpecifier);
     toRed(rangeStart: number, parent: red.TypeAnnotationParent): red.TypeAnnotation;
 }
-export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | SwitchStatementCaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;
+export type Node = SourceFile | PackageMemberDeclarationList | Keyword | PackageImportDirectiveList | SinglePackageImportDirective | PackageGroupImportDirective | PackageImportList | PackageImport | PackagePath | NamedTypeSpecifier | UnionTypeSpecifier | UnionTypeSpecifierTypeList | ParenthesizedTypeSpecifier | NullableTypeSpecifier | AnonymousTypeSpecifier | InvalidTypeSpecifier | AnonymousMethodTypeDeclaration | AnonymousStructuredTypeDeclaration | AnonymousVariantTypeDeclaration | TopLevelTranslationList | TranslationsDeclaration | PackageAliasTypeDeclaration | AliasTypeDeclarationBody | PackageMemberGroupDeclaration | PackageConstructorDeclaration | PackageEntryPointDeclaration | PackageMethodDeclaration | PackageMethodTypeDeclaration | MethodTypeDeclarationBody | BaseTypeList | TypeMemberDeclarationList | TypeMemberDeclarationBlock | PackageStructuredTypeDeclaration | StructuredTypeDeclarationBody | PackageVariableDeclaration | PackageVariableGetterDeclaration | PackageVariableSetterDeclaration | PackageVariantTypeDeclaration | VariantTypeDeclarationBody | TypeExtensionDeclaration | ExtendedTypeClauseCommaList | ExtendedTypeClause | InvalidPackageMemberDeclaration | TypeMemberGroupDeclaration | TypeConstructorDeclaration | TypeDestructorDeclaration | TypeIndexedGetterDeclaration | TypeIndexedSetterDeclaration | TypeIndexerParameterClause | TypeDereferencedVariableGetterDeclaration | TypeDereferencedVariableSetterDeclaration | TypeMethodDeclaration | OperatorDeclaration | TypeVariableDeclaration | TypeVariableGetterDeclaration | TypeVariableSetterDeclaration | InvalidTypeMemberDeclaration | NestedMethodDeclaration | LocalVariableDeclaration | EnumerationVariableDeclaration | ArrayLiteral | ArrayLiteralElementList | AssertionExpression | AssumptionExpression | AsExpression | BinaryExpression | MethodBlockLiteral | ArgumentList | CallExpression | AutotypeCallExpression | IndexedAccessExpression | InvalidExpression | IsExpression | MethodLiteral | ParenthesizedExpression | WhenTernaryExpression | PrefixUnaryExpression | PropertyAccessExpression | ReferenceExpression | DereferenceExpression | TextTemplateLiteral | TextTemplateSpanList | TextTemplateSpan | TokenExpression | KeywordExpression | ObjectExpression | BaseExpression | IdentifierExpression | GenericSpecializationExpression | DefaultMatchExpression | AssignmentStatement | StatementList | StatementBlock | BreakLoopStatement | ContinueLoopStatement | DisposeStatement | RunStatement | TryStatement | CatchClause | ErrorVariableDeclaration | FinallyClause | EmptyStatement | ErrorStatement | ExpressionStatement | EnumerationVariableList | ForStatement | IfStatement | ElseIfClauseList | ElseIfClause | ElseClause | InvalidStatement | NestedMethodDeclarationStatement | LocalVariableDeclarationStatement | LoopStatement | ReturnStatement | CaseClauseList | SwitchStatement | MatchExpressionList | CaseClause | WhileStatement | YieldStatement | TranslationParameterList | TranslationParameterClause | ConstructorTranslation | IndexerTranslationParameterClause | IndexerTranslation | TranslationTypeParameterList | TranslationTypeParameterClause | PackageMethodTranslation | TypeMethodTranslation | MethodTypeTranslation | PackageImportTranslation | QualifiedName | PackageVariableTranslation | TypeVariableOrVariantTranslation | TypeMemberTranslationList | TypeTranslation | TextLiteralTranslation | TextTemplateLiteralTranslation | VariantDeclaration | TypeParameterDeclaration | ParameterDeclaration | Argument | TagList | Tag | ModifierList | Modifier | ParameterClause | ParameterList | TypeArgumentClause | TypeArgumentList | TypeParameterClause | TypeParameterList | TypeAnnotation | Token;

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

@@ -20,7 +20,7 @@ export declare class Token<TKind extends TokenKind = TokenKind> extends BaseNode
     readonly value: string;
     readonly leadingTrivia: readonly Trivia[];
     readonly flags: TokenFlags;
-    readonly ifOperatorNameThenKind: OperatorKind | undefined;
+    readonly operatorKind: OperatorKind | undefined;
     get isMissing(): boolean;
     protected get thisAsNode(): Node;
     get rangeLength(): number;

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

@@ -1,2 +1,2 @@
 import { Node } from './index.js';
-export declare function toSourceCode(node: Node, lengthLimit?: number): string;
+export declare function toSourceCode(node: Node, lengthLimit?: number, excludeLeadingTrivia?: boolean): string;