@artel/artc 0.6.25280 → 0.6.25282

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-LLI2DYRX.js";
+} from "../chunk-VVFLEWSA.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -205,7 +205,8 @@ var customRequests = {
   deleteSourceFile: new CustomRequestType("artel/fs.deleteSourceFile"),
   getNodeRange: new CustomRequestType("artel/getNodeRange"),
   assignField: new CustomRequestType("artel/assignField"),
-  deleteBlockFromScript: new CustomRequestType("artel/deleteBlockFromScript")
+  addBlockToScript: new CustomRequestType("artel/addBlockToScript"),
+  deleteBlocksFromScript: new CustomRequestType("artel/deleteBlocksFromScript")
 };
 
 // source/services/LanguageServer.ts
@@ -238,6 +239,55 @@ var SourceFileEdit = class {
   }
 };
 
+// source/services/AddBlockToScriptService.ts
+var AddBlockToScriptService = class _AddBlockToScriptService {
+  static {
+    this.indentationStep = "  ";
+  }
+  static {
+    this.elementParameterName = "el";
+  }
+  createEditAddingBlock(sourceFile, subprogramDeclaration, addedBlockInfo) {
+    const subprogramBlock = subprogramDeclaration.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) + _AddBlockToScriptService.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 scriptBlockText = this.createScriptBlockText(addedBlockInfo, scriptBlockIndentation, newLine);
+    const editText = `${newLine}${scriptBlockText}`;
+    const result = new SourceFileEdit(sourceFile, Range.empty(editStart), editText);
+    return result;
+  }
+  createScriptBlockText(blockInfo, indentation, newLine) {
+    const i = indentation;
+    const s = _AddBlockToScriptService.indentationStep;
+    const nl = newLine;
+    const el = _AddBlockToScriptService.elementParameterName;
+    return `${i}${blockInfo.name}(${nl}${i}${s}key = ${blockInfo.key},${nl}${i}${s}script =${nl}${i}${s}{${nl}` + Object.entries(blockInfo.elementProperties).map(([p, v]) => `${i}${s}${s}${el}.${p} = ${v}${nl}`).join("") + `${i}${s}})`;
+  }
+  detectNewLine(text) {
+    return text.includes("\r\n") ? "\r\n" : "\n";
+  }
+};
+
 // source/services/AssignFieldService.ts
 var AssignFieldService = class _AssignFieldService {
   static {
@@ -296,11 +346,11 @@ var AssignFieldService = class _AssignFieldService {
       if (statement.kind === 92 /* AssignmentStatement */) {
         const left = unwrapParenthesizedExpressions(statement.left);
         if (left.kind === 76 /* MemberAccessExpression */) {
-          const memberAccessMeaning = analyzer.resolveMemberAccessExpression(left).meaning;
+          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).meaning;
+              const receiverMeaning = analyzer.resolveIdentifierExpression(receiver);
               if (receiverMeaning.kind === "variable-access" && receiverMeaning.variable.getName().considerEqual(_AssignFieldService.receiverVariableName)) {
                 return statement;
               }
@@ -337,7 +387,7 @@ var SyntaxFactory = class {
     let equalsToken;
     if (alias !== void 0) {
       aliasIdentifier = this.createIdentifier(alias);
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* Equals */);
     }
     const packageName = this.packageName(pathSegments);
     const packageImport = new PackageImport(aliasIdentifier, equalsToken, packageName, void 0);
@@ -346,7 +396,7 @@ var SyntaxFactory = class {
   }
   static packageName(segments) {
     const segmentIdentifiers = segments.map((s) => this.createIdentifier(s));
-    const packageNameParts = this.createTokenSeparatedElements(segmentIdentifiers, 27 /* Dot */);
+    const packageNameParts = this.createTokenSeparatedElements(segmentIdentifiers, 26 /* Dot */);
     return new PackageName(packageNameParts, void 0);
   }
   static packageAliasTypeDeclaration(tags, modifiers, name, typeParameters, body) {
@@ -355,7 +405,7 @@ var SyntaxFactory = class {
     const typeKeyword = this.keyword(16 /* Type */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(57 /* Equals */);
     return new PackageAliasTypeDeclaration(
       tagList,
       modifierList,
@@ -378,9 +428,9 @@ var SyntaxFactory = class {
     return new PackageMemberGroupDeclaration(
       tagList,
       modifierList,
-      this.token(44 /* OpenBrace */),
+      this.token(43 /* OpenBrace */),
       declarationList,
-      this.token(21 /* CloseBrace */),
+      this.token(20 /* CloseBrace */),
       void 0
     );
   }
@@ -410,7 +460,7 @@ var SyntaxFactory = class {
     const typeKeyword = this.keyword(16 /* Type */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(57 /* Equals */);
     return new PackageFunctionTypeDeclaration(
       tagList,
       modifierList,
@@ -440,7 +490,7 @@ var SyntaxFactory = class {
     const typeKeyword = this.keyword(16 /* Type */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(57 /* Equals */);
     return new PackageStructuredTypeDeclaration(
       tagList,
       modifierList,
@@ -454,7 +504,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.createTokenSeparatedElements(baseTypes, 24 /* Comma */), void 0) : void 0;
     const memberBlock = this.typeMemberDeclarationBlock(members);
     return new StructuredTypeDeclarationBody(
       structuredTypeKindKeyword,
@@ -470,7 +520,7 @@ var SyntaxFactory = class {
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (initializer !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* Equals */);
     }
     return new PackageVariableDeclaration(
       tagList,
@@ -511,7 +561,7 @@ var SyntaxFactory = class {
     const typeKeyword = this.keyword(16 /* Type */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
-    const equalsToken = this.token(58 /* Equals */);
+    const equalsToken = this.token(57 /* Equals */);
     return new PackageVariantTypeDeclaration(
       tagList,
       modifierList,
@@ -535,7 +585,7 @@ var SyntaxFactory = class {
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (initializer !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* Equals */);
     }
     return new FieldDeclaration(
       tagList,
@@ -635,42 +685,42 @@ var SyntaxFactory = class {
   }
   static typeMemberDeclarationBlock(members) {
     return new TypeMemberDeclarationBlock(
-      this.token(44 /* OpenBrace */),
+      this.token(43 /* OpenBrace */),
       new TypeMemberDeclarationList(members, void 0),
-      this.token(21 /* CloseBrace */),
+      this.token(20 /* 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);
     let equalsToken;
     if (value !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* 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(44 /* OpenParenthesis */),
+      new ParameterList(this.createTokenSeparatedElements(parameters, 24 /* Comma */), void 0),
+      this.token(21 /* 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(45 /* OpenSquareBracket */),
+      new ParameterList(this.createTokenSeparatedElements(indexParameters, 24 /* Comma */), void 0),
+      this.token(22 /* CloseSquareBracket */),
       void 0
     );
   }
   static namedTypeSpecifier(name, typeArguments) {
     const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
     const qualifiedName = new QualifiedName(
-      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */),
+      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 26 /* Dot */),
       void 0
     );
     let typeArgumentClause;
@@ -680,21 +730,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.createTokenSeparatedElements(typeSpecifiers, 17 /* Bar */), void 0);
   }
   static intersectionTypeSpecifier(typeSpecifiers) {
     return new IntersectionTypeSpecifier(this.createTokenSeparatedElements(
       typeSpecifiers,
-      11 /* Ampersand */
+      10 /* Ampersand */
     ), void 0);
   }
   static nullableTypeSpecifier(typeSpecifier) {
-    const questionToken = this.token(50 /* Question */);
+    const questionToken = this.token(49 /* 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(44 /* OpenParenthesis */);
+    const closeParenthesisToken = this.token(21 /* CloseParenthesis */);
     return new ParenthesizedTypeSpecifier(openParenthesisToken, typeSpecifier, closeParenthesisToken, void 0);
   }
   static anonymousStructuredTypeSpecifier(body) {
@@ -710,11 +760,11 @@ var SyntaxFactory = class {
     const nameIdentifier = this.createIdentifier(name);
     let colonToken;
     if (constraint !== void 0) {
-      colonToken = this.token(24 /* Colon */);
+      colonToken = this.token(23 /* Colon */);
     }
     let equalsToken;
     if (defaultType !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* Equals */);
     }
     return new TypeParameterDeclaration(
       nameIdentifier,
@@ -731,15 +781,15 @@ var SyntaxFactory = class {
     const typeAnnotation = this.createTypeAnnotation(typeSpecifier);
     let equalsToken;
     if (defaultValue !== void 0) {
-      equalsToken = this.token(58 /* Equals */);
+      equalsToken = this.token(57 /* Equals */);
     }
     return new ParameterDeclaration(tagList, nameIdentifier, typeAnnotation, equalsToken, defaultValue, void 0);
   }
   static tag(name, typeArguments, args) {
-    const hashSignToken = this.token(36 /* HashSign */);
+    const hashSignToken = this.token(35 /* HashSign */);
     const qualifiedNameIdentifiers = typeof name === "string" ? [this.createIdentifier(name)] : name.map((s) => this.createIdentifier(s));
     const qualifiedName = new QualifiedName(
-      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 27 /* Dot */),
+      this.createTokenSeparatedElements(qualifiedNameIdentifiers, 26 /* Dot */),
       void 0
     );
     const typeArgumentClause = typeArguments !== void 0 ? this.typeArgumentClause(typeArguments) : void 0;
@@ -747,12 +797,12 @@ var SyntaxFactory = class {
     let argumentList;
     let closeParenthesisToken;
     if (args !== void 0) {
-      openParenthesisToken = this.token(45 /* OpenParenthesis */);
+      openParenthesisToken = this.token(44 /* OpenParenthesis */);
       argumentList = new ArgumentList(
-        this.createTokenSeparatedElements(args, 25 /* Comma */),
+        this.createTokenSeparatedElements(args, 24 /* Comma */),
         void 0
       );
-      closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+      closeParenthesisToken = this.token(21 /* CloseParenthesis */);
     }
     return new Tag(
       hashSignToken,
@@ -770,39 +820,39 @@ var SyntaxFactory = class {
     let levelKeyword;
     let closeParenthesisToken;
     if (level !== void 0) {
-      openParenthesisToken = this.token(45 /* OpenParenthesis */);
+      openParenthesisToken = this.token(44 /* OpenParenthesis */);
       levelKeyword = this.keyword(level);
-      closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+      closeParenthesisToken = this.token(21 /* CloseParenthesis */);
     }
     return new Modifier(valueKeyword, openParenthesisToken, levelKeyword, closeParenthesisToken, void 0);
   }
   static typeArgumentClause(typeArguments) {
-    const lessThanToken = this.token(37 /* LessThan */);
+    const lessThanToken = this.token(36 /* LessThan */);
     const typeArgumentList = new TypeArgumentList(
-      this.createTokenSeparatedElements(typeArguments, 25 /* Comma */),
+      this.createTokenSeparatedElements(typeArguments, 24 /* Comma */),
       void 0
     );
-    const greaterThanToken = this.token(34 /* GreaterThan */);
+    const greaterThanToken = this.token(33 /* 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(23 /* Colon */), typeSpecifier, void 0);
   }
   static statementBlock(statements) {
-    const openBraceToken = this.token(44 /* OpenBrace */);
+    const openBraceToken = this.token(43 /* OpenBrace */);
     const statementList = new StatementList(statements, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(20 /* 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(43 /* OpenBrace */);
+    const closeBraceToken = this.token(20 /* CloseBrace */);
     return new FunctionBlock(openBraceToken, expression, closeBraceToken, void 0);
   }
   static functionStatementBlock(statements) {
-    const openBraceToken = this.token(44 /* OpenBrace */);
+    const openBraceToken = this.token(43 /* OpenBrace */);
     const statementList = new StatementList(statements, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(20 /* CloseBrace */);
     return new FunctionBlock(openBraceToken, statementList, closeBraceToken, void 0);
   }
   static nullLiteral() {
@@ -815,9 +865,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(43 /* OpenBrace */);
     const translationList = new TopLevelTranslationList(translations, void 0);
-    const closeBraceToken = this.token(21 /* CloseBrace */);
+    const closeBraceToken = this.token(20 /* CloseBrace */);
     return new TranslationsDeclaration(
       tagList,
       modifierList,
@@ -830,7 +880,7 @@ var SyntaxFactory = class {
   }
   static packageVariableTranslation(sourceName, translatedName) {
     const sourceNameIdentifier = this.createIdentifier(sourceName);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     return new PackageVariableTranslationDeclaration(
       sourceNameIdentifier,
@@ -844,7 +894,7 @@ var SyntaxFactory = class {
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
@@ -864,16 +914,16 @@ var SyntaxFactory = class {
     const typeKeyword = this.keyword(16 /* Type */);
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     let openBraceToken;
     let memberList;
     let closeBraceToken;
     if (members !== void 0) {
-      openBraceToken = this.token(44 /* OpenBrace */);
+      openBraceToken = this.token(43 /* OpenBrace */);
       memberList = new TypeMemberTranslationList(members, void 0);
-      closeBraceToken = this.token(21 /* CloseBrace */);
+      closeBraceToken = this.token(20 /* CloseBrace */);
     }
     return new TypeTranslationDeclaration(
       typeKeyword,
@@ -893,7 +943,7 @@ var SyntaxFactory = class {
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
@@ -911,7 +961,7 @@ var SyntaxFactory = class {
   }
   static fieldOrVariantTranslation(sourceName, translatedName) {
     const sourceNameIdentifier = this.createIdentifier(sourceName);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     return new FieldOrVariantTranslation(
       sourceNameIdentifier,
@@ -925,7 +975,7 @@ var SyntaxFactory = class {
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedNameIdentifier = this.createIdentifier(translatedName);
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
@@ -944,7 +994,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(42 /* MinusGreaterThan */);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new ConstructorTranslation(
       creationKeyword,
@@ -956,7 +1006,7 @@ var SyntaxFactory = class {
   }
   static indexerTranslation(sourceParameters, translatedParameters) {
     const sourceParameterClause = this.indexParameterTranslationClause(sourceParameters);
-    const minusGreaterThanToken = this.token(43 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.token(42 /* MinusGreaterThan */);
     const translatedParameterClause = this.indexParameterTranslationClause(translatedParameters);
     return new IndexerTranslation(
       sourceParameterClause,
@@ -966,21 +1016,21 @@ var SyntaxFactory = class {
     );
   }
   static translationParameterClause(parameters) {
-    const openParenthesisToken = this.token(45 /* OpenParenthesis */);
+    const openParenthesisToken = this.token(44 /* OpenParenthesis */);
     const parameterList = new TranslationParameterList(
-      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 24 /* Comma */),
       void 0
     );
-    const closeParenthesisToken = this.token(22 /* CloseParenthesis */);
+    const closeParenthesisToken = this.token(21 /* CloseParenthesis */);
     return new TranslationParameterClause(openParenthesisToken, parameterList, closeParenthesisToken, void 0);
   }
   static indexParameterTranslationClause(parameters) {
-    const openSquareBracketToken = this.token(46 /* OpenSquareBracket */);
+    const openSquareBracketToken = this.token(45 /* OpenSquareBracket */);
     const parameterList = new TranslationParameterList(
-      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+      this.createTokenSeparatedElements(parameters.map((p) => this.createIdentifier(p)), 24 /* Comma */),
       void 0
     );
-    const closeSquareBracketToken = this.token(23 /* CloseSquareBracket */);
+    const closeSquareBracketToken = this.token(22 /* CloseSquareBracket */);
     return new IndexParameterTranslationClause(
       openSquareBracketToken,
       parameterList,
@@ -1000,9 +1050,9 @@ var SyntaxFactory = class {
       return void 0;
     }
     return new TypeParameterClause(
-      this.token(37 /* LessThan */),
-      new TypeParameterList(this.createTokenSeparatedElements(typeParameters, 25 /* Comma */), void 0),
-      this.token(34 /* GreaterThan */),
+      this.token(36 /* LessThan */),
+      new TypeParameterList(this.createTokenSeparatedElements(typeParameters, 24 /* Comma */), void 0),
+      this.token(33 /* GreaterThan */),
       void 0
     );
   }
@@ -1011,12 +1061,12 @@ var SyntaxFactory = class {
       return void 0;
     }
     return new TranslationTypeParameterClause(
-      this.token(37 /* LessThan */),
+      this.token(36 /* LessThan */),
       new TranslationTypeParameterList(
-        this.createTokenSeparatedElements(typeParameters.map((p) => this.createIdentifier(p)), 25 /* Comma */),
+        this.createTokenSeparatedElements(typeParameters.map((p) => this.createIdentifier(p)), 24 /* Comma */),
         void 0
       ),
-      this.token(34 /* GreaterThan */),
+      this.token(33 /* GreaterThan */),
       void 0
     );
   }
@@ -1024,11 +1074,11 @@ var SyntaxFactory = class {
     if (typeSpecifier === void 0) {
       return void 0;
     }
-    return new TypeAnnotation(this.token(24 /* Colon */), typeSpecifier, void 0);
+    return new TypeAnnotation(this.token(23 /* Colon */), typeSpecifier, void 0);
   }
   static createIdentifier(value) {
     if (typeof value === "string") {
-      return new Token(10 /* Identifier */, value, [], [], 0 /* None */, void 0, void 0);
+      return new Token(9 /* Identifier */, value, [], [], 0 /* None */, void 0, void 0);
     }
     return value;
   }
@@ -1414,7 +1464,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);
@@ -1875,7 +1925,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 === 51 /* Semicolon */) {
         this.writeToken(element);
         isPreviousElementSemicolon = true;
       } else {
@@ -1893,7 +1943,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 === 24 /* Comma */) {
         this.writeToken(element);
       } else {
         if (i > 0) {
@@ -1924,7 +1974,7 @@ var SyntaxToCode = class _SyntaxToCode {
       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 +2072,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 +2337,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;
@@ -2317,7 +2367,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(
@@ -2558,6 +2608,7 @@ var TranslationsGenerator = class _TranslationsGenerator {
           return this.createPackageTypeWithMembersTranslation(entity);
         }
       case 11 /* TypeExtension */:
+      case 13 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -2686,7 +2737,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.",
@@ -2798,7 +2849,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;
@@ -2889,7 +2940,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;
@@ -3178,7 +3229,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;
@@ -3202,7 +3253,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 */)) {
@@ -3212,18 +3263,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(57 /* Equals */) && tokenOrKeyword.parent.kind === 8 /* PackageImport */) {
       return new PackageImportCompletionContext([], void 0);
     }
-    if (tokenOrKeyword.isToken(27 /* Dot */) && tokenOrKeyword.parent.kind === 9 /* PackageName */) {
+    if (tokenOrKeyword.isToken(26 /* 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(43 /* 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(26 /* Dot */) && tokenOrKeyword.parent.kind === 76 /* MemberAccessExpression */) {
       const memberAccess = tokenOrKeyword.parent;
       {
         const packageTreeNode = this.analyzer.getDenotedPackageNameTreeNode(memberAccess.expression);
@@ -3253,7 +3304,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(26 /* 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(
@@ -3292,7 +3343,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(26 /* 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(
@@ -3589,7 +3640,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();
@@ -3660,41 +3711,41 @@ var CompletionService = class {
       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(20 /* 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(44 /* 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(20 /* 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(20 /* 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(20 /* 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(57 /* 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;
@@ -3705,7 +3756,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(20 /* 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 */) {
@@ -4921,9 +4972,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;
@@ -4982,7 +5033,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") {
@@ -5009,7 +5060,7 @@ var SyntaxContextFactory = class {
     if (positionDescription.kind === "after-token-or-keyword") {
       isUnqualifiedTypeContext = this.isUnqualifiedTypeContext(positionDescription.tokenOrKeyword);
     }
-    const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(36 /* HashSign */) && positionDescription.tokenOrKeyword.parent.kind === 152 /* Tag */;
+    const isUnqualifiedTagNameCompletionContext = positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(35 /* HashSign */) && positionDescription.tokenOrKeyword.parent.kind === 152 /* Tag */;
     let isTopLevelTranslationListContext;
     if (positionDescription.kind === "after-token-or-keyword") {
       isTopLevelTranslationListContext = this.isTopLevelTranslationListContext(positionDescription.tokenOrKeyword);
@@ -5020,7 +5071,7 @@ var SyntaxContextFactory = class {
     }
     return new SyntaxContext(
       isInComment,
-      isInStringOrChar,
+      isInText,
       isInQuotedIdentifier,
       isPackageMemberDeclarationListContext,
       isTypeMemberDeclarationListContext,
@@ -5034,7 +5085,7 @@ var SyntaxContextFactory = class {
     );
   }
   static isExpressionOrStatementContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(58 /* Equals */)) {
+    if (tokenOrKeyword.isToken(57 /* Equals */)) {
       if (tokenOrKeyword.parent.kind === 92 /* AssignmentStatement */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
@@ -5059,7 +5110,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 };
       }
@@ -5076,11 +5127,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);
@@ -5092,10 +5143,10 @@ var SyntaxContextFactory = class {
         isStatementContext: false
       };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 94 /* StatementBlock */) {
+    if (tokenOrKeyword.isToken(43 /* 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(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* FunctionBlock */) {
       const block = tokenOrKeyword.parent;
       if (block.expressionOrStatementList.kind !== 93 /* StatementList */ || block.expressionOrStatementList.statements.count() === 0) {
         return {
@@ -5109,10 +5160,10 @@ var SyntaxContextFactory = class {
         };
       }
     }
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 93 /* StatementList */) {
+    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 93 /* StatementList */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
-    if (tokenOrKeyword.isToken(45 /* OpenParenthesis */)) {
+    if (tokenOrKeyword.isToken(44 /* OpenParenthesis */)) {
       if (tokenOrKeyword.parent.kind === 73 /* ParenthesizedExpression */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
@@ -5141,15 +5192,15 @@ var SyntaxContextFactory = class {
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
     }
-    if (tokenOrKeyword.isToken(46 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 70 /* IndexedAccessExpression */) {
+    if (tokenOrKeyword.isToken(45 /* 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(45 /* 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(24 /* Comma */)) {
       if (tokenOrKeyword.parent.kind === 67 /* ArgumentList */) {
         const argumentList = tokenOrKeyword.parent;
         let index = 0;
@@ -5244,16 +5295,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(51 /* 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(20 /* 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(20 /* 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(43 /* 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(
@@ -5265,7 +5316,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(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 152 /* Tag */);
@@ -5275,13 +5326,13 @@ var SyntaxContextFactory = class {
     return false;
   }
   static isTypeMemberDeclarationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 29 /* TypeMemberDeclarationList */) {
+    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 29 /* TypeMemberDeclarationList */) {
       return true;
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 30 /* TypeMemberDeclarationBlock */) {
+    if (tokenOrKeyword.isToken(43 /* 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(20 /* 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(
@@ -5296,13 +5347,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(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 154 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     const tag = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 152 /* Tag */);
@@ -5324,12 +5375,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;
@@ -5343,7 +5394,7 @@ var SyntaxContextFactory = class {
     return result;
   }
   static isUnqualifiedTypeContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(24 /* Colon */) && tokenOrKeyword.parent.kind === 161 /* TypeAnnotation */) {
+    if (tokenOrKeyword.isToken(23 /* 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 */) {
@@ -5352,19 +5403,19 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isKeyword(16 /* Type */) && (NodeTypeUtils.isPackageTypeDeclaration(tokenOrKeyword.parent) || tokenOrKeyword.parent.kind === 38 /* TypeExtensionDeclaration */)) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(37 /* LessThan */) && tokenOrKeyword.parent.kind === 157 /* TypeArgumentClause */) {
+    if (tokenOrKeyword.isToken(36 /* 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(24 /* 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 */) {
+    if (tokenOrKeyword.isToken(35 /* 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(23 /* Colon */) || tokenOrKeyword.isToken(57 /* Equals */)) && tokenOrKeyword.parent.kind === 148 /* TypeParameterDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(58 /* Equals */) && tokenOrKeyword.parent.kind === 20 /* PackageAliasTypeDeclaration */) {
+    if (tokenOrKeyword.isToken(57 /* Equals */) && tokenOrKeyword.parent.kind === 20 /* PackageAliasTypeDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
     if (tokenOrKeyword.isKeyword(14 /* Is */) && tokenOrKeyword.parent.kind === 72 /* IsExpression */) {
@@ -5373,22 +5424,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(44 /* 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(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 124 /* TopLevelTranslationList */) {
       return { translationsDeclaration: tokenOrKeyword.parent.parent };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */) {
+    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 123 /* TranslationsDeclaration */) {
       return { translationsDeclaration: tokenOrKeyword.parent };
     }
     const type = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
@@ -5422,10 +5473,10 @@ var SyntaxContextFactory = class {
     return void 0;
   }
   static isTypeMemberTranslationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(52 /* Semicolon */) && tokenOrKeyword.parent.kind === 138 /* TypeMemberTranslationList */) {
+    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 138 /* TypeMemberTranslationList */) {
       return { typeTranslation: tokenOrKeyword.parent.parent };
     }
-    if (tokenOrKeyword.isToken(44 /* OpenBrace */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */) {
+    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 139 /* TypeTranslationDeclaration */) {
       return { typeTranslation: tokenOrKeyword.parent };
     }
     const indexer = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 129 /* IndexerTranslation */);
@@ -5567,35 +5618,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(19 /* 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(19 /* 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(43 /* 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(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* 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(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* 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(44 /* OpenParenthesis */) || tokenOrKeyword.isToken(21 /* 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(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* 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(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* 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;
@@ -5737,8 +5788,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 */:
@@ -5761,7 +5812,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;
@@ -6043,7 +6094,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) {
@@ -6167,7 +6218,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)) {
@@ -6194,8 +6245,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);
@@ -6209,8 +6260,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);
@@ -6222,8 +6273,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);
@@ -6268,7 +6319,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": {
@@ -6300,7 +6351,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": {
@@ -6399,7 +6450,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);
@@ -6853,9 +6904,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(19 /* Caret */) || t.isToken(45 /* OpenSquareBracket */) || t.isToken(22 /* CloseSquareBracket */)) {
           return 1;
         } else {
           return 0;
@@ -7410,9 +7461,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(19 /* Caret */) || t.isToken(45 /* OpenSquareBracket */) || t.isToken(22 /* CloseSquareBracket */)) {
         return 1;
       } else {
         return 0;
@@ -7754,7 +7805,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":
@@ -7772,7 +7823,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":
@@ -7812,8 +7863,8 @@ var EvaluatableExpressionService = class {
         }
         break;
       default: {
-        const checkResult = this.isNamedDeclaration(parent);
-        if (checkResult !== void 0 && checkResult.nameIdentifier === node) {
+        const namedDeclarationName = this.ifNamedDeclarationThenName(parent);
+        if (namedDeclarationName === node) {
           return node;
         }
       }
@@ -7830,39 +7881,49 @@ var EvaluatableExpressionService = class {
         return false;
     }
   }
-  isNamedDeclaration(node) {
+  ifNamedDeclarationThenName(node) {
     switch (node.kind) {
       case 58 /* ForStatementVariableDeclaration */:
-        return { nameIdentifier: node.name };
       case 20 /* PackageAliasTypeDeclaration */:
-        return { nameIdentifier: node.name };
       case 25 /* PackageFunctionDeclaration */:
-        return { nameIdentifier: node.name };
       case 26 /* PackageFunctionTypeDeclaration */:
-        return { nameIdentifier: node.name };
       case 31 /* PackageStructuredTypeDeclaration */:
-        return { nameIdentifier: node.name };
       case 33 /* PackageVariableDeclaration */:
-        return { nameIdentifier: node.name };
       case 36 /* PackageVariantTypeDeclaration */:
-        return { nameIdentifier: node.name };
       case 56 /* NestedFunctionDeclaration */:
-        return { nameIdentifier: node.name };
       case 57 /* LocalVariableDeclaration */:
-        return { nameIdentifier: node.name };
       case 149 /* ParameterDeclaration */:
-        return { nameIdentifier: node.name };
       case 50 /* MethodDeclaration */:
-        return { nameIdentifier: node.name };
       case 52 /* FieldDeclaration */:
-        return { nameIdentifier: node.name };
       case 148 /* TypeParameterDeclaration */:
-        return { nameIdentifier: node.name };
-      case 147 /* VariantDeclaration */:
-        return { nameIdentifier: node.name };
+      case 147 /* VariantValueDeclaration */:
       case 102 /* ErrorVariableDeclaration */:
-        return { nameIdentifier: node.name };
+      case 34 /* PackageVariableGetterDeclaration */:
+      case 35 /* PackageVariableSetterDeclaration */:
+      case 53 /* FieldGetterDeclaration */:
+      case 54 /* FieldSetterDeclaration */:
+      case 51 /* OperatorDeclaration */:
+      case 146 /* TranslationTextTemplateParameter */:
+        return node.name;
+      case 89 /* IdentifierExpression */:
+      case 76 /* MemberAccessExpression */:
+      case 150 /* Argument */:
+      case 125 /* TranslationParameterList */:
+      case 130 /* TranslationTypeParameterList */:
+      case 132 /* PackageFunctionTranslationDeclaration */:
+      case 134 /* FunctionTypeTranslationDeclaration */:
+      case 136 /* PackageVariableTranslationDeclaration */:
+      case 137 /* FieldOrVariantTranslation */:
+      case 139 /* TypeTranslationDeclaration */:
+      case 135 /* QualifiedName */:
+      case 133 /* MethodTranslation */:
+      case 8 /* PackageImport */:
+      case 9 /* PackageName */:
+      case 3 /* Keyword */:
+        return void 0;
       default:
+        Debug.typeIsAssignableTo();
+        Debug.typeIsAssignableTo();
         return void 0;
     }
   }
@@ -7913,11 +7974,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(19 /* Caret */) || t.isToken(45 /* OpenSquareBracket */) || t.isToken(22 /* CloseSquareBracket */) || t.isToken(43 /* OpenBrace */)) {
         return 1;
       } else {
         return 0;
@@ -8232,9 +8293,9 @@ var SourceFileItemsService = class {
           ));
           break;
         }
-        case 147 /* VariantDeclaration */: {
+        case 147 /* VariantValueDeclaration */: {
           result.push(this.createItem(
-            9 /* Variant */,
+            9 /* VariantValue */,
             node2.name.value,
             node2.rangeWithoutTrivia,
             node2.name.rangeWithoutTrivia,
@@ -8297,7 +8358,7 @@ var SourceFileItemsService = class {
         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 */:
+      case 9 /* VariantValue */:
         return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(6 /* Variant */, this.locale, this.dialect)}>`;
       case 18 /* TypeParameter */:
         return name ?? `<${LocalizationHelper.localizeHelperPhrase(2 /* TypeParameter */, this.locale)}>`;
@@ -8478,13 +8539,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 & 256 /* StartsWithTilde */) !== 0) {
           textContentStart += 1;
         }
-        if ((child.flags & 256 /* EndsWithTilde */) !== 0) {
+        if ((child.flags & 512 /* EndsWithTilde */) !== 0) {
           textContentEnd -= 1;
         }
         if (offset >= textContentStart && offset < textContentEnd) {
@@ -8497,7 +8558,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;
@@ -8506,9 +8567,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;
@@ -8560,7 +8621,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()) {
@@ -8614,7 +8675,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()) {
@@ -8657,7 +8718,7 @@ var SemanticTokensService = class {
               ));
             }
           }
-          if (node.kind === 147 /* VariantDeclaration */) {
+          if (node.kind === 147 /* VariantValueDeclaration */) {
             result.push(
               new SemanticToken(
                 node.name.rangeWithoutTrivia,
@@ -8921,7 +8982,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();
       }
@@ -8934,7 +8995,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;
@@ -12042,7 +12103,7 @@ var EntityToSyntax = class {
   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;
@@ -12845,6 +12906,7 @@ var _LanguageServer = class _LanguageServer {
     this.fileSystemTreeDisplayService = new FileSystemTreeDisplayService();
     this.selectionRangeService = new SelectionRangeService();
     this.assignFieldService = new AssignFieldService();
+    this.addBlockToScriptService = new AddBlockToScriptService();
     this.deleteBlockFromScriptService = new DeleteBlockFromScriptService();
     this.codeActionsService = new CodeActionsService();
     this.connection = config.connection;
@@ -12942,7 +13004,9 @@ 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.addBlockToScript, (params, token) => this.withTaskController(token, (taskController) => this.onAddBlockToScript(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();
   }
@@ -13447,7 +13511,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;
@@ -13514,16 +13578,22 @@ var _LanguageServer = class _LanguageServer {
       }
     });
   }
-  onDeleteBlockFromScript(params, taskController) {
+  onAddBlockToScript(params, taskController) {
     return __async(this, null, function* () {
       const functionNodeUri = URI.parse(params.functionNodeUri);
       const sourceFileContext = yield this.getSourceFileContext(functionNodeUri, 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(
+          const addedBlockInfo = {
+            name: params.name,
+            key: params.key,
+            elementProperties: params.elementProperties
+          };
+          const sourceFileEdit = this.addBlockToScriptService.createEditAddingBlock(
             sourceFileContext.sourceFile,
-            functionDeclaration
+            functionDeclaration,
+            addedBlockInfo
           );
           if (sourceFileEdit !== void 0) {
             const textDocumentEdit = this.convertSourceFileEdit(sourceFileEdit);
@@ -13534,6 +13604,32 @@ var _LanguageServer = class _LanguageServer {
       }
     });
   }
+  onDeleteBlocksFromScript(params, taskController) {
+    return __async(this, null, function* () {
+      const documentEdits = new Array();
+      for (const functionNodeUri of params.functionNodeUris) {
+        const parsedFunctionNodeUri = URI.parse(functionNodeUri);
+        const sourceFileContext = yield this.getSourceFileContext(parsedFunctionNodeUri, taskController);
+        if (sourceFileContext !== void 0) {
+          const functionDeclaration = NodePath.parse(parsedFunctionNodeUri.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);
+              documentEdits.push(textDocumentEdit);
+            }
+          }
+        }
+      }
+      if (documentEdits.length > 0) {
+        const workspaceEdit = { documentChanges: documentEdits };
+        yield this.connection.workspace.applyEdit(workspaceEdit);
+      }
+    });
+  }
   convertSourceFileEdit(edit) {
     const range = this.convertSourceFileRange(edit.sourceFile, edit.range);
     const textDocument = ls3.OptionalVersionedTextDocumentIdentifier.create(