@artel/artc 0.6.25281 → 0.6.25283

package/build/api/ApiServices.js

@@ -155,8 +155,8 @@ import {
   Uri,
   VariableDeclaration_entity,
   VariableDeclaration_typeMember,
-  VariantDeclaration,
   VariantTypeDeclarationBody,
+  VariantValueDeclaration,
   WellKnownDeclarationsLoadError,
   __async,
   __decorateClass,
@@ -188,7 +188,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-TIWNEKIS.js";
+} from "../chunk-2Q4QKW7T.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -205,7 +205,9 @@ var customRequests = {
   deleteSourceFile: new CustomRequestType("artel/fs.deleteSourceFile"),
   getNodeRange: new CustomRequestType("artel/getNodeRange"),
   assignField: new CustomRequestType("artel/assignField"),
-  deleteBlockFromScript: new CustomRequestType("artel/deleteBlockFromScript")
+  addBlocksToScript: new CustomRequestType("artel/addBlocksToScript"),
+  canDeleteBlocksFromScript: new CustomRequestType("artel/canDeleteBlocksFromScript"),
+  deleteBlocksFromScript: new CustomRequestType("artel/deleteBlocksFromScript")
 };
 
 // source/services/LanguageServer.ts
@@ -214,108 +216,6 @@ import * as ls3 from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { URI } from "vscode-uri";
 
-// source/services/Types.ts
-import * as ls2 from "vscode-languageserver";
-var SourceLocation = class {
-  constructor(sourceFile, range) {
-    this.sourceFile = sourceFile;
-    this.range = range;
-  }
-};
-function isCompletionItemData(value) {
-  Debug.cast(value);
-  return value instanceof Object && typeof value.cacheId === "number" && typeof value.indexInCache === "number";
-}
-function isCodeActionData(value) {
-  Debug.cast(value);
-  return value instanceof Object && typeof value.name === "string" && value.location instanceof Object && ls2.DocumentUri.is(value.location.uri) && ls2.Position.is(value.location.position) && "data" in value;
-}
-var SourceFileEdit = class {
-  constructor(sourceFile, range, text) {
-    this.sourceFile = sourceFile;
-    this.range = range;
-    this.text = text;
-  }
-};
-
-// source/services/AssignFieldService.ts
-var AssignFieldService = class _AssignFieldService {
-  static {
-    this.receiverVariableName = new Name("el");
-  }
-  createEditWithAssignment(analyzer, sourceFile, subprogramDeclaration, fieldName, value) {
-    const subprogramBlock = subprogramDeclaration.block;
-    if (subprogramBlock === void 0) {
-      return void 0;
-    }
-    const lastAssignmentStatement = this.findLastAssignmentToField(analyzer, subprogramBlock, fieldName);
-    let result;
-    if (lastAssignmentStatement !== void 0) {
-      result = new SourceFileEdit(sourceFile, lastAssignmentStatement.right.rangeWithoutTrivia, value);
-    } else {
-      const assignmentText = `${_AssignFieldService.receiverVariableName.unescapedOriginal}.${fieldName} = ${value}`;
-      if (subprogramBlock.expressionOrStatementList.kind === 93 /* StatementList */) {
-        const lastStatement = subprogramBlock.expressionOrStatementList?.statements.last();
-        let editRange;
-        let indentationText;
-        if (lastStatement !== void 0) {
-          editRange = Range.empty(lastStatement.rangeWithoutTrivia.end);
-          const statementStartCharacter = sourceFile.getPositionAt(lastStatement.rangeWithoutTrivia.start).character;
-          indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(statementStartCharacter)}`;
-        } else {
-          const openBraceRange = subprogramBlock.openBraceToken.rangeWithoutTrivia;
-          const closeBraceRange = subprogramBlock.closeBraceToken.rangeWithoutTrivia;
-          const openBracePosition = sourceFile.getPositionAt(openBraceRange.start);
-          const closeBracePosition = sourceFile.getPositionAt(closeBraceRange.start);
-          if (openBracePosition.line !== closeBracePosition.line) {
-            editRange = Range.empty(openBraceRange.end);
-            indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(closeBracePosition.character + 2)}`;
-          } else {
-            editRange = Range.empty(openBraceRange.end);
-            indentationText = " ";
-          }
-        }
-        result = new SourceFileEdit(sourceFile, editRange, `${indentationText}${assignmentText}`);
-      } else {
-        const expressionStartCharacter = sourceFile.getPositionAt(subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.start).character;
-        const indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(expressionStartCharacter)}`;
-        const editRange = Range.empty(subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.end);
-        result = new SourceFileEdit(sourceFile, editRange, `${indentationText}${assignmentText}`);
-      }
-    }
-    return result;
-  }
-  findLastAssignmentToField(analyzer, block, fieldNameText) {
-    if (block.expressionOrStatementList.kind !== 93 /* StatementList */) {
-      return void 0;
-    }
-    const fieldName = new Name(fieldNameText);
-    const statements = block.expressionOrStatementList.statements.toArray();
-    for (let i = statements.length - 1; i >= 0; i--) {
-      const statement = statements[i];
-      if (statement.kind === 92 /* AssignmentStatement */) {
-        const left = unwrapParenthesizedExpressions(statement.left);
-        if (left.kind === 76 /* MemberAccessExpression */) {
-          const memberAccessMeaning = analyzer.resolveMemberAccessExpression(left).meaning;
-          if (memberAccessMeaning.kind === "instance-field-access" && memberAccessMeaning.field.getName().considerEqual(fieldName)) {
-            const receiver = unwrapParenthesizedExpressions(left.expression);
-            if (receiver.kind === 89 /* IdentifierExpression */) {
-              const receiverMeaning = analyzer.resolveIdentifierExpression(receiver).meaning;
-              if (receiverMeaning.kind === "variable-access" && receiverMeaning.variable.getName().considerEqual(_AssignFieldService.receiverVariableName)) {
-                return statement;
-              }
-            }
-          }
-        }
-      }
-    }
-    return void 0;
-  }
-  detectNewLine(text) {
-    return text.includes("\r\n") ? "\r\n" : "\n";
-  }
-};
-
 // source/tree/SyntaxFactory.ts
 var SyntaxFactory = class {
   static sourceFile(packageImportDirectives, declarations) {
@@ -336,8 +236,8 @@ var SyntaxFactory = class {
     let aliasIdentifier;
     let equalsToken;
     if (alias !== void 0) {
-      aliasIdentifier = this.createIdentifier(alias);
-      equalsToken = this.token(58 /* Equals */);
+      aliasIdentifier = this.identifier(alias);
+      equalsToken = this.token(64 /* Equals */);
     }
     const packageName = this.packageName(pathSegments);
     const packageImport = new PackageImport(aliasIdentifier, equalsToken, packageName, void 0);
@@ -345,17 +245,17 @@ var SyntaxFactory = class {
     return new SinglePackageImportDirective(importKeyword, packageImport, void 0);
   }
   static packageName(segments) {
-    const segmentIdentifiers = segments.map((s) => this.createIdentifier(s));
-    const packageNameParts = this.createTokenSeparatedElements(segmentIdentifiers, 27 /* Dot */);
+    const segmentIdentifiers = segments.map((s) => this.identifier(s));
+    const packageNameParts = this.createSeparatedElements(segmentIdentifiers, 28 /* Dot */);
     return new PackageName(packageNameParts, void 0);
   }
   static packageAliasTypeDeclaration(tags, modifiers, name, typeParameters, body) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const typeKeyword = this.keyword(16 /* Type */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(64 /* Equals */);
     return new PackageAliasTypeDeclaration(
       tagList,
       modifierList,
@@ -378,9 +278,9 @@ var SyntaxFactory = class {
     return new PackageMemberGroupDeclaration(
       tagList,
       modifierList,
-      this.token(44 /* OpenBrace */),
+      this.token(46 /* OpenBrace */),
       declarationList,
-      this.token(21 /* CloseBrace */),
+      this.token(22 /* CloseBrace */),
       void 0
     );
   }
@@ -388,7 +288,7 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const functionKeyword = this.keyword(12 /* Function */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
     const parameterClause = this.parameterClause(parameters);
     const returnTypeAnnotation = this.createTypeAnnotation(returnTypeSpecifier);
@@ -408,9 +308,9 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const typeKeyword = this.keyword(16 /* Type */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(64 /* Equals */);
     return new PackageFunctionTypeDeclaration(
       tagList,
       modifierList,
@@ -438,9 +338,9 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const typeKeyword = this.keyword(16 /* Type */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(64 /* Equals */);
     return new PackageStructuredTypeDeclaration(
       tagList,
       modifierList,
@@ -454,7 +354,7 @@ var SyntaxFactory = class {
   }
   static structuredTypeDeclarationBody(structuredTypeKind, baseTypes, members) {
     const structuredTypeKindKeyword = this.keyword(structuredTypeKind);
-    const baseTypeList = baseTypes !== void 0 && baseTypes.length > 0 ? new BaseTypeList(this.createTokenSeparatedElements(baseTypes, 25 /* Comma */), void 0) : void 0;
+    const baseTypeList = baseTypes !== void 0 && baseTypes.length > 0 ? new BaseTypeList(this.createSeparatedElements(baseTypes, 26 /* Comma */), void 0) : void 0;
     const memberBlock = this.typeMemberDeclarationBlock(members);
     return new StructuredTypeDeclarationBody(
       structuredTypeKindKeyword,
@@ -466,11 +366,11 @@ var SyntaxFactory = class {
   static packageVariableDeclaration(tags, modifiers, name, typeSpecifier, initializer) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (initializer !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(64 /* Equals */);
     }
     return new PackageVariableDeclaration(
       tagList,
@@ -486,7 +386,7 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const getKeyword = this.keyword(58 /* Get */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new PackageVariableGetterDeclaration(
       tagList,
@@ -502,16 +402,16 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const setKeyword = this.keyword(59 /* Set */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     return new PackageVariableSetterDeclaration(tagList, modifierList, setKeyword, nameIdentifier, body, void 0);
   }
   static packageVariantTypeDeclaration(tags, modifiers, name, typeParameters, body) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const typeKeyword = this.keyword(16 /* Type */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(64 /* Equals */);
     return new PackageVariantTypeDeclaration(
       tagList,
       modifierList,
@@ -531,11 +431,11 @@ var SyntaxFactory = class {
   static fieldDeclaration(tags, modifiers, name, typeSpecifier, initializer) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (initializer !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(64 /* Equals */);
     }
     return new FieldDeclaration(
       tagList,
@@ -551,7 +451,7 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const getKeyword = this.keyword(58 /* Get */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new FieldGetterDeclaration(
       tagList,
@@ -567,14 +467,14 @@ var SyntaxFactory = class {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const setKeyword = this.keyword(59 /* Set */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     return new FieldSetterDeclaration(tagList, modifierList, setKeyword, nameIdentifier, body, void 0);
   }
   static methodDeclaration(tags, modifiers, name, typeParameters, parameters, returnTypeSpecifier, body) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
     const functionKeyword = this.keyword(12 /* Function */);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
     const parameterClause = this.parameterClause(parameters);
     const returnTypeAnnotation = this.createTypeAnnotation(returnTypeSpecifier);
@@ -635,42 +535,42 @@ var SyntaxFactory = class {
   }
   static typeMemberDeclarationBlock(members) {
     return new TypeMemberDeclarationBlock(
-      this.token(44 /* OpenBrace */),
+      this.token(46 /* OpenBrace */),
       new TypeMemberDeclarationList(members, void 0),
-      this.token(21 /* CloseBrace */),
+      this.token(22 /* CloseBrace */),
       void 0
     );
   }
-  static variantDeclaration(tags, modifiers, name, value) {
+  static variantValueDeclaration(tags, modifiers, name, value) {
     const tagList = new TagList(tags, void 0);
     const modifierList = new ModifierList(modifiers, void 0);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     let equalsToken;
     if (value !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(64 /* Equals */);
     }
-    return new VariantDeclaration(tagList, modifierList, nameIdentifier, equalsToken, value, void 0);
+    return new VariantValueDeclaration(tagList, modifierList, nameIdentifier, equalsToken, value, void 0);
   }
   static parameterClause(parameters) {
     return new ParameterClause(
-      this.token(45 /* OpenParenthesis */),
-      new ParameterList(this.createTokenSeparatedElements(parameters, 25 /* Comma */), void 0),
-      this.token(22 /* CloseParenthesis */),
+      this.token(47 /* OpenParenthesis */),
+      new ParameterList(this.createSeparatedElements(parameters, 26 /* Comma */), void 0),
+      this.token(23 /* CloseParenthesis */),
       void 0
     );
   }
   static indexParameterClause(indexParameters) {
     return new IndexParameterClause(
-      this.token(46 /* OpenSquareBracket */),
-      new ParameterList(this.createTokenSeparatedElements(indexParameters, 25 /* Comma */), void 0),
-      this.token(23 /* CloseSquareBracket */),
+      this.token(48 /* OpenSquareBracket */),
+      new ParameterList(this.createSeparatedElements(indexParameters, 26 /* Comma */), void 0),
+      this.token(24 /* CloseSquareBracket */),
       void 0
     );
   }
   static namedTypeSpecifier(name, typeArguments) {
-    const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
+    const qualifiedNameIdentifiers = typeof name === "string" || name instanceof Token ? [this.identifier(name)] : name.map((s) => this.identifier(s));
     const qualifiedName = new QualifiedName(
-      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */),
+      this.createSeparatedElements(qualifiedNameIdentifiers, 28 /* Dot */),
       void 0
     );
     let typeArgumentClause;
@@ -680,21 +580,21 @@ var SyntaxFactory = class {
     return new NamedTypeSpecifier(qualifiedName, typeArgumentClause, void 0);
   }
   static unionTypeSpecifier(typeSpecifiers) {
-    return new UnionTypeSpecifier(this.createTokenSeparatedElements(typeSpecifiers, 18 /* Bar */), void 0);
+    return new UnionTypeSpecifier(this.createSeparatedElements(typeSpecifiers, 17 /* Bar */), void 0);
   }
   static intersectionTypeSpecifier(typeSpecifiers) {
-    return new IntersectionTypeSpecifier(this.createTokenSeparatedElements(
+    return new IntersectionTypeSpecifier(this.createSeparatedElements(
       typeSpecifiers,
-      11 /* Ampersand */
+      10 /* Ampersand */
     ), void 0);
   }
   static nullableTypeSpecifier(typeSpecifier) {
-    const questionToken = this.token(50 /* Question */);
+    const questionToken = this.token(52 /* Question */);
     return new NullableTypeSpecifier(typeSpecifier, questionToken, void 0);
   }
   static parenthesizedTypeSpecifier(typeSpecifier) {
-    const openParenthesisToken = this.token(45 /* OpenParenthesis */);
-    const closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+    const openParenthesisToken = this.token(47 /* OpenParenthesis */);
+    const closeParenthesisToken = this.token(23 /* CloseParenthesis */);
     return new ParenthesizedTypeSpecifier(openParenthesisToken, typeSpecifier, closeParenthesisToken, void 0);
   }
   static anonymousStructuredTypeSpecifier(body) {
@@ -707,14 +607,14 @@ var SyntaxFactory = class {
     return new AnonymousTypeSpecifier(new AnonymousVariantTypeDeclaration(body, void 0), void 0);
   }
   static typeParameterDeclaration(name, constraint, defaultType) {
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     let colonToken;
     if (constraint !== void 0) {
-      colonToken = this.token(24 /* Colon */);
+      colonToken = this.token(25 /* Colon */);
     }
     let equalsToken;
     if (defaultType !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(64 /* Equals */);
     }
     return new TypeParameterDeclaration(
       nameIdentifier,
@@ -727,19 +627,19 @@ var SyntaxFactory = class {
   }
   static parameterDeclaration(tags, name, typeSpecifier, defaultValue) {
     const tagList = new TagList(tags, void 0);
-    const nameIdentifier = this.createIdentifier(name);
+    const nameIdentifier = this.identifier(name);
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (defaultValue !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(64 /* Equals */);
     }
     return new ParameterDeclaration(tagList, nameIdentifier, typeAnnotation, equalsToken, defaultValue, void 0);
   }
   static tag(name, typeArguments, args) {
     const hashSignToken = this.token(36 /* HashSign */);
-    const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
+    const qualifiedNameIdentifiers = typeof name === "string" || name instanceof Token ? [this.identifier(name)] : name.map((s) => this.identifier(s));
     const qualifiedName = new QualifiedName(
-      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */),
+      this.createSeparatedElements(qualifiedNameIdentifiers, 28 /* Dot */),
       void 0
     );
     const typeArgumentClause = typeArguments !== void 0 ? this.typeArgumentClause(typeArguments) : void 0;
@@ -747,12 +647,12 @@ var SyntaxFactory = class {
     let argumentList;
     let closeParenthesisToken;
     if (args !== void 0) {
-      openParenthesisToken = this.token(45 /* OpenParenthesis */);
+      openParenthesisToken = this.token(47 /* OpenParenthesis */);
       argumentList = new ArgumentList(
-        this.createTokenSeparatedElements(args, 25 /* Comma */),
+        this.createSeparatedElements(args, 26 /* Comma */),
         void 0
       );
-      closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+      closeParenthesisToken = this.token(23 /* CloseParenthesis */);
     }
     return new Tag(
       hashSignToken,
@@ -765,44 +665,44 @@ var SyntaxFactory = class {
     );
   }
   static modifier(value, level) {
-    const valueKeyword = this.keyword(value);
+    const valueKeyword = this.createKeyword(value, 1 /* Missing */ | 12296 /* SingularNeuAdjective */);
     let openParenthesisToken;
     let levelKeyword;
     let closeParenthesisToken;
     if (level !== void 0) {
-      openParenthesisToken = this.token(45 /* OpenParenthesis */);
+      openParenthesisToken = this.token(47 /* OpenParenthesis */);
       levelKeyword = this.keyword(level);
-      closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+      closeParenthesisToken = this.token(23 /* CloseParenthesis */);
     }
     return new Modifier(valueKeyword, openParenthesisToken, levelKeyword, closeParenthesisToken, void 0);
   }
   static typeArgumentClause(typeArguments) {
     const lessThanToken = this.token(37 /* LessThan */);
     const typeArgumentList = new TypeArgumentList(
-      this.createTokenSeparatedElements(typeArguments, 25 /* Comma */),
+      this.createSeparatedElements(typeArguments, 26 /* Comma */),
       void 0
     );
     const greaterThanToken = this.token(34 /* GreaterThan */);
     return new TypeArgumentClause(lessThanToken, typeArgumentList, greaterThanToken, void 0);
   }
   static typeAnnotation(typeSpecifier) {
-    return new TypeAnnotation(this.token(24 /* Colon */), typeSpecifier, void 0);
+    return new TypeAnnotation(this.token(25 /* Colon */), typeSpecifier, void 0);
   }
   static statementBlock(statements) {
-    const openBraceToken = this.token(44 /* OpenBrace */);
+    const openBraceToken = this.token(46 /* OpenBrace */);
     const statementList = new StatementList(statements, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(22 /* CloseBrace */);
     return new StatementBlock(openBraceToken, statementList, closeBraceToken, void 0);
   }
   static functionExpressionBlock(expression) {
-    const openBraceToken = this.token(44 /* OpenBrace */);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const openBraceToken = this.token(46 /* OpenBrace */);
+    const closeBraceToken = this.token(22 /* CloseBrace */);
     return new FunctionBlock(openBraceToken, expression, closeBraceToken, void 0);
   }
   static functionStatementBlock(statements) {
-    const openBraceToken = this.token(44 /* OpenBrace */);
+    const openBraceToken = this.token(46 /* OpenBrace */);
     const statementList = new StatementList(statements, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(22 /* CloseBrace */);
     return new FunctionBlock(openBraceToken, statementList, closeBraceToken, void 0);
   }
   static nullLiteral() {
@@ -815,9 +715,9 @@ var SyntaxFactory = class {
     const tagList = new TagList([], void 0);
     const modifierList = new ModifierList([], void 0);
     const translationsKeyword = this.keyword(55 /* Translations */);
-    const openBraceToken = this.token(44 /* OpenBrace */);
+    const openBraceToken = this.token(46 /* OpenBrace */);
     const translationList = new TopLevelTranslationList(translations, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(22 /* CloseBrace */);
     return new TranslationsDeclaration(
       tagList,
       modifierList,
@@ -829,9 +729,9 @@ var SyntaxFactory = class {
     );
   }
   static packageVariableTranslation(sourceName, translatedName) {
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const sourceNameIdentifier = this.identifier(sourceName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     return new PackageVariableTranslationDeclaration(
       sourceNameIdentifier,
       minusGreaterThanToken,
@@ -841,11 +741,11 @@ var SyntaxFactory = class {
   }
   static packageFunctionTranslation(sourceName, sourceTypeParameters, sourceParameters, translatedName, translatedTypeParameters, translatedParameters) {
     const functionKeyword = this.keyword(12 /* Function */);
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
+    const sourceNameIdentifier = this.identifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new PackageFunctionTranslationDeclaration(
@@ -862,18 +762,18 @@ var SyntaxFactory = class {
   }
   static typeTranslation(sourceName, sourceTypeParameters, translatedName, translatedTypeParameters, members) {
     const typeKeyword = this.keyword(16 /* Type */);
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
+    const sourceNameIdentifier = this.identifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     let openBraceToken;
     let memberList;
     let closeBraceToken;
     if (members !== void 0) {
-      openBraceToken = this.token(44 /* OpenBrace */);
+      openBraceToken = this.token(46 /* OpenBrace */);
       memberList = new TypeMemberTranslationList(members, void 0);
-      closeBraceToken = this.token(21 /* CloseBrace */);
+      closeBraceToken = this.token(22 /* CloseBrace */);
     }
     return new TypeTranslationDeclaration(
       typeKeyword,
@@ -890,11 +790,11 @@ var SyntaxFactory = class {
   }
   static functionTypeTranslation(sourceName, sourceTypeParameters, sourceParameters, translatedName, translatedTypeParameters, translatedParameters) {
     const typeKeyword = this.keyword(16 /* Type */);
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
+    const sourceNameIdentifier = this.identifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new FunctionTypeTranslationDeclaration(
@@ -910,9 +810,9 @@ var SyntaxFactory = class {
     );
   }
   static fieldOrVariantTranslation(sourceName, translatedName) {
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const sourceNameIdentifier = this.identifier(sourceName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     return new FieldOrVariantTranslation(
       sourceNameIdentifier,
       minusGreaterThanToken,
@@ -922,11 +822,11 @@ var SyntaxFactory = class {
   }
   static methodTranslation(sourceName, sourceTypeParameters, sourceParameters, translatedName, translatedTypeParameters, translatedParameters) {
     const functionKeyword = this.keyword(12 /* Function */);
-    const sourceNameIdentifier = this.createIdentifier(sourceName);
+    const sourceNameIdentifier = this.identifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
-    const translatedNameIdentifier = this.createIdentifier(translatedName);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
+    const translatedNameIdentifier = this.identifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new MethodTranslation(
@@ -944,7 +844,7 @@ var SyntaxFactory = class {
   static constructorTranslation(sourceParameters, translatedParameters) {
     const creationKeyword = this.keyword(31 /* Creation */);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new ConstructorTranslation(
       creationKeyword,
@@ -956,7 +856,7 @@ var SyntaxFactory = class {
   }
   static indexerTranslation(sourceParameters, translatedParameters) {
     const sourceParameterClause = this.indexParameterTranslationClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(45 /* MinusGreaterThan */);
     const translatedParameterClause = this.indexParameterTranslationClause(translatedParameters);
     return new IndexerTranslation(
       sourceParameterClause,
@@ -966,21 +866,21 @@ var SyntaxFactory = class {
     );
   }
   static translationParameterClause(parameters) {
-    const openParenthesisToken = this.token(45 /* OpenParenthesis */);
+    const openParenthesisToken = this.token(47 /* OpenParenthesis */);
     const parameterList = new TranslationParameterList(
-      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+      this.createSeparatedElements(parameters.map((p) => this.identifier(p)), 26 /* Comma */),
       void 0
     );
-    const closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+    const closeParenthesisToken = this.token(23 /* CloseParenthesis */);
     return new TranslationParameterClause(openParenthesisToken, parameterList, closeParenthesisToken, void 0);
   }
   static indexParameterTranslationClause(parameters) {
-    const openSquareBracketToken = this.token(46 /* OpenSquareBracket */);
+    const openSquareBracketToken = this.token(48 /* OpenSquareBracket */);
     const parameterList = new TranslationParameterList(
-      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+      this.createSeparatedElements(parameters.map((p) => this.identifier(p)), 26 /* Comma */),
       void 0
     );
-    const closeSquareBracketToken = this.token(23 /* CloseSquareBracket */);
+    const closeSquareBracketToken = this.token(24 /* CloseSquareBracket */);
     return new IndexParameterTranslationClause(
       openSquareBracketToken,
       parameterList,
@@ -988,12 +888,24 @@ var SyntaxFactory = class {
       void 0
     );
   }
+  static identifier(value) {
+    if (typeof value === "string") {
+      return this.createToken(9 /* Identifier */, value, 0 /* None */);
+    }
+    return value;
+  }
   static token(kind, value) {
     const flags = value === void 0 ? 1 /* Missing */ : 0 /* None */;
-    return new Token(kind, value ?? "", [], [], flags, void 0, void 0);
+    return this.createToken(kind, value ?? "", flags);
   }
   static keyword(kind) {
-    return new Keyword([], kind, true, void 0);
+    return this.createKeyword(kind, 1 /* Missing */);
+  }
+  static createToken(kind, value, flags) {
+    return new Token(kind, value, [], [], flags, void 0, void 0);
+  }
+  static createKeyword(kind, flags) {
+    return new Keyword([], kind, flags, void 0);
   }
   static createTypeParameterClause(typeParameters) {
     if (typeParameters === void 0) {
@@ -1001,7 +913,7 @@ var SyntaxFactory = class {
     }
     return new TypeParameterClause(
       this.token(37 /* LessThan */),
-      new TypeParameterList(this.createTokenSeparatedElements(typeParameters, 25 /* Comma */), void 0),
+      new TypeParameterList(this.createSeparatedElements(typeParameters, 26 /* Comma */), void 0),
       this.token(34 /* GreaterThan */),
       void 0
     );
@@ -1013,7 +925,7 @@ var SyntaxFactory = class {
     return new TranslationTypeParameterClause(
       this.token(37 /* LessThan */),
       new TranslationTypeParameterList(
-        this.createTokenSeparatedElements(typeParameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+        this.createSeparatedElements(typeParameters.map((p) => this.identifier(p)), 26 /* Comma */),
         void 0
       ),
       this.token(34 /* GreaterThan */),
@@ -1024,19 +936,13 @@ var SyntaxFactory = class {
     if (typeSpecifier === void 0) {
       return void 0;
     }
-    return new TypeAnnotation(this.token(24 /* Colon */), typeSpecifier, void 0);
-  }
-  static createIdentifier(value) {
-    if (typeof value === "string") {
-      return new Token(10 /* Identifier */, value, [], [], 0 /* None */, void 0, void 0);
-    }
-    return value;
+    return new TypeAnnotation(this.token(25 /* Colon */), typeSpecifier, void 0);
   }
-  static createTokenSeparatedElements(elements, tokenKind) {
+  static createSeparatedElements(elements, separator) {
     const result = new Array();
     for (let i = 0; i < elements.length; i++) {
       if (i > 0) {
-        const token = this.token(tokenKind);
+        const token = this.token(separator);
         result.push(token);
       }
       result.push(elements[i]);
@@ -1054,6 +960,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.node = node;
     this.newLine = options7?.newLine ?? "\n";
     this.indentationStep = options7?.indentationStep ?? "  ";
+    this.modifiersOnSeparateLine = options7?.modifiersOnSeparateLine ?? false;
     this.keywordsLocale = options7?.keywordsLocale ?? 1 /* Ru */;
     this.keywordsDialect = options7?.keywordsDialect ?? DefaultDialect;
     this.singleWordKeywordValues = Query.from(getOrCreateKeywordDictionary(this.keywordsLocale, this.keywordsDialect).values()).mapAndFilter((k) => k.keywordKind !== 0 /* Unknown */ ? k.value : void 0).uniqueToSet();
@@ -1220,7 +1127,7 @@ var SyntaxToCode = class _SyntaxToCode {
   }
   writePackageMemberGroupDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
-    this.writeDeclarationModifiers(node.modifierList);
+    this.writeDeclarationModifiers(node.modifierList, true);
     this.writeToken(node.openBraceToken);
     this.writeNewLineOrWhitespace();
     if (node.declarationList.elements.length > 0) {
@@ -1414,7 +1321,7 @@ var SyntaxToCode = class _SyntaxToCode {
       this.writeDeclarationBody(node.block);
     }
   }
-  writeVariantDeclaration(node) {
+  writeVariantValueDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
     this.writeDeclarationModifiers(node.modifierList);
     this.writeToken(node.name);
@@ -1427,7 +1334,7 @@ var SyntaxToCode = class _SyntaxToCode {
   }
   writeTypeMemberGroupDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
-    this.writeDeclarationModifiers(node.modifierList);
+    this.writeDeclarationModifiers(node.modifierList, true);
     this.writeTypeMemberDeclarationBlock(node.memberBlock, false);
   }
   writeTypeParameterClause(node) {
@@ -1493,12 +1400,16 @@ var SyntaxToCode = class _SyntaxToCode {
       this.writeToken(node.closeParenthesisToken);
     }
   }
-  writeDeclarationModifiers(modifierList) {
+  writeDeclarationModifiers(modifierList, isGroupDeclarationModifiers = false) {
     if (modifierList.modifiers.length > 0) {
       const modifiers = Array.from(modifierList.modifiers);
       modifiers.sort((m1, m2) => modifierSortOrder[m1.value.keywordKind] - modifierSortOrder[m2.value.keywordKind]);
       this.writeWhitespaceSeparatedList(modifiers, (n) => this.writeModifier(n));
-      this.writeNewLineOrWhitespace();
+      if (isGroupDeclarationModifiers === true || this.modifiersOnSeparateLine) {
+        this.writeNewLineOrWhitespace();
+      } else {
+        this.writeWhitespace();
+      }
     }
   }
   writeModifier(node) {
@@ -1875,7 +1786,7 @@ var SyntaxToCode = class _SyntaxToCode {
     let isPreviousElementSemicolon = false;
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
-      if (element.kind === 0 /* Token */ && element.tokenKind === 52 /* Semicolon */) {
+      if (element.kind === 0 /* Token */ && element.tokenKind === 58 /* Semicolon */) {
         this.writeToken(element);
         isPreviousElementSemicolon = true;
       } else {
@@ -1893,7 +1804,7 @@ var SyntaxToCode = class _SyntaxToCode {
   writeCommaSeparatedList(elements, writeNonCommaElement) {
     for (let i = 0; i < elements.length; i++) {
       const element = elements[i];
-      if (element.kind === 0 /* Token */ && element.tokenKind === 25 /* Comma */) {
+      if (element.kind === 0 /* Token */ && element.tokenKind === 26 /* Comma */) {
         this.writeToken(element);
       } else {
         if (i > 0) {
@@ -1905,10 +1816,17 @@ var SyntaxToCode = class _SyntaxToCode {
   }
   writeKeyword(keyword) {
     if (keyword.isMissing) {
-      this.writeCode(LocalizationHelper.localizeKeywordAndTakeFirst(
+      let preferredFlags;
+      if (keyword.parent.kind === 154 /* Modifier */) {
+        preferredFlags = this.getModifierPreferredFlags(keyword.parent);
+      } else {
+        preferredFlags = 12290 /* SingularNeuNoun */;
+      }
+      this.writeCode(LocalizationHelper.localizeKeywordAndTakeBest(
         keyword.keywordKind,
         this.keywordsLocale,
-        this.keywordsDialect
+        this.keywordsDialect,
+        preferredFlags
       ));
     } else {
       for (let i = 0; i < keyword.tokens.length; i++) {
@@ -1919,12 +1837,51 @@ var SyntaxToCode = class _SyntaxToCode {
       }
     }
   }
+  getModifierPreferredFlags(modifier) {
+    const modifierTarget = modifier.parent.parent;
+    switch (modifierTarget.kind) {
+      case 25 /* PackageFunctionDeclaration */:
+      case 35 /* PackageVariableSetterDeclaration */:
+      case 54 /* FieldSetterDeclaration */:
+      case 46 /* IndexedElementSetterDeclaration */:
+      case 49 /* DereferencedVariableSetterDeclaration */:
+      case 50 /* MethodDeclaration */:
+      case 51 /* OperatorDeclaration */:
+      case 24 /* PackageEntryPointDeclaration */:
+        return 10242 /* SingularFemNoun */;
+      case 20 /* PackageAliasTypeDeclaration */:
+      case 31 /* PackageStructuredTypeDeclaration */:
+      case 36 /* PackageVariantTypeDeclaration */:
+      case 26 /* PackageFunctionTypeDeclaration */:
+        return 9218 /* SingularMasNoun */;
+      case 33 /* PackageVariableDeclaration */:
+      case 34 /* PackageVariableGetterDeclaration */:
+      case 38 /* TypeExtensionDeclaration */:
+      case 23 /* PackageConstructorDeclaration */:
+      case 43 /* ConstructorDeclaration */:
+      case 44 /* DestructorDeclaration */:
+      case 45 /* IndexedElementGetterDeclaration */:
+      case 48 /* DereferencedVariableGetterDeclaration */:
+      case 52 /* FieldDeclaration */:
+      case 53 /* FieldGetterDeclaration */:
+      case 147 /* VariantValueDeclaration */:
+      case 41 /* MissingPackageMemberDeclaration */:
+      case 55 /* MissingTypeMemberDeclaration */:
+        return 12290 /* SingularNeuNoun */;
+      case 42 /* TypeMemberGroupDeclaration */:
+      case 22 /* PackageMemberGroupDeclaration */:
+      case 123 /* TranslationsDeclaration */:
+        return 16386 /* PluralNoun */;
+      default:
+        Debug.never(modifierTarget);
+    }
+  }
   writeToken(token) {
     if ((token.flags & 1 /* Missing */) !== 0) {
       this.writeCode(tokenKindValues[token.tokenKind]);
     } else {
       let value = token.value;
-      if (token.tokenKind === 10 /* Identifier */) {
+      if (token.tokenKind === 9 /* Identifier */) {
         if (value.startsWith("'") && value.endsWith("'")) {
           value = `'${this.escapeLiteralIdentifier(value.substring(1, value.length - 1))}'`;
         } else if (this.singleWordKeywordValues.has(value)) {
@@ -2022,7 +1979,7 @@ var SyntaxToCode = class _SyntaxToCode {
       [94 /* StatementBlock */]: this.prototype.writeStatementBlock,
       [95 /* FunctionBlock */]: this.prototype.writeFunctionBlock,
       [135 /* QualifiedName */]: this.prototype.writeQualifiedName,
-      [147 /* VariantDeclaration */]: this.prototype.writeVariantDeclaration,
+      [147 /* VariantValueDeclaration */]: this.prototype.writeVariantValueDeclaration,
       [148 /* TypeParameterDeclaration */]: this.prototype.writeTypeParameterDeclaration,
       [149 /* ParameterDeclaration */]: this.prototype.writeParameterDeclaration,
       [150 /* Argument */]: this.prototype.writeArgument,
@@ -2287,7 +2244,7 @@ var TokenOrKeywordsTouchingOffset_two = class {
     this.kind = "two";
   }
   getSinglePrioritizingNamed() {
-    if (this.left.isToken(10 /* Identifier */) || this.left.isKeyword()) {
+    if (this.left.isToken(9 /* Identifier */) || this.left.isKeyword()) {
       return this.left;
     }
     return this.right;
@@ -2306,6 +2263,36 @@ function getTriviaAtOffset(sourceFile, offset) {
   return token?.getTriviaAt(offset);
 }
 
+// source/services/Types.ts
+import * as ls2 from "vscode-languageserver";
+var SourceLocation = class {
+  constructor(sourceFile, range) {
+    this.sourceFile = sourceFile;
+    this.range = range;
+  }
+};
+function isCompletionItemData(value) {
+  Debug.cast(value);
+  return value instanceof Object && typeof value.cacheId === "number" && typeof value.indexInCache === "number";
+}
+function isCodeActionData(value) {
+  Debug.cast(value);
+  return value instanceof Object && typeof value.name === "string" && value.location instanceof Object && ls2.DocumentUri.is(value.location.uri) && ls2.Position.is(value.location.position) && "data" in value;
+}
+var SourceFileEdit = class {
+  constructor(sourceFile, range, text) {
+    this.sourceFile = sourceFile;
+    this.range = range;
+    this.text = text;
+  }
+};
+var NodeLocation = class {
+  constructor(sourceFile, path) {
+    this.sourceFile = sourceFile;
+    this.path = path;
+  }
+};
+
 // source/services/TranslationsGenerationService.ts
 var TranslationsGenerationService = class {
   generateMissingTranslations(analyzer, sourceFile, offset, onlyTypeMembers) {
@@ -2317,7 +2304,7 @@ var TranslationsGenerationService = class {
       return void 0;
     }
     let result;
-    if (tokenOrKeyword.isToken(10 /* Identifier */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
+    if (tokenOrKeyword.isToken(9 /* Identifier */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
       const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
       if (translationPackage !== void 0) {
         const generator = new TranslationsGenerator(
@@ -2687,7 +2674,7 @@ var CodeActionsService = class {
     }
     const result = new Array();
     const diagnosticCodeSet = new Set(diagnosticCodes);
-    if (diagnosticCodeSet.has(288 /* TheFollowingDeclarationsAreNotTranslated0 */) || diagnosticCodeSet.has(289 /* TheFollowingDeclarationsAreNotTranslated0And1More */)) {
+    if (diagnosticCodeSet.has(2087 /* TheFollowingDeclarationsAreNotTranslated0 */) || diagnosticCodeSet.has(2088 /* TheFollowingDeclarationsAreNotTranslated0And1More */)) {
       const data = { onlyTypeMembers: false };
       result.push(CodeAction.unresolved(
         "\u0421\u0433\u0435\u043D\u0435\u0440\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u044E\u0449\u0438\u0435 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u044B.",
@@ -2799,7 +2786,7 @@ var SignatureForNode = class _SignatureForNode {
     }
   }
   static getSignaturesForCallExpression(analyzer, node) {
-    const meaning = analyzer.resolveCallExpression(node).meaning;
+    const meaning = analyzer.resolveCallExpression(node);
     switch (meaning.kind) {
       case "function-call": {
         let suitableSignatureIndex;
@@ -2890,7 +2877,7 @@ var SignatureForNode = class _SignatureForNode {
     return void 0;
   }
   static getSignaturesForIndexedAccessExpression(analyzer, node) {
-    const meaning = analyzer.resolveIndexedAccessExpression(node).meaning;
+    const meaning = analyzer.resolveIndexedAccessExpression(node);
     switch (meaning.kind) {
       case "resolved": {
         let suitableSignatureIndex;
@@ -3179,7 +3166,7 @@ var CompletionService = class {
   }
   createPositionDescription(sourceFile, offset) {
     let token = getPrecedingToken(sourceFile, offset);
-    if (token?.tokenKind === 10 /* Identifier */ && offset === token.rangeWithoutTrivia.end) {
+    if (token?.tokenKind === 9 /* Identifier */ && offset === token.rangeWithoutTrivia.end) {
       token = getPrecedingToken(sourceFile, offset - 1);
     }
     let result;
@@ -3203,7 +3190,7 @@ var CompletionService = class {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return { kind: "none" };
     }
-    if (syntaxContext.isInComment || syntaxContext.isInStringOrChar) {
+    if (syntaxContext.isInComment || syntaxContext.isInText) {
       return { kind: "none" };
     }
     if (syntaxContext.isInQuotedIdentifier !== void 0 && (syntaxContext.isInQuotedIdentifier.parent.kind === 51 /* OperatorDeclaration */ || syntaxContext.isInQuotedIdentifier.parent.kind === 50 /* MethodDeclaration */)) {
@@ -3213,18 +3200,18 @@ var CompletionService = class {
     if (tokenOrKeyword.isKeyword(18 /* Import */) && tokenOrKeyword.parent.kind === 5 /* SinglePackageImportDirective */) {
       return new PackageImportCompletionContext([], void 0);
     }
-    if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 8 /* PackageImport */) {
+    if (tokenOrKeyword.isToken(64 /* Equals */) && tokenOrKeyword.parent.kind === 8 /* PackageImport */) {
       return new PackageImportCompletionContext([], void 0);
     }
-    if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 9 /* PackageName */) {
+    if (tokenOrKeyword.isToken(28 /* Dot */) && tokenOrKeyword.parent.kind === 9 /* PackageName */) {
       const packageImport = tokenOrKeyword.parent.parent;
       const precedingSegmentNames = packageImport.packageName.segments.takeWhile((s) => s.rangeWithTrivia.start < tokenOrKeyword.value.rangeWithTrivia.start).map((p) => this.analyzer.createNameFromIdentifier(p)).toArray();
       return new PackageImportCompletionContext(precedingSegmentNames, void 0);
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || this.tokenOrKeywordIsPackageImportListChild(tokenOrKeyword)) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || this.tokenOrKeywordIsPackageImportListChild(tokenOrKeyword)) {
       return new PackageImportCompletionContext([], void 0);
     }
-    if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 76 /* MemberAccessExpression */) {
+    if (tokenOrKeyword.isToken(28 /* Dot */) && tokenOrKeyword.parent.kind === 76 /* MemberAccessExpression */) {
       const memberAccess = tokenOrKeyword.parent;
       {
         const packageTreeNode = this.analyzer.getDenotedPackageNameTreeNode(memberAccess.expression);
@@ -3254,7 +3241,7 @@ var CompletionService = class {
       const hidingMatcher = semanticContext.getHidingMatcher();
       return new TypeMemberCompletionContext(type, isStaticAccess, hidingMatcher, semanticContext);
     }
-    if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 10 /* NamedTypeSpecifier */) {
+    if (tokenOrKeyword.isToken(28 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 10 /* NamedTypeSpecifier */) {
       const namedTypeSpecifier = tokenOrKeyword.parent.parent;
       const resolutionResult = this.analyzer.resolveNamedTypeSpecifier(namedTypeSpecifier);
       const segmentIndex = Math.floor(
@@ -3293,7 +3280,7 @@ var CompletionService = class {
       }
       return { kind: "none" };
     }
-    if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 152 /* Tag */) {
+    if (tokenOrKeyword.isToken(28 /* Dot */) && tokenOrKeyword.parent.kind === 135 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 152 /* Tag */) {
       const tag = tokenOrKeyword.parent.parent;
       const resolutionResult = this.analyzer.resolveTag(tag);
       const segmentIndex = Math.floor(
@@ -3590,7 +3577,7 @@ var CompletionService = class {
     return result;
   }
   getKeywordCompletionItemInfos(syntaxContext, semanticContext, positionDescription) {
-    if (syntaxContext.isInComment || syntaxContext.isInStringOrChar) {
+    if (syntaxContext.isInComment || syntaxContext.isInText) {
       return [];
     }
     const kinds = /* @__PURE__ */ new Set();
@@ -3654,48 +3641,48 @@ var CompletionService = class {
     if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(40 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 56 /* NestedFunctionDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 65 /* FunctionLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 27 /* FunctionTypeDeclarationBody */)) {
       kinds.add(12 /* Function */);
     }
-    return Query.from(kinds.values()).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i).toArray();
+    return Query.from(kinds.values()).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i).toArray();
   }
   isRepeatWhileKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 115 /* LoopStatement */;
+    return tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 115 /* LoopStatement */;
   }
   isModifierLevelContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */;
+    return tokenOrKeyword.isToken(47 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */;
   }
   isElseOrElseIfKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 108 /* IfStatement */ && tokenOrKeyword.parent === tokenOrKeyword.parent.parent.block || tokenOrKeyword.parent.parent.kind === 110 /* ElseIfClause */);
+    return tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 108 /* IfStatement */ && tokenOrKeyword.parent === tokenOrKeyword.parent.parent.block || tokenOrKeyword.parent.parent.kind === 110 /* ElseIfClause */);
   }
   isCatchKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 100 /* TryStatement */;
+    return tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 100 /* TryStatement */;
   }
   isFinallyKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 100 /* TryStatement */ || tokenOrKeyword.parent.parent.kind === 101 /* CatchClause */);
+    return tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 100 /* TryStatement */ || tokenOrKeyword.parent.parent.kind === 101 /* CatchClause */);
   }
   isTypeKindCompletionContext(positionDescription) {
-    return positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(58 /* Equals */) && NodeTypeUtils.isPackageTypeDeclaration(positionDescription.tokenOrKeyword.parent);
+    return positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(64 /* Equals */) && NodeTypeUtils.isPackageTypeDeclaration(positionDescription.tokenOrKeyword.parent);
   }
   isFromKeywordContext(positionDescription) {
-    if (!(positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(10 /* Identifier */))) {
+    if (!(positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(9 /* Identifier */))) {
       return false;
     }
     const token = positionDescription.tokenOrKeyword.value;
@@ -3706,7 +3693,7 @@ var CompletionService = class {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 120 /* CaseClause */) {
+    if (tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 120 /* CaseClause */) {
       return true;
     }
     if (syntaxContext.precedingExpression !== void 0 && syntaxContext.precedingExpression.parent.kind === 118 /* SwitchStatement */) {
@@ -4000,7 +3987,7 @@ var CompletionService = class {
         12 /* Function */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -4058,7 +4045,7 @@ var CompletionService = class {
         31 /* Creation */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelper.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -4922,9 +4909,9 @@ var OperatorNameCompletionItemInfo = class {
   }
 };
 var SyntaxContext = class {
-  constructor(isInComment, isInStringOrChar, isInQuotedIdentifier, isPackageMemberDeclarationListContext, isTypeMemberDeclarationListContext, isStatementContext, isExpressionContext, precedingExpression, isUnqualifiedTypeContext, isUnqualifiedTagNameCompletionContext, isTopLevelTranslationListContext, isTypeMemberTranslationListContext) {
+  constructor(isInComment, isInText, isInQuotedIdentifier, isPackageMemberDeclarationListContext, isTypeMemberDeclarationListContext, isStatementContext, isExpressionContext, precedingExpression, isUnqualifiedTypeContext, isUnqualifiedTagNameCompletionContext, isTopLevelTranslationListContext, isTypeMemberTranslationListContext) {
     this.isInComment = isInComment;
-    this.isInStringOrChar = isInStringOrChar;
+    this.isInText = isInText;
     this.isInQuotedIdentifier = isInQuotedIdentifier;
     this.isPackageMemberDeclarationListContext = isPackageMemberDeclarationListContext;
     this.isTypeMemberDeclarationListContext = isTypeMemberDeclarationListContext;
@@ -4983,7 +4970,7 @@ var ExpressionRole_other = class {
 var SyntaxContextFactory = class {
   static fromPositionDescription(sourceFile, positionDescription) {
     const isInComment = this.isInComment(sourceFile, positionDescription.getOffset());
-    const isInStringOrChar = this.isInStringOrChar(sourceFile, positionDescription.getOffset());
+    const isInText = this.isInText(sourceFile, positionDescription.getOffset());
     const isInQuotedIdentifier = this.isInQuotedIdentifier(sourceFile, positionDescription.getOffset());
     let isPackageMemberDeclarationListContext = false;
     if (positionDescription.kind === "at-file-start") {
@@ -5021,7 +5008,7 @@ var SyntaxContextFactory = class {
     }
     return new SyntaxContext(
       isInComment,
-      isInStringOrChar,
+      isInText,
       isInQuotedIdentifier,
       isPackageMemberDeclarationListContext,
       isTypeMemberDeclarationListContext,
@@ -5035,7 +5022,7 @@ var SyntaxContextFactory = class {
     );
   }
   static isExpressionOrStatementContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(58 /* Equals */)) {
+    if (tokenOrKeyword.isToken(64 /* Equals */)) {
       if (tokenOrKeyword.parent.kind === 92 /* AssignmentStatement */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
@@ -5060,7 +5047,7 @@ var SyntaxContextFactory = class {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 147 /* VariantDeclaration */) {
+      if (tokenOrKeyword.parent.kind === 147 /* VariantValueDeclaration */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
@@ -5077,11 +5064,11 @@ var SyntaxContextFactory = class {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isToken(7 /* TextTemplateHead */) && (tokenOrKeyword.parent.kind === 79 /* TextTemplateLiteral */ || tokenOrKeyword.parent.kind === 80 /* LocalizableTextTemplateLiteral */)) {
+    if (tokenOrKeyword.isToken(6 /* TextTemplateHead */) && (tokenOrKeyword.parent.kind === 79 /* TextTemplateLiteral */ || tokenOrKeyword.parent.kind === 80 /* LocalizableTextTemplateLiteral */)) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.spanList.spans.at(0)?.expression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isToken(8 /* TextTemplatePart */) && tokenOrKeyword.parent.kind === 82 /* TextTemplateSpan */) {
+    if (tokenOrKeyword.isToken(7 /* TextTemplatePart */) && tokenOrKeyword.parent.kind === 82 /* TextTemplateSpan */) {
       let expressionForTargetType;
       const spanList = tokenOrKeyword.parent.parent;
       const spanIndex = spanList.spans.indexOf(tokenOrKeyword.parent);
@@ -5093,10 +5080,10 @@ var SyntaxContextFactory = class {
         isStatementContext: false
       };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */) {
       const block = tokenOrKeyword.parent;
       if (block.expressionOrStatementList.kind !== 93 /* StatementList */ || block.expressionOrStatementList.statements.count() === 0) {
         return {
@@ -5110,10 +5097,10 @@ var SyntaxContextFactory = class {
         };
       }
     }
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 93 /* StatementList */) {
+    if (tokenOrKeyword.isToken(58 /* Semicolon */) && tokenOrKeyword.parent.kind === 93 /* StatementList */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
-    if (tokenOrKeyword.isToken(45 /* OpenParenthesis */)) {
+    if (tokenOrKeyword.isToken(47 /* OpenParenthesis */)) {
       if (tokenOrKeyword.parent.kind === 73 /* ParenthesizedExpression */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
@@ -5142,15 +5129,15 @@ var SyntaxContextFactory = class {
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
     }
-    if (tokenOrKeyword.isToken(46 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
+    if (tokenOrKeyword.isToken(48 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
       const expressionRole = new ExpressionRole_argument(tokenOrKeyword.parent.argumentList, 0);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isToken(46 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 59 /* ArrayLiteral */) {
+    if (tokenOrKeyword.isToken(48 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 59 /* ArrayLiteral */) {
       const expressionRole = new ExpressionRole_arrayElement(tokenOrKeyword.parent);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isToken(25 /* Comma */)) {
+    if (tokenOrKeyword.isToken(26 /* Comma */)) {
       if (tokenOrKeyword.parent.kind === 67 /* ArgumentList */) {
         const argumentList = tokenOrKeyword.parent;
         let index = 0;
@@ -5245,16 +5232,16 @@ var SyntaxContextFactory = class {
     return { isExpressionContext: void 0, isStatementContext: false };
   }
   static isPackageMemberDeclarationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && (tokenOrKeyword.parent.kind === 2 /* PackageMemberDeclarationList */ || tokenOrKeyword.parent.kind === 4 /* PackageImportDirectiveList */)) {
+    if (tokenOrKeyword.isToken(58 /* Semicolon */) && (tokenOrKeyword.parent.kind === 2 /* PackageMemberDeclarationList */ || tokenOrKeyword.parent.kind === 4 /* PackageImportDirectiveList */)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */ && (tokenOrKeyword.parent.parent.kind === 38 /* TypeExtensionDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 31 /* PackageStructuredTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 36 /* PackageVariantTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 20 /* PackageAliasTypeDeclaration */)) {
+    if (tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */ && (tokenOrKeyword.parent.parent.kind === 38 /* TypeExtensionDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 31 /* PackageStructuredTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 36 /* PackageVariantTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 20 /* PackageAliasTypeDeclaration */)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(21 /* CloseBrace */) && (tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */ || tokenOrKeyword.parent.kind === 22 /* PackageMemberGroupDeclaration */ || tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && (tokenOrKeyword.parent.parent.kind === 23 /* PackageConstructorDeclaration */ || tokenOrKeyword.parent.parent.kind === 24 /* PackageEntryPointDeclaration */ || tokenOrKeyword.parent.parent.kind === 25 /* PackageFunctionDeclaration */))) {
+    if (tokenOrKeyword.isToken(22 /* CloseBrace */) && (tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */ || tokenOrKeyword.parent.kind === 22 /* PackageMemberGroupDeclaration */ || tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && (tokenOrKeyword.parent.parent.kind === 23 /* PackageConstructorDeclaration */ || tokenOrKeyword.parent.parent.kind === 24 /* PackageEntryPointDeclaration */ || tokenOrKeyword.parent.parent.kind === 25 /* PackageFunctionDeclaration */))) {
       return true;
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 22 /* PackageMemberGroupDeclaration */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 22 /* PackageMemberGroupDeclaration */) {
       return true;
     }
     if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 5 /* SinglePackageImportDirective */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 25 /* PackageFunctionDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 26 /* PackageFunctionTypeDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 20 /* PackageAliasTypeDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 33 /* PackageVariableDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
@@ -5266,7 +5253,7 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 154 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isToken(23 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 152 /* Tag */);
@@ -5276,13 +5263,13 @@ var SyntaxContextFactory = class {
     return false;
   }
   static isTypeMemberDeclarationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 29 /* TypeMemberDeclarationList */) {
+    if (tokenOrKeyword.isToken(58 /* Semicolon */) && tokenOrKeyword.parent.kind === 29 /* TypeMemberDeclarationList */) {
       return true;
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */) {
       return true;
     }
-    if (tokenOrKeyword.isToken(21 /* CloseBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */ && tokenOrKeyword.parent.parent.kind === 42 /* TypeMemberGroupDeclaration */) {
+    if (tokenOrKeyword.isToken(22 /* CloseBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */ && tokenOrKeyword.parent.parent.kind === 42 /* TypeMemberGroupDeclaration */) {
       return true;
     }
     if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 52 /* FieldDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 53 /* FieldGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 54 /* FieldSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
@@ -5297,13 +5284,13 @@ var SyntaxContextFactory = class {
     ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
       tokenOrKeyword,
       49 /* DereferencedVariableSetterDeclaration */
-    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 50 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 51 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 43 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 44 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 147 /* VariantDeclaration */)) {
+    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 50 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 51 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 43 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 44 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 147 /* VariantValueDeclaration */)) {
       return true;
     }
     if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 154 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(22 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isToken(23 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 152 /* Tag */);
@@ -5325,12 +5312,12 @@ var SyntaxContextFactory = class {
     }
     return trivia !== void 0 && offset > trivia.range.start && (trivia.kind === 2 /* SingleLineComment */ || trivia.kind === 3 /* MultiLineComment */);
   }
-  static isInStringOrChar(sourceFile, offset) {
+  static isInText(sourceFile, offset) {
     let token = getTokenAtOffset(sourceFile.getSyntaxNode(), offset, false);
     if (token?.tokenKind === 1 /* EndOfFile */ && token.rangeWithTrivia.isEmpty) {
       token = getTokenAtOffset(sourceFile.getSyntaxNode(), offset - 1, false);
     }
-    return token !== void 0 && offset > token.rangeWithoutTrivia.start && (token.tokenKind === 6 /* TextLiteral */ || token.tokenKind === 5 /* CharLiteral */ || token.tokenKind === 7 /* TextTemplateHead */ || token.tokenKind === 8 /* TextTemplatePart */ || token.tokenKind === 9 /* TextTemplateTail */);
+    return token !== void 0 && offset > token.rangeWithoutTrivia.start && (token.tokenKind === 5 /* TextLiteral */ || token.tokenKind === 6 /* TextTemplateHead */ || token.tokenKind === 7 /* TextTemplatePart */ || token.tokenKind === 8 /* TextTemplateTail */);
   }
   static isInQuotedIdentifier(sourceFile, offset) {
     let result;
@@ -5344,7 +5331,7 @@ var SyntaxContextFactory = class {
     return result;
   }
   static isUnqualifiedTypeContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(24 /* Colon */) && tokenOrKeyword.parent.kind === 161 /* TypeAnnotation */) {
+    if (tokenOrKeyword.isToken(25 /* Colon */) && tokenOrKeyword.parent.kind === 161 /* TypeAnnotation */) {
       return { allowsAnonymousTypes: true };
     }
     if ((tokenOrKeyword.isKeyword(4 /* Object */) || tokenOrKeyword.isKeyword(5 /* PlainObject */) || tokenOrKeyword.isKeyword(3 /* Aspect */)) && tokenOrKeyword.parent.kind === 32 /* StructuredTypeDeclarationBody */) {
@@ -5356,16 +5343,16 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isToken(37 /* LessThan */) && tokenOrKeyword.parent.kind === 157 /* TypeArgumentClause */) {
       return { allowsAnonymousTypes: true };
     }
-    if (tokenOrKeyword.isToken(25 /* Comma */) && (tokenOrKeyword.parent.kind === 28 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 158 /* TypeArgumentList */)) {
+    if (tokenOrKeyword.isToken(26 /* Comma */) && (tokenOrKeyword.parent.kind === 28 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 158 /* TypeArgumentList */)) {
       return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 158 /* TypeArgumentList */ };
     }
     if (tokenOrKeyword.isToken(36 /* HashSign */) && tokenOrKeyword.parent.kind === 152 /* Tag */) {
       return { allowsAnonymousTypes: false };
     }
-    if ((tokenOrKeyword.isToken(24 /* Colon */) || tokenOrKeyword.isToken(58 /* Equals */)) && tokenOrKeyword.parent.kind === 148 /* TypeParameterDeclaration */) {
+    if ((tokenOrKeyword.isToken(25 /* Colon */) || tokenOrKeyword.isToken(64 /* Equals */)) && tokenOrKeyword.parent.kind === 148 /* TypeParameterDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 20 /* PackageAliasTypeDeclaration */) {
+    if (tokenOrKeyword.isToken(64 /* Equals */) && tokenOrKeyword.parent.kind === 20 /* PackageAliasTypeDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
     if (tokenOrKeyword.isKeyword(14 /* Is */) && tokenOrKeyword.parent.kind === 72 /* IsExpression */) {
@@ -5374,22 +5361,22 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isKeyword(42 /* As */) && tokenOrKeyword.parent.kind === 63 /* AsExpression */) {
       return { allowsAnonymousTypes: true };
     }
-    if (tokenOrKeyword.isToken(18 /* Bar */) && tokenOrKeyword.parent.kind === 11 /* UnionTypeSpecifier */) {
+    if (tokenOrKeyword.isToken(17 /* Bar */) && tokenOrKeyword.parent.kind === 11 /* UnionTypeSpecifier */) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(11 /* Ampersand */) && tokenOrKeyword.parent.kind === 12 /* IntersectionTypeSpecifier */) {
+    if (tokenOrKeyword.isToken(10 /* Ampersand */) && tokenOrKeyword.parent.kind === 12 /* IntersectionTypeSpecifier */) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(45 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 13 /* ParenthesizedTypeSpecifier */) {
+    if (tokenOrKeyword.isToken(47 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 13 /* ParenthesizedTypeSpecifier */) {
       return { allowsAnonymousTypes: true };
     }
     return void 0;
   }
   static isTopLevelTranslationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 124 /* TopLevelTranslationList */) {
+    if (tokenOrKeyword.isToken(58 /* Semicolon */) && tokenOrKeyword.parent.kind === 124 /* TopLevelTranslationList */) {
       return { translationsDeclaration: tokenOrKeyword.parent.parent };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */) {
       return { translationsDeclaration: tokenOrKeyword.parent };
     }
     const type = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
@@ -5423,10 +5410,10 @@ var SyntaxContextFactory = class {
     return void 0;
   }
   static isTypeMemberTranslationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 138 /* TypeMemberTranslationList */) {
+    if (tokenOrKeyword.isToken(58 /* Semicolon */) && tokenOrKeyword.parent.kind === 138 /* TypeMemberTranslationList */) {
       return { typeTranslation: tokenOrKeyword.parent.parent };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */) {
+    if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */) {
       return { typeTranslation: tokenOrKeyword.parent };
     }
     const indexer = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 129 /* IndexerTranslation */);
@@ -5568,35 +5555,35 @@ var NodeSemanticInfoService = class {
       return this.ofPrefixUnaryExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.parent.kind === 64 /* BinaryExpression */) {
       return this.ofBinaryExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
-    } else if (tokenOrKeyword.isToken(20 /* Caret */) && (tokenOrKeyword.parent.kind === 48 /* DereferencedVariableGetterDeclaration */ || tokenOrKeyword.parent.kind === 49 /* DereferencedVariableSetterDeclaration */)) {
+    } else if (tokenOrKeyword.isToken(21 /* Caret */) && (tokenOrKeyword.parent.kind === 48 /* DereferencedVariableGetterDeclaration */ || tokenOrKeyword.parent.kind === 49 /* DereferencedVariableSetterDeclaration */)) {
       return this.ofDereferenceOperatorDeclaration(analyzer, tokenOrKeyword.parent);
-    } else if (tokenOrKeyword.isToken(20 /* Caret */) && tokenOrKeyword.parent.kind === 78 /* DereferenceExpression */) {
+    } else if (tokenOrKeyword.isToken(21 /* Caret */) && tokenOrKeyword.parent.kind === 78 /* DereferenceExpression */) {
       return this.ofDereferenceExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.parent.kind === 92 /* AssignmentStatement */) {
       return this.ofAssignmentStatementOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(31 /* Creation */) && tokenOrKeyword.parent.kind === 43 /* ConstructorDeclaration */) {
       return this.ofConstructorDeclaration(analyzer, tokenOrKeyword.parent);
-    } else if (tokenOrKeyword.isToken(14 /* Asterisk */) && tokenOrKeyword.parent.kind === 91 /* DefaultMatchExpression */) {
+    } else if (tokenOrKeyword.isToken(13 /* Asterisk */) && tokenOrKeyword.parent.kind === 91 /* DefaultMatchExpression */) {
       return this.ofDefaultMatchExpression(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isKeyword(12 /* Function */) && tokenOrKeyword.parent.kind === 65 /* FunctionLiteral */) {
       return this.ofRegularOrBlockFunctionLiteral(analyzer, tokenOrKeyword.parent);
-    } else if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && tokenOrKeyword.parent.parent.kind === 66 /* FunctionBlockLiteral */) {
+    } else if (tokenOrKeyword.isToken(46 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */ && tokenOrKeyword.parent.parent.kind === 66 /* FunctionBlockLiteral */) {
       return this.ofRegularOrBlockFunctionLiteral(analyzer, tokenOrKeyword.parent.parent);
     } else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 87 /* ObjectExpression */) {
       return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(56 /* Base */) && tokenOrKeyword.parent.kind === 88 /* BaseExpression */) {
       return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options7);
-    } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 47 /* IndexParameterClause */) {
+    } else if ((tokenOrKeyword.isToken(48 /* OpenSquareBracket */) || tokenOrKeyword.isToken(24 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 47 /* IndexParameterClause */) {
       return this.ofIndexedElementAccessorDeclaration(analyzer, tokenOrKeyword.parent.parent);
-    } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
+    } else if ((tokenOrKeyword.isToken(48 /* OpenSquareBracket */) || tokenOrKeyword.isToken(24 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
       return this.ofIndexedAccessExpressionOperator(analyzer, tokenOrKeyword.parent, options7);
     } else if (tokenOrKeyword.isKeyword(31 /* Creation */) && tokenOrKeyword.parent.kind === 127 /* ConstructorTranslation */) {
       return this.ofConstructorTranslationSourceConstructor(analyzer, tokenOrKeyword.parent, options7);
-    } else if ((tokenOrKeyword.isToken(45 /* OpenParenthesis */) || tokenOrKeyword.isToken(22 /* CloseParenthesis */)) && tokenOrKeyword.parent.kind === 126 /* TranslationParameterClause */ && tokenOrKeyword.parent.parent.kind === 127 /* ConstructorTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
+    } else if ((tokenOrKeyword.isToken(47 /* OpenParenthesis */) || tokenOrKeyword.isToken(23 /* CloseParenthesis */)) && tokenOrKeyword.parent.kind === 126 /* TranslationParameterClause */ && tokenOrKeyword.parent.parent.kind === 127 /* ConstructorTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
       return this.ofConstructorTranslationTranslatedConstructor(analyzer, tokenOrKeyword.parent.parent, options7);
-    } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.sourceParameterClause === tokenOrKeyword.parent) {
+    } else if ((tokenOrKeyword.isToken(48 /* OpenSquareBracket */) || tokenOrKeyword.isToken(24 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.sourceParameterClause === tokenOrKeyword.parent) {
       return this.ofIndexerTranslationSourceIndexer(analyzer, tokenOrKeyword.parent.parent, options7);
-    } else if ((tokenOrKeyword.isToken(46 /* OpenSquareBracket */) || tokenOrKeyword.isToken(23 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
+    } else if ((tokenOrKeyword.isToken(48 /* OpenSquareBracket */) || tokenOrKeyword.isToken(24 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 128 /* IndexParameterTranslationClause */ && tokenOrKeyword.parent.parent.kind === 129 /* IndexerTranslation */ && tokenOrKeyword.parent.parent.translatedParameterClause === tokenOrKeyword.parent) {
       return this.ofIndexerTranslationTranslatedIndexer(analyzer, tokenOrKeyword.parent.parent, options7);
     }
     return void 0;
@@ -5738,8 +5725,8 @@ var NodeSemanticInfoService = class {
       case 148 /* TypeParameterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTypeParameterDeclaration(parent));
         break;
-      case 147 /* VariantDeclaration */:
-        result = new DefinitionNodeSemanticInfo(analyzer.entity.ofVariantDeclaration(parent));
+      case 147 /* VariantValueDeclaration */:
+        result = new DefinitionNodeSemanticInfo(analyzer.entity.ofVariantValueDeclaration(parent));
         break;
       case 34 /* PackageVariableGetterDeclaration */:
       case 35 /* PackageVariableSetterDeclaration */:
@@ -5762,7 +5749,7 @@ var NodeSemanticInfoService = class {
   }
   static ofMember(analyzer, node, options7) {
     let result;
-    const meaning = analyzer.resolveMemberAccessExpression(node).meaning;
+    const meaning = analyzer.resolveMemberAccessExpression(node);
     switch (meaning.kind) {
       case "instance-field-access": {
         let narrowedType;
@@ -6044,7 +6031,7 @@ var NodeSemanticInfoService = class {
   }
   static ofIdentifierExpression(analyzer, node, options7) {
     let result;
-    const meaning = analyzer.resolveIdentifierExpression(node).meaning;
+    const meaning = analyzer.resolveIdentifierExpression(node);
     switch (meaning.kind) {
       case "type-access":
         if (meaning.suitableTypes.length > 0) {
@@ -6168,7 +6155,7 @@ var NodeSemanticInfoService = class {
     return new DefinitionNodeSemanticInfo(entity);
   }
   static ofIndexedAccessExpressionOperator(analyzer, node, options7) {
-    const meaning = analyzer.resolveIndexedAccessExpression(node).meaning;
+    const meaning = analyzer.resolveIndexedAccessExpression(node);
     if (meaning.kind === "resolved") {
       let result;
       if (isNonEmptyArray(meaning.suitableIndexers)) {
@@ -6195,8 +6182,8 @@ var NodeSemanticInfoService = class {
     const operatorKind = analyzer.getBinaryOperatorKindIfCompoundAssignmentOperator(node.operator);
     if (operatorKind !== void 0) {
       const operator = analyzer.resolveCompoundAssignmentStatementOperator(node, operatorKind);
-      if (operator.kind === "ok") {
-        const target = new OperatorReferenceTarget(operator.value);
+      if (operator !== void 0) {
+        const target = new OperatorReferenceTarget(operator);
         let result = new ReferenceNodeSemanticInfo([target], false);
         if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6210,8 +6197,8 @@ var NodeSemanticInfoService = class {
     const classificationResult = analyzer.classifyBinaryExpressionOperator(node.operator);
     if (classificationResult.kind === "user-definable") {
       const operator = analyzer.resolveBinaryExpressionUserDefinableOperator(node, classificationResult.operatorKind);
-      if (operator.kind === "ok") {
-        const target = new OperatorReferenceTarget(operator.value);
+      if (operator !== void 0) {
+        const target = new OperatorReferenceTarget(operator);
         let result = new ReferenceNodeSemanticInfo([target], false);
         if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6223,8 +6210,8 @@ var NodeSemanticInfoService = class {
   }
   static ofPrefixUnaryExpressionOperator(analyzer, node, options7) {
     const operator = analyzer.resolvePrefixUnaryExpressionUserDefinableOperator(node);
-    if (operator.kind === "ok") {
-      const target = new OperatorReferenceTarget(operator.value);
+    if (operator !== void 0) {
+      const target = new OperatorReferenceTarget(operator);
       let result = new ReferenceNodeSemanticInfo([target], false);
       if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6269,7 +6256,7 @@ var NodeSemanticInfoService = class {
     return result;
   }
   static ofObjectExpression(analyzer, node, options7) {
-    const meaning = analyzer.resolveObjectExpression(node).meaning;
+    const meaning = analyzer.resolveObjectExpression(node);
     let result;
     switch (meaning.kind) {
       case "own-constructor-access": {
@@ -6301,7 +6288,7 @@ var NodeSemanticInfoService = class {
     return result;
   }
   static ofBaseExpression(analyzer, node, options7) {
-    const meaning = analyzer.resolveBaseExpression(node).meaning;
+    const meaning = analyzer.resolveBaseExpression(node);
     let result;
     switch (meaning.kind) {
       case "base-constructor-access": {
@@ -6400,7 +6387,7 @@ var NodeSemanticInfoService = class {
   static ofPackageNameSegmentAccess(analyzer, packageTreeNode, node) {
     let parent = getParentSkippingParenthesizedExpressions(node);
     while (parent.kind === 76 /* MemberAccessExpression */) {
-      const meaning = analyzer.resolveMemberAccessExpression(parent).meaning;
+      const meaning = analyzer.resolveMemberAccessExpression(parent);
       if (meaning.kind === "package-name-segment-access") {
         packageTreeNode = meaning.packageTreeNode;
         parent = getParentSkippingParenthesizedExpressions(parent);
@@ -6854,9 +6841,9 @@ var DefinitionService = class {
   getDefinition(analyzer, sourceFile, offset, taskController) {
     return __async(this, null, function* () {
       const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
-        if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
+        if (t.isToken(9 /* Identifier */) || t.isKeyword()) {
           return 2;
-        } else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
+        } else if (t.isToken(21 /* Caret */) || t.isToken(48 /* OpenSquareBracket */) || t.isToken(24 /* CloseSquareBracket */)) {
           return 1;
         } else {
           return 0;
@@ -7081,38 +7068,6 @@ var DefinitionsAndReferenceInfo = class {
   }
 };
 
-// source/services/DeleteBlockFromScriptService.ts
-var DeleteBlockFromScriptService = class {
-  createEditDeletingBlock(sourceFile, subprogramDeclaration) {
-    let result;
-    if (NodeTypeUtils.isRegularOrBlockFunctionLiteral(subprogramDeclaration) && subprogramDeclaration.parent.kind === 150 /* Argument */ && subprogramDeclaration.parent.parent.parent.kind === 68 /* CallExpression */) {
-      const callExpression = subprogramDeclaration.parent.parent.parent;
-      let rangeStart = callExpression.rangeWithoutTrivia.start;
-      let rangeEnd = callExpression.rangeWithoutTrivia.end;
-      const leadingTrivia = callExpression.findLeftmostToken()?.selectLeadingTrivia(() => true);
-      const lastLeadingTrivia = leadingTrivia !== void 0 && leadingTrivia.length > 0 ? leadingTrivia[leadingTrivia.length - 1] : void 0;
-      if (lastLeadingTrivia?.kind === 0 /* Whitespace */) {
-        rangeStart = lastLeadingTrivia.range.start;
-      }
-      const trailingTrivia = callExpression.findRightmostToken()?.selectTrailingTrivia(() => true);
-      if (trailingTrivia !== void 0) {
-        let trailingTriviaIndex = -1;
-        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 0 /* Whitespace */) {
-          trailingTriviaIndex++;
-        }
-        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 1 /* NewLine */) {
-          trailingTriviaIndex++;
-        }
-        if (trailingTriviaIndex >= 0) {
-          rangeEnd = trailingTrivia[trailingTriviaIndex].range.end;
-        }
-      }
-      result = new SourceFileEdit(sourceFile, new Range(rangeStart, rangeEnd), "");
-    }
-    return result;
-  }
-};
-
 // source/services/ReferencesService.ts
 var ReferencesService = class {
   getReferencesInCompilation(analyzer, sourceFile, offset, options7, taskController) {
@@ -7411,9 +7366,9 @@ var ReferencesService = class {
   }
   getReferencedDefinitionInfosAtOffset(analyzer, sourceFile, offset, options7) {
     const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
-      if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
+      if (t.isToken(9 /* Identifier */) || t.isKeyword()) {
         return 2;
-      } else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */)) {
+      } else if (t.isToken(21 /* Caret */) || t.isToken(48 /* OpenSquareBracket */) || t.isToken(24 /* CloseSquareBracket */)) {
         return 1;
       } else {
         return 0;
@@ -7755,7 +7710,7 @@ var EvaluatableExpressionService = class {
     if (isIdentifier(node)) {
       let originalName;
       if (node.parent.kind === 76 /* MemberAccessExpression */) {
-        const meaning = analyzer.resolveMemberAccessExpression(node.parent).meaning;
+        const meaning = analyzer.resolveMemberAccessExpression(node.parent);
         let entity;
         switch (meaning.kind) {
           case "static-field-access":
@@ -7773,7 +7728,7 @@ var EvaluatableExpressionService = class {
         }
         originalName = entity?.getOriginalEntity().getName().keyWithoutBackQuotes;
       } else if (node.parent.kind === 89 /* IdentifierExpression */) {
-        const meaning = analyzer.resolveIdentifierExpression(node.parent).meaning;
+        const meaning = analyzer.resolveIdentifierExpression(node.parent);
         let entity;
         switch (meaning.kind) {
           case "variable-access":
@@ -7846,7 +7801,7 @@ var EvaluatableExpressionService = class {
       case 50 /* MethodDeclaration */:
       case 52 /* FieldDeclaration */:
       case 148 /* TypeParameterDeclaration */:
-      case 147 /* VariantDeclaration */:
+      case 147 /* VariantValueDeclaration */:
       case 102 /* ErrorVariableDeclaration */:
       case 34 /* PackageVariableGetterDeclaration */:
       case 35 /* PackageVariableSetterDeclaration */:
@@ -7924,11 +7879,11 @@ var FileSystemTreeDisplayService = class _FileSystemTreeDisplayService {
 var HoverService = class {
   getHover(analyzer, sourceFile, offset) {
     const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSingleWithHighestPriority((t) => {
-      if (t.isToken(10 /* Identifier */) || t.isKeyword()) {
+      if (t.isToken(9 /* Identifier */) || t.isKeyword()) {
         return 2;
-      } else if (t.isToken(14 /* Asterisk */)) {
+      } else if (t.isToken(13 /* Asterisk */)) {
         return 1;
-      } else if (t.isToken(20 /* Caret */) || t.isToken(46 /* OpenSquareBracket */) || t.isToken(23 /* CloseSquareBracket */) || t.isToken(44 /* OpenBrace */)) {
+      } else if (t.isToken(21 /* Caret */) || t.isToken(48 /* OpenSquareBracket */) || t.isToken(24 /* CloseSquareBracket */) || t.isToken(46 /* OpenBrace */)) {
         return 1;
       } else {
         return 0;
@@ -8064,337 +8019,40 @@ var Hover = class {
   }
 };
 
-// source/services/SourceFileItemsService.ts
-var SourceFileItemsService = class {
-  getItems(sourceFile) {
-    this.sourceFile = sourceFile;
-    return this.getChildItems(sourceFile.getSyntaxNode());
+// source/services/RenameService.ts
+var RenameService = class {
+  constructor() {
+    this.referencesService = new ReferencesService();
   }
-  get locale() {
-    return this.sourceFile.package.locale;
+  prepareRename(analyzer, sourceFile, offset) {
+    const checkResult = this.canRename(analyzer, sourceFile, offset);
+    return checkResult?.renameRange;
   }
-  get dialect() {
-    return this.sourceFile.package.dialect;
-  }
-  getChildItems(node) {
-    const result = new Array();
-    visitChildren(node, false, (node2) => {
-      const items = this.getChildItems(node2);
-      switch (node2.kind) {
-        case 8 /* PackageImport */: {
-          if (node2.alias !== void 0) {
-            result.push(this.createItem(
-              0 /* PackageAlias */,
-              node2.alias.value,
-              node2.rangeWithoutTrivia,
-              node2.alias.rangeWithoutTrivia,
-              items
-            ));
-          }
-          break;
-        }
-        case 33 /* PackageVariableDeclaration */: {
-          result.push(this.createItem(
-            1 /* PackageVariable */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 34 /* PackageVariableGetterDeclaration */: {
-          result.push(this.createItem(
-            2 /* PackageVariableGetter */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 35 /* PackageVariableSetterDeclaration */: {
-          result.push(this.createItem(
-            3 /* PackageVariableSetter */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 25 /* PackageFunctionDeclaration */: {
-          result.push(this.createItem(
-            4 /* PackageFunction */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 31 /* PackageStructuredTypeDeclaration */: {
-          result.push(this.createItem(
-            5 /* StructuredType */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 52 /* FieldDeclaration */: {
-          result.push(this.createItem(
-            12 /* Field */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 53 /* FieldGetterDeclaration */: {
-          result.push(this.createItem(
-            13 /* FieldGetter */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 54 /* FieldSetterDeclaration */: {
-          result.push(this.createItem(
-            14 /* FieldSetter */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 50 /* MethodDeclaration */: {
-          result.push(this.createItem(
-            15 /* Method */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 43 /* ConstructorDeclaration */: {
-          result.push(this.createItem(
-            10 /* Constructor */,
-            void 0,
-            node2.rangeWithoutTrivia,
-            node2.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 44 /* DestructorDeclaration */: {
-          result.push(this.createItem(
-            11 /* Destructor */,
-            void 0,
-            node2.rangeWithoutTrivia,
-            node2.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 45 /* IndexedElementGetterDeclaration */: {
-          result.push(this.createItem(
-            16 /* IndexedElementGetter */,
-            void 0,
-            node2.rangeWithoutTrivia,
-            node2.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 46 /* IndexedElementSetterDeclaration */: {
-          result.push(this.createItem(
-            17 /* IndexedElementSetter */,
-            void 0,
-            node2.rangeWithoutTrivia,
-            node2.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 26 /* PackageFunctionTypeDeclaration */: {
-          result.push(this.createItem(
-            6 /* FunctionType */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 36 /* PackageVariantTypeDeclaration */: {
-          result.push(this.createItem(
-            7 /* VariantType */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 147 /* VariantDeclaration */: {
-          result.push(this.createItem(
-            9 /* Variant */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 148 /* TypeParameterDeclaration */: {
-          result.push(this.createItem(
-            18 /* TypeParameter */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        case 56 /* NestedFunctionDeclaration */: {
-          result.push(this.createItem(
-            19 /* NestedFunction */,
-            node2.name.value,
-            node2.rangeWithoutTrivia,
-            node2.name.rangeWithoutTrivia,
-            items
-          ));
-          break;
-        }
-        default: {
-          result.push(...items);
-          break;
-        }
-      }
-    });
-    return result;
-  }
-  createItem(kind, name, range, selectionRange, items) {
-    const itemName = this.getNameOrStubIfEmpty(name, kind);
-    return new Item(kind, itemName, range, selectionRange, items, this.sourceFile);
-  }
-  getNameOrStubIfEmpty(name, kind) {
-    if (name !== void 0 && name.trim().length === 0) {
-      name = void 0;
-    }
-    switch (kind) {
-      case 0 /* PackageAlias */:
-        return name ?? `<${LocalizationHelper.localizeHelperPhrase(4 /* PackageAlias */, this.locale)}>`;
-      case 1 /* PackageVariable */:
-      case 12 /* Field */:
-        return name ?? `<${LocalizationHelper.localizeHelperPhrase(6 /* Variable */, this.locale)}>`;
-      case 4 /* PackageFunction */:
-      case 15 /* Method */:
-      case 19 /* NestedFunction */:
-        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(12 /* Function */, this.locale, this.dialect)}>`;
-      case 5 /* StructuredType */:
-      case 6 /* FunctionType */:
-      case 7 /* VariantType */:
-      case 8 /* InvalidType */:
-        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(16 /* Type */, this.locale, this.dialect)}>`;
-      case 10 /* Constructor */:
-        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(31 /* Creation */, this.locale, this.dialect);
-      case 11 /* Destructor */:
-        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(58 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
-      case 3 /* PackageVariableSetter */:
-      case 14 /* FieldSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
-      case 16 /* IndexedElementGetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Get */, this.locale, this.dialect)} []`;
-      case 17 /* IndexedElementSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} []`;
-      default:
-        Debug.never(kind);
-    }
-  }
-};
-var Item = class {
-  constructor(kind, name, range, selectionRange, items, sourceFile) {
-    this.kind = kind;
-    this.name = name;
-    this.range = range;
-    this.selectionRange = selectionRange;
-    this.items = items;
-    this.sourceFile = sourceFile;
-  }
-};
-
-// source/services/ProjectItemsService.ts
-var WorkspaceItemsService = class {
-  constructor() {
-    this.sourceFileItemsService = new SourceFileItemsService();
-  }
-  getItems(compilations) {
-    const result = new Array();
-    const packageUris = /* @__PURE__ */ new Set();
-    for (const compilation of compilations) {
-      for (const pkg of compilation.allPackages) {
-        if (packageUris.has(pkg.uri.toString())) {
-          continue;
-        }
-        packageUris.add(pkg.uri.toString());
-        for (const sourceFile of pkg.sourceFiles) {
-          result.push(...this.sourceFileItemsService.getItems(sourceFile));
-        }
-      }
-    }
-    return result;
-  }
-};
-
-// source/services/RenameService.ts
-var RenameService = class {
-  constructor() {
-    this.referencesService = new ReferencesService();
-  }
-  prepareRename(analyzer, sourceFile, offset) {
-    const checkResult = this.canRename(analyzer, sourceFile, offset);
-    return checkResult?.renameRange;
-  }
-  rename(analyzer, sourceFile, offset, newText, taskController) {
-    return __async(this, null, function* () {
-      let result;
-      if (this.canRename(analyzer, sourceFile, offset) !== void 0) {
-        const options7 = {
-          onlyWithSameAlias: true,
-          onlyNamed: true,
-          allowAmbiguous: false,
-          isForRename: true
-        };
-        const sourceFiles = Query.from(analyzer.compilation.enumerateSourceFiles()).filter((f) => f.uri.scheme !== InMemoryPackageScheme);
-        const references = yield this.referencesService.getReferencesInFiles(
-          analyzer,
-          sourceFile,
-          offset,
-          sourceFiles,
-          options7,
-          taskController
-        );
-        result = references.map((r) => new Rename(r.sourceFile, r.range, newText));
-      } else {
-        result = [];
-      }
-      return result;
-    });
+  rename(analyzer, sourceFile, offset, newText, taskController) {
+    return __async(this, null, function* () {
+      let result;
+      if (this.canRename(analyzer, sourceFile, offset) !== void 0) {
+        const options7 = {
+          onlyWithSameAlias: true,
+          onlyNamed: true,
+          allowAmbiguous: false,
+          isForRename: true
+        };
+        const sourceFiles = Query.from(analyzer.compilation.enumerateSourceFiles()).filter((f) => f.uri.scheme !== InMemoryPackageScheme);
+        const references = yield this.referencesService.getReferencesInFiles(
+          analyzer,
+          sourceFile,
+          offset,
+          sourceFiles,
+          options7,
+          taskController
+        );
+        result = references.map((r) => new Rename(r.sourceFile, r.range, newText));
+      } else {
+        result = [];
+      }
+      return result;
+    });
   }
   canRename(analyzer, sourceFile, offset) {
     const tokenOrKeyword = getTokenOrKeywordsTouchingOffset(sourceFile.getSyntaxNode(), offset).getSinglePrioritizingNamed();
@@ -8470,6 +8128,167 @@ var Rename = class {
   }
 };
 
+// source/services/ScriptEditingService.ts
+var ScriptEditingService = class _ScriptEditingService {
+  static {
+    this.indentationStep = "  ";
+  }
+  static {
+    this.elementParameterNameText = "el";
+  }
+  static {
+    this.elementParameterName = new Name(_ScriptEditingService.elementParameterNameText);
+  }
+  createEditWithFieldAssignment(analyzer, sourceFile, scriptDeclaration, fieldName, value) {
+    const subprogramBlock = scriptDeclaration.block;
+    if (subprogramBlock === void 0) {
+      return void 0;
+    }
+    const lastAssignmentStatement = this.findLastAssignmentToField(analyzer, subprogramBlock, fieldName);
+    let result;
+    if (lastAssignmentStatement !== void 0) {
+      result = new SourceFileEdit(sourceFile, lastAssignmentStatement.right.rangeWithoutTrivia, value);
+    } else {
+      const assignmentText = `${_ScriptEditingService.elementParameterNameText}.${fieldName} = ${value}`;
+      if (subprogramBlock.expressionOrStatementList.kind === 93 /* StatementList */) {
+        const lastStatement = subprogramBlock.expressionOrStatementList?.statements.last();
+        let editRange;
+        let indentationText;
+        if (lastStatement !== void 0) {
+          editRange = Range.empty(lastStatement.rangeWithoutTrivia.end);
+          const statementStartCharacter = sourceFile.getPositionAt(lastStatement.rangeWithoutTrivia.start).character;
+          indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(statementStartCharacter)}`;
+        } else {
+          const openBraceRange = subprogramBlock.openBraceToken.rangeWithoutTrivia;
+          const closeBraceRange = subprogramBlock.closeBraceToken.rangeWithoutTrivia;
+          const openBracePosition = sourceFile.getPositionAt(openBraceRange.start);
+          const closeBracePosition = sourceFile.getPositionAt(closeBraceRange.start);
+          if (openBracePosition.line !== closeBracePosition.line) {
+            editRange = Range.empty(openBraceRange.end);
+            indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(closeBracePosition.character + 2)}`;
+          } else {
+            editRange = Range.empty(openBraceRange.end);
+            indentationText = " ";
+          }
+        }
+        result = new SourceFileEdit(sourceFile, editRange, `${indentationText}${assignmentText}`);
+      } else {
+        const expressionStartCharacter = sourceFile.getPositionAt(subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.start).character;
+        const indentationText = `${this.detectNewLine(sourceFile.getSourceText())}${" ".repeat(expressionStartCharacter)}`;
+        const editRange = Range.empty(subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.end);
+        result = new SourceFileEdit(sourceFile, editRange, `${indentationText}${assignmentText}`);
+      }
+    }
+    return result;
+  }
+  createEditAddingBlocks(sourceFile, scriptDeclaration, addedBlockInfos) {
+    const subprogramBlock = scriptDeclaration.block;
+    if (subprogramBlock === void 0) {
+      return void 0;
+    }
+    let scriptBlockIndentation;
+    let editStart;
+    if (subprogramBlock.expressionOrStatementList.kind === 93 /* StatementList */) {
+      const lastStatement = subprogramBlock.expressionOrStatementList.statements.last();
+      if (lastStatement !== void 0) {
+        const lastStatementStartCharacter = sourceFile.getPositionAt(lastStatement.rangeWithoutTrivia.start).character;
+        scriptBlockIndentation = " ".repeat(lastStatementStartCharacter);
+        editStart = lastStatement.rangeWithoutTrivia.end;
+      } else {
+        const openBraceStartCharacter = sourceFile.getPositionAt(subprogramBlock.openBraceToken.rangeWithoutTrivia.start).character;
+        scriptBlockIndentation = " ".repeat(openBraceStartCharacter) + _ScriptEditingService.indentationStep;
+        editStart = subprogramBlock.openBraceToken.rangeWithoutTrivia.end;
+      }
+    } else {
+      const expressionStartCharacter = sourceFile.getPositionAt(subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.start).character;
+      scriptBlockIndentation = " ".repeat(expressionStartCharacter);
+      editStart = subprogramBlock.expressionOrStatementList.rangeWithoutTrivia.end;
+    }
+    const newLine = this.detectNewLine(sourceFile.getSourceText());
+    const scriptBlocksText = addedBlockInfos.map((i) => this.createScriptBlockText(i, scriptBlockIndentation, newLine)).join(newLine);
+    const editText = `${newLine}${scriptBlocksText}`;
+    const result = new SourceFileEdit(sourceFile, Range.empty(editStart), editText);
+    return result;
+  }
+  canDeleteBlocks(outerScriptFunctionLocation, scriptFunctionLocations) {
+    const outerScriptPathText = outerScriptFunctionLocation.path.toString();
+    return scriptFunctionLocations.every((l) => l.sourceFile === outerScriptFunctionLocation.sourceFile && l.path.toString().startsWith(outerScriptPathText));
+  }
+  createEditDeletingBlock(sourceFile, scriptDeclaration) {
+    let result;
+    if (NodeTypeUtils.isRegularOrBlockFunctionLiteral(scriptDeclaration) && scriptDeclaration.parent.kind === 150 /* Argument */ && scriptDeclaration.parent.parent.parent.kind === 68 /* CallExpression */) {
+      const callExpression = scriptDeclaration.parent.parent.parent;
+      let rangeStart = callExpression.rangeWithoutTrivia.start;
+      let rangeEnd = callExpression.rangeWithoutTrivia.end;
+      const leadingTrivia = callExpression.findLeftmostToken()?.selectLeadingTrivia(() => true);
+      const lastLeadingTrivia = leadingTrivia !== void 0 && leadingTrivia.length > 0 ? leadingTrivia[leadingTrivia.length - 1] : void 0;
+      if (lastLeadingTrivia?.kind === 0 /* Whitespace */) {
+        rangeStart = lastLeadingTrivia.range.start;
+      }
+      const trailingTrivia = callExpression.findRightmostToken()?.selectTrailingTrivia(() => true);
+      if (trailingTrivia !== void 0) {
+        let trailingTriviaIndex = -1;
+        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 0 /* Whitespace */) {
+          trailingTriviaIndex++;
+        }
+        if (trailingTrivia.length > trailingTriviaIndex + 1 && trailingTrivia[trailingTriviaIndex + 1].kind === 1 /* NewLine */) {
+          trailingTriviaIndex++;
+        }
+        if (trailingTriviaIndex >= 0) {
+          rangeEnd = trailingTrivia[trailingTriviaIndex].range.end;
+        }
+      }
+      result = new SourceFileEdit(sourceFile, new Range(rangeStart, rangeEnd), "");
+    }
+    return result;
+  }
+  findLastAssignmentToField(analyzer, block, fieldNameText) {
+    if (block.expressionOrStatementList.kind !== 93 /* StatementList */) {
+      return void 0;
+    }
+    const fieldName = new Name(fieldNameText);
+    const statements = block.expressionOrStatementList.statements.toArray();
+    for (let i = statements.length - 1; i >= 0; i--) {
+      const statement = statements[i];
+      if (statement.kind === 92 /* AssignmentStatement */) {
+        const left = unwrapParenthesizedExpressions(statement.left);
+        if (left.kind === 76 /* MemberAccessExpression */) {
+          const memberAccessMeaning = analyzer.resolveMemberAccessExpression(left);
+          if (memberAccessMeaning.kind === "instance-field-access" && memberAccessMeaning.field.getName().considerEqual(fieldName)) {
+            const receiver = unwrapParenthesizedExpressions(left.expression);
+            if (receiver.kind === 89 /* IdentifierExpression */) {
+              const receiverMeaning = analyzer.resolveIdentifierExpression(receiver);
+              if (receiverMeaning.kind === "variable-access" && receiverMeaning.variable.getName().considerEqual(_ScriptEditingService.elementParameterName)) {
+                return statement;
+              }
+            }
+          }
+        }
+      }
+    }
+    return void 0;
+  }
+  createScriptBlockText(blockInfo, indentation, newLine) {
+    const i = indentation;
+    const s = _ScriptEditingService.indentationStep;
+    const nl = newLine;
+    const el = _ScriptEditingService.elementParameterNameText;
+    let result = `${i}${blockInfo.name}(${nl}${i}${s}key = ${blockInfo.key},${nl}`;
+    if (blockInfo.areaIndex !== void 0) {
+      result += `${i}${s}areaIndex = ${blockInfo.areaIndex},${nl}`;
+    }
+    result += `${i}${s}script =${nl}${i}${s}{${nl}` + Object.entries(blockInfo.elementProperties).map(([p, v]) => `${i}${s}${s}${el}.${p} = ${v}${nl}`).join("");
+    if (blockInfo.nestedBlocks.length > 0) {
+      result += blockInfo.nestedBlocks.map((b) => this.createScriptBlockText(b, `${i}${s}${s}`, nl) + nl).join("");
+    }
+    result += `${i}${s}})`;
+    return result;
+  }
+  detectNewLine(text) {
+    return text.includes("\r\n") ? "\r\n" : "\n";
+  }
+};
+
 // source/services/SelectionRangeService.ts
 var SelectionRangeService = class {
   getSelectionRange(sourceFile, offset) {
@@ -8489,13 +8308,13 @@ var SelectionRangeService = class {
       if (!this.nodeShouldBeSkipped(child) && !child.rangeWithoutTrivia.equals(result.range)) {
         result = new SelectionRange(child.rangeWithoutTrivia, result);
       }
-      if (child.kind === 0 /* Token */ && (child.tokenKind === 6 /* TextLiteral */ || child.tokenKind === 7 /* TextTemplateHead */ || child.tokenKind === 8 /* TextTemplatePart */ || child.tokenKind === 9 /* TextTemplateTail */ || child.tokenKind === 5 /* CharLiteral */)) {
+      if (child.kind === 0 /* Token */ && (child.tokenKind === 5 /* TextLiteral */ || child.tokenKind === 6 /* TextTemplateHead */ || child.tokenKind === 7 /* TextTemplatePart */ || child.tokenKind === 8 /* TextTemplateTail */)) {
         let textContentStart = child.rangeWithoutTrivia.start + 1;
         let textContentEnd = child.rangeWithoutTrivia.end - 1;
-        if ((child.flags & 128 /* StartsWithTilde */) !== 0) {
+        if ((child.flags & 512 /* StartsWithTilde */) !== 0) {
           textContentStart += 1;
         }
-        if ((child.flags & 256 /* EndsWithTilde */) !== 0) {
+        if ((child.flags & 1024 /* EndsWithTilde */) !== 0) {
           textContentEnd -= 1;
         }
         if (offset >= textContentStart && offset < textContentEnd) {
@@ -8508,7 +8327,7 @@ var SelectionRangeService = class {
   }
   nodeContainsOffset(node, offset, searchInTrivia) {
     const range = searchInTrivia ? node.rangeWithTrivia : node.rangeWithoutTrivia;
-    if (node.kind === 0 /* Token */ && node.tokenKind === 10 /* Identifier */ || node.kind === 3 /* Keyword */) {
+    if (node.kind === 0 /* Token */ && node.tokenKind === 9 /* Identifier */ || node.kind === 3 /* Keyword */) {
       return offset >= range.start && offset <= range.end;
     } else {
       return offset >= range.start && offset < range.end;
@@ -8517,9 +8336,9 @@ var SelectionRangeService = class {
   nodeShouldBeSkipped(node) {
     if (node.kind === 0 /* Token */) {
       switch (node.tokenKind) {
-        case 7 /* TextTemplateHead */:
-        case 8 /* TextTemplatePart */:
-        case 9 /* TextTemplateTail */:
+        case 6 /* TextTemplateHead */:
+        case 7 /* TextTemplatePart */:
+        case 8 /* TextTemplateTail */:
           return true;
         default:
           return false;
@@ -8571,7 +8390,7 @@ var SemanticTokensService = class {
             return;
           }
           if (node.kind === 89 /* IdentifierExpression */) {
-            const meaning = analyzer.resolveIdentifierExpression(node).meaning;
+            const meaning = analyzer.resolveIdentifierExpression(node);
             if (meaning.kind === "variable-access") {
               const variable = meaning.variable.getEntity();
               if (variable.subkind === "field" && variable.isVariant()) {
@@ -8625,7 +8444,7 @@ var SemanticTokensService = class {
             }
           }
           if (node.kind === 76 /* MemberAccessExpression */) {
-            const meaning = analyzer.resolveMemberAccessExpression(node).meaning;
+            const meaning = analyzer.resolveMemberAccessExpression(node);
             if (meaning.kind === "static-field-access") {
               const entity = meaning.field.getEntity();
               if (entity.subkind === "field" && entity.isVariant()) {
@@ -8668,7 +8487,7 @@ var SemanticTokensService = class {
               ));
             }
           }
-          if (node.kind === 147 /* VariantDeclaration */) {
+          if (node.kind === 147 /* VariantValueDeclaration */) {
             result.push(
               new SemanticToken(
                 node.name.rangeWithoutTrivia,
@@ -8932,7 +8751,7 @@ var TypeParameterSignatureHelpProvider = class {
   getSignaturesForGenericSpecializationExpression(node) {
     const expression = unwrapParenthesizedExpressions(node.expression);
     if (expression.kind === 89 /* IdentifierExpression */) {
-      const meaning = this.analyzer.resolveIdentifierExpression(expression).meaning;
+      const meaning = this.analyzer.resolveIdentifierExpression(expression);
       if (meaning.kind === "function-access") {
         return Query.from(meaning.candidates).mapAndFilter((f) => this.getSignatureForAccessedFunction(f)).toArray();
       }
@@ -8945,7 +8764,7 @@ var TypeParameterSignatureHelpProvider = class {
       return void 0;
     }
     if (expression.kind === 76 /* MemberAccessExpression */) {
-      const meaning = this.analyzer.resolveMemberAccessExpression(expression).meaning;
+      const meaning = this.analyzer.resolveMemberAccessExpression(expression);
       let accessedFunctions;
       if (meaning.kind === "instance-method-access") {
         accessedFunctions = meaning.candidates;
@@ -11786,56 +11605,40 @@ var EntityToSyntax = class {
     }
   }
   convertPackageVariable(entity) {
-    const commonModifiers = new Array();
-    if (entity.isConstant()) {
-      commonModifiers.push(SyntaxFactory.modifier(36 /* Const */));
-    }
     const name = this.getEntityName(entity);
     const type = this.convertType(entity.getType());
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageVariableModifiers(entity);
     let result;
     if (isComputedVariableEntity(entity)) {
       result = [];
       const getterEntity = entity.getGetter();
       if (getterEntity !== void 0) {
-        const tags = this.convertTags(getterEntity.getTags());
-        const modifiers = Array.from(commonModifiers);
-        const isHidden = getterEntity.isHidden();
-        if (isHidden !== void 0) {
-          modifiers.push(this.createHidingModifier(isHidden));
-        }
         result.push(SyntaxFactory.packageVariableGetterDeclaration(tags, modifiers, name, type, void 0));
       }
       const setterEntity = entity.getSetter();
       if (setterEntity !== void 0) {
-        const tags = this.convertTags(setterEntity.getTags());
-        const modifiers = Array.from(commonModifiers);
-        const isHidden = setterEntity.isHidden();
-        if (isHidden !== void 0) {
-          modifiers.push(this.createHidingModifier(isHidden));
-        }
         result.push(SyntaxFactory.packageVariableSetterDeclaration(tags, modifiers, name, void 0));
       }
     } else {
-      const tags = this.convertTags(entity.getTags());
-      const modifiers = Array.from(commonModifiers);
-      const isHidden = entity.isHidden();
-      if (isHidden !== void 0) {
-        modifiers.push(this.createHidingModifier(isHidden));
-      }
       result = SyntaxFactory.packageVariableDeclaration(tags, modifiers, name, type);
     }
     return result;
   }
-  convertPackageFunction(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertPackageVariableModifiers(entity) {
     const modifiers = new Array();
-    if (entity.isAsync()) {
-      modifiers.push(SyntaxFactory.modifier(40 /* Async */));
-    }
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    if (entity.isConstant()) {
+      modifiers.push(SyntaxFactory.modifier(36 /* Const */));
+    }
+    return modifiers;
+  }
+  convertPackageFunction(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageFunctionModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const parameters = this.convertParameters(entity.getParameters());
@@ -11850,60 +11653,87 @@ var EntityToSyntax = class {
       void 0
     );
   }
-  convertPackageStructuredType(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertPackageFunctionModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
-    if (entity.markedBasic()) {
-      modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
-    }
-    if (entity.isAbstract()) {
-      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+    if (entity.isAsync()) {
+      modifiers.push(SyntaxFactory.modifier(40 /* Async */));
     }
+    return modifiers;
+  }
+  convertPackageStructuredType(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageStructuredTypeModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const body = this.createStructuredTypeDeclarationBody(entity);
     return SyntaxFactory.packageStructuredTypeDeclaration(tags, modifiers, name, typeParameters, body);
   }
-  convertPackageAliasType(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertPackageStructuredTypeModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    if (entity.markedBasic()) {
+      modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
+    }
+    if (entity.isAbstract()) {
+      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+    }
+    return modifiers;
+  }
+  convertPackageAliasType(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageAliasTypeModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const body = this.createAliasTypeDeclarationBody(entity);
     return SyntaxFactory.packageAliasTypeDeclaration(tags, modifiers, name, typeParameters, body);
   }
-  convertPackageVariantType(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertPackageAliasTypeModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    return modifiers;
+  }
+  convertPackageVariantType(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageVariantTypeModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const body = this.createVariantTypeDeclarationBody(entity);
     return SyntaxFactory.packageVariantTypeDeclaration(tags, modifiers, name, typeParameters, body);
   }
-  convertPackageFunctionType(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertPackageVariantTypeModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    return modifiers;
+  }
+  convertPackageFunctionType(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertPackageFunctionTypeModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const body = this.createFunctionTypeDeclarationBody(entity);
     return SyntaxFactory.packageFunctionTypeDeclaration(tags, modifiers, name, typeParameters, body);
   }
+  convertPackageFunctionTypeModifiers(entity) {
+    const modifiers = new Array();
+    const isHidden = entity.isHidden();
+    if (isHidden !== void 0) {
+      modifiers.push(this.createHidingModifier(isHidden));
+    }
+    return modifiers;
+  }
   convertTypeEntityMembers(members) {
     const variables = members.getNamedMembers().filter((m) => m.kind === 0 /* Variable */).flatMap((m) => this.convertField(m));
     const methods = members.getNamedMembers().filter((m) => m.kind !== 0 /* Variable */).map((m) => this.convertMethod(m));
@@ -11916,60 +11746,27 @@ var EntityToSyntax = class {
     if (entity.isVariant()) {
       return this.convertVariant(entity);
     }
-    const commonModifiers = new Array();
-    if (entity.isConstant()) {
-      commonModifiers.push(SyntaxFactory.modifier(36 /* Const */));
-    }
-    if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
-    }
-    if (entity.markedAbstract()) {
-      commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
-    }
-    if (entity.markedBasic()) {
-      commonModifiers.push(SyntaxFactory.modifier(17 /* Basic */));
-    }
-    if (entity.isOverride()) {
-      commonModifiers.push(SyntaxFactory.modifier(39 /* Override */));
-    }
     const name = this.getEntityName(entity);
     const type = this.convertType(entity.getType());
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertFieldModifiers(entity);
     let result;
     if (isComputedVariableEntity(entity)) {
       result = [];
       const getterEntity = entity.getGetter();
       if (getterEntity !== void 0) {
-        const tags = this.convertTags(getterEntity.getTags());
-        const modifiers = Array.from(commonModifiers);
-        const isHidden = getterEntity.isHidden();
-        if (isHidden !== void 0) {
-          modifiers.push(this.createHidingModifier(isHidden));
-        }
         result.push(SyntaxFactory.fieldGetterDeclaration(tags, modifiers, name, type, void 0));
       }
       const setterEntity = entity.getSetter();
       if (setterEntity !== void 0) {
-        const tags = this.convertTags(setterEntity.getTags());
-        const modifiers = Array.from(commonModifiers);
-        const isHidden = setterEntity.isHidden();
-        if (isHidden !== void 0) {
-          modifiers.push(this.createHidingModifier(isHidden));
-        }
         result.push(SyntaxFactory.fieldSetterDeclaration(tags, modifiers, name, void 0));
       }
     } else {
-      const tags = this.convertTags(entity.getTags());
-      const modifiers = Array.from(commonModifiers);
-      const isHidden = entity.isHidden();
-      if (isHidden !== void 0) {
-        modifiers.push(this.createHidingModifier(isHidden));
-      }
-      result = SyntaxFactory.fieldDeclaration(tags, commonModifiers, name, type);
+      result = SyntaxFactory.fieldDeclaration(tags, modifiers, name, type);
     }
     return result;
   }
-  convertMethod(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertFieldModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
@@ -11978,36 +11775,56 @@ var EntityToSyntax = class {
     if (entity.isStatic()) {
       modifiers.push(SyntaxFactory.modifier(41 /* Static */));
     }
-    if (entity.markedAbstract()) {
-      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
-    }
     if (entity.markedBasic()) {
       modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
     }
+    if (entity.markedAbstract()) {
+      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+    }
     if (entity.isOverride()) {
       modifiers.push(SyntaxFactory.modifier(39 /* Override */));
     }
+    if (entity.isConstant()) {
+      modifiers.push(SyntaxFactory.modifier(36 /* Const */));
+    }
+    return modifiers;
+  }
+  convertMethod(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertMethodModifiers(entity);
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
     const parameters = this.convertParameters(entity.getParameters());
     const returnType = this.convertType(entity.getReturnType());
     return SyntaxFactory.methodDeclaration(tags, modifiers, name, typeParameters, parameters, returnType, void 0);
   }
-  convertConstructor(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertMethodModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
       modifiers.push(this.createHidingModifier(isHidden));
     }
+    if (entity.isStatic()) {
+      modifiers.push(SyntaxFactory.modifier(41 /* Static */));
+    }
+    if (entity.markedBasic()) {
+      modifiers.push(SyntaxFactory.modifier(17 /* Basic */));
+    }
     if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
+    if (entity.isOverride()) {
+      modifiers.push(SyntaxFactory.modifier(39 /* Override */));
+    }
+    return modifiers;
+  }
+  convertConstructor(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertConstructorModifiers(entity);
     const parameters = this.convertParameters(entity.getParameters());
     return SyntaxFactory.constructorDeclaration(tags, modifiers, parameters, void 0);
   }
-  convertDestructor(entity) {
-    const tags = this.convertTags(entity.getTags());
+  convertConstructorModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
@@ -12016,44 +11833,61 @@ var EntityToSyntax = class {
     if (entity.markedAbstract()) {
       modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
+    return modifiers;
+  }
+  convertDestructor(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertDestructorModifiers(entity);
     const parameters = this.convertParameters(entity.getParameters());
     return SyntaxFactory.destructorDeclaration(tags, modifiers, parameters, void 0);
   }
-  convertIndexer(entity) {
-    const commonModifiers = new Array();
-    if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(41 /* Static */));
+  convertDestructorModifiers(entity) {
+    const modifiers = new Array();
+    const isHidden = entity.isHidden();
+    if (isHidden !== void 0) {
+      modifiers.push(this.createHidingModifier(isHidden));
     }
     if (entity.markedAbstract()) {
-      commonModifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
     }
+    return modifiers;
+  }
+  convertIndexer(entity) {
+    const tags = this.convertTags(entity.getTags());
+    const modifiers = this.convertIndexerModifiers(entity);
     const parameters = this.convertParameters(entity.getParameters());
     const result = new Array();
     const getterEntity = entity.getGetter();
     if (getterEntity !== void 0) {
-      const tags = this.convertTags(getterEntity.getTags());
-      const modifiers = Array.from(commonModifiers);
-      const isHidden = entity.isHidden();
-      if (isHidden !== void 0) {
-        modifiers.push(this.createHidingModifier(isHidden));
-      }
       const type = this.convertType(entity.getType());
       const declaration = SyntaxFactory.indexedElementGetterDeclaration(tags, modifiers, parameters, type, void 0);
       result.push(declaration);
     }
     const setterEntity = entity.getSetter();
     if (setterEntity !== void 0) {
-      const tags = this.convertTags(setterEntity.getTags());
-      const modifiers = Array.from(commonModifiers);
       const declaration = SyntaxFactory.indexedElementSetterDeclaration(tags, modifiers, parameters, void 0);
       result.push(declaration);
     }
     return result;
   }
+  convertIndexerModifiers(entity) {
+    const modifiers = new Array();
+    const isHidden = entity.isHidden();
+    if (isHidden !== void 0) {
+      modifiers.push(this.createHidingModifier(isHidden));
+    }
+    if (entity.isStatic()) {
+      modifiers.push(SyntaxFactory.modifier(41 /* Static */));
+    }
+    if (entity.markedAbstract()) {
+      modifiers.push(SyntaxFactory.modifier(38 /* Abstract */));
+    }
+    return modifiers;
+  }
   convertVariant(entity) {
     const tags = this.convertTags(entity.getTags());
     const name = this.getEntityName(entity);
-    return SyntaxFactory.variantDeclaration(tags, [], name);
+    return SyntaxFactory.variantValueDeclaration(tags, [], name);
   }
   createStructuredTypeDeclarationBody(entity) {
     let structuredTypeKindKeyword;
@@ -12184,6 +12018,8 @@ var EntityToSyntax = class {
         return this.convertIntersectionType(type);
       case "unresolved":
         return this.convertUnresolvedType(type);
+      case "substitution-stub":
+        return this.convertSubstitutionStubType(type);
       default:
         Debug.never(type);
     }
@@ -12245,6 +12081,9 @@ var EntityToSyntax = class {
   convertUnresolvedType(_type) {
     return SyntaxFactory.namedTypeSpecifier("\u041E\u0431\u044A\u0435\u043A\u0442");
   }
+  convertSubstitutionStubType(_type) {
+    return SyntaxFactory.namedTypeSpecifier("\u041E\u0431\u044A\u0435\u043A\u0442");
+  }
   createNamedTypeSpecifier(name, substitutions) {
     const typeArguments = Query.from(substitutions.getTypes()).map((t) => this.convertType(t)).toArray();
     return SyntaxFactory.namedTypeSpecifier(name, typeArguments);
@@ -12656,184 +12495,481 @@ var EntityFinder = class {
         Debug.never(entity);
     }
   }
-  findConstructorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getConstructors();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
+  findConstructorEntity(entity) {
+    const containingType = this.findEntity(entity.getContainingEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getConstructors();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
+      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
+      const index = this.findOverloadedMemberIndex(referenceData, membersData);
+      return index >= 0 ? members[index] : void 0;
+    }
+  }
+  findDestructorEntity(entity) {
+    const containingType = this.findEntity(entity.getContainingEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getDestructors();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
+      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
+      const index = this.findOverloadedMemberIndex(referenceData, membersData);
+      return index >= 0 ? members[index] : void 0;
+    }
+  }
+  findOperatorEntity(entity) {
+    const containingType = this.findEntity(entity.getContainingEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getOperators();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
+      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
+      const index = this.findOverloadedMemberIndex(referenceData, membersData);
+      return index >= 0 ? members[index] : void 0;
+    }
+  }
+  findIndexerEntity(entity) {
+    const containingType = this.findEntity(entity.getContainingEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getIndexers();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
+      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
+      const index = this.findOverloadedMemberIndex(referenceData, membersData);
+      return index >= 0 ? members[index] : void 0;
+    }
+  }
+  findDereferenceOperatorEntity(entity) {
+    const containingType = this.findEntity(entity.getContainingEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getDereferenceOperators();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      return void 0;
+    }
+  }
+  findTypeParameterEntity(entity) {
+    const containingEntity = this.findEntity(entity.getContainingEntity());
+    const index = entity.getContainingEntity().getTypeParameters().indexOf(entity);
+    if (containingEntity !== void 0 && index >= 0) {
+      return this.ifEntityWithTypeParametersThenParameters(containingEntity)?.[index];
+    } else {
+      return void 0;
+    }
+  }
+  findPackageTypeEntityByNameAndArity(name, arity) {
+    return this.packageEntity.getMembers().getNamedMembersByName(name).filter((m) => m.kind === 2 /* Type */).find((m) => m.getArity() === arity);
+  }
+  ifEntityWithParametersThenParameters(entity) {
+    switch (entity.kind) {
+      case 1 /* Function */:
+        return entity.getParameters();
+      case 5 /* Indexer */:
+        return entity.getParameters();
+      case 7 /* Constructor */:
+        return entity.getParameters();
+      case 8 /* Destructor */:
+        return entity.getParameters();
+      case 2 /* Type */: {
+        if (entity.typeEntityKind === 0 /* Function */) {
+          return entity.getParameters();
+        }
+        return void 0;
+      }
+      case 9 /* Operator */:
+        return entity.getParameters();
+      case 0 /* Variable */:
+      case 3 /* Getter */:
+      case 4 /* Setter */:
+      case 10 /* PackageAlias */:
+      case 12 /* Package */:
+      case 11 /* TypeExtension */:
+      case 6 /* DereferenceOperator */:
+        return void 0;
+      case 13 /* TextTranslation */:
+        return void 0;
+      default:
+        Debug.never(entity);
+    }
+  }
+  ifEntityWithTypeParametersThenParameters(entity) {
+    switch (entity.kind) {
+      case 1 /* Function */:
+        return entity.getTypeParameters();
+      case 2 /* Type */: {
+        if (entity.typeEntityKind !== 2 /* Parameter */) {
+          return entity.getTypeParameters();
+        }
+        return void 0;
+      }
+      case 8 /* Destructor */:
+      case 7 /* Constructor */:
+      case 5 /* Indexer */:
+      case 6 /* DereferenceOperator */:
+      case 0 /* Variable */:
+      case 3 /* Getter */:
+      case 4 /* Setter */:
+      case 10 /* PackageAlias */:
+      case 12 /* Package */:
+      case 11 /* TypeExtension */:
+      case 9 /* Operator */:
+      case 13 /* TextTranslation */:
+        return void 0;
+      default:
+        Debug.never(entity);
+    }
+  }
+  findOverloadedMemberIndex(referenceData, membersData) {
+    for (let i = 0; i < membersData.length; i++) {
+      const memberData = membersData[i];
+      if (memberData.typeParameters.length !== referenceData.typeParameters.length || memberData.parameters.length !== referenceData.parameters.length) {
+        continue;
+      }
+      const parametersAreEqual = Query.zip(
+        memberData.parameters,
+        referenceData.parameters,
+        (r, m) => this.getEntityName(r).considerEqual(this.getEntityName(m))
+      ).all((v) => v);
+      if (parametersAreEqual) {
+        return i;
+      }
     }
+    return -1;
   }
-  findDestructorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getDestructors();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
+  getEntityName(entity) {
+    return entity.getName();
   }
-  findOperatorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getOperators();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
+};
+var DataForFindingOverloadedMember = class {
+  constructor(typeParameters, parameters) {
+    this.typeParameters = typeParameters;
+    this.parameters = parameters;
+  }
+};
+
+// source/services/SourceFileItemsService.ts
+var SourceFileItemsService = class {
+  getItems(sourceFile) {
+    this.sourceFile = sourceFile;
+    return this.getChildItems(sourceFile.getSyntaxNode());
+  }
+  get locale() {
+    return this.sourceFile.package.locale;
+  }
+  get dialect() {
+    return this.sourceFile.package.dialect;
+  }
+  getChildItems(node) {
+    const result = new Array();
+    visitChildren(node, false, (node2) => {
+      const items = this.getChildItems(node2);
+      switch (node2.kind) {
+        case 8 /* PackageImport */: {
+          if (node2.alias !== void 0) {
+            result.push(this.createItem(
+              0 /* PackageAlias */,
+              node2.alias.value,
+              node2.rangeWithoutTrivia,
+              node2.alias.rangeWithoutTrivia,
+              items
+            ));
+          }
+          break;
+        }
+        case 33 /* PackageVariableDeclaration */: {
+          result.push(this.createItem(
+            1 /* PackageVariable */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 34 /* PackageVariableGetterDeclaration */: {
+          result.push(this.createItem(
+            2 /* PackageVariableGetter */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 35 /* PackageVariableSetterDeclaration */: {
+          result.push(this.createItem(
+            3 /* PackageVariableSetter */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 25 /* PackageFunctionDeclaration */: {
+          result.push(this.createItem(
+            4 /* PackageFunction */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 31 /* PackageStructuredTypeDeclaration */: {
+          result.push(this.createItem(
+            5 /* StructuredType */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 52 /* FieldDeclaration */: {
+          result.push(this.createItem(
+            12 /* Field */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 53 /* FieldGetterDeclaration */: {
+          result.push(this.createItem(
+            13 /* FieldGetter */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 54 /* FieldSetterDeclaration */: {
+          result.push(this.createItem(
+            14 /* FieldSetter */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 50 /* MethodDeclaration */: {
+          result.push(this.createItem(
+            15 /* Method */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 43 /* ConstructorDeclaration */: {
+          result.push(this.createItem(
+            10 /* Constructor */,
+            void 0,
+            node2.rangeWithoutTrivia,
+            node2.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 44 /* DestructorDeclaration */: {
+          result.push(this.createItem(
+            11 /* Destructor */,
+            void 0,
+            node2.rangeWithoutTrivia,
+            node2.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 45 /* IndexedElementGetterDeclaration */: {
+          result.push(this.createItem(
+            16 /* IndexedElementGetter */,
+            void 0,
+            node2.rangeWithoutTrivia,
+            node2.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 46 /* IndexedElementSetterDeclaration */: {
+          result.push(this.createItem(
+            17 /* IndexedElementSetter */,
+            void 0,
+            node2.rangeWithoutTrivia,
+            node2.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 26 /* PackageFunctionTypeDeclaration */: {
+          result.push(this.createItem(
+            6 /* FunctionType */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 36 /* PackageVariantTypeDeclaration */: {
+          result.push(this.createItem(
+            7 /* VariantType */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 147 /* VariantValueDeclaration */: {
+          result.push(this.createItem(
+            9 /* VariantValue */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 148 /* TypeParameterDeclaration */: {
+          result.push(this.createItem(
+            18 /* TypeParameter */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        case 56 /* NestedFunctionDeclaration */: {
+          result.push(this.createItem(
+            19 /* NestedFunction */,
+            node2.name.value,
+            node2.rangeWithoutTrivia,
+            node2.name.rangeWithoutTrivia,
+            items
+          ));
+          break;
+        }
+        default: {
+          result.push(...items);
+          break;
+        }
+      }
+    });
+    return result;
   }
-  findIndexerEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getIndexers();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
+  createItem(kind, name, range, selectionRange, items) {
+    const itemName = this.getNameOrStubIfEmpty(name, kind);
+    return new Item(kind, itemName, range, selectionRange, items, this.sourceFile);
   }
-  findDereferenceOperatorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
+  getNameOrStubIfEmpty(name, kind) {
+    if (name !== void 0 && name.trim().length === 0) {
+      name = void 0;
     }
-    const members = containingType.getMembers().getDereferenceOperators();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      return void 0;
+    switch (kind) {
+      case 0 /* PackageAlias */:
+        return name ?? `<${LocalizationHelper.localizeHelperPhrase(4 /* PackageAlias */, this.locale)}>`;
+      case 1 /* PackageVariable */:
+      case 12 /* Field */:
+        return name ?? `<${LocalizationHelper.localizeHelperPhrase(6 /* Variable */, this.locale)}>`;
+      case 4 /* PackageFunction */:
+      case 15 /* Method */:
+      case 19 /* NestedFunction */:
+        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(12 /* Function */, this.locale, this.dialect)}>`;
+      case 5 /* StructuredType */:
+      case 6 /* FunctionType */:
+      case 7 /* VariantType */:
+      case 8 /* InvalidType */:
+        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(16 /* Type */, this.locale, this.dialect)}>`;
+      case 10 /* Constructor */:
+        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(31 /* Creation */, this.locale, this.dialect);
+      case 11 /* Destructor */:
+        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(47 /* Destruction */, this.locale, this.dialect);
+      case 9 /* VariantValue */:
+        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(58 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
+      case 3 /* PackageVariableSetter */:
+      case 14 /* FieldSetter */:
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
+      case 16 /* IndexedElementGetter */:
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Get */, this.locale, this.dialect)} []`;
+      case 17 /* IndexedElementSetter */:
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(59 /* Set */, this.locale, this.dialect)} []`;
+      default:
+        Debug.never(kind);
     }
   }
-  findTypeParameterEntity(entity) {
-    const containingEntity = this.findEntity(entity.getContainingEntity());
-    const index = entity.getContainingEntity().getTypeParameters().indexOf(entity);
-    if (containingEntity !== void 0 && index >= 0) {
-      return this.ifEntityWithTypeParametersThenParameters(containingEntity)?.[index];
-    } else {
-      return void 0;
-    }
+};
+var Item = class {
+  constructor(kind, name, range, selectionRange, items, sourceFile) {
+    this.kind = kind;
+    this.name = name;
+    this.range = range;
+    this.selectionRange = selectionRange;
+    this.items = items;
+    this.sourceFile = sourceFile;
   }
-  findPackageTypeEntityByNameAndArity(name, arity) {
-    return this.packageEntity.getMembers().getNamedMembersByName(name).filter((m) => m.kind === 2 /* Type */).find((m) => m.getArity() === arity);
+};
+
+// source/services/WorkspaceItemsService.ts
+var WorkspaceItemsService = class {
+  constructor() {
+    this.sourceFileItemsService = new SourceFileItemsService();
   }
-  ifEntityWithParametersThenParameters(entity) {
-    switch (entity.kind) {
-      case 1 /* Function */:
-        return entity.getParameters();
-      case 5 /* Indexer */:
-        return entity.getParameters();
-      case 7 /* Constructor */:
-        return entity.getParameters();
-      case 8 /* Destructor */:
-        return entity.getParameters();
-      case 2 /* Type */: {
-        if (entity.typeEntityKind === 0 /* Function */) {
-          return entity.getParameters();
+  getItems(compilations) {
+    const result = new Array();
+    const packageUris = /* @__PURE__ */ new Set();
+    for (const compilation of compilations) {
+      for (const pkg of compilation.allPackages) {
+        if (packageUris.has(pkg.uri.toString())) {
+          continue;
         }
-        return void 0;
-      }
-      case 9 /* Operator */:
-        return entity.getParameters();
-      case 0 /* Variable */:
-      case 3 /* Getter */:
-      case 4 /* Setter */:
-      case 10 /* PackageAlias */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
-      case 6 /* DereferenceOperator */:
-        return void 0;
-      case 13 /* TextTranslation */:
-        return void 0;
-      default:
-        Debug.never(entity);
-    }
-  }
-  ifEntityWithTypeParametersThenParameters(entity) {
-    switch (entity.kind) {
-      case 1 /* Function */:
-        return entity.getTypeParameters();
-      case 2 /* Type */: {
-        if (entity.typeEntityKind !== 2 /* Parameter */) {
-          return entity.getTypeParameters();
+        packageUris.add(pkg.uri.toString());
+        for (const sourceFile of pkg.sourceFiles) {
+          result.push(...this.sourceFileItemsService.getItems(sourceFile));
         }
-        return void 0;
-      }
-      case 8 /* Destructor */:
-      case 7 /* Constructor */:
-      case 5 /* Indexer */:
-      case 6 /* DereferenceOperator */:
-      case 0 /* Variable */:
-      case 3 /* Getter */:
-      case 4 /* Setter */:
-      case 10 /* PackageAlias */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
-      case 9 /* Operator */:
-      case 13 /* TextTranslation */:
-        return void 0;
-      default:
-        Debug.never(entity);
-    }
-  }
-  findOverloadedMemberIndex(referenceData, membersData) {
-    for (let i = 0; i < membersData.length; i++) {
-      const memberData = membersData[i];
-      if (memberData.typeParameters.length !== referenceData.typeParameters.length || memberData.parameters.length !== referenceData.parameters.length) {
-        continue;
-      }
-      const parametersAreEqual = Query.zip(
-        memberData.parameters,
-        referenceData.parameters,
-        (r, m) => this.getEntityName(r).considerEqual(this.getEntityName(m))
-      ).all((v) => v);
-      if (parametersAreEqual) {
-        return i;
       }
     }
-    return -1;
-  }
-  getEntityName(entity) {
-    return entity.getName();
-  }
-};
-var DataForFindingOverloadedMember = class {
-  constructor(typeParameters, parameters) {
-    this.typeParameters = typeParameters;
-    this.parameters = parameters;
+    return result;
   }
 };
 
@@ -12855,8 +12991,7 @@ var _LanguageServer = class _LanguageServer {
     this.signatureHelpService = new SignatureHelpService();
     this.fileSystemTreeDisplayService = new FileSystemTreeDisplayService();
     this.selectionRangeService = new SelectionRangeService();
-    this.assignFieldService = new AssignFieldService();
-    this.deleteBlockFromScriptService = new DeleteBlockFromScriptService();
+    this.scriptEditingService = new ScriptEditingService();
     this.codeActionsService = new CodeActionsService();
     this.connection = config.connection;
     this.config = config;
@@ -12953,7 +13088,11 @@ var _LanguageServer = class _LanguageServer {
     this.disposables.push(disposable);
     disposable = this.connection.onRequest(customRequests.assignField, (params, token) => this.withTaskController(token, (taskController) => this.onAssignField(params, taskController)));
     this.disposables.push(disposable);
-    disposable = this.connection.onRequest(customRequests.deleteBlockFromScript, (params, token) => this.withTaskController(token, (taskController) => this.onDeleteBlockFromScript(params, taskController)));
+    disposable = this.connection.onRequest(customRequests.addBlocksToScript, (params, token) => this.withTaskController(token, (taskController) => this.onAddBlocksToScript(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.canDeleteBlocksFromScript, (params, token) => this.withTaskController(token, (taskController) => this.onCanDeleteBlocksFromScript(params, taskController)));
+    this.disposables.push(disposable);
+    disposable = this.connection.onRequest(customRequests.deleteBlocksFromScript, (params, token) => this.withTaskController(token, (taskController) => this.onDeleteBlocksFromScript(params, taskController)));
     this.disposables.push(disposable);
     this.connection.listen();
   }
@@ -13458,7 +13597,7 @@ var _LanguageServer = class _LanguageServer {
         return ls3.SymbolKind.Function;
       case 7 /* VariantType */:
         return ls3.SymbolKind.Enum;
-      case 9 /* Variant */:
+      case 9 /* VariantValue */:
         return ls3.SymbolKind.EnumMember;
       case 8 /* InvalidType */:
         return ls3.SymbolKind.Class;
@@ -13504,15 +13643,15 @@ var _LanguageServer = class _LanguageServer {
   }
   onAssignField(params, taskController) {
     return __async(this, null, function* () {
-      const functionNodeUri = URI.parse(params.functionNodeUri);
-      const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, taskController);
+      const scriptFunctionUri = URI.parse(params.scriptFunctionUri);
+      const sourceFileContext = yield this.getSourceFileContext(scriptFunctionUri, taskController);
       if (sourceFileContext !== void 0) {
-        const functionDeclaration = NodePath.parse(functionNodeUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
-        if (functionDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(functionDeclaration)) {
-          const sourceFileEdit = this.assignFieldService.createEditWithAssignment(
+        const scriptDeclaration = NodePath.parse(scriptFunctionUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
+        if (scriptDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(scriptDeclaration)) {
+          const sourceFileEdit = this.scriptEditingService.createEditWithFieldAssignment(
             sourceFileContext.analyzer,
             sourceFileContext.sourceFile,
-            functionDeclaration,
+            scriptDeclaration,
             params.fieldName,
             params.value
           );
@@ -13525,24 +13664,88 @@ var _LanguageServer = class _LanguageServer {
       }
     });
   }
-  onDeleteBlockFromScript(params, taskController) {
+  onAddBlocksToScript(params, taskController) {
+    return __async(this, null, function* () {
+      const sourceFileEdits = new Array();
+      const convertAddedScriptBlock = (block) => {
+        return {
+          name: block.name,
+          key: block.key,
+          areaIndex: block.areaIndex,
+          elementProperties: block.elementProperties ?? {},
+          nestedBlocks: block.nestedBlocks?.map(convertAddedScriptBlock) ?? []
+        };
+      };
+      for (const scriptBlockAddedToOuterScript of params) {
+        const scriptFunctionUri = URI.parse(scriptBlockAddedToOuterScript.outerScriptFunctionUri);
+        const sourceFileContext = yield this.getSourceFileContext(scriptFunctionUri, taskController);
+        if (sourceFileContext !== void 0) {
+          const scriptDeclaration = NodePath.parse(scriptFunctionUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
+          if (scriptDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(scriptDeclaration)) {
+            const addedBlockInfos = scriptBlockAddedToOuterScript.values.map(convertAddedScriptBlock);
+            const sourceFileEdit = this.scriptEditingService.createEditAddingBlocks(
+              sourceFileContext.sourceFile,
+              scriptDeclaration,
+              addedBlockInfos
+            );
+            if (sourceFileEdit !== void 0) {
+              sourceFileEdits.push(sourceFileEdit);
+            }
+          }
+        }
+      }
+      if (sourceFileEdits.length > 0) {
+        const workspaceEdit = this.convertSourceFileEditsToWorkspaceEdit(sourceFileEdits);
+        yield this.connection.workspace.applyEdit(workspaceEdit);
+      }
+    });
+  }
+  onCanDeleteBlocksFromScript(params, taskController) {
     return __async(this, null, function* () {
-      const functionNodeUri = URI.parse(params.functionNodeUri);
-      const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, taskController);
+      let result = false;
+      const outerScriptFunctionUri = URI.parse(params.outerScriptFunctionUri);
+      const sourceFileContext = yield this.getSourceFileContext(outerScriptFunctionUri, taskController);
       if (sourceFileContext !== void 0) {
-        const functionDeclaration = NodePath.parse(functionNodeUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
-        if (functionDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(functionDeclaration)) {
-          const sourceFileEdit = this.deleteBlockFromScriptService.createEditDeletingBlock(
-            sourceFileContext.sourceFile,
-            functionDeclaration
-          );
-          if (sourceFileEdit !== void 0) {
-            const textDocumentEdit = this.convertSourceFileEdit(sourceFileEdit);
-            const workspaceEdit = { documentChanges: [textDocumentEdit] };
-            yield this.connection.workspace.applyEdit(workspaceEdit);
+        const outerScriptFunctionLocation = new NodeLocation(
+          sourceFileContext.sourceFile,
+          NodePath.parse(outerScriptFunctionUri.fragment)
+        );
+        const scriptFunctionLocations = Query.from(params.scriptFunctionUris).map((u) => {
+          const parsedVscodeUri = URI.parse(u);
+          const uri = this.convertVscodeUriToUri(parsedVscodeUri);
+          const sourceFile = sourceFileContext.analyzer.compilation.getSourceFileByUri(uri);
+          return sourceFile !== void 0 ? new NodeLocation(sourceFile, NodePath.parse(parsedVscodeUri.fragment)) : void 0;
+        }).toNullable();
+        if (scriptFunctionLocations !== void 0) {
+          result = this.scriptEditingService.canDeleteBlocks(outerScriptFunctionLocation, scriptFunctionLocations);
+        }
+      }
+      return result;
+    });
+  }
+  onDeleteBlocksFromScript(params, taskController) {
+    return __async(this, null, function* () {
+      const sourceFileEdits = new Array();
+      for (const scriptFunctionUri of params.scriptFunctionUris) {
+        const parsedScriptFunctionUri = URI.parse(scriptFunctionUri);
+        const sourceFileContext = yield this.getSourceFileContext(parsedScriptFunctionUri, taskController);
+        if (sourceFileContext !== void 0) {
+          const scriptDeclaration = NodePath.parse(parsedScriptFunctionUri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
+          if (scriptDeclaration !== void 0 && NodeTypeUtils.isSubprogramDeclarationOrLiteral(scriptDeclaration)) {
+            const sourceFileEdit = this.scriptEditingService.createEditDeletingBlock(
+              sourceFileContext.sourceFile,
+              scriptDeclaration
+            );
+            if (sourceFileEdit !== void 0) {
+              sourceFileEdits.push(sourceFileEdit);
+            }
           }
         }
       }
+      if (sourceFileEdits.length > 0) {
+        const workspaceEdit = this.convertSourceFileEditsToWorkspaceEdit(sourceFileEdits);
+        yield this.connection.workspace.applyEdit(workspaceEdit);
+      }
     });
   }
   convertSourceFileEdit(edit) {