@artel/artc 0.6.25210 → 0.6.25212

package/build/api/ApiServices.js

@@ -7,7 +7,6 @@ import {
   AnonymousTypeSpecifier,
   AnonymousVariantTypeDeclaration,
   BaseTypeList,
-  BinaryOperatorDeclaration_typeMember,
   Cached,
   CallArgumentList,
   CancelledError,
@@ -62,6 +61,7 @@ import {
   NodePath,
   NodeTypeUtils,
   NullableTypeSpecifier,
+  OperatorDeclaration_typeMember,
   PackageAliasTypeDeclaration,
   PackageImport,
   PackageImportDirectiveList,
@@ -144,7 +144,6 @@ import {
   TypeVariableGetterDeclaration,
   TypeVariableOrVariantTranslation,
   TypeVariableSetterDeclaration,
-  UnaryOperatorDeclaration_typeMember,
   UnionTypeSpecifier,
   UnionTypeSpecifierTypeList,
   Uri,
@@ -172,8 +171,10 @@ import {
   isSourceOrConfigurationFileName,
   isTypeEntity,
   isTypeEntityWithMembers,
+  isUnaryOperator,
   kebabCaseToCamelCase,
   localeToString,
+  operatorKinds,
   setUserLocale,
   tokenKindValues,
   traverseTreeWithCancellationToken,
@@ -181,7 +182,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldExecution
-} from "../chunk-3ORG7RXI.js";
+} from "../chunk-DYVLHEXS.js";
 
 // source/services/CustomCommand.ts
 import * as ls from "vscode-languageserver";
@@ -269,7 +270,7 @@ function cast(value) {
 import { atomic as atomic6, atomicRun as atomicRun3 } from "reactronic";
 import * as ls3 from "vscode-languageserver";
 import { TextDocument } from "vscode-languageserver-textdocument";
-import { URI as URI2, Utils } from "vscode-uri";
+import { URI as URI2 } from "vscode-uri";
 
 // source/services/Types.ts
 import * as ls2 from "vscode-languageserver";
@@ -362,24 +363,23 @@ var AddPropertyAssignmentService = class {
       case 50 /* TypeDereferencedVariableGetterDeclaration */:
       case 51 /* TypeDereferencedVariableSetterDeclaration */:
       case 52 /* TypeMethodDeclaration */:
-      case 54 /* TypeVariableGetterDeclaration */:
-      case 55 /* TypeVariableSetterDeclaration */:
-      case 57 /* NestedMethodDeclaration */:
-      case 66 /* MethodBlockLiteral */:
+      case 55 /* TypeVariableGetterDeclaration */:
+      case 56 /* TypeVariableSetterDeclaration */:
+      case 58 /* NestedMethodDeclaration */:
+      case 67 /* MethodBlockLiteral */:
       case 76 /* MethodLiteral */:
+      case 53 /* OperatorDeclaration */:
         return void 0;
-      case 101 /* RunStatement */:
+      case 100 /* RunStatement */:
         return this.ifShouldBeAssignedAtTheEndOfSubprogramThenBody(parent);
-      case 102 /* OnErrorClause */:
-      case 104 /* FinallyClause */:
-      case 109 /* ForStatement */:
-      case 110 /* IfStatement */:
-      case 112 /* ElseIfClause */:
-      case 116 /* UnobservableStatement */:
-      case 117 /* LoopStatement */:
-      case 122 /* SwitchStatementCaseClause */:
-      case 123 /* TransactionalStatement */:
-      case 124 /* WhileStatement */:
+      case 101 /* OnErrorClause */:
+      case 103 /* FinallyClause */:
+      case 108 /* ForStatement */:
+      case 109 /* IfStatement */:
+      case 111 /* ElseIfClause */:
+      case 115 /* LoopStatement */:
+      case 120 /* SwitchStatementCaseClause */:
+      case 121 /* WhileStatement */:
         return this.getContainingSubprogram(parent)?.body;
       default:
         Debug.never(parent);
@@ -410,10 +410,10 @@ function isSubprogramDeclaration(node) {
     case 50 /* TypeDereferencedVariableGetterDeclaration */:
     case 51 /* TypeDereferencedVariableSetterDeclaration */:
     case 52 /* TypeMethodDeclaration */:
-    case 54 /* TypeVariableGetterDeclaration */:
-    case 55 /* TypeVariableSetterDeclaration */:
-    case 57 /* NestedMethodDeclaration */:
-    case 66 /* MethodBlockLiteral */:
+    case 55 /* TypeVariableGetterDeclaration */:
+    case 56 /* TypeVariableSetterDeclaration */:
+    case 58 /* NestedMethodDeclaration */:
+    case 67 /* MethodBlockLiteral */:
     case 76 /* MethodLiteral */:
       return true;
     default:
@@ -484,7 +484,7 @@ var SyntaxFactory = class {
   static packageMethodDeclaration(tags, modifiers, name, typeParameters, parameters, returnTypeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const operationKeyword = this.keyword(11 /* Operation */);
+    const functionKeyword = this.keyword(11 /* Function */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
     const parameterClause = this.parameterClause(parameters);
@@ -492,7 +492,7 @@ var SyntaxFactory = class {
     return new PackageMethodDeclaration(
       tagList,
       modifierList,
-      operationKeyword,
+      functionKeyword,
       nameIdentifier,
       typeParameterClause,
       parameterClause,
@@ -518,10 +518,10 @@ var SyntaxFactory = class {
     );
   }
   static methodTypeDeclarationBody(parameters, returnTypeSpecifier) {
-    const operationKeyword = this.keyword(11 /* Operation */);
+    const functionKeyword = this.keyword(11 /* Function */);
     const parameterClause = this.parameterClause(parameters);
     const returnTypeAnnotation = this.createTypeAnnotation(returnTypeSpecifier);
-    return new MethodTypeDeclarationBody(void 0, operationKeyword, parameterClause, returnTypeAnnotation);
+    return new MethodTypeDeclarationBody(void 0, functionKeyword, parameterClause, returnTypeAnnotation);
   }
   static packageStructuredTypeDeclaration(tags, modifiers, name, typeParameters, body) {
     const tagList = new TagList(tags);
@@ -571,7 +571,7 @@ var SyntaxFactory = class {
   static packageVariableGetterDeclaration(tags, modifiers, name, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(61 /* Get */);
+    const getKeyword = this.keyword(57 /* Get */);
     const nameIdentifier = this.createIdentifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new PackageVariableGetterDeclaration(
@@ -586,7 +586,7 @@ var SyntaxFactory = class {
   static packageVariableSetterDeclaration(tags, modifiers, name, setterParameterClause, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const setKeyword = this.keyword(62 /* Set */);
+    const setKeyword = this.keyword(58 /* Set */);
     const nameIdentifier = this.createIdentifier(name);
     return new PackageVariableSetterDeclaration(
       tagList,
@@ -640,7 +640,7 @@ var SyntaxFactory = class {
   static typeVariableGetterDeclaration(tags, modifiers, name, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(61 /* Get */);
+    const getKeyword = this.keyword(57 /* Get */);
     const nameIdentifier = this.createIdentifier(name);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new TypeVariableGetterDeclaration(
@@ -655,7 +655,7 @@ var SyntaxFactory = class {
   static typeVariableSetterDeclaration(tags, modifiers, name, setterParameterClause, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const setKeyword = this.keyword(62 /* Set */);
+    const setKeyword = this.keyword(58 /* Set */);
     const nameIdentifier = this.createIdentifier(name);
     return new TypeVariableSetterDeclaration(
       tagList,
@@ -669,7 +669,7 @@ var SyntaxFactory = class {
   static typeMethodDeclaration(tags, modifiers, name, typeParameters, parameters, returnTypeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const operationKeyword = this.keyword(11 /* Operation */);
+    const functionKeyword = this.keyword(11 /* Function */);
     const nameIdentifier = this.createIdentifier(name);
     const typeParameterClause = this.createTypeParameterClause(typeParameters);
     const parameterClause = this.parameterClause(parameters);
@@ -677,7 +677,7 @@ var SyntaxFactory = class {
     return new TypeMethodDeclaration(
       tagList,
       modifierList,
-      operationKeyword,
+      functionKeyword,
       nameIdentifier,
       typeParameterClause,
       parameterClause,
@@ -695,14 +695,14 @@ var SyntaxFactory = class {
   static typeDestructorDeclaration(tags, modifiers, parameters, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const destructionKeyword = this.keyword(50 /* Destruction */);
+    const destructionKeyword = this.keyword(46 /* Destruction */);
     const parameterClause = this.parameterClause(parameters);
     return new TypeDestructorDeclaration(tagList, modifierList, destructionKeyword, parameterClause, body);
   }
   static typeIndexedGetterDeclaration(tags, modifiers, parameters, typeSpecifier, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(61 /* Get */);
+    const getKeyword = this.keyword(57 /* Get */);
     const parameterClause = this.indexerParameterClause(parameters);
     const typeAnnotation = this.typeAnnotation(typeSpecifier);
     return new TypeIndexedGetterDeclaration(
@@ -717,7 +717,7 @@ var SyntaxFactory = class {
   static typeIndexedSetterDeclaration(tags, modifiers, parameters, setterParameterClause, body) {
     const tagList = new TagList(tags);
     const modifierList = new ModifierList(modifiers);
-    const getKeyword = this.keyword(62 /* Set */);
+    const getKeyword = this.keyword(58 /* Set */);
     const parameterClause = this.indexerParameterClause(parameters);
     return new TypeIndexedSetterDeclaration(
       tagList,
@@ -873,7 +873,7 @@ var SyntaxFactory = class {
     return new StatementBlock(openBraceToken, statementList, closeBraceToken);
   }
   static noneLiteral() {
-    return new KeywordExpression(this.keyword(60 /* None */));
+    return new KeywordExpression(this.keyword(56 /* None */));
   }
   static integerLiteral(value) {
     return new TokenExpression(this.token(2 /* IntegerLiteral */, value.toString()));
@@ -881,7 +881,7 @@ var SyntaxFactory = class {
   static translationsDeclaration(translations) {
     const tagList = new TagList([]);
     const modifierList = new ModifierList([]);
-    const translationsKeyword = this.keyword(58 /* Translations */);
+    const translationsKeyword = this.keyword(54 /* Translations */);
     const openBraceToken = this.token(43 /* OpenBrace */);
     const translationList = new TopLevelTranslationList(translations);
     const closeBraceToken = this.token(20 /* CloseBrace */);
@@ -901,7 +901,7 @@ var SyntaxFactory = class {
     return new PackageVariableTranslation(sourceNameIdentifier, minusGreaterThanToken, translatedNameIdentifier);
   }
   static packageMethodTranslation(sourceName, sourceTypeParameters, sourceParameters, translatedName, translatedTypeParameters, translatedParameters) {
-    const operationKeyword = this.keyword(11 /* Operation */);
+    const functionKeyword = this.keyword(11 /* Function */);
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
@@ -910,7 +910,7 @@ var SyntaxFactory = class {
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new PackageMethodTranslation(
-      operationKeyword,
+      functionKeyword,
       sourceNameIdentifier,
       sourceTypeParameterClause,
       sourceParameterClause,
@@ -978,7 +978,7 @@ var SyntaxFactory = class {
     );
   }
   static typeMethodTranslation(sourceName, sourceTypeParameters, sourceParameters, translatedName, translatedTypeParameters, translatedParameters) {
-    const operationKeyword = this.keyword(11 /* Operation */);
+    const functionKeyword = this.keyword(11 /* Function */);
     const sourceNameIdentifier = this.createIdentifier(sourceName);
     const sourceTypeParameterClause = this.createTranslationTypeParameterClause(sourceTypeParameters);
     const sourceParameterClause = this.translationParameterClause(sourceParameters);
@@ -987,7 +987,7 @@ var SyntaxFactory = class {
     const translatedTypeParameterClause = this.createTranslationTypeParameterClause(translatedTypeParameters);
     const translatedParameterClause = this.translationParameterClause(translatedParameters);
     return new TypeMethodTranslation(
-      operationKeyword,
+      functionKeyword,
       sourceNameIdentifier,
       sourceTypeParameterClause,
       sourceParameterClause,
@@ -1033,10 +1033,10 @@ var SyntaxFactory = class {
   }
   static token(kind, value) {
     const flags = value === void 0 ? 1 /* Missing */ : 0 /* None */;
-    return new Token(kind, value ?? "", [], flags);
+    return new Token(kind, value ?? "", [], flags, void 0);
   }
   static keyword(kind) {
-    return new Keyword(kind, [], true);
+    return new Keyword([], kind, true);
   }
   static createTypeParameterClause(typeParameters) {
     if (typeParameters === void 0) {
@@ -1068,7 +1068,7 @@ var SyntaxFactory = class {
   }
   static createIdentifier(value) {
     if (typeof value === "string") {
-      return new Token(63 /* Identifier */, value, [], 0 /* None */);
+      return new Token(63 /* Identifier */, value, [], 0 /* None */, void 0);
     }
     return value;
   }
@@ -1190,7 +1190,7 @@ var SyntaxToCode = class _SyntaxToCode {
   writePackageMethodDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
     this.writeDeclarationModifiers(node.modifierList);
-    this.writeKeyword(node.operationKeyword);
+    this.writeKeyword(node.functionKeyword);
     this.writeWhitespace();
     this.writeToken(node.name);
     if (node.typeParameterClause !== void 0) {
@@ -1305,7 +1305,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.writeTypeMemberDeclarationBlock(node.memberBlock);
   }
   writeMethodTypeDeclarationBody(node) {
-    this.writeKeyword(node.operationKeyword);
+    this.writeKeyword(node.functionKeyword);
     this.writeParameterClause(node.parameterClause);
     if (node.returnTypeAnnotation !== void 0) {
       this.writeTypeAnnotation(node.returnTypeAnnotation, true);
@@ -1371,7 +1371,7 @@ var SyntaxToCode = class _SyntaxToCode {
   writeTypeMethodDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
     this.writeDeclarationModifiers(node.modifierList);
-    this.writeKeyword(node.operationKeyword);
+    this.writeKeyword(node.functionKeyword);
     this.writeWhitespace();
     this.writeToken(node.name);
     if (node.typeParameterClause !== void 0) {
@@ -1385,6 +1385,20 @@ var SyntaxToCode = class _SyntaxToCode {
       this.writeDeclarationBody(node.body);
     }
   }
+  writeOperatorDeclaration(node) {
+    this.writeDeclarationTags(node.tagList);
+    this.writeDeclarationModifiers(node.modifierList);
+    this.writeKeyword(node.functionKeyword);
+    this.writeWhitespace();
+    this.writeToken(node.name);
+    this.writeParameterClause(node.parameterClause);
+    if (node.returnTypeAnnotation !== void 0) {
+      this.writeTypeAnnotation(node.returnTypeAnnotation, true);
+    }
+    if (node.body !== void 0) {
+      this.writeDeclarationBody(node.body);
+    }
+  }
   writeTypeConstructorDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
     this.writeDeclarationModifiers(node.modifierList);
@@ -1727,7 +1741,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.writeToken(node.translatedName);
   }
   writePackageMethodTranslation(node) {
-    this.writeKeyword(node.operationKeyword);
+    this.writeKeyword(node.functionKeyword);
     this.writeWhitespace();
     this.writeToken(node.sourceName);
     if (node.sourceTypeParameterClause !== void 0) {
@@ -1796,7 +1810,7 @@ var SyntaxToCode = class _SyntaxToCode {
     this.writeToken(node.translatedName);
   }
   writeTypeMethodTranslation(node) {
-    this.writeKeyword(node.operationKeyword);
+    this.writeKeyword(node.functionKeyword);
     this.writeWhitespace();
     this.writeToken(node.sourceName);
     if (node.sourceTypeParameterClause !== void 0) {
@@ -2014,22 +2028,23 @@ var SyntaxToCode = class _SyntaxToCode {
       [50 /* TypeDereferencedVariableGetterDeclaration */]: this.prototype.writeTypeDereferencedVariableGetterDeclaration,
       [51 /* TypeDereferencedVariableSetterDeclaration */]: this.prototype.writeTypeDereferencedVariableSetterDeclaration,
       [52 /* TypeMethodDeclaration */]: this.prototype.writeTypeMethodDeclaration,
-      [53 /* TypeVariableDeclaration */]: this.prototype.writeTypeVariableDeclaration,
-      [54 /* TypeVariableGetterDeclaration */]: this.prototype.writeTypeVariableGetterDeclaration,
-      [55 /* TypeVariableSetterDeclaration */]: this.prototype.writeTypeVariableSetterDeclaration,
-      [96 /* StatementBlock */]: this.prototype.writeStatementBlock,
-      [137 /* QualifiedName */]: this.prototype.writeQualifiedName,
-      [144 /* VariantDeclaration */]: this.prototype.writeVariantDeclaration,
-      [145 /* TypeParameterDeclaration */]: this.prototype.writeTypeParameterDeclaration,
-      [146 /* ParameterDeclaration */]: this.prototype.writeParameterDeclaration,
-      [147 /* CallArgument */]: this.prototype.writeCallArgument,
-      [149 /* Tag */]: this.prototype.writeTag,
-      [151 /* Modifier */]: this.prototype.writeModifier,
-      [152 /* ParameterClause */]: this.prototype.writeParameterClause,
-      [153 /* ParameterList */]: this.prototype.writeParameterList,
-      [154 /* SetterParameterClause */]: this.prototype.writeSetterParameterClause,
-      [156 /* TypeArgumentClause */]: this.prototype.writeTypeArgumentClause,
-      [158 /* TypeParameterClause */]: this.prototype.writeTypeParameterClause,
+      [53 /* OperatorDeclaration */]: this.prototype.writeOperatorDeclaration,
+      [54 /* TypeVariableDeclaration */]: this.prototype.writeTypeVariableDeclaration,
+      [55 /* TypeVariableGetterDeclaration */]: this.prototype.writeTypeVariableGetterDeclaration,
+      [56 /* TypeVariableSetterDeclaration */]: this.prototype.writeTypeVariableSetterDeclaration,
+      [95 /* StatementBlock */]: this.prototype.writeStatementBlock,
+      [134 /* QualifiedName */]: this.prototype.writeQualifiedName,
+      [141 /* VariantDeclaration */]: this.prototype.writeVariantDeclaration,
+      [142 /* TypeParameterDeclaration */]: this.prototype.writeTypeParameterDeclaration,
+      [143 /* ParameterDeclaration */]: this.prototype.writeParameterDeclaration,
+      [144 /* CallArgument */]: this.prototype.writeCallArgument,
+      [146 /* Tag */]: this.prototype.writeTag,
+      [148 /* Modifier */]: this.prototype.writeModifier,
+      [149 /* ParameterClause */]: this.prototype.writeParameterClause,
+      [150 /* ParameterList */]: this.prototype.writeParameterList,
+      [151 /* SetterParameterClause */]: this.prototype.writeSetterParameterClause,
+      [153 /* TypeArgumentClause */]: this.prototype.writeTypeArgumentClause,
+      [155 /* TypeParameterClause */]: this.prototype.writeTypeParameterClause,
       [17 /* AnonymousMethodTypeDeclaration */]: this.prototype.writeAnonymousMethodTypeDeclaration,
       [18 /* AnonymousStructuredTypeDeclaration */]: this.prototype.writeAnonymousStructuredTypeDeclaration,
       [19 /* AnonymousVariantTypeDeclaration */]: this.prototype.writeAnonymousVariantTypeDeclaration,
@@ -2046,25 +2061,24 @@ var SyntaxToCode = class _SyntaxToCode {
       [42 /* ExtendedTypeClause */]: this.prototype.writeNodeDefault,
       [43 /* InvalidPackageMemberDeclaration */]: this.prototype.writeNodeDefault,
       [49 /* TypeIndexerParameterClause */]: this.prototype.writeNodeDefault,
-      [56 /* InvalidTypeMemberDeclaration */]: this.prototype.writeNodeDefault,
-      [57 /* NestedMethodDeclaration */]: this.prototype.writeNodeDefault,
-      [58 /* LocalVariableDeclaration */]: this.prototype.writeNodeDefault,
-      [59 /* EnumerationVariableDeclaration */]: this.prototype.writeNodeDefault,
-      [60 /* ArrayLiteral */]: this.prototype.writeNodeDefault,
-      [61 /* ArrayLiteralElementList */]: this.prototype.writeNodeDefault,
-      [62 /* AssertionExpression */]: this.prototype.writeNodeDefault,
-      [63 /* AssumptionExpression */]: this.prototype.writeNodeDefault,
-      [64 /* AsExpression */]: this.prototype.writeNodeDefault,
-      [65 /* BinaryExpression */]: this.prototype.writeNodeDefault,
-      [66 /* MethodBlockLiteral */]: this.prototype.writeNodeDefault,
-      [67 /* CallArgumentList */]: this.prototype.writeNodeDefault,
-      [68 /* CallExpression */]: this.prototype.writeNodeDefault,
-      [69 /* AutotypeCallExpression */]: this.prototype.writeNodeDefault,
-      [70 /* IndexedAccessArgumentList */]: this.prototype.writeNodeDefault,
-      [71 /* IndexedAccessExpression */]: this.prototype.writeNodeDefault,
-      [72 /* InvalidExpression */]: this.prototype.writeNodeDefault,
-      [73 /* IsExpression */]: this.prototype.writeNodeDefault,
-      [74 /* UnobservableExpression */]: this.prototype.writeNodeDefault,
+      [57 /* InvalidTypeMemberDeclaration */]: this.prototype.writeNodeDefault,
+      [58 /* NestedMethodDeclaration */]: this.prototype.writeNodeDefault,
+      [59 /* LocalVariableDeclaration */]: this.prototype.writeNodeDefault,
+      [60 /* EnumerationVariableDeclaration */]: this.prototype.writeNodeDefault,
+      [61 /* ArrayLiteral */]: this.prototype.writeNodeDefault,
+      [62 /* ArrayLiteralElementList */]: this.prototype.writeNodeDefault,
+      [63 /* AssertionExpression */]: this.prototype.writeNodeDefault,
+      [64 /* AssumptionExpression */]: this.prototype.writeNodeDefault,
+      [65 /* AsExpression */]: this.prototype.writeNodeDefault,
+      [66 /* BinaryExpression */]: this.prototype.writeNodeDefault,
+      [67 /* MethodBlockLiteral */]: this.prototype.writeNodeDefault,
+      [68 /* CallArgumentList */]: this.prototype.writeNodeDefault,
+      [69 /* CallExpression */]: this.prototype.writeNodeDefault,
+      [70 /* AutotypeCallExpression */]: this.prototype.writeNodeDefault,
+      [71 /* IndexedAccessArgumentList */]: this.prototype.writeNodeDefault,
+      [72 /* IndexedAccessExpression */]: this.prototype.writeNodeDefault,
+      [73 /* InvalidExpression */]: this.prototype.writeNodeDefault,
+      [74 /* IsExpression */]: this.prototype.writeNodeDefault,
       [75 /* NotExpression */]: this.prototype.writeNodeDefault,
       [76 /* MethodLiteral */]: this.prototype.writeNodeDefault,
       [77 /* ParenthesizedExpression */]: this.prototype.writeNodeDefault,
@@ -2081,63 +2095,60 @@ var SyntaxToCode = class _SyntaxToCode {
       [88 /* ObjectExpression */]: this.prototype.writeNodeDefault,
       [89 /* BaseExpression */]: this.prototype.writeNodeDefault,
       [90 /* IdentifierExpression */]: this.prototype.writeNodeDefault,
-      [91 /* TransactionalExpression */]: this.prototype.writeNodeDefault,
-      [92 /* GenericSpecializationExpression */]: this.prototype.writeNodeDefault,
-      [93 /* DefaultMatchExpression */]: this.prototype.writeNodeDefault,
-      [94 /* AssignmentStatement */]: this.prototype.writeNodeDefault,
-      [95 /* StatementList */]: this.prototype.writeNodeDefault,
-      [97 /* BreakLoopStatement */]: this.prototype.writeNodeDefault,
-      [98 /* ContinueLoopStatement */]: this.prototype.writeNodeDefault,
-      [99 /* DisposeStatement */]: this.prototype.writeNodeDefault,
-      [100 /* RunStatementClauseList */]: this.prototype.writeNodeDefault,
-      [101 /* RunStatement */]: this.prototype.writeNodeDefault,
-      [102 /* OnErrorClause */]: this.prototype.writeNodeDefault,
-      [103 /* ErrorVariableDeclaration */]: this.prototype.writeNodeDefault,
-      [104 /* FinallyClause */]: this.prototype.writeNodeDefault,
-      [105 /* EmptyStatement */]: this.prototype.writeNodeDefault,
-      [106 /* ErrorStatement */]: this.prototype.writeNodeDefault,
-      [107 /* ExpressionStatement */]: this.prototype.writeNodeDefault,
-      [108 /* EnumerationVariableList */]: this.prototype.writeNodeDefault,
-      [109 /* ForStatement */]: this.prototype.writeNodeDefault,
-      [110 /* IfStatement */]: this.prototype.writeNodeDefault,
-      [111 /* ElseIfClauseList */]: this.prototype.writeNodeDefault,
-      [112 /* ElseIfClause */]: this.prototype.writeNodeDefault,
-      [113 /* InvalidStatement */]: this.prototype.writeNodeDefault,
-      [114 /* NestedMethodDeclarationStatement */]: this.prototype.writeNodeDefault,
-      [115 /* LocalVariableDeclarationStatement */]: this.prototype.writeNodeDefault,
-      [116 /* UnobservableStatement */]: this.prototype.writeNodeDefault,
-      [117 /* LoopStatement */]: this.prototype.writeNodeDefault,
-      [118 /* ReturnStatement */]: this.prototype.writeNodeDefault,
-      [119 /* CaseClauseList */]: this.prototype.writeNodeDefault,
-      [120 /* SwitchStatement */]: this.prototype.writeNodeDefault,
-      [121 /* MatchExpressionList */]: this.prototype.writeNodeDefault,
-      [122 /* SwitchStatementCaseClause */]: this.prototype.writeNodeDefault,
-      [123 /* TransactionalStatement */]: this.prototype.writeNodeDefault,
-      [124 /* WhileStatement */]: this.prototype.writeNodeDefault,
-      [125 /* YieldStatement */]: this.prototype.writeNodeDefault,
-      [126 /* TranslationParameterList */]: this.prototype.writeNodeDefault,
-      [127 /* TranslationParameterClause */]: this.prototype.writeTranslationParameterClause,
-      [128 /* ConstructorTranslation */]: this.prototype.writeConstructorTranslation,
-      [129 /* IndexerTranslationParameterClause */]: this.prototype.writeIndexerTranslationParameterClause,
-      [130 /* IndexerTranslation */]: this.prototype.writeIndexerTranslation,
-      [131 /* TranslationTypeParameterList */]: this.prototype.writeNodeDefault,
-      [132 /* TranslationTypeParameterClause */]: this.prototype.writeTranslationTypeParameterClause,
-      [133 /* PackageMethodTranslation */]: this.prototype.writePackageMethodTranslation,
-      [134 /* TypeMethodTranslation */]: this.prototype.writeTypeMethodTranslation,
-      [135 /* MethodTypeTranslation */]: this.prototype.writeMethodTypeTranslation,
-      [136 /* PackageImportTranslation */]: this.prototype.writePackageImportTranslation,
-      [138 /* PackageVariableTranslation */]: this.prototype.writePackageVariableTranslation,
-      [139 /* TypeVariableOrVariantTranslation */]: this.prototype.writeTypeVariableOrVariantTranslation,
-      [140 /* TypeMemberTranslationList */]: this.prototype.writeNodeDefault,
-      [141 /* TypeTranslation */]: this.prototype.writeTypeTranslation,
-      [142 /* TextLiteralTranslation */]: this.prototype.writeNodeDefault,
-      [143 /* TextTemplateLiteralTranslation */]: this.prototype.writeNodeDefault,
-      [148 /* TagList */]: this.prototype.writeNodeDefault,
-      [150 /* ModifierList */]: this.prototype.writeNodeDefault,
-      [155 /* SetterParameterDeclaration */]: this.prototype.writeNodeDefault,
-      [157 /* TypeArgumentList */]: this.prototype.writeNodeDefault,
-      [159 /* TypeParameterList */]: this.prototype.writeNodeDefault,
-      [160 /* TypeAnnotation */]: this.prototype.writeNodeDefault
+      [91 /* GenericSpecializationExpression */]: this.prototype.writeNodeDefault,
+      [92 /* DefaultMatchExpression */]: this.prototype.writeNodeDefault,
+      [93 /* AssignmentStatement */]: this.prototype.writeNodeDefault,
+      [94 /* StatementList */]: this.prototype.writeNodeDefault,
+      [96 /* BreakLoopStatement */]: this.prototype.writeNodeDefault,
+      [97 /* ContinueLoopStatement */]: this.prototype.writeNodeDefault,
+      [98 /* DisposeStatement */]: this.prototype.writeNodeDefault,
+      [99 /* RunStatementClauseList */]: this.prototype.writeNodeDefault,
+      [100 /* RunStatement */]: this.prototype.writeNodeDefault,
+      [101 /* OnErrorClause */]: this.prototype.writeNodeDefault,
+      [102 /* ErrorVariableDeclaration */]: this.prototype.writeNodeDefault,
+      [103 /* FinallyClause */]: this.prototype.writeNodeDefault,
+      [104 /* EmptyStatement */]: this.prototype.writeNodeDefault,
+      [105 /* ErrorStatement */]: this.prototype.writeNodeDefault,
+      [106 /* ExpressionStatement */]: this.prototype.writeNodeDefault,
+      [107 /* EnumerationVariableList */]: this.prototype.writeNodeDefault,
+      [108 /* ForStatement */]: this.prototype.writeNodeDefault,
+      [109 /* IfStatement */]: this.prototype.writeNodeDefault,
+      [110 /* ElseIfClauseList */]: this.prototype.writeNodeDefault,
+      [111 /* ElseIfClause */]: this.prototype.writeNodeDefault,
+      [112 /* InvalidStatement */]: this.prototype.writeNodeDefault,
+      [113 /* NestedMethodDeclarationStatement */]: this.prototype.writeNodeDefault,
+      [114 /* LocalVariableDeclarationStatement */]: this.prototype.writeNodeDefault,
+      [115 /* LoopStatement */]: this.prototype.writeNodeDefault,
+      [116 /* ReturnStatement */]: this.prototype.writeNodeDefault,
+      [117 /* CaseClauseList */]: this.prototype.writeNodeDefault,
+      [118 /* SwitchStatement */]: this.prototype.writeNodeDefault,
+      [119 /* MatchExpressionList */]: this.prototype.writeNodeDefault,
+      [120 /* SwitchStatementCaseClause */]: this.prototype.writeNodeDefault,
+      [121 /* WhileStatement */]: this.prototype.writeNodeDefault,
+      [122 /* YieldStatement */]: this.prototype.writeNodeDefault,
+      [123 /* TranslationParameterList */]: this.prototype.writeNodeDefault,
+      [124 /* TranslationParameterClause */]: this.prototype.writeTranslationParameterClause,
+      [125 /* ConstructorTranslation */]: this.prototype.writeConstructorTranslation,
+      [126 /* IndexerTranslationParameterClause */]: this.prototype.writeIndexerTranslationParameterClause,
+      [127 /* IndexerTranslation */]: this.prototype.writeIndexerTranslation,
+      [128 /* TranslationTypeParameterList */]: this.prototype.writeNodeDefault,
+      [129 /* TranslationTypeParameterClause */]: this.prototype.writeTranslationTypeParameterClause,
+      [130 /* PackageMethodTranslation */]: this.prototype.writePackageMethodTranslation,
+      [131 /* TypeMethodTranslation */]: this.prototype.writeTypeMethodTranslation,
+      [132 /* MethodTypeTranslation */]: this.prototype.writeMethodTypeTranslation,
+      [133 /* PackageImportTranslation */]: this.prototype.writePackageImportTranslation,
+      [135 /* PackageVariableTranslation */]: this.prototype.writePackageVariableTranslation,
+      [136 /* TypeVariableOrVariantTranslation */]: this.prototype.writeTypeVariableOrVariantTranslation,
+      [137 /* TypeMemberTranslationList */]: this.prototype.writeNodeDefault,
+      [138 /* TypeTranslation */]: this.prototype.writeTypeTranslation,
+      [139 /* TextLiteralTranslation */]: this.prototype.writeNodeDefault,
+      [140 /* TextTemplateLiteralTranslation */]: this.prototype.writeNodeDefault,
+      [145 /* TagList */]: this.prototype.writeNodeDefault,
+      [147 /* ModifierList */]: this.prototype.writeNodeDefault,
+      [152 /* SetterParameterDeclaration */]: this.prototype.writeNodeDefault,
+      [154 /* TypeArgumentList */]: this.prototype.writeNodeDefault,
+      [156 /* TypeParameterList */]: this.prototype.writeNodeDefault,
+      [157 /* TypeAnnotation */]: this.prototype.writeNodeDefault
     };
     return writeFunctions;
   }
@@ -2149,14 +2160,13 @@ var SyntaxToCode = class _SyntaxToCode {
 };
 var modifierSortOrder = {
   [34 /* Hidden */]: 0,
-  [43 /* Static */]: 1,
-  [38 /* Redefinable */]: 2,
-  [37 /* Abstract */]: 3,
-  [39 /* Redefined */]: 4,
-  [35 /* Observable */]: 5,
-  [36 /* Consistent */]: 6,
-  [42 /* Async */]: 7,
-  [33 /* Const */]: 8
+  [39 /* Static */]: 1,
+  [16 /* Basic */]: 2,
+  [36 /* Redefinable */]: 3,
+  [35 /* Abstract */]: 4,
+  [37 /* Redefined */]: 5,
+  [38 /* Async */]: 6,
+  [33 /* Const */]: 7
 };
 
 // source/services/TreeUtils.ts
@@ -2324,7 +2334,7 @@ var TranslationsGenerationService = class {
       return void 0;
     }
     let result;
-    if (tokenOrKeyword.isToken(63 /* Identifier */) && tokenOrKeyword.parent.kind === 141 /* TypeTranslation */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
+    if (tokenOrKeyword.isToken(63 /* Identifier */) && tokenOrKeyword.parent.kind === 138 /* TypeTranslation */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
       const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
       if (translationPackage !== void 0) {
         const generator = new TranslationsGenerator(
@@ -2336,7 +2346,7 @@ var TranslationsGenerationService = class {
         result = generator.generateMissingTypeMemberTranslations(tokenOrKeyword.parent);
       }
     }
-    if (result === void 0 && tokenOrKeyword.isKeyword(58 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */) {
+    if (result === void 0 && tokenOrKeyword.isKeyword(54 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */) {
       const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
       if (translationPackage !== void 0) {
         const generator = new TranslationsGenerator(
@@ -2362,7 +2372,7 @@ var TranslationsGenerationService = class {
     if (tokenOrKeyword === void 0) {
       return false;
     }
-    if (!(tokenOrKeyword.isKeyword(58 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */)) {
+    if (!(tokenOrKeyword.isKeyword(54 /* Translations */) && tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */)) {
       return false;
     }
     const translationPackage = analyzer.getAnalyzedTranslationPackageIfTargetResolved(sourceFile.package);
@@ -2370,16 +2380,19 @@ var TranslationsGenerationService = class {
       return false;
     }
     const generator = new TranslationsGenerator(analyzer, sourceFile, translationPackage, sourceFile.package.dialect);
-    return Query.from(tokenOrKeyword.parent.translationList.translationDeclarations).filter((t) => t.kind === 141 /* TypeTranslation */).mapAndFilter((t) => translationPackage.getTypeTranslationTarget(t).target).any((t) => generator.collectNotTranslatedTypeMembers(t).length > 0);
+    return Query.from(tokenOrKeyword.parent.translationList.translationDeclarations).filter((t) => t.kind === 138 /* TypeTranslation */).mapAndFilter((t) => translationPackage.getTypeTranslationTarget(t).target).any((t) => generator.collectNotTranslatedTypeMembers(t).length > 0);
   }
 };
-var TranslationsGenerator = class {
+var TranslationsGenerator = class _TranslationsGenerator {
   constructor(_analyzer, _sourceFile, _translationPackage, _dialect) {
     this._analyzer = _analyzer;
     this._sourceFile = _sourceFile;
     this._translationPackage = _translationPackage;
     this._dialect = _dialect;
   }
+  static {
+    this._translationArrowRegExp = /-> /g;
+  }
   generateMissingPackageMemberAndTypeMemberTranslations(translationsDeclaration) {
     const result = new Array();
     const memberEntities = this.collectNotTranslatedPackageMembers();
@@ -2389,9 +2402,27 @@ var TranslationsGenerator = class {
         keywordsLocale: this._translationPackage.getTranslatedPackage().getLocale(),
         keywordsDialect: this._dialect,
         initialIndentation: this.detectIndentationForPackageMemberTranslations(translationsDeclaration),
-        indentationStep: this.detectIndentationStepForTypeMemberTranslations(translationsDeclaration)
+        indentationStep: this.detectIndentationStepForTypeMemberTranslations(translationsDeclaration),
+        newLine
       };
-      const memberTranslationsCode = Query.from(memberEntities).mapAndFilter((m) => this.createPackageMemberTranslationNode(m)).uniqueWithComparator(compareNodes).map((n) => new SyntaxToCode(n, syntaxToCodeOptions).convert()).join(`${newLine}${newLine}`);
+      const memberTranslationsCode = Query.from(memberEntities).mapAndFilter((m) => this.createPackageMemberTranslationNode(m)).uniqueWithComparator(compareNodes).map((n) => {
+        const code = new SyntaxToCode(n, syntaxToCodeOptions).convert();
+        if (n.kind === 138 /* TypeTranslation */) {
+          const startOffset = Math.max(code.indexOf(newLine), 0);
+          return this.addNewLineBeforeArrowsInTranslation(
+            code,
+            syntaxToCodeOptions.initialIndentation + syntaxToCodeOptions.indentationStep.repeat(2),
+            newLine,
+            startOffset
+          );
+        } else {
+          return this.addNewLineBeforeArrowsInTranslation(
+            code,
+            syntaxToCodeOptions.initialIndentation + syntaxToCodeOptions.indentationStep,
+            newLine
+          );
+        }
+      }).join(`${newLine}${newLine}`);
       const editRange = Range.empty(translationsDeclaration.openBraceToken.rangeWithoutTrivia.end);
       let editText = newLine + memberTranslationsCode;
       if (translationsDeclaration.translationList.translationDeclarations.count() > 0) {
@@ -2408,7 +2439,7 @@ var TranslationsGenerator = class {
   generateMissingTranslationsForPartiallyTranslatedTypes(translationsDeclaration) {
     const result = new Array();
     for (const translation of translationsDeclaration.translationList.translationDeclarations) {
-      if (translation.kind === 141 /* TypeTranslation */) {
+      if (translation.kind === 138 /* TypeTranslation */) {
         const edits = this.generateMissingTypeMemberTranslations(translation);
         if (edits !== void 0) {
           result.push(...edits);
@@ -2427,13 +2458,21 @@ var TranslationsGenerator = class {
       return void 0;
     }
     const newLine = this.detectNewLine();
-    const membersIndentation = this.detectIndentationForTypeMemberTranslations(typeTranslation);
     const syntaxToCodeOptions = {
       keywordsLocale: this._translationPackage.getTranslatedPackage().getLocale(),
       keywordsDialect: this._dialect,
-      initialIndentation: membersIndentation
+      initialIndentation: this.detectIndentationForTypeMemberTranslations(typeTranslation),
+      indentationStep: this.detectIndentationStepForTypeMemberTranslations(typeTranslation),
+      newLine
     };
-    const memberTranslationsCode = Query.from(memberEntities).mapAndFilter((m) => this.createTypeMemberTranslationNode(m)).uniqueWithComparator(compareNodes).map((n) => new SyntaxToCode(n, syntaxToCodeOptions).convert()).join(`${newLine}${newLine}`);
+    const memberTranslationsCode = Query.from(memberEntities).mapAndFilter((m) => this.createTypeMemberTranslationNode(m)).uniqueWithComparator(compareNodes).map((n) => {
+      const code = new SyntaxToCode(n, syntaxToCodeOptions).convert();
+      return this.addNewLineBeforeArrowsInTranslation(
+        code,
+        syntaxToCodeOptions.initialIndentation + syntaxToCodeOptions.indentationStep,
+        newLine
+      );
+    }).join(`${newLine}${newLine}`);
     let editText;
     let editRange;
     if (typeTranslation.openBraceToken !== void 0) {
@@ -2506,21 +2545,34 @@ var TranslationsGenerator = class {
     }
     return " ".repeat(indentationSize);
   }
-  detectIndentationStepForTypeMemberTranslations(translationsDeclaration) {
+  detectIndentationStepForTypeMemberTranslations(node) {
     let indentationStepSize;
-    for (const member of translationsDeclaration.translationList.translationDeclarations) {
-      if (member.kind === 141 /* TypeTranslation */) {
-        const typeMemberTranslation = member.memberList?.members.first();
-        if (typeMemberTranslation !== void 0) {
-          const typeTranslationIndentation = this._sourceFile.getPositionAt(member.typeKeyword.rangeWithoutTrivia.start).character;
-          const typeMemberTranslationIndentation = this._sourceFile.getPositionAt(typeMemberTranslation.rangeWithoutTrivia.start).character;
-          indentationStepSize = Math.max(typeMemberTranslationIndentation - typeTranslationIndentation, 0);
-          break;
+    if (node.kind === 138 /* TypeTranslation */) {
+      indentationStepSize = tryDetectIndentationStepSizeUsingTypeTranslation(node, this._sourceFile);
+    }
+    if (indentationStepSize === void 0) {
+      const translationsDeclarations = node.kind === 21 /* TranslationsDeclaration */ ? node : node.parent.parent;
+      for (const member of translationsDeclarations.translationList.translationDeclarations) {
+        if (member.kind === 138 /* TypeTranslation */) {
+          indentationStepSize = tryDetectIndentationStepSizeUsingTypeTranslation(member, this._sourceFile);
+          if (indentationStepSize !== void 0) {
+            break;
+          }
         }
       }
     }
     indentationStepSize ??= 2;
     return " ".repeat(indentationStepSize);
+    function tryDetectIndentationStepSizeUsingTypeTranslation(node2, sourceFile) {
+      let result;
+      const member = node2.memberList?.members.first();
+      if (member !== void 0) {
+        const typeTranslationIndentation = sourceFile.getPositionAt(node2.typeKeyword.rangeWithoutTrivia.start).character;
+        const typeMemberTranslationIndentation = sourceFile.getPositionAt(member.rangeWithoutTrivia.start).character;
+        result = Math.max(typeMemberTranslationIndentation - typeTranslationIndentation, 0);
+      }
+      return result;
+    }
   }
   detectIndentationForTypeMemberTranslations(typeTranslation) {
     let indentationSize;
@@ -2560,7 +2612,7 @@ var TranslationsGenerator = class {
         return this.createPackageTypeWithMembersTranslation(entity);
       case 11 /* MethodType */:
         return this.createPackageMethodTypeTranslation(entity);
-      case 18 /* TypeExtension */:
+      case 17 /* TypeExtension */:
         return void 0;
       default:
         Debug.never(entity);
@@ -2602,8 +2654,7 @@ var TranslationsGenerator = class {
         return this.createVariantTranslation(entity);
       case 8 /* DereferenceOperator */:
       case 10 /* Destructor */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
+      case 15 /* Operator */:
         return void 0;
       default:
         Debug.never(entity);
@@ -2632,7 +2683,18 @@ var TranslationsGenerator = class {
     return SyntaxFactory.typeVariableOrVariantTranslation(name, name);
   }
   getNameText(name) {
-    return name.unescapedOriginal;
+    const flags = name.flags & ~16 /* ConflictResolvingParameterName */;
+    return name.getPreferredUnescapedOriginal(flags);
+  }
+  // TODO: Работать с синтаксическим деревом и использовать Trivia для добавления перевода строки. Требуется доработка
+  // SyntaxToCode и возможность добавлять Trivia в узлы, создаваемые через SyntaxFactory.
+  addNewLineBeforeArrowsInTranslation(code, indentationAfterNewLine, newLine, startOffset = 0) {
+    const replacementString = "->" + newLine + indentationAfterNewLine;
+    if (startOffset === 0) {
+      return code.replace(_TranslationsGenerator._translationArrowRegExp, replacementString);
+    } else {
+      return code.substring(0, startOffset) + code.substring(startOffset).replace(_TranslationsGenerator._translationArrowRegExp, replacementString);
+    }
   }
   detectNewLine() {
     return this._sourceFile.getSourceText().includes("\r\n") ? "\r\n" : "\n";
@@ -2679,7 +2741,7 @@ var CodeActionsService = class {
     }
     const result = new Array();
     const diagnosticCodeSet = new Set(diagnosticCodes);
-    if (diagnosticCodeSet.has(135 /* TheFollowingDeclarationsAreNotTranslated0 */) || diagnosticCodeSet.has(136 /* TheFollowingDeclarationAreNotTranslated0And1More */)) {
+    if (diagnosticCodeSet.has(142 /* TheFollowingDeclarationsAreNotTranslated0 */) || diagnosticCodeSet.has(143 /* TheFollowingDeclarationAreNotTranslated0And1More */)) {
       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.",
@@ -2796,13 +2858,13 @@ var ValueArgumentFactory = class _ValueArgumentFactory {
 var SignatureForNode = class _SignatureForNode {
   static getSignaturesForNode(analyzer, node) {
     switch (node.kind) {
-      case 68 /* CallExpression */:
+      case 69 /* CallExpression */:
         return _SignatureForNode.getSignaturesForCallExpression(analyzer, node);
-      case 69 /* AutotypeCallExpression */:
+      case 70 /* AutotypeCallExpression */:
         return _SignatureForNode.getSignaturesForAutotypeCallExpression(analyzer, node);
-      case 71 /* IndexedAccessExpression */:
+      case 72 /* IndexedAccessExpression */:
         return _SignatureForNode.getSignaturesForIndexedAccessExpression(analyzer, node);
-      case 149 /* Tag */:
+      case 146 /* Tag */:
         return _SignatureForNode.getSignaturesForTag(analyzer, node);
       default:
         Debug.never(node);
@@ -2942,7 +3004,7 @@ var SimplifiedOverloadResolver = class _SimplifiedOverloadResolver {
         result = false;
         break;
       }
-      if (argument.expression === void 0 || argument.expression.kind === 72 /* InvalidExpression */) {
+      if (argument.expression === void 0 || argument.expression.kind === 73 /* InvalidExpression */) {
         continue;
       }
       const targetParameterType = targetParameter.getType();
@@ -3156,17 +3218,20 @@ var CompletionService = class {
     );
     completionItemInfos = this.mergeOverloadedMethods(completionItemInfos);
     completionItemInfos = this.removeCompletionItemsWithDuplicateLabels(completionItemInfos);
-    const cacheId = this._cache.add(completionItemInfos);
+    const cacheId = this._cache.add(completionItemInfos, sourceFile).id;
     const result = this.convertCompletionItemInfos(completionItemInfos, cacheId);
     return result;
   }
   resolveCompletionItem(cacheId, indexInCache) {
-    const itemInfos = this._cache.get(cacheId);
-    if (itemInfos === void 0 || indexInCache >= itemInfos.length) {
+    const cacheEntry = this._cache.get(cacheId);
+    if (cacheEntry === void 0 || indexInCache >= cacheEntry.items.length) {
       return new ResolutionResult_notInCache();
     }
-    const completionItemInfo = itemInfos[indexInCache];
-    return new ResolutionResult_item(this.convertCompletionItemInfo(completionItemInfo, cacheId, indexInCache, true));
+    const completionItemInfo = cacheEntry.items[indexInCache];
+    return new ResolutionResult_item(
+      this.convertCompletionItemInfo(completionItemInfo, cacheId, indexInCache, true),
+      cacheEntry.sourceFile
+    );
   }
   createSemanticContextAtPosition(positionDescription) {
     switch (positionDescription.kind) {
@@ -3215,6 +3280,9 @@ var CompletionService = class {
     if (syntaxContext.isInComment || syntaxContext.isInStringOrChar) {
       return { kind: "none" };
     }
+    if (syntaxContext.isInQuotedIdentifier !== void 0 && (syntaxContext.isInQuotedIdentifier.parent.kind === 53 /* OperatorDeclaration */ || syntaxContext.isInQuotedIdentifier.parent.kind === 52 /* TypeMethodDeclaration */)) {
+      return new OperatorNameCompletionContext(syntaxContext.isInQuotedIdentifier);
+    }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
     if (tokenOrKeyword.isKeyword(17 /* Import */) && tokenOrKeyword.parent.kind === 5 /* SinglePackageImportDirective */) {
       return new PackageImportCompletionContext([], void 0);
@@ -3271,7 +3339,7 @@ var CompletionService = class {
         typeExtensionLookup
       );
     }
-    if (tokenOrKeyword.isToken(26 /* Dot */) && tokenOrKeyword.parent.kind === 137 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 10 /* NamedTypeSpecifier */) {
+    if (tokenOrKeyword.isToken(26 /* Dot */) && tokenOrKeyword.parent.kind === 134 /* QualifiedName */ && tokenOrKeyword.parent.parent.kind === 10 /* NamedTypeSpecifier */) {
       const namedTypeSpecifier = tokenOrKeyword.parent.parent;
       const resolutionResult = this._analyzer.resolveNamedTypeSpecifier(namedTypeSpecifier);
       const segmentIndex = Math.floor(
@@ -3279,7 +3347,7 @@ var CompletionService = class {
       );
       if (segmentIndex < resolutionResult.resolvedQualifiers.length) {
         let completionInIsOrAsExpressionInfo;
-        if (namedTypeSpecifier.parent.kind === 73 /* IsExpression */ || namedTypeSpecifier.parent.kind === 64 /* AsExpression */) {
+        if (namedTypeSpecifier.parent.kind === 74 /* IsExpression */ || namedTypeSpecifier.parent.kind === 65 /* AsExpression */) {
           completionInIsOrAsExpressionInfo = {
             expressionType: this._analyzer.type.ofExpression(namedTypeSpecifier.parent.expression)
           };
@@ -3315,7 +3383,7 @@ var CompletionService = class {
     }
     if (syntaxContext.isUnqualifiedTypeContext !== void 0) {
       let completionInIsOrAsExpressionInfo;
-      if (tokenOrKeyword.parent.kind === 73 /* IsExpression */ || tokenOrKeyword.parent.kind === 64 /* AsExpression */) {
+      if (tokenOrKeyword.parent.kind === 74 /* IsExpression */ || tokenOrKeyword.parent.kind === 65 /* AsExpression */) {
         completionInIsOrAsExpressionInfo = {
           expressionType: this._analyzer.type.ofExpression(tokenOrKeyword.parent.expression)
         };
@@ -3365,17 +3433,17 @@ var CompletionService = class {
       translationKind = 0 /* Any */;
       hasPrecedingKeyword = false;
     }
-    if (tokenOrKeyword.isKeyword(17 /* Import */) && tokenOrKeyword.parent.kind === 136 /* PackageImportTranslation */) {
+    if (tokenOrKeyword.isKeyword(17 /* Import */) && tokenOrKeyword.parent.kind === 133 /* PackageImportTranslation */) {
       translationsDeclaration = tokenOrKeyword.parent.parent.parent;
       translationKind = 1 /* PackageImport */;
       hasPrecedingKeyword = true;
     }
-    if (tokenOrKeyword.isKeyword(15 /* Type */) && (tokenOrKeyword.parent.kind === 141 /* TypeTranslation */ || tokenOrKeyword.parent.kind === 135 /* MethodTypeTranslation */)) {
+    if (tokenOrKeyword.isKeyword(15 /* Type */) && (tokenOrKeyword.parent.kind === 138 /* TypeTranslation */ || tokenOrKeyword.parent.kind === 132 /* MethodTypeTranslation */)) {
       translationsDeclaration = tokenOrKeyword.parent.parent.parent;
       translationKind = 3 /* Type */;
       hasPrecedingKeyword = true;
     }
-    if (tokenOrKeyword.isKeyword(11 /* Operation */) && tokenOrKeyword.parent.kind === 133 /* PackageMethodTranslation */) {
+    if (tokenOrKeyword.isKeyword(11 /* Function */) && tokenOrKeyword.parent.kind === 130 /* PackageMethodTranslation */) {
       translationsDeclaration = tokenOrKeyword.parent.parent.parent;
       translationKind = 2 /* Method */;
       hasPrecedingKeyword = true;
@@ -3395,9 +3463,9 @@ var CompletionService = class {
         hasPrecedingKeyword
       );
     }
-    if (tokenOrKeyword.isToken(26 /* Dot */) && tokenOrKeyword.parent.kind === 137 /* QualifiedName */) {
+    if (tokenOrKeyword.isToken(26 /* Dot */) && tokenOrKeyword.parent.kind === 134 /* QualifiedName */) {
       const qualifiedName = tokenOrKeyword.parent;
-      if (qualifiedName.parent.kind === 136 /* PackageImportTranslation */ && qualifiedName === qualifiedName.parent.sourceName) {
+      if (qualifiedName.parent.kind === 133 /* PackageImportTranslation */ && qualifiedName === qualifiedName.parent.sourceName) {
         const precedingSegmentNames = qualifiedName.qualifiers.takeWhile((s) => s.rangeStart < tokenOrKeyword.value.rangeStart).map((p) => this._analyzer.createNameFromIdentifier(p)).toArray();
         const sourceLocale = translationPackage.getTranslatedPackage().getLocale();
         return new PackageImportCompletionContext(precedingSegmentNames, { sourceLocale });
@@ -3422,12 +3490,12 @@ var CompletionService = class {
       translationKind = 0 /* Any */;
       hasPrecedingKeyword = false;
     }
-    if (tokenOrKeyword.isKeyword(11 /* Operation */) && tokenOrKeyword.parent.kind === 134 /* TypeMethodTranslation */) {
+    if (tokenOrKeyword.isKeyword(11 /* Function */) && tokenOrKeyword.parent.kind === 131 /* TypeMethodTranslation */) {
       typeTranslation = tokenOrKeyword.parent.parent.parent;
       translationKind = 1 /* Method */;
       hasPrecedingKeyword = true;
     }
-    if (tokenOrKeyword.isKeyword(28 /* Creation */) && tokenOrKeyword.parent.kind === 128 /* ConstructorTranslation */) {
+    if (tokenOrKeyword.isKeyword(28 /* Creation */) && tokenOrKeyword.parent.kind === 125 /* ConstructorTranslation */) {
       typeTranslation = tokenOrKeyword.parent.parent.parent;
       translationKind = 3 /* Constructor */;
       hasPrecedingKeyword = true;
@@ -3457,17 +3525,17 @@ var CompletionService = class {
       let signatures;
       let valueArguments;
       switch (role.argumentList.parent.kind) {
-        case 68 /* CallExpression */:
+        case 69 /* CallExpression */:
           signatures = SignatureForNode.getSignaturesForCallExpression(this._analyzer, role.argumentList.parent);
           valueArguments = ValueArgumentFactory.createValueArgumentsOfCallExpression(role.argumentList.parent);
           break;
-        case 69 /* AutotypeCallExpression */:
+        case 70 /* AutotypeCallExpression */:
           signatures = SignatureForNode.getSignaturesForAutotypeCallExpression(this._analyzer, role.argumentList.parent);
           valueArguments = ValueArgumentFactory.createValueArgumentsOfAutotypeCallExpression(
             role.argumentList.parent
           );
           break;
-        case 149 /* Tag */:
+        case 146 /* Tag */:
           signatures = SignatureForNode.getSignaturesForTag(this._analyzer, role.argumentList.parent);
           valueArguments = ValueArgumentFactory.createValueArgumentsOfTag(role.argumentList.parent);
           break;
@@ -3581,6 +3649,9 @@ var CompletionService = class {
       case "type-member-translation-list":
         result = this.getTypeAliasMemberListItemInfos(completionContext);
         break;
+      case "operator-name":
+        result = this.getOperatorNameItemInfos(completionContext);
+        break;
       case "none":
         result = [];
         break;
@@ -3601,22 +3672,22 @@ var CompletionService = class {
     }
     const kinds = /* @__PURE__ */ new Set();
     if (syntaxContext.isPackageMemberDeclarationListContext) {
-      kinds.add(17 /* Import */).add(7 /* Run */).add(28 /* Creation */).add(11 /* Operation */).add(15 /* Type */).add(61 /* Get */).add(62 /* Set */).add(58 /* Translations */);
+      kinds.add(17 /* Import */).add(7 /* Run */).add(28 /* Creation */).add(11 /* Function */).add(15 /* Type */).add(57 /* Get */).add(58 /* Set */).add(54 /* Translations */);
     }
     if (syntaxContext.isPackageMemberDeclarationListContext || syntaxContext.isTypeMemberDeclarationListContext) {
-      kinds.add(33 /* Const */).add(34 /* Hidden */).add(37 /* Abstract */).add(43 /* Static */).add(38 /* Redefinable */).add(39 /* Redefined */).add(42 /* Async */).add(35 /* Observable */).add(36 /* Consistent */);
+      kinds.add(34 /* Hidden */).add(39 /* Static */).add(16 /* Basic */).add(36 /* Redefinable */).add(35 /* Abstract */).add(37 /* Redefined */).add(38 /* Async */).add(33 /* Const */);
     }
     if (syntaxContext.isTypeMemberDeclarationListContext) {
-      kinds.add(28 /* Creation */).add(11 /* Operation */).add(50 /* Destruction */).add(61 /* Get */).add(62 /* Set */);
+      kinds.add(28 /* Creation */).add(11 /* Function */).add(46 /* Destruction */).add(57 /* Get */).add(58 /* Set */);
     }
     if (syntaxContext.isStatementContext) {
-      kinds.add(7 /* Run */).add(32 /* For */).add(23 /* While */).add(24 /* Loop */).add(14 /* Return */).add(18 /* Error */).add(26 /* Yield */).add(48 /* Await */).add(30 /* BreakLoop */).add(31 /* ContinueLoop */).add(12 /* If */).add(46 /* Switch */).add(1 /* Let */).add(33 /* Const */).add(49 /* Dispose */).add(11 /* Operation */).add(42 /* Async */).add(40 /* Transactional */).add(41 /* Unobservable */);
+      kinds.add(7 /* Run */).add(32 /* For */).add(23 /* While */).add(24 /* Loop */).add(14 /* Return */).add(18 /* Error */).add(26 /* Yield */).add(44 /* Await */).add(30 /* BreakLoop */).add(31 /* ContinueLoop */).add(12 /* If */).add(42 /* Switch */).add(1 /* Let */).add(33 /* Const */).add(45 /* Dispose */).add(11 /* Function */).add(38 /* Async */);
     }
     if (this.isFromKeywordContext(positionDescription)) {
       kinds.add(8 /* From */);
     }
     if (syntaxContext.isExpressionContext !== void 0) {
-      kinds.add(45 /* Not */).add(55 /* Yes */).add(56 /* No */).add(60 /* None */).add(42 /* Async */).add(11 /* Operation */).add(40 /* Transactional */).add(41 /* Unobservable */).add(57 /* Reference */).add(2 /* Autotype */);
+      kinds.add(41 /* Not */).add(51 /* Yes */).add(52 /* No */).add(56 /* None */).add(38 /* Async */).add(11 /* Function */).add(53 /* Reference */).add(2 /* Autotype */);
       if (positionDescription.kind === "after-token-or-keyword") {
         const container = semanticContext.getContainingTypeOrTypeExtension();
         if (container !== void 0) {
@@ -3624,17 +3695,17 @@ var CompletionService = class {
           if (container.kind === "type") {
             const typeEntity = container.value;
             if (typeEntity?.kind === 12 /* StructuredType */ && typeEntity.getBaseObjectType() !== void 0 || typeEntity?.kind === 2 /* VariantType */ || typeEntity?.kind === 14 /* AliasType */) {
-              kinds.add(59 /* Base */);
+              kinds.add(55 /* Base */);
             }
           }
         }
       }
     }
     if (this.isTypeKindCompletionContext(positionDescription)) {
-      kinds.add(4 /* Object */).add(5 /* PlainObject */).add(3 /* Aspect */).add(6 /* Variant */).add(11 /* Operation */).add(42 /* Async */);
+      kinds.add(4 /* Object */).add(5 /* PlainObject */).add(3 /* Aspect */).add(6 /* Variant */).add(11 /* Function */).add(38 /* Async */);
     }
     if (this.isCaseKeywordContext(positionDescription, syntaxContext)) {
-      kinds.add(47 /* Case */);
+      kinds.add(43 /* Case */);
     }
     if (this.isRunStatementAccessorListContext(positionDescription)) {
       kinds.add(29 /* OnError */).add(19 /* Finally */);
@@ -3643,19 +3714,19 @@ var CompletionService = class {
       kinds.add(9 /* Else */).add(10 /* ElseIf */);
     }
     if (syntaxContext.precedingExpression !== void 0) {
-      kinds.add(44 /* As */).add(13 /* Is */).add(20 /* And */).add(21 /* Or */).add(22 /* Xor */).add(27 /* When */);
+      kinds.add(40 /* As */).add(13 /* Is */).add(20 /* And */).add(21 /* Or */).add(22 /* Xor */).add(27 /* When */);
     }
     if (this.isModifierLevelContext(positionDescription)) {
-      kinds.add(54 /* InType */).add(51 /* InHierarchy */).add(52 /* InFile */).add(53 /* InPackage */);
+      kinds.add(50 /* InType */).add(47 /* InHierarchy */).add(48 /* InFile */).add(49 /* InPackage */);
     }
     if (this.isRepeatWhileKeywordContext(positionDescription)) {
       kinds.add(25 /* RepeatWhile */);
     }
     if (syntaxContext.isUnqualifiedTypeContext?.allowsAnonymousTypes === true) {
-      kinds.add(5 /* PlainObject */).add(4 /* Object */).add(6 /* Variant */).add(3 /* Aspect */).add(11 /* Operation */).add(42 /* Async */);
+      kinds.add(5 /* PlainObject */).add(4 /* Object */).add(6 /* Variant */).add(3 /* Aspect */).add(11 /* Function */).add(38 /* Async */);
     }
-    if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(42 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 57 /* NestedMethodDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 76 /* MethodLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 29 /* MethodTypeDeclarationBody */)) {
-      kinds.add(11 /* Operation */);
+    if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(38 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 58 /* NestedMethodDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 76 /* MethodLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 29 /* MethodTypeDeclarationBody */)) {
+      kinds.add(11 /* Function */);
     }
     return Query.from(kinds.values()).map(
       (k) => LocalizationHelper.localizeKeyword(k, this._locale, this._dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v))
@@ -3666,28 +3737,28 @@ var CompletionService = class {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 96 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 117 /* LoopStatement */;
+    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 95 /* 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(44 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 151 /* Modifier */;
+    return tokenOrKeyword.isToken(44 /* OpenParenthesis */) && tokenOrKeyword.parent.kind === 148 /* Modifier */;
   }
   isElseOrElseIfKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 96 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 110 /* IfStatement */ && tokenOrKeyword.parent === tokenOrKeyword.parent.parent.thenBlock || tokenOrKeyword.parent.parent.kind === 112 /* ElseIfClause */);
+    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 95 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 109 /* IfStatement */ && tokenOrKeyword.parent === tokenOrKeyword.parent.parent.thenBlock || tokenOrKeyword.parent.parent.kind === 111 /* ElseIfClause */);
   }
   isRunStatementAccessorListContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 96 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 101 /* RunStatement */ || tokenOrKeyword.parent.parent.kind === 102 /* OnErrorClause */ || tokenOrKeyword.parent.parent.kind === 104 /* FinallyClause */);
+    return tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 95 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 100 /* RunStatement */ || tokenOrKeyword.parent.parent.kind === 101 /* OnErrorClause */ || tokenOrKeyword.parent.parent.kind === 103 /* FinallyClause */);
   }
   isTypeKindCompletionContext(positionDescription) {
     return positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isToken(57 /* Equals */) && NodeTypeUtils.isPackageTypeDeclaration(positionDescription.tokenOrKeyword.parent);
@@ -3697,17 +3768,17 @@ var CompletionService = class {
       return false;
     }
     const token = positionDescription.tokenOrKeyword.value;
-    return token.parent.kind === 59 /* EnumerationVariableDeclaration */ && (token.parent.parent.elements.length > 0 && token.parent.parent.elements[token.parent.parent.elements.length - 1] === token.parent || token.parent.parent.elements.length > 1 && token.parent.parent.elements[token.parent.parent.elements.length - 2] === token.parent);
+    return token.parent.kind === 60 /* EnumerationVariableDeclaration */ && (token.parent.parent.elements.length > 0 && token.parent.parent.elements[token.parent.parent.elements.length - 1] === token.parent || token.parent.parent.elements.length > 1 && token.parent.parent.elements[token.parent.parent.elements.length - 2] === token.parent);
   }
   isCaseKeywordContext(positionDescription, syntaxContext) {
     if (positionDescription.kind !== "after-token-or-keyword") {
       return false;
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
-    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 96 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 122 /* SwitchStatementCaseClause */) {
+    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 95 /* StatementBlock */ && tokenOrKeyword.parent.parent.kind === 120 /* SwitchStatementCaseClause */) {
       return true;
     }
-    if (syntaxContext.precedingExpression !== void 0 && syntaxContext.precedingExpression.parent.kind === 120 /* SwitchStatement */) {
+    if (syntaxContext.precedingExpression !== void 0 && syntaxContext.precedingExpression.parent.kind === 118 /* SwitchStatement */) {
       return true;
     }
     return false;
@@ -3825,7 +3896,9 @@ var CompletionService = class {
         default:
           Debug.never(d.value);
       }
-    });
+    }).chain(
+      Query.from(lookup.getOperators()).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o.value, o.localization))
+    );
   }
   getTypeCompletionItemInfos(ctx) {
     let result;
@@ -3996,7 +4069,7 @@ var CompletionService = class {
           default:
             Debug.never(m.value);
         }
-      }).toArray();
+      }).chain(Query.from(memberLookup.getOperators(ctx.hidingMatcher, ctx.typeExtensionsLookup)).filter((m) => m.value.isStatic() === ctx.isStaticAccess).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o.value, o.localization))).toArray();
     }
   }
   getPackageImportCompletionItemInfos(ctx) {
@@ -4103,7 +4176,7 @@ var CompletionService = class {
       const keywords = [
         17 /* Import */,
         15 /* Type */,
-        11 /* Operation */
+        11 /* Function */
       ];
       result = result.chain(
         Query.from(keywords).map(
@@ -4177,7 +4250,7 @@ var CompletionService = class {
     }
     if (!ctx.hasPrecedingKeyword) {
       const keywords = [
-        11 /* Operation */,
+        11 /* Function */,
         28 /* Creation */
       ];
       result = result.chain(
@@ -4188,13 +4261,25 @@ var CompletionService = class {
     }
     return result.toArray();
   }
+  getOperatorNameItemInfos(ctx) {
+    let editRange;
+    const identifierRange = ctx.nameToken.rangeWithoutTrivia;
+    if (identifierRange.length > 2) {
+      editRange = new Range(identifierRange.start + 1, identifierRange.end - 1);
+    }
+    return operatorKinds.map((k) => {
+      const value = LocalizationHelper.localizeSyntacticalOperatorKind(k, this._locale, this._dialect);
+      return new OperatorNameCompletionItemInfo(this.completionItemInfoContext, value, editRange);
+    });
+  }
   mergeOverloadedMethods(completionItemInfos) {
     const result = new Array();
     const methodInfoByLabel = /* @__PURE__ */ new Map();
     for (const itemInfo of completionItemInfos) {
       switch (itemInfo.kind) {
         case "type-method":
-        case "method-entity": {
+        case "method-entity":
+        case "operator": {
           const label = itemInfo.getLabel();
           const methodInfo = methodInfoByLabel.get(label);
           if (methodInfo !== void 0) {
@@ -4248,6 +4333,7 @@ var CompletionService = class {
       info.getCompletionItemKind(),
       isForResolve ? info.getDetails() : void 0,
       info.getInsertText(),
+      info.getEditRange(),
       info.getSortText(),
       cacheId,
       indexInCache
@@ -4255,19 +4341,21 @@ var CompletionService = class {
   }
 };
 var CompletionItem = class {
-  constructor(label, kind, details, insertText, sortText, cacheId, indexInCache) {
+  constructor(label, kind, details, insertText, editRange, sortText, cacheId, indexInCache) {
     this.label = label;
     this.kind = kind;
     this.details = details;
     this.insertText = insertText;
+    this.editRange = editRange;
     this.sortText = sortText;
     this.cacheId = cacheId;
     this.indexInCache = indexInCache;
   }
 };
 var ResolutionResult_item = class {
-  constructor(value) {
+  constructor(value, sourceFile) {
     this.value = value;
+    this.sourceFile = sourceFile;
     this.kind = "item";
   }
 };
@@ -4324,10 +4412,10 @@ function getRightmostChildExcludingValidEmptyNodes(node) {
 }
 function isInvalidNode(node) {
   switch (node.kind) {
-    case 72 /* InvalidExpression */:
+    case 73 /* InvalidExpression */:
     case 43 /* InvalidPackageMemberDeclaration */:
-    case 113 /* InvalidStatement */:
-    case 56 /* InvalidTypeMemberDeclaration */:
+    case 112 /* InvalidStatement */:
+    case 57 /* InvalidTypeMemberDeclaration */:
     case 16 /* InvalidTypeSpecifier */:
       return true;
     case 0 /* Token */:
@@ -4377,6 +4465,12 @@ var TypeCompletionContext = class {
     this.kind = "type";
   }
 };
+var OperatorNameCompletionContext = class {
+  constructor(nameToken) {
+    this.nameToken = nameToken;
+    this.kind = "operator-name";
+  }
+};
 var ScopeTypeSearchLocation = class {
   constructor(lookup) {
     this.lookup = lookup;
@@ -4473,6 +4567,9 @@ var PackageNameSegmentCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var PackageAliasEntityCompletionItemInfo = class {
   constructor(ctx, packageAlias) {
@@ -4495,6 +4592,9 @@ var PackageAliasEntityCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var TypeVariableCompletionItemInfo = class {
   constructor(ctx, variable, name, isNameExplicitlyOriginal) {
@@ -4521,6 +4621,9 @@ var TypeVariableCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var TypeMethodCompletionItemInfo = class {
   constructor(ctx, method, name, isNameExplicitlyOriginal) {
@@ -4547,6 +4650,37 @@ var TypeMethodCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
+};
+var OperatorCompletionItemInfo = class {
+  constructor(ctx, operator, localization) {
+    this.ctx = ctx;
+    this.operator = operator;
+    this.localization = localization;
+    this.kind = "operator";
+  }
+  getLabel() {
+    return `'${this.ctx.displayService.displayOperatorKind(this.operator.getOperatorKind(), this.localization.locale)}'`;
+  }
+  getCompletionItemKind() {
+    return 4 /* Operator */;
+  }
+  getDetails() {
+    return this.ctx.displayService.displayOperatorDeclaration(
+      new OperatorDeclaration_typeMember(this.operator, this.localization)
+    );
+  }
+  getInsertText() {
+    return void 0;
+  }
+  getSortText() {
+    return void 0;
+  }
+  getEditRange() {
+    return void 0;
+  }
 };
 var VariantCompletionItemInfo = class {
   constructor(ctx, variant, name, isNameExplicitlyOriginal) {
@@ -4560,7 +4694,7 @@ var VariantCompletionItemInfo = class {
     return `${this.isNameExplicitlyOriginal ? "~" : ""}${this.ctx.getInsertTextForName(this.name.value)}`;
   }
   getCompletionItemKind() {
-    return 11 /* Variant */;
+    return 12 /* Variant */;
   }
   getDetails() {
     return this.ctx.displayService.displayVariantEntity(this.variant, this.name.localization);
@@ -4571,6 +4705,9 @@ var VariantCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var VariableEntityCompletionItemInfo = class {
   constructor(ctx, entity, name, isNameExplicitlyOriginal) {
@@ -4586,13 +4723,13 @@ var VariableEntityCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.entity.subkind) {
       case "package":
-        return 6 /* PackageVariable */;
+        return 7 /* PackageVariable */;
       case "type":
         return 2 /* TypeVariable */;
       case "parameter":
-        return 9 /* ParameterVariable */;
+        return 10 /* ParameterVariable */;
       case "local":
-        return 8 /* LocalVariable */;
+        return 9 /* LocalVariable */;
       default:
         Debug.never(this.entity);
     }
@@ -4608,6 +4745,9 @@ var VariableEntityCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var MethodEntityCompletionItemInfo = class {
   constructor(ctx, entity, name, isNameExplicitlyOriginal) {
@@ -4623,11 +4763,11 @@ var MethodEntityCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.entity.subkind) {
       case "package":
-        return 7 /* PackageMethod */;
+        return 8 /* PackageMethod */;
       case "type":
         return 3 /* TypeMethod */;
       case "nested":
-        return 10 /* NestedMethod */;
+        return 11 /* NestedMethod */;
       default:
         Debug.never(this.entity);
     }
@@ -4643,6 +4783,9 @@ var MethodEntityCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var NamedTypeCompletionItemInfo = class {
   constructor(ctx, entity, name, isNameExplicitlyOriginal, prefix = "", sortText) {
@@ -4660,23 +4803,23 @@ var NamedTypeCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.entity.kind) {
       case 2 /* VariantType */:
-        return 15 /* VariantType */;
+        return 16 /* VariantType */;
       case 6 /* TypeParameter */:
-        return 16 /* TypeParameter */;
+        return 17 /* TypeParameter */;
       case 11 /* MethodType */:
-        return 17 /* MethodType */;
+        return 18 /* MethodType */;
       case 12 /* StructuredType */:
         if (this.entity.isRefObject()) {
-          return 12 /* RefObjectType */;
+          return 13 /* RefObjectType */;
         } else if (this.entity.isPlainObject()) {
-          return 13 /* PlainObjectType */;
+          return 14 /* PlainObjectType */;
         } else if (this.entity.isAspect()) {
-          return 14 /* AspectType */;
+          return 15 /* AspectType */;
         } else {
-          return 19 /* InvalidType */;
+          return 20 /* InvalidType */;
         }
       case 14 /* AliasType */:
-        return 18 /* AliasType */;
+        return 19 /* AliasType */;
       default:
         Debug.never(this.entity);
     }
@@ -4690,6 +4833,9 @@ var NamedTypeCompletionItemInfo = class {
   getSortText() {
     return this.sortText;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var KeywordCompletionItemInfo = class {
   constructor(ctx, keywordKind, value) {
@@ -4702,7 +4848,7 @@ var KeywordCompletionItemInfo = class {
     return this.value;
   }
   getCompletionItemKind() {
-    return 20 /* Keyword */;
+    return 21 /* Keyword */;
   }
   getDetails() {
     return void 0;
@@ -4713,6 +4859,9 @@ var KeywordCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var MergedOverloadedMethodCompletionItemInfo = class {
   constructor(ctx, firstOverloadInfo, overloadCount) {
@@ -4739,6 +4888,9 @@ var MergedOverloadedMethodCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var TargetSignatureValueParameterCompletionItemInfo = class {
   constructor(ctx, parameter) {
@@ -4750,7 +4902,7 @@ var TargetSignatureValueParameterCompletionItemInfo = class {
     return `${this.ctx.getInsertTextForName(this.parameter.getName())} =`;
   }
   getCompletionItemKind() {
-    return 21 /* TargetSignatureParameter */;
+    return 22 /* TargetSignatureParameter */;
   }
   getDetails() {
     return this.ctx.displayService.displayValueParameterDeclaration(
@@ -4767,6 +4919,9 @@ var TargetSignatureValueParameterCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var AliasesSourceVariableCompletionItemInfo = class {
   constructor(ctx, variable, displayService) {
@@ -4781,13 +4936,13 @@ var AliasesSourceVariableCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.variable.subkind) {
       case "package":
-        return 6 /* PackageVariable */;
+        return 7 /* PackageVariable */;
       case "type":
         return 2 /* TypeVariable */;
       case "parameter":
-        return 6 /* PackageVariable */;
+        return 7 /* PackageVariable */;
       case "local":
-        return 8 /* LocalVariable */;
+        return 9 /* LocalVariable */;
       default:
         Debug.never(this.variable);
     }
@@ -4803,6 +4958,9 @@ var AliasesSourceVariableCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var AliasesSourceMethodCompletionItemInfo = class {
   constructor(ctx, method, includeMethodKeyword, displayService) {
@@ -4818,11 +4976,11 @@ var AliasesSourceMethodCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.method.subkind) {
       case "package":
-        return 7 /* PackageMethod */;
+        return 8 /* PackageMethod */;
       case "type":
         return 3 /* TypeMethod */;
       case "nested":
-        return 10 /* NestedMethod */;
+        return 11 /* NestedMethod */;
       default:
         Debug.never(this.method);
     }
@@ -4836,13 +4994,16 @@ var AliasesSourceMethodCompletionItemInfo = class {
     const displayParts = this.displayService.getMethodDeclarationDisplayParts(
       new MethodDeclaration_entity(this.method, Localization.Original.ofEntity(this.method))
     );
-    const keywordWithWhitespace = this.includeMethodKeyword ? displayParts.operationKeyword + displayParts.whitespaceAfterOperationKeyword : "";
+    const keywordWithWhitespace = this.includeMethodKeyword ? displayParts.functionKeyword + displayParts.whitespaceAfterFunctionKeyword : "";
     const valueParameters = displayParts.valueParameters.map((p) => p.name).join(displayParts.typeParameterSeparator);
     return keywordWithWhitespace + displayParts.name + displayParts.typeParametersStart + displayParts.typeParameters.join(displayParts.typeParameterSeparator) + displayParts.typeParametersEnd + displayParts.valueParametersStart + valueParameters + displayParts.valueParametersEnd;
   }
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var AliasesSourcePackageTypeCompletionItemInfo = class {
   constructor(ctx, typeEntity, includeTypeKeyword, displayService) {
@@ -4858,21 +5019,21 @@ var AliasesSourcePackageTypeCompletionItemInfo = class {
   getCompletionItemKind() {
     switch (this.typeEntity.kind) {
       case 2 /* VariantType */:
-        return 15 /* VariantType */;
+        return 16 /* VariantType */;
       case 11 /* MethodType */:
-        return 17 /* MethodType */;
+        return 18 /* MethodType */;
       case 12 /* StructuredType */: {
         if (this.typeEntity.isRefObject()) {
-          return 12 /* RefObjectType */;
+          return 13 /* RefObjectType */;
         } else if (this.typeEntity.isPlainObject()) {
-          return 13 /* PlainObjectType */;
+          return 14 /* PlainObjectType */;
         } else if (this.typeEntity.isAspect()) {
-          return 14 /* AspectType */;
+          return 15 /* AspectType */;
         }
-        return 19 /* InvalidType */;
+        return 20 /* InvalidType */;
       }
       case 14 /* AliasType */:
-        return 18 /* AliasType */;
+        return 19 /* AliasType */;
     }
   }
   getDetails() {
@@ -4911,6 +5072,9 @@ var AliasesSourcePackageTypeCompletionItemInfo = class {
         Debug.never(this.typeEntity);
     }
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var AliasesSourceTypeIndexerCompletionItemInfo = class {
   constructor(ctx, indexer, displayService) {
@@ -4931,7 +5095,7 @@ var AliasesSourceTypeIndexerCompletionItemInfo = class {
     return this.label;
   }
   getCompletionItemKind() {
-    return 4 /* TypeIndexer */;
+    return 5 /* TypeIndexer */;
   }
   getDetails() {
     return this.label;
@@ -4943,6 +5107,9 @@ var AliasesSourceTypeIndexerCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
 };
 var AliasesSourceTypeConstructorCompletionItemInfo = class {
   constructor(ctx, constructor_, includeOnCreateKeyword, displayService) {
@@ -4968,7 +5135,7 @@ var AliasesSourceTypeConstructorCompletionItemInfo = class {
     return this.label;
   }
   getCompletionItemKind() {
-    return 5 /* TypeConstructor */;
+    return 6 /* TypeConstructor */;
   }
   getDetails() {
     return this.label;
@@ -4981,11 +5148,41 @@ var AliasesSourceTypeConstructorCompletionItemInfo = class {
   getSortText() {
     return void 0;
   }
+  getEditRange() {
+    return void 0;
+  }
+};
+var OperatorNameCompletionItemInfo = class {
+  constructor(ctx, value, editRange) {
+    this.ctx = ctx;
+    this.value = value;
+    this.editRange = editRange;
+    this.kind = "operator-name";
+  }
+  getLabel() {
+    return this.value;
+  }
+  getCompletionItemKind() {
+    return 23 /* OperatorName */;
+  }
+  getDetails() {
+    return void 0;
+  }
+  getInsertText() {
+    return void 0;
+  }
+  getSortText() {
+    return void 0;
+  }
+  getEditRange() {
+    return this.editRange;
+  }
 };
 var SyntaxContext = class {
-  constructor(isInComment, isInStringOrChar, isPackageMemberDeclarationListContext, isTypeMemberDeclarationListContext, isStatementContext, isExpressionContext, precedingExpression, isUnqualifiedTypeContext, isTopLevelTranslationListContext, isTypeMemberTranslationListContext) {
+  constructor(isInComment, isInStringOrChar, isInQuotedIdentifier, isPackageMemberDeclarationListContext, isTypeMemberDeclarationListContext, isStatementContext, isExpressionContext, precedingExpression, isUnqualifiedTypeContext, isTopLevelTranslationListContext, isTypeMemberTranslationListContext) {
     this.isInComment = isInComment;
     this.isInStringOrChar = isInStringOrChar;
+    this.isInQuotedIdentifier = isInQuotedIdentifier;
     this.isPackageMemberDeclarationListContext = isPackageMemberDeclarationListContext;
     this.isTypeMemberDeclarationListContext = isTypeMemberDeclarationListContext;
     this.isStatementContext = isStatementContext;
@@ -5038,6 +5235,7 @@ var SyntaxContextFactory = class {
   static fromPositionDescription(sourceFile, positionDescription) {
     const isInComment = this.isInComment(sourceFile, positionDescription.getOffset());
     const isInStringOrChar = this.isInStringOrChar(sourceFile, positionDescription.getOffset());
+    const isInQuotedIdentifier = this.isInQuotedIdentifier(sourceFile, positionDescription.getOffset());
     let isPackageMemberDeclarationListContext = false;
     if (positionDescription.kind === "at-file-start") {
       isPackageMemberDeclarationListContext = true;
@@ -5074,6 +5272,7 @@ var SyntaxContextFactory = class {
     return new SyntaxContext(
       isInComment,
       isInStringOrChar,
+      isInQuotedIdentifier,
       isPackageMemberDeclarationListContext,
       isTypeMemberDeclarationListContext,
       isStatementContext,
@@ -5086,11 +5285,11 @@ var SyntaxContextFactory = class {
   }
   static isExpressionOrStatementContext(tokenOrKeyword) {
     if (tokenOrKeyword.isToken(57 /* Equals */)) {
-      if (tokenOrKeyword.parent.kind === 94 /* AssignmentStatement */) {
+      if (tokenOrKeyword.parent.kind === 93 /* AssignmentStatement */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 58 /* LocalVariableDeclaration */) {
+      if (tokenOrKeyword.parent.kind === 59 /* LocalVariableDeclaration */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.initializer);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
@@ -5098,24 +5297,24 @@ var SyntaxContextFactory = class {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.initializer);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 53 /* TypeVariableDeclaration */) {
+      if (tokenOrKeyword.parent.kind === 54 /* TypeVariableDeclaration */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.initializer);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 146 /* ParameterDeclaration */) {
+      if (tokenOrKeyword.parent.kind === 143 /* ParameterDeclaration */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.defaultValue);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 147 /* CallArgument */) {
+      if (tokenOrKeyword.parent.kind === 144 /* CallArgument */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 144 /* VariantDeclaration */) {
+      if (tokenOrKeyword.parent.kind === 141 /* VariantDeclaration */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.value);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
     }
-    if (tokenOrKeyword.parent.kind === 94 /* AssignmentStatement */) {
+    if (tokenOrKeyword.parent.kind === 93 /* AssignmentStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
@@ -5123,7 +5322,7 @@ var SyntaxContextFactory = class {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.operand);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.parent.kind === 65 /* BinaryExpression */) {
+    if (tokenOrKeyword.parent.kind === 66 /* BinaryExpression */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.right);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
@@ -5143,10 +5342,10 @@ var SyntaxContextFactory = class {
         isStatementContext: false
       };
     }
-    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 96 /* StatementBlock */) {
+    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 95 /* StatementBlock */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
-    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 95 /* StatementList */) {
+    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 94 /* StatementList */) {
       return { isExpressionContext: { expressionRole: new ExpressionRole_other(void 0) }, isStatementContext: true };
     }
     if (tokenOrKeyword.isToken(44 /* OpenParenthesis */)) {
@@ -5158,27 +5357,19 @@ var SyntaxContextFactory = class {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 91 /* TransactionalExpression */) {
-        const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
-        return { isExpressionContext: { expressionRole }, isStatementContext: false };
-      }
-      if (tokenOrKeyword.parent.kind === 74 /* UnobservableExpression */) {
-        const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
-        return { isExpressionContext: { expressionRole }, isStatementContext: false };
-      }
       if (tokenOrKeyword.parent.kind === 81 /* ReferenceExpression */) {
         const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 68 /* CallExpression */) {
+      if (tokenOrKeyword.parent.kind === 69 /* CallExpression */) {
         const expressionRole = new ExpressionRole_callArgument(tokenOrKeyword.parent.callArgumentList, 0);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 69 /* AutotypeCallExpression */) {
+      if (tokenOrKeyword.parent.kind === 70 /* AutotypeCallExpression */) {
         const expressionRole = new ExpressionRole_callArgument(tokenOrKeyword.parent.callArgumentList, 0);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 149 /* Tag */) {
+      if (tokenOrKeyword.parent.kind === 146 /* Tag */) {
         const callArgumentList = tokenOrKeyword.parent.callArgumentList;
         if (callArgumentList !== void 0) {
           const expressionRole = new ExpressionRole_callArgument(callArgumentList, 0);
@@ -5186,16 +5377,16 @@ var SyntaxContextFactory = class {
         }
       }
     }
-    if (tokenOrKeyword.isToken(45 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 71 /* IndexedAccessExpression */) {
+    if (tokenOrKeyword.isToken(45 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 72 /* IndexedAccessExpression */) {
       const expressionRole = new ExpressionRole_indexedAccessArgument(tokenOrKeyword.parent.argumentsList, 0);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isToken(45 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 60 /* ArrayLiteral */) {
+    if (tokenOrKeyword.isToken(45 /* OpenSquareBracket */) && tokenOrKeyword.parent.kind === 61 /* ArrayLiteral */) {
       const expressionRole = new ExpressionRole_arrayElement(tokenOrKeyword.parent);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
     if (tokenOrKeyword.isToken(24 /* Comma */)) {
-      if (tokenOrKeyword.parent.kind === 67 /* CallArgumentList */) {
+      if (tokenOrKeyword.parent.kind === 68 /* CallArgumentList */) {
         const argumentList = tokenOrKeyword.parent;
         let index = 0;
         for (const element of argumentList.elements) {
@@ -5209,7 +5400,7 @@ var SyntaxContextFactory = class {
         const expressionRole = new ExpressionRole_callArgument(argumentList, index);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 70 /* IndexedAccessArgumentList */) {
+      if (tokenOrKeyword.parent.kind === 71 /* IndexedAccessArgumentList */) {
         const argumentList = tokenOrKeyword.parent;
         let index = 0;
         for (const element of argumentList.elements) {
@@ -5223,48 +5414,48 @@ var SyntaxContextFactory = class {
         const expressionRole = new ExpressionRole_indexedAccessArgument(argumentList, index);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 121 /* MatchExpressionList */) {
+      if (tokenOrKeyword.parent.kind === 119 /* MatchExpressionList */) {
         const expressionRole = new ExpressionRole_matchListElement(tokenOrKeyword.parent.parent.parent.parent);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
-      if (tokenOrKeyword.parent.kind === 61 /* ArrayLiteralElementList */) {
+      if (tokenOrKeyword.parent.kind === 62 /* ArrayLiteralElementList */) {
         const expressionRole = new ExpressionRole_arrayElement(tokenOrKeyword.parent.parent);
         return { isExpressionContext: { expressionRole }, isStatementContext: false };
       }
     }
-    if (tokenOrKeyword.isKeyword(47 /* Case */) && tokenOrKeyword.parent.kind === 122 /* SwitchStatementCaseClause */) {
+    if (tokenOrKeyword.isKeyword(43 /* Case */) && tokenOrKeyword.parent.kind === 120 /* SwitchStatementCaseClause */) {
       const expressionRole = new ExpressionRole_matchListElement(tokenOrKeyword.parent.parent.parent);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(14 /* Return */) && tokenOrKeyword.parent.kind === 118 /* ReturnStatement */) {
+    if (tokenOrKeyword.isKeyword(14 /* Return */) && tokenOrKeyword.parent.kind === 116 /* ReturnStatement */) {
       const expressionRole = new ExpressionRole_returnedValue(tokenOrKeyword.parent);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(46 /* Switch */) && tokenOrKeyword.parent.kind === 120 /* SwitchStatement */) {
+    if (tokenOrKeyword.isKeyword(42 /* Switch */) && tokenOrKeyword.parent.kind === 118 /* SwitchStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(12 /* If */) && tokenOrKeyword.parent.kind === 110 /* IfStatement */) {
+    if (tokenOrKeyword.isKeyword(12 /* If */) && tokenOrKeyword.parent.kind === 109 /* IfStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.condition);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(10 /* ElseIf */) && tokenOrKeyword.parent.kind === 112 /* ElseIfClause */) {
+    if (tokenOrKeyword.isKeyword(10 /* ElseIf */) && tokenOrKeyword.parent.kind === 111 /* ElseIfClause */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.condition);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(8 /* From */) && tokenOrKeyword.parent.kind === 109 /* ForStatement */) {
+    if (tokenOrKeyword.isKeyword(8 /* From */) && tokenOrKeyword.parent.kind === 108 /* ForStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.enumeratedExpression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(23 /* While */) && tokenOrKeyword.parent.kind === 124 /* WhileStatement */) {
+    if (tokenOrKeyword.isKeyword(23 /* While */) && tokenOrKeyword.parent.kind === 121 /* WhileStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.condition);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(25 /* RepeatWhile */) && tokenOrKeyword.parent.kind === 117 /* LoopStatement */) {
+    if (tokenOrKeyword.isKeyword(25 /* RepeatWhile */) && tokenOrKeyword.parent.kind === 115 /* LoopStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.condition);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
-    if (tokenOrKeyword.isKeyword(26 /* Yield */) && tokenOrKeyword.parent.kind === 125 /* YieldStatement */) {
+    if (tokenOrKeyword.isKeyword(26 /* Yield */) && tokenOrKeyword.parent.kind === 122 /* YieldStatement */) {
       const expressionRole = new ExpressionRole_other(tokenOrKeyword.parent.expression);
       return { isExpressionContext: { expressionRole }, isStatementContext: false };
     }
@@ -5294,7 +5485,7 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 32 /* TypeMemberDeclarationBlock */ && (tokenOrKeyword.parent.parent.kind === 40 /* TypeExtensionDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 33 /* PackageStructuredTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 38 /* PackageVariantTypeDeclaration */ || tokenOrKeyword.parent.parent.parent.kind === 22 /* PackageAliasTypeDeclaration */)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && (tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */ || tokenOrKeyword.parent.kind === 24 /* PackageMemberGroupDeclaration */ || tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || tokenOrKeyword.parent.kind === 96 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 25 /* PackageConstructorDeclaration */ || tokenOrKeyword.parent.parent.kind === 26 /* PackageEntryPointDeclaration */ || tokenOrKeyword.parent.parent.kind === 27 /* PackageMethodDeclaration */))) {
+    if (tokenOrKeyword.isToken(20 /* CloseBrace */) && (tokenOrKeyword.parent.kind === 21 /* TranslationsDeclaration */ || tokenOrKeyword.parent.kind === 24 /* PackageMemberGroupDeclaration */ || tokenOrKeyword.parent.kind === 6 /* PackageGroupImportDirective */ || tokenOrKeyword.parent.kind === 95 /* StatementBlock */ && (tokenOrKeyword.parent.parent.kind === 25 /* PackageConstructorDeclaration */ || tokenOrKeyword.parent.parent.kind === 26 /* PackageEntryPointDeclaration */ || tokenOrKeyword.parent.parent.kind === 27 /* PackageMethodDeclaration */))) {
       return true;
     }
     if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 24 /* PackageMemberGroupDeclaration */) {
@@ -5306,10 +5497,10 @@ var SyntaxContextFactory = class {
     ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 37 /* PackageVariableSetterDeclaration */)) {
       return true;
     }
-    if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 151 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 148 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 151 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isToken(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 148 /* Modifier */ && NodeTypeUtils.isPackageMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     return false;
@@ -5324,19 +5515,19 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isToken(20 /* CloseBrace */) && tokenOrKeyword.parent.kind === 44 /* TypeMemberGroupDeclaration */) {
       return true;
     }
-    if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 53 /* TypeVariableDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 54 /* TypeVariableGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 55 /* TypeVariableSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 47 /* TypeIndexedGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 48 /* TypeIndexedSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
+    if (SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 54 /* TypeVariableDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 55 /* TypeVariableGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 56 /* TypeVariableSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 47 /* TypeIndexedGetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 48 /* TypeIndexedSetterDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
       tokenOrKeyword,
       50 /* TypeDereferencedVariableGetterDeclaration */
     ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
       tokenOrKeyword,
       51 /* TypeDereferencedVariableSetterDeclaration */
-    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 52 /* TypeMethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 45 /* TypeConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 46 /* TypeDestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 144 /* VariantDeclaration */)) {
+    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 52 /* TypeMethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 53 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 45 /* TypeConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 46 /* TypeDestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 141 /* VariantDeclaration */)) {
       return true;
     }
-    if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 151 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 148 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
-    if (tokenOrKeyword.isToken(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 151 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
+    if (tokenOrKeyword.isToken(21 /* CloseParenthesis */) && tokenOrKeyword.parent.kind === 148 /* Modifier */ && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
       return true;
     }
     return false;
@@ -5361,8 +5552,19 @@ var SyntaxContextFactory = class {
     }
     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 */);
   }
+  static isInQuotedIdentifier(sourceFile, offset) {
+    let result;
+    const tokenArOffset = getTokenAtOffset(sourceFile.getSyntaxNode(), offset, false);
+    if (tokenArOffset !== void 0 && isIdentifier(tokenArOffset)) {
+      const range = tokenArOffset.rangeWithoutTrivia;
+      if (offset >= range.start + 1 && offset < range.end) {
+        result = tokenArOffset;
+      }
+    }
+    return result;
+  }
   static isUnqualifiedTypeContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(23 /* Colon */) && tokenOrKeyword.parent.kind === 160 /* TypeAnnotation */) {
+    if (tokenOrKeyword.isToken(23 /* Colon */) && tokenOrKeyword.parent.kind === 157 /* TypeAnnotation */) {
       return { allowsAnonymousTypes: true };
     }
     if ((tokenOrKeyword.isKeyword(4 /* Object */) || tokenOrKeyword.isKeyword(5 /* PlainObject */) || tokenOrKeyword.isKeyword(3 /* Aspect */)) && tokenOrKeyword.parent.kind === 34 /* StructuredTypeDeclarationBody */) {
@@ -5371,25 +5573,25 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isKeyword(15 /* Type */) && (NodeTypeUtils.isPackageTypeDeclaration(tokenOrKeyword.parent) || tokenOrKeyword.parent.kind === 40 /* TypeExtensionDeclaration */)) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isToken(36 /* LessThan */) && tokenOrKeyword.parent.kind === 156 /* TypeArgumentClause */) {
+    if (tokenOrKeyword.isToken(36 /* LessThan */) && tokenOrKeyword.parent.kind === 153 /* TypeArgumentClause */) {
       return { allowsAnonymousTypes: true };
     }
-    if (tokenOrKeyword.isToken(24 /* Comma */) && (tokenOrKeyword.parent.kind === 30 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 157 /* TypeArgumentList */)) {
-      return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 157 /* TypeArgumentList */ };
+    if (tokenOrKeyword.isToken(24 /* Comma */) && (tokenOrKeyword.parent.kind === 30 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 154 /* TypeArgumentList */)) {
+      return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 154 /* TypeArgumentList */ };
     }
-    if (tokenOrKeyword.isToken(35 /* HashSign */) && tokenOrKeyword.parent.kind === 149 /* Tag */) {
+    if (tokenOrKeyword.isToken(35 /* HashSign */) && tokenOrKeyword.parent.kind === 146 /* Tag */) {
       return { allowsAnonymousTypes: false };
     }
-    if ((tokenOrKeyword.isToken(23 /* Colon */) || tokenOrKeyword.isToken(57 /* Equals */)) && tokenOrKeyword.parent.kind === 145 /* TypeParameterDeclaration */) {
+    if ((tokenOrKeyword.isToken(23 /* Colon */) || tokenOrKeyword.isToken(57 /* Equals */)) && tokenOrKeyword.parent.kind === 142 /* TypeParameterDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
     if (tokenOrKeyword.isToken(57 /* Equals */) && tokenOrKeyword.parent.kind === 22 /* PackageAliasTypeDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
-    if (tokenOrKeyword.isKeyword(13 /* Is */) && tokenOrKeyword.parent.kind === 73 /* IsExpression */) {
+    if (tokenOrKeyword.isKeyword(13 /* Is */) && tokenOrKeyword.parent.kind === 74 /* IsExpression */) {
       return { allowsAnonymousTypes: true };
     }
-    if (tokenOrKeyword.isKeyword(44 /* As */) && tokenOrKeyword.parent.kind === 64 /* AsExpression */) {
+    if (tokenOrKeyword.isKeyword(40 /* As */) && tokenOrKeyword.parent.kind === 65 /* AsExpression */) {
       return { allowsAnonymousTypes: true };
     }
     if (tokenOrKeyword.isToken(17 /* Bar */) && tokenOrKeyword.parent.kind === 12 /* UnionTypeSpecifierTypeList */) {
@@ -5406,32 +5608,32 @@ var SyntaxContextFactory = class {
     }
     const packageImport = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      136 /* PackageImportTranslation */
+      133 /* PackageImportTranslation */
     );
     if (packageImport !== void 0) {
       return { translationsDeclaration: packageImport.parent.parent };
     }
-    const type = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 141 /* TypeTranslation */);
+    const type = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 138 /* TypeTranslation */);
     if (type !== void 0) {
       return { translationsDeclaration: type.parent.parent };
     }
     const methodType = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      135 /* MethodTypeTranslation */
+      132 /* MethodTypeTranslation */
     );
     if (methodType !== void 0) {
       return { translationsDeclaration: methodType.parent.parent };
     }
     const variable = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      138 /* PackageVariableTranslation */
+      135 /* PackageVariableTranslation */
     );
     if (variable !== void 0) {
       return { translationsDeclaration: variable.parent.parent };
     }
     const method = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      133 /* PackageMethodTranslation */
+      130 /* PackageMethodTranslation */
     );
     if (method !== void 0) {
       return { translationsDeclaration: method.parent.parent };
@@ -5439,33 +5641,33 @@ var SyntaxContextFactory = class {
     return void 0;
   }
   static isTypeMemberTranslationListContext(tokenOrKeyword) {
-    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 140 /* TypeMemberTranslationList */) {
+    if (tokenOrKeyword.isToken(51 /* Semicolon */) && tokenOrKeyword.parent.kind === 137 /* TypeMemberTranslationList */) {
       return { typeTranslation: tokenOrKeyword.parent.parent };
     }
-    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 141 /* TypeTranslation */) {
+    if (tokenOrKeyword.isToken(43 /* OpenBrace */) && tokenOrKeyword.parent.kind === 138 /* TypeTranslation */) {
       return { typeTranslation: tokenOrKeyword.parent };
     }
-    const indexer = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 130 /* IndexerTranslation */);
+    const indexer = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(tokenOrKeyword, 127 /* IndexerTranslation */);
     if (indexer !== void 0) {
       return { typeTranslation: indexer.parent.parent };
     }
     const constructor = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      128 /* ConstructorTranslation */
+      125 /* ConstructorTranslation */
     );
     if (constructor !== void 0) {
       return { typeTranslation: constructor.parent.parent };
     }
     const variableOrVariant = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      139 /* TypeVariableOrVariantTranslation */
+      136 /* TypeVariableOrVariantTranslation */
     );
     if (variableOrVariant !== void 0) {
       return { typeTranslation: variableOrVariant.parent.parent };
     }
     const method = SyntaxContextUtils.ifTokenIsValidEndOfNodeThenNode(
       tokenOrKeyword,
-      134 /* TypeMethodTranslation */
+      131 /* TypeMethodTranslation */
     );
     if (method !== void 0) {
       return { typeTranslation: method.parent.parent };
@@ -5558,13 +5760,13 @@ var CompletionItemInfoCache = class {
   constructor() {
     this._id = 0;
   }
-  add(list) {
-    this._entry = { cacheId: this.getNextId(), value: list };
-    return this._entry.cacheId;
+  add(list, sourceFile) {
+    this._entry = { id: this.getNextId(), items: list, sourceFile };
+    return this._entry;
   }
   get(id) {
-    if (id === this._entry?.cacheId) {
-      return this._entry.value;
+    if (id === this._entry?.id) {
+      return this._entry;
     }
     return void 0;
   }
@@ -5578,31 +5780,31 @@ var NodeSemanticInfoService = class {
   static ofTokenOrKeyword(analyzer, tokenOrKeyword, options6) {
     if (isIdentifier(tokenOrKeyword.value)) {
       return this.ofNonKeywordIdentifier(analyzer, tokenOrKeyword.value, options6);
-    } else if (tokenOrKeyword.isKeyword(2 /* Autotype */) && tokenOrKeyword.parent.kind === 69 /* AutotypeCallExpression */) {
+    } else if (tokenOrKeyword.isKeyword(2 /* Autotype */) && tokenOrKeyword.parent.kind === 70 /* AutotypeCallExpression */) {
       return this.ofAutotypeCallExpression(analyzer, tokenOrKeyword.parent, options6);
     } else if (tokenOrKeyword.parent.kind === 79 /* PrefixUnaryExpression */) {
       return this.ofPrefixUnaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
-    } else if (tokenOrKeyword.isKeyword(45 /* Not */) && tokenOrKeyword.parent.kind === 75 /* NotExpression */) {
+    } else if (tokenOrKeyword.isKeyword(41 /* Not */) && tokenOrKeyword.parent.kind === 75 /* NotExpression */) {
       return this.ofNotExpressionNotKeyword(analyzer, tokenOrKeyword.parent, options6);
-    } else if (tokenOrKeyword.parent.kind === 65 /* BinaryExpression */) {
+    } else if (tokenOrKeyword.parent.kind === 66 /* BinaryExpression */) {
       return this.ofBinaryExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
     } else if (tokenOrKeyword.isToken(19 /* Caret */) && (tokenOrKeyword.parent.kind === 50 /* TypeDereferencedVariableGetterDeclaration */ || tokenOrKeyword.parent.kind === 51 /* TypeDereferencedVariableSetterDeclaration */)) {
       return this.ofDereferenceOperatorDeclaration(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isToken(19 /* Caret */) && tokenOrKeyword.parent.kind === 82 /* DereferenceExpression */) {
       return this.ofDereferenceExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
-    } else if (tokenOrKeyword.parent.kind === 94 /* AssignmentStatement */) {
+    } else if (tokenOrKeyword.parent.kind === 93 /* AssignmentStatement */) {
       return this.ofAssignmentStatementOperator(analyzer, tokenOrKeyword.parent, options6);
     } else if (tokenOrKeyword.isKeyword(28 /* Creation */) && tokenOrKeyword.parent.kind === 45 /* TypeConstructorDeclaration */) {
       return this.ofTypeConstructorDeclaration(analyzer, tokenOrKeyword.parent);
-    } else if (tokenOrKeyword.isToken(13 /* Asterisk */) && tokenOrKeyword.parent.kind === 93 /* DefaultMatchExpression */) {
+    } else if (tokenOrKeyword.isToken(13 /* Asterisk */) && tokenOrKeyword.parent.kind === 92 /* DefaultMatchExpression */) {
       return this.ofDefaultMatchExpression(analyzer, tokenOrKeyword.parent);
     } else if (tokenOrKeyword.isKeyword(4 /* Object */) && tokenOrKeyword.parent.kind === 88 /* ObjectExpression */) {
       return this.ofObjectExpression(analyzer, tokenOrKeyword.parent, options6);
-    } else if (tokenOrKeyword.isKeyword(59 /* Base */) && tokenOrKeyword.parent.kind === 89 /* BaseExpression */) {
+    } else if (tokenOrKeyword.isKeyword(55 /* Base */) && tokenOrKeyword.parent.kind === 89 /* BaseExpression */) {
       return this.ofBaseExpression(analyzer, tokenOrKeyword.parent, options6);
     } else if ((tokenOrKeyword.isToken(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 49 /* TypeIndexerParameterClause */) {
       return this.ofTypeIndexerDeclaration(analyzer, tokenOrKeyword.parent.parent);
-    } else if ((tokenOrKeyword.isToken(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 71 /* IndexedAccessExpression */) {
+    } else if ((tokenOrKeyword.isToken(45 /* OpenSquareBracket */) || tokenOrKeyword.isToken(22 /* CloseSquareBracket */)) && tokenOrKeyword.parent.kind === 72 /* IndexedAccessExpression */) {
       return this.ofIndexedAccessExpressionOperator(analyzer, tokenOrKeyword.parent, options6);
     }
     return void 0;
@@ -5615,11 +5817,11 @@ var NodeSemanticInfoService = class {
     let result;
     const parent = node.parent;
     switch (parent.kind) {
-      case 131 /* TranslationTypeParameterList */:
+      case 128 /* TranslationTypeParameterList */:
         break;
-      case 126 /* TranslationParameterList */:
+      case 123 /* TranslationParameterList */:
         break;
-      case 147 /* CallArgument */: {
+      case 144 /* CallArgument */: {
         const respectiveParameter = analyzer.getRespectiveParameter(parent);
         if (respectiveParameter !== void 0) {
           const target = new SimpleWithLocalization(
@@ -5633,10 +5835,10 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 59 /* EnumerationVariableDeclaration */:
+      case 60 /* EnumerationVariableDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofEnumerationVariableDeclaration(parent));
         break;
-      case 103 /* ErrorVariableDeclaration */:
+      case 102 /* ErrorVariableDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofErrorVariableDeclaration(parent));
         break;
       case 22 /* PackageAliasTypeDeclaration */:
@@ -5660,16 +5862,16 @@ var NodeSemanticInfoService = class {
       case 90 /* IdentifierExpression */:
         result = this.ofIdentifierExpression(analyzer, parent, options6);
         break;
-      case 57 /* NestedMethodDeclaration */:
+      case 58 /* NestedMethodDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofNestedMethodDeclaration(parent));
         break;
-      case 58 /* LocalVariableDeclaration */:
+      case 59 /* LocalVariableDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofLocalVariableDeclaration(parent));
         break;
-      case 137 /* QualifiedName */:
+      case 134 /* QualifiedName */:
         result = this.ofQualifiedNameQualifier(analyzer, parent, node, options6);
         break;
-      case 138 /* PackageVariableTranslation */: {
+      case 135 /* PackageVariableTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetResult = translationPackage?.getPackageVariableTranslationTarget(parent);
         if (translationPackage !== void 0 && getTargetResult?.target !== void 0) {
@@ -5689,7 +5891,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 139 /* TypeVariableOrVariantTranslation */: {
+      case 136 /* TypeVariableOrVariantTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetsResult = translationPackage?.getTypeVariableOrVariantTranslationTargets(parent);
         if (translationPackage !== void 0 && isNonEmptyArray(getTargetsResult?.targets)) {
@@ -5713,7 +5915,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 133 /* PackageMethodTranslation */: {
+      case 130 /* PackageMethodTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetsResult = translationPackage?.getPackageMethodTranslationTargets(parent);
         if (translationPackage !== void 0 && isNonEmptyArray(getTargetsResult?.targets)) {
@@ -5737,7 +5939,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 134 /* TypeMethodTranslation */: {
+      case 131 /* TypeMethodTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetsResult = translationPackage?.getTypeMethodTranslationTargets(parent);
         if (translationPackage !== void 0 && isNonEmptyArray(getTargetsResult?.targets)) {
@@ -5761,7 +5963,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 141 /* TypeTranslation */: {
+      case 138 /* TypeTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetResult = translationPackage?.getTypeTranslationTarget(parent);
         if (translationPackage !== void 0 && getTargetResult?.target !== void 0) {
@@ -5781,7 +5983,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 135 /* MethodTypeTranslation */: {
+      case 132 /* MethodTypeTranslation */: {
         const translationPackage = this.getContainingTranslationPackage(analyzer, node);
         const getTargetResult = translationPackage?.getMethodTypeTranslationTarget(parent);
         if (translationPackage !== void 0 && getTargetResult?.target !== void 0) {
@@ -5801,7 +6003,7 @@ var NodeSemanticInfoService = class {
         }
         break;
       }
-      case 146 /* ParameterDeclaration */:
+      case 143 /* ParameterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofParameterDeclaration(parent));
         break;
       case 8 /* PackageImport */:
@@ -5816,24 +6018,27 @@ var NodeSemanticInfoService = class {
       case 52 /* TypeMethodDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTypeMethodDeclaration(parent));
         break;
-      case 53 /* TypeVariableDeclaration */:
+      case 53 /* OperatorDeclaration */:
+        result = new DefinitionNodeSemanticInfo(analyzer.entity.ofOperatorDeclaration(parent));
+        break;
+      case 54 /* TypeVariableDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTypeVariableDeclaration(parent));
         break;
-      case 145 /* TypeParameterDeclaration */:
+      case 142 /* TypeParameterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofTypeParameterDeclaration(parent));
         break;
-      case 144 /* VariantDeclaration */:
+      case 141 /* VariantDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofVariantDeclaration(parent));
         break;
       case 36 /* PackageVariableGetterDeclaration */:
       case 37 /* PackageVariableSetterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofComputedPackageVariableDeclaration(parent));
         break;
-      case 54 /* TypeVariableGetterDeclaration */:
-      case 55 /* TypeVariableSetterDeclaration */:
+      case 55 /* TypeVariableGetterDeclaration */:
+      case 56 /* TypeVariableSetterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofComputedTypeVariableDeclaration(parent));
         break;
-      case 155 /* SetterParameterDeclaration */:
+      case 152 /* SetterParameterDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofSetterParameterDeclaration(parent));
         break;
       case 3 /* Keyword */:
@@ -5894,6 +6099,14 @@ var NodeSemanticInfoService = class {
           result = createAccessedMethodsReference(meaning.candidates, true);
         }
         break;
+      case "operator-access": {
+        if (isNonEmptyArray(meaning.suitableOperators)) {
+          result = createOperatorsReference(meaning.suitableOperators, meaning.suitableOperators.length > 1);
+        } else if (isNonEmptyArray(meaning.candidates)) {
+          result = createOperatorsReference(meaning.candidates, true);
+        }
+        break;
+      }
       case "package-method-access":
         if (isNonEmptyArray(meaning.suitableMethods)) {
           result = createAccessedMethodsReference(meaning.suitableMethods, meaning.suitableMethods.length > 1);
@@ -5924,9 +6137,11 @@ var NodeSemanticInfoService = class {
     }
     return result;
     function createAccessedMethodsReference(methods, isAmbiguous) {
-      const targets = methods.map(
-        (o) => new SimpleWithLocalization(new AccessedMethodReferenceTarget(o.value), o.localization)
-      );
+      const targets = methods.map((o) => new SimpleWithLocalization(new AccessedMethodReferenceTarget(o.value), o.localization));
+      return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
+    }
+    function createOperatorsReference(operators, isAmbiguous) {
+      const targets = operators.map((o) => new SimpleWithLocalization(new OperatorReferenceTarget(o.value), o.localization));
       return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
     }
   }
@@ -5977,7 +6192,7 @@ var NodeSemanticInfoService = class {
         return result;
       }
       case 42 /* ExtendedTypeClause */:
-      case 136 /* PackageImportTranslation */:
+      case 133 /* PackageImportTranslation */:
         return void 0;
       default:
         Debug.never(node.parent);
@@ -6010,6 +6225,14 @@ var NodeSemanticInfoService = class {
           result = createAccessedMethodsReference(meaning.candidates, true);
         }
         break;
+      case "operator-access": {
+        if (isNonEmptyArray(meaning.suitableOperators)) {
+          result = createOperatorsReference(meaning.suitableOperators, meaning.suitableOperators.length > 1);
+        } else if (isNonEmptyArray(meaning.candidates)) {
+          result = createOperatorsReference(meaning.candidates, true);
+        }
+        break;
+      }
       case "variable-access": {
         const variable = meaning.variable;
         if (variable.value.kind === "entity") {
@@ -6079,9 +6302,11 @@ var NodeSemanticInfoService = class {
     }
     return result;
     function createAccessedMethodsReference(methods, isAmbiguous) {
-      const targets = methods.map(
-        (o) => new SimpleWithLocalization(new AccessedMethodReferenceTarget(o.value), o.localization)
-      );
+      const targets = methods.map((o) => new SimpleWithLocalization(new AccessedMethodReferenceTarget(o.value), o.localization));
+      return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
+    }
+    function createOperatorsReference(operators, isAmbiguous) {
+      const targets = operators.map((o) => new SimpleWithLocalization(new OperatorReferenceTarget(o.value), o.localization));
       return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
     }
   }
@@ -6114,7 +6339,7 @@ var NodeSemanticInfoService = class {
       const operator = analyzer.resolveCompoundAssignmentStatementOperator(node, operatorKind);
       if (operator.kind === "ok") {
         const target = new SimpleWithLocalization(
-          new TypeBinaryOperatorReferenceTarget(operator.value.value),
+          new OperatorReferenceTarget(operator.value.value),
           operator.value.localization
         );
         let result = new ReferenceNodeSemanticInfo([target], false);
@@ -6132,7 +6357,7 @@ var NodeSemanticInfoService = class {
       const operator = analyzer.resolveBinaryExpressionUserDefinableOperator(node, classificationResult.operatorKind);
       if (operator.kind === "ok") {
         const target = new SimpleWithLocalization(
-          new TypeBinaryOperatorReferenceTarget(operator.value.value),
+          new OperatorReferenceTarget(operator.value.value),
           operator.value.localization
         );
         let result = new ReferenceNodeSemanticInfo([target], false);
@@ -6148,7 +6373,7 @@ var NodeSemanticInfoService = class {
     const operator = analyzer.resolveNotExpressionOperator(node);
     if (operator.kind === "ok") {
       const target = new SimpleWithLocalization(
-        new TypeUnaryOperatorReferenceTarget(operator.value.value),
+        new OperatorReferenceTarget(operator.value.value),
         operator.value.localization
       );
       let result = new ReferenceNodeSemanticInfo([target], false);
@@ -6163,7 +6388,7 @@ var NodeSemanticInfoService = class {
     const operator = analyzer.resolvePrefixUnaryExpressionOperator(node);
     if (operator.kind === "ok") {
       const target = new SimpleWithLocalization(
-        new TypeUnaryOperatorReferenceTarget(operator.value.value),
+        new OperatorReferenceTarget(operator.value.value),
         operator.value.localization
       );
       let result = new ReferenceNodeSemanticInfo([target], false);
@@ -6275,6 +6500,15 @@ var NodeSemanticInfoService = class {
         result = new ReferenceNodeSemanticInfo([target], false);
         break;
       }
+      case "overridden-operator-access": {
+        const locale = TreeQuery.fromNode(node).packageEntity(analyzer).getLocale();
+        const target = new SimpleWithLocalization(
+          new OperatorReferenceTarget(meaning.operator),
+          new Localization.Original(locale)
+        );
+        result = new ReferenceNodeSemanticInfo([target], false);
+        break;
+      }
       case "unresolved":
         break;
       default:
@@ -6326,11 +6560,11 @@ var NodeSemanticInfoService = class {
     }
     const parent = getParentSkippingParenthesizedExpressions(typeAccessExpression);
     let parentCallExpression;
-    if (parent.kind === 68 /* CallExpression */) {
+    if (parent.kind === 69 /* CallExpression */) {
       parentCallExpression = parent;
-    } else if (parent.kind === 92 /* GenericSpecializationExpression */) {
+    } else if (parent.kind === 91 /* GenericSpecializationExpression */) {
       const grandParent = getParentSkippingParenthesizedExpressions(parent);
-      if (grandParent.kind === 68 /* CallExpression */) {
+      if (grandParent.kind === 69 /* CallExpression */) {
         parentCallExpression = grandParent;
       }
     }
@@ -6459,18 +6693,6 @@ var TypeConstructorReferenceTarget = class {
     this.kind = "type-constructor";
   }
 };
-var TypeUnaryOperatorReferenceTarget = class {
-  constructor(operator) {
-    this.operator = operator;
-    this.kind = "type-unary-operator";
-  }
-};
-var TypeBinaryOperatorReferenceTarget = class {
-  constructor(operator) {
-    this.operator = operator;
-    this.kind = "type-binary-operator";
-  }
-};
 var TypeDereferenceOperatorReferenceTarget = class {
   constructor(operator, accessKind) {
     this.operator = operator;
@@ -6484,6 +6706,12 @@ var AccessedMethodReferenceTarget = class {
     this.kind = "accessed-method";
   }
 };
+var OperatorReferenceTarget = class {
+  constructor(operator) {
+    this.operator = operator;
+    this.kind = "operator";
+  }
+};
 var MatchResultValueParameterReferenceTarget = class {
   constructor(parameter, accessKind) {
     this.parameter = parameter;
@@ -6537,7 +6765,7 @@ var SimpleWithLocalization = class {
 
 // source/services/Utils.ts
 function getEntitySourceLocations(analyzer, entity) {
-  if (entity.kind === 17 /* Package */) {
+  if (entity.kind === 16 /* Package */) {
     return void 0;
   }
   let result;
@@ -6585,7 +6813,7 @@ function getEntitySourceLocations(analyzer, entity) {
         case 17 /* AnonymousMethodTypeDeclaration */:
         case 18 /* AnonymousStructuredTypeDeclaration */:
         case 19 /* AnonymousVariantTypeDeclaration */:
-        case 66 /* MethodBlockLiteral */:
+        case 67 /* MethodBlockLiteral */:
         case 76 /* MethodLiteral */:
           range = node.rangeWithoutTrivia;
           break;
@@ -6594,10 +6822,11 @@ function getEntitySourceLocations(analyzer, entity) {
         case 28 /* PackageMethodTypeDeclaration */:
         case 33 /* PackageStructuredTypeDeclaration */:
         case 38 /* PackageVariantTypeDeclaration */:
-        case 57 /* NestedMethodDeclaration */:
+        case 58 /* NestedMethodDeclaration */:
         case 52 /* TypeMethodDeclaration */:
-        case 145 /* TypeParameterDeclaration */:
-        case 144 /* VariantDeclaration */:
+        case 142 /* TypeParameterDeclaration */:
+        case 141 /* VariantDeclaration */:
+        case 53 /* OperatorDeclaration */:
           range = node.name.rangeWithoutTrivia;
           break;
         case 45 /* TypeConstructorDeclaration */:
@@ -6619,10 +6848,10 @@ function getEntitySourceLocations(analyzer, entity) {
         case 37 /* PackageVariableSetterDeclaration */:
           range = node.setKeyword.rangeWithoutTrivia;
           break;
-        case 54 /* TypeVariableGetterDeclaration */:
+        case 55 /* TypeVariableGetterDeclaration */:
           range = node.getKeyword.rangeWithoutTrivia;
           break;
-        case 55 /* TypeVariableSetterDeclaration */:
+        case 56 /* TypeVariableSetterDeclaration */:
           range = node.setKeyword.rangeWithoutTrivia;
           break;
         case 47 /* TypeIndexedGetterDeclaration */:
@@ -6748,9 +6977,7 @@ var DefinitionService = class {
         return getEntitySourceLocations(analyzer, target.constructor_.getEntity());
       case "accessed-method":
         return getEntitySourceLocations(analyzer, target.method.getEntity());
-      case "type-unary-operator":
-        return getEntitySourceLocations(analyzer, target.operator.getEntity());
-      case "type-binary-operator":
+      case "operator":
         return getEntitySourceLocations(analyzer, target.operator.getEntity());
       case "type-dereference-operator":
         return getEntitySourceLocations(analyzer, target.operator.getEntity());
@@ -6784,9 +7011,7 @@ var DefinitionService = class {
         return target.parameter.getEntity();
       case "type-constructor":
         return target.constructor_.getEntity();
-      case "type-unary-operator":
-        return target.operator.getEntity();
-      case "type-binary-operator":
+      case "operator":
         return target.operator.getEntity();
       case "type-dereference-operator":
         return target.operator.getEntity();
@@ -6877,7 +7102,7 @@ var ReferencesService = class {
               }
             }
             if (!options6.onlyNamed) {
-              if (node.kind === 69 /* AutotypeCallExpression */ && restrictions.canBeAutotypeCall) {
+              if (node.kind === 70 /* AutotypeCallExpression */ && restrictions.canBeAutotypeCall) {
                 const semanticInfo = NodeSemanticInfoService.ofAutotypeCallExpression(analyzer, node, semanticInfoOptions);
                 const referenceKind = this.ifReferenceToDefinitionThenKind(
                   definition,
@@ -6921,7 +7146,7 @@ var ReferencesService = class {
                   result.push(new Reference(sourceFile2, node.notKeyword.rangeWithoutTrivia, referenceKind));
                 }
               }
-              if (node.kind === 65 /* BinaryExpression */ && restrictions.canBeBinaryExpressionOperator) {
+              if (node.kind === 66 /* BinaryExpression */ && restrictions.canBeBinaryExpressionOperator) {
                 const semanticInfo = NodeSemanticInfoService.ofBinaryExpressionOperator(
                   analyzer,
                   node,
@@ -6965,7 +7190,7 @@ var ReferencesService = class {
                   result.push(new Reference(sourceFile2, node.caretToken.rangeWithoutTrivia, referenceKind));
                 }
               }
-              if (node.kind === 94 /* AssignmentStatement */ && restrictions.canBeAssignmentStatementOperator) {
+              if (node.kind === 93 /* AssignmentStatement */ && restrictions.canBeAssignmentStatementOperator) {
                 const semanticInfo = NodeSemanticInfoService.ofAssignmentStatementOperator(
                   analyzer,
                   node,
@@ -7029,7 +7254,7 @@ var ReferencesService = class {
                   result.push(new Reference(sourceFile2, node.parameterClause.rangeWithoutTrivia, referenceKind));
                 }
               }
-              if (node.kind === 71 /* IndexedAccessExpression */ && restrictions.canBeIndexer) {
+              if (node.kind === 72 /* IndexedAccessExpression */ && restrictions.canBeIndexer) {
                 const semanticInfo = NodeSemanticInfoService.ofIndexedAccessExpressionOperator(
                   analyzer,
                   node,
@@ -7148,9 +7373,7 @@ var ReferencesService = class {
           );
         case "type-constructor":
           return new DefinitionInfo(target.value.constructor_.getEntity(), target.localization, 0 /* Read */);
-        case "type-unary-operator":
-          return new DefinitionInfo(target.value.operator.getEntity(), target.localization, 0 /* Read */);
-        case "type-binary-operator":
+        case "operator":
           return new DefinitionInfo(target.value.operator.getEntity(), target.localization, 0 /* Read */);
         case "type-dereference-operator":
           return new DefinitionInfo(
@@ -7200,13 +7423,15 @@ var ReferencesService = class {
       result.canBeAutotypeCall = true;
       result.canBeConstructorDeclaration = true;
     }
-    if (definition.value.kind === 15 /* UnaryOperator */) {
-      result.canBePrefixUnaryOperator = true;
-      result.canBeNotExpression = true;
-    }
-    if (definition.value.kind === 16 /* BinaryOperator */) {
-      result.canBeBinaryExpressionOperator = true;
-      result.canBeAssignmentStatementOperator = true;
+    if (definition.value.kind === 15 /* Operator */) {
+      const operatorKind = definition.value.getOperatorKind();
+      if (isUnaryOperator(operatorKind)) {
+        result.canBePrefixUnaryOperator = true;
+        result.canBeNotExpression = true;
+      } else {
+        result.canBeBinaryExpressionOperator = true;
+        result.canBeAssignmentStatementOperator = true;
+      }
     }
     if (definition.value.kind === 8 /* DereferenceOperator */) {
       result.canBeDereferenceOperator = true;
@@ -7289,10 +7514,9 @@ var ReferencesService = class {
       case 10 /* Destructor */:
       case 7 /* Indexer */:
       case 8 /* DereferenceOperator */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
-      case 17 /* Package */:
-      case 18 /* TypeExtension */:
+      case 16 /* Package */:
+      case 17 /* TypeExtension */:
+      case 15 /* Operator */:
         return void 0;
       default:
         Debug.never(entity);
@@ -7438,7 +7662,7 @@ var EvaluatableExpressionService = class {
   }
   isNamedDeclaration(node) {
     switch (node.kind) {
-      case 59 /* EnumerationVariableDeclaration */:
+      case 60 /* EnumerationVariableDeclaration */:
         return { nameIdentifier: node.name };
       case 22 /* PackageAliasTypeDeclaration */:
         return { nameIdentifier: node.name };
@@ -7452,21 +7676,21 @@ var EvaluatableExpressionService = class {
         return { nameIdentifier: node.name };
       case 38 /* PackageVariantTypeDeclaration */:
         return { nameIdentifier: node.name };
-      case 57 /* NestedMethodDeclaration */:
+      case 58 /* NestedMethodDeclaration */:
         return { nameIdentifier: node.name };
-      case 58 /* LocalVariableDeclaration */:
+      case 59 /* LocalVariableDeclaration */:
         return { nameIdentifier: node.name };
-      case 146 /* ParameterDeclaration */:
+      case 143 /* ParameterDeclaration */:
         return { nameIdentifier: node.name };
       case 52 /* TypeMethodDeclaration */:
         return { nameIdentifier: node.name };
-      case 53 /* TypeVariableDeclaration */:
+      case 54 /* TypeVariableDeclaration */:
         return { nameIdentifier: node.name };
-      case 145 /* TypeParameterDeclaration */:
+      case 142 /* TypeParameterDeclaration */:
         return { nameIdentifier: node.name };
-      case 144 /* VariantDeclaration */:
+      case 141 /* VariantDeclaration */:
         return { nameIdentifier: node.name };
-      case 103 /* ErrorVariableDeclaration */:
+      case 102 /* ErrorVariableDeclaration */:
         return { nameIdentifier: node.name };
       default:
         return void 0;
@@ -7587,13 +7811,12 @@ var HoverService = class {
         );
         return new Hover(this._displayService.displayConstructorDeclaration(declaration), range);
       }
-      case "type-unary-operator": {
-        const operator = new UnaryOperatorDeclaration_typeMember(firstTarget.value.operator);
-        return new Hover(this._displayService.displayUnaryOperatorDeclaration(operator), range);
-      }
-      case "type-binary-operator": {
-        const operator = new BinaryOperatorDeclaration_typeMember(firstTarget.value.operator);
-        return new Hover(this._displayService.displayBinaryOperatorDeclaration(operator), range);
+      case "operator": {
+        const operator = new OperatorDeclaration_typeMember(
+          firstTarget.value.operator,
+          firstTarget.localization
+        );
+        return new Hover(this._displayService.displayOperatorDeclaration(operator), range);
       }
       case "type-dereference-operator": {
         const operator = new DereferenceOperatorDeclaration_typeMember(firstTarget.value.operator);
@@ -7623,7 +7846,7 @@ var HoverService = class {
           const typeText = this._displayService.displayType(firstTarget.value.type);
           return new Hover(`${keywordText}: ${typeText}`, range);
         } else if (firstTarget.value.typeContextKind === "base") {
-          const keywordText = this._displayService.displayKeyword(59 /* Base */);
+          const keywordText = this._displayService.displayKeyword(55 /* Base */);
           const typeText = this._displayService.displayType(firstTarget.value.type);
           return new Hover(`${keywordText}: ${typeText}`, range);
         } else {
@@ -7762,7 +7985,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 53 /* TypeVariableDeclaration */: {
+        case 54 /* TypeVariableDeclaration */: {
           result.push(
             this.createItem(
               12 /* TypeVariable */,
@@ -7774,7 +7997,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 54 /* TypeVariableGetterDeclaration */: {
+        case 55 /* TypeVariableGetterDeclaration */: {
           result.push(
             this.createItem(
               13 /* TypeVariableGetter */,
@@ -7786,7 +8009,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 55 /* TypeVariableSetterDeclaration */: {
+        case 56 /* TypeVariableSetterDeclaration */: {
           result.push(
             this.createItem(
               14 /* TypeVariableSetter */,
@@ -7880,7 +8103,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 144 /* VariantDeclaration */: {
+        case 141 /* VariantDeclaration */: {
           result.push(
             this.createItem(
               9 /* Variant */,
@@ -7892,7 +8115,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 145 /* TypeParameterDeclaration */: {
+        case 142 /* TypeParameterDeclaration */: {
           result.push(
             this.createItem(
               18 /* TypeParameter */,
@@ -7904,7 +8127,7 @@ var SourceFileItemsService = class {
           );
           break;
         }
-        case 57 /* NestedMethodDeclaration */: {
+        case 58 /* NestedMethodDeclaration */: {
           result.push(
             this.createItem(
               19 /* NestedMethod */,
@@ -7941,7 +8164,7 @@ var SourceFileItemsService = class {
       case 4 /* PackageMethod */:
       case 15 /* TypeMethod */:
       case 19 /* NestedMethod */:
-        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(11 /* Operation */, this.locale, this.dialect)}>`;
+        return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(11 /* Function */, this.locale, this.dialect)}>`;
       case 5 /* StructuredType */:
       case 6 /* MethodType */:
       case 7 /* VariantType */:
@@ -7950,21 +8173,21 @@ var SourceFileItemsService = class {
       case 10 /* TypeConstructor */:
         return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(28 /* Creation */, this.locale, this.dialect);
       case 11 /* TypeDestructor */:
-        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(50 /* Destruction */, this.locale, this.dialect);
+        return name ?? LocalizationHelper.localizeKeywordAndTakeFirst(46 /* Destruction */, this.locale, this.dialect);
       case 9 /* Variant */:
         return name ?? `<${LocalizationHelper.localizeKeywordAndTakeFirst(6 /* Variant */, this.locale, this.dialect)}>`;
       case 18 /* TypeParameter */:
         return name ?? `<${LocalizationHelper.localizeHelperPhrase(2 /* TypeParameter */, this.locale)}>`;
       case 2 /* PackageVariableGetter */:
       case 13 /* TypeVariableGetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(61 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(57 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
       case 3 /* PackageVariableSetter */:
       case 14 /* TypeVariableSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(62 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
       case 16 /* TypeIndexedGetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(61 /* Get */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(57 /* Get */, this.locale, this.dialect)} []`;
       case 17 /* TypeIndexedSetter */:
-        return `${LocalizationHelper.localizeKeywordAndTakeFirst(62 /* Set */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelper.localizeKeywordAndTakeFirst(58 /* Set */, this.locale, this.dialect)} []`;
       default:
         Debug.never(kind);
     }
@@ -8071,9 +8294,10 @@ var RenameService = class {
           case "match-result-value-parameter":
             canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.parameter.entity);
             break;
+          case "operator":
+            canBeRenamed = this.entityCanBeRenamed(analyzer, target.value.operator.getEntity());
+            break;
           case "type-constructor":
-          case "type-unary-operator":
-          case "type-binary-operator":
           case "type-dereference-operator":
           case "package":
           case "type-context":
@@ -8154,7 +8378,7 @@ var SelectionRangeService = class {
       }
     }
     switch (node.kind) {
-      case 160 /* TypeAnnotation */:
+      case 157 /* TypeAnnotation */:
       case 34 /* StructuredTypeDeclarationBody */:
       case 39 /* VariantTypeDeclarationBody */:
       case 23 /* AliasTypeDeclarationBody */:
@@ -8282,7 +8506,7 @@ var SemanticTokensService = class {
               );
             }
           }
-          if (node.kind === 144 /* VariantDeclaration */) {
+          if (node.kind === 141 /* VariantDeclaration */) {
             result.push(
               new SemanticToken(
                 node.name.rangeWithoutTrivia,
@@ -8300,7 +8524,7 @@ var SemanticTokensService = class {
               )
             );
           }
-          if (node.kind === 57 /* NestedMethodDeclaration */) {
+          if (node.kind === 58 /* NestedMethodDeclaration */) {
             result.push(
               new SemanticToken(node.name.rangeWithoutTrivia, 5 /* NestedMethod */, new SemanticTokenModifiers().makeDeclaration().setCapitalized(this.isCapitalizedName(node.name.value)))
             );
@@ -8310,6 +8534,11 @@ var SemanticTokensService = class {
               new SemanticToken(node.name.rangeWithoutTrivia, 6 /* TypeMethod */, new SemanticTokenModifiers().makeDeclaration().setCapitalized(this.isCapitalizedName(node.name.value)))
             );
           }
+          if (node.kind === 53 /* OperatorDeclaration */) {
+            result.push(
+              new SemanticToken(node.name.rangeWithoutTrivia, 7 /* Operator */, new SemanticTokenModifiers().makeDeclaration())
+            );
+          }
         }
       );
       return result.sort((t1, t2) => t1.range.start - t2.range.end);
@@ -8386,7 +8615,8 @@ var supportedSemanticTokens = [
   3 /* Variant */,
   4 /* PackageMethod */,
   5 /* NestedMethod */,
-  6 /* TypeMethod */
+  6 /* TypeMethod */,
+  7 /* Operator */
 ];
 var supportedSemanticTokenModifiers = [
   1 /* Const */,
@@ -8460,7 +8690,7 @@ var TypeParameterSignatureHelpProvider = class {
     }
     let node = token.parent;
     while (node !== void 0) {
-      if (node.kind === 156 /* TypeArgumentClause */ && this._offset >= node.lessThanToken.rangeWithoutTrivia.end && (node.greaterThanToken.rangeWithoutTrivia.isEmpty || this._offset <= node.greaterThanToken.rangeWithoutTrivia.start)) {
+      if (node.kind === 153 /* TypeArgumentClause */ && this._offset >= node.lessThanToken.rangeWithoutTrivia.end && (node.greaterThanToken.rangeWithoutTrivia.isEmpty || this._offset <= node.greaterThanToken.rangeWithoutTrivia.start)) {
         const argumentIndex = this.getArgumentIndex(node.typeArgumentList, this._offset);
         const argumentCount = this.countArguments(node.typeArgumentList);
         return new NodeWithTypeArgumentsInfo(node.parent, argumentIndex, argumentCount);
@@ -8505,7 +8735,7 @@ var TypeParameterSignatureHelpProvider = class {
     switch (node.kind) {
       case 10 /* NamedTypeSpecifier */:
         return this.getSignaturesForNamedTypeSpecifier(node);
-      case 92 /* GenericSpecializationExpression */:
+      case 91 /* GenericSpecializationExpression */:
         return this.getSignaturesForGenericSpecializationExpression(node);
       default:
         Debug.never(node);
@@ -8716,7 +8946,7 @@ var SignatureContext = class {
     this.displayService = displayService;
   }
   convertMethodDisplayParts(parts) {
-    const prefix = parts.asyncKeywordWithWhitespace + parts.operationKeyword + parts.whitespaceAfterOperationKeyword + parts.container + parts.name + parts.typeParametersStart;
+    const prefix = parts.asyncKeywordWithWhitespace + parts.functionKeyword + parts.whitespaceAfterFunctionKeyword + parts.container + parts.name + parts.typeParametersStart;
     const postfix = parts.typeParametersEnd + parts.valueParametersStart + parts.valueParameters.map((p) => p.toString()).join(parts.valueParameterSeparator) + parts.valueParametersEnd + parts.returnTypeAnnotationColon + parts.returnType;
     return new SignatureDisplayParts(prefix, parts.typeParameters, parts.typeParameterSeparator, postfix);
   }
@@ -8791,7 +9021,7 @@ var ValueParametersSignatureHelpProvider = class {
     let node = token.parent;
     while (node !== void 0) {
       switch (node.kind) {
-        case 68 /* CallExpression */: {
+        case 69 /* CallExpression */: {
           if (this._offset >= node.openParenthesisToken.rangeWithoutTrivia.end && (node.closeParenthesisToken.rangeWithoutTrivia.isEmpty || this._offset <= node.closeParenthesisToken.rangeWithoutTrivia.start)) {
             const valueArguments = ValueArgumentFactory.createValueArgumentsOfCallExpression(node);
             const argumentIndex = this.getArgumentIndexInList(node.callArgumentList.elements, this._offset);
@@ -8799,7 +9029,7 @@ var ValueParametersSignatureHelpProvider = class {
           }
           break;
         }
-        case 69 /* AutotypeCallExpression */: {
+        case 70 /* AutotypeCallExpression */: {
           if (this._offset >= node.openParenthesisToken.rangeWithoutTrivia.end && (node.closeParenthesisToken.rangeWithoutTrivia.isEmpty || this._offset <= node.closeParenthesisToken.rangeWithoutTrivia.start)) {
             const valueArguments = ValueArgumentFactory.createValueArgumentsOfAutotypeCallExpression(node);
             const argumentIndex = this.getArgumentIndexInList(node.callArgumentList.elements, this._offset);
@@ -8807,7 +9037,7 @@ var ValueParametersSignatureHelpProvider = class {
           }
           break;
         }
-        case 71 /* IndexedAccessExpression */: {
+        case 72 /* IndexedAccessExpression */: {
           if (this._offset >= node.openSquareBracketToken.rangeWithoutTrivia.end && (node.closeSquareBracketToken.rangeWithoutTrivia.isEmpty || this._offset <= node.closeSquareBracketToken.rangeWithoutTrivia.start)) {
             const valueArguments = ValueArgumentFactory.createValueArgumentsOfIndexedAccessExpression(node);
             const argumentIndex = this.getArgumentIndexInList(node.argumentsList.elements, this._offset);
@@ -8815,7 +9045,7 @@ var ValueParametersSignatureHelpProvider = class {
           }
           break;
         }
-        case 149 /* Tag */: {
+        case 146 /* Tag */: {
           if (node.openParenthesisToken !== void 0 && this._offset >= node.openParenthesisToken.rangeWithoutTrivia.end && node.callArgumentList !== void 0 && (node.closeParenthesisToken === void 0 || node.closeParenthesisToken.rangeWithoutTrivia.isEmpty || this._offset <= node.closeParenthesisToken.rangeWithoutTrivia.start)) {
             const argumentIndex = this.getArgumentIndexInList(node.callArgumentList.elements, this._offset);
             const valueArguments = ValueArgumentFactory.createValueArgumentsOfTag(node);
@@ -8902,13 +9132,13 @@ var SignatureContext2 = class {
     this.displayService = displayService;
   }
   convertMethodDisplayParts(parts) {
-    const prefix = parts.asyncKeywordWithWhitespace + parts.operationKeyword + parts.whitespaceAfterOperationKeyword + parts.container + parts.name + parts.typeParametersStart + parts.typeParameters.join(parts.typeParameterSeparator) + parts.typeParametersEnd + parts.valueParametersStart;
+    const prefix = parts.asyncKeywordWithWhitespace + parts.functionKeyword + parts.whitespaceAfterFunctionKeyword + parts.container + parts.name + parts.typeParametersStart + parts.typeParameters.join(parts.typeParameterSeparator) + parts.typeParametersEnd + parts.valueParametersStart;
     const valueParameters = parts.valueParameters.map((p) => p.toString());
     const postfix = parts.valueParametersEnd + parts.returnTypeAnnotationColon + parts.returnType;
     return new SignatureDisplayParts(prefix, valueParameters, parts.valueParameterSeparator, postfix);
   }
   convertMethodTypeBodyDisplayParts(parts) {
-    const prefix = parts.asyncKeywordWithWhitespace + parts.operationKeyword + parts.valueParametersStart;
+    const prefix = parts.asyncKeywordWithWhitespace + parts.functionKeyword + parts.valueParametersStart;
     const valueParameters = parts.valueParameters.map((p) => p.toString());
     const postfix = parts.valueParametersEnd + parts.returnTypeAnnotationColon + parts.returnType;
     return new SignatureDisplayParts(prefix, valueParameters, parts.valueParameterSeparator, postfix);
@@ -11313,7 +11543,7 @@ var EntityToSyntax = class {
     const tags = this.convertTags(entity.getTags());
     const modifiers = new Array();
     if (entity.isAsync()) {
-      modifiers.push(SyntaxFactory.modifier(42 /* Async */));
+      modifiers.push(SyntaxFactory.modifier(38 /* Async */));
     }
     const isHidden = entity.isHidden();
     if (isHidden !== void 0) {
@@ -11395,16 +11625,16 @@ var EntityToSyntax = class {
       commonModifiers.push(SyntaxFactory.modifier(33 /* Const */));
     }
     if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(43 /* Static */));
+      commonModifiers.push(SyntaxFactory.modifier(39 /* Static */));
     }
     if (entity.isAbstract()) {
-      commonModifiers.push(SyntaxFactory.modifier(37 /* Abstract */));
+      commonModifiers.push(SyntaxFactory.modifier(35 /* Abstract */));
     }
     if (entity.isRedefinable()) {
-      commonModifiers.push(SyntaxFactory.modifier(38 /* Redefinable */));
+      commonModifiers.push(SyntaxFactory.modifier(36 /* Redefinable */));
     }
     if (entity.isRedefined()) {
-      commonModifiers.push(SyntaxFactory.modifier(39 /* Redefined */));
+      commonModifiers.push(SyntaxFactory.modifier(37 /* Redefined */));
     }
     const name = this.getEntityName(entity);
     const type = this.convertType(entity.getType());
@@ -11450,16 +11680,16 @@ var EntityToSyntax = class {
       modifiers.push(this.createHidingModifier(isHidden));
     }
     if (entity.isStatic()) {
-      modifiers.push(SyntaxFactory.modifier(43 /* Static */));
+      modifiers.push(SyntaxFactory.modifier(39 /* Static */));
     }
     if (entity.isAbstract()) {
-      modifiers.push(SyntaxFactory.modifier(37 /* Abstract */));
+      modifiers.push(SyntaxFactory.modifier(35 /* Abstract */));
     }
     if (entity.isRedefinable()) {
-      modifiers.push(SyntaxFactory.modifier(38 /* Redefinable */));
+      modifiers.push(SyntaxFactory.modifier(36 /* Redefinable */));
     }
     if (entity.isRedefined()) {
-      modifiers.push(SyntaxFactory.modifier(39 /* Redefined */));
+      modifiers.push(SyntaxFactory.modifier(37 /* Redefined */));
     }
     const name = this.getEntityName(entity);
     const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
@@ -11475,7 +11705,7 @@ var EntityToSyntax = class {
       modifiers.push(this.createHidingModifier(isHidden));
     }
     if (entity.isAbstract()) {
-      modifiers.push(SyntaxFactory.modifier(37 /* Abstract */));
+      modifiers.push(SyntaxFactory.modifier(35 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
     return SyntaxFactory.typeConstructorDeclaration(tags, modifiers, parameters, void 0);
@@ -11488,7 +11718,7 @@ var EntityToSyntax = class {
       modifiers.push(this.createHidingModifier(isHidden));
     }
     if (entity.isAbstract()) {
-      modifiers.push(SyntaxFactory.modifier(37 /* Abstract */));
+      modifiers.push(SyntaxFactory.modifier(35 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
     return SyntaxFactory.typeDestructorDeclaration(tags, modifiers, parameters, void 0);
@@ -11496,10 +11726,10 @@ var EntityToSyntax = class {
   convertTypeIndexer(entity) {
     const commonModifiers = new Array();
     if (entity.isStatic()) {
-      commonModifiers.push(SyntaxFactory.modifier(43 /* Static */));
+      commonModifiers.push(SyntaxFactory.modifier(39 /* Static */));
     }
     if (entity.isAbstract()) {
-      commonModifiers.push(SyntaxFactory.modifier(37 /* Abstract */));
+      commonModifiers.push(SyntaxFactory.modifier(35 /* Abstract */));
     }
     const parameters = this.convertValueParameters(entity.getValueParameters());
     const result = new Array();
@@ -11616,16 +11846,16 @@ var EntityToSyntax = class {
     let levelKeyword;
     switch (hiding.kind) {
       case "type":
-        levelKeyword = 54 /* InType */;
+        levelKeyword = 50 /* InType */;
         break;
       case "type-hierarchy":
-        levelKeyword = 51 /* InHierarchy */;
+        levelKeyword = 47 /* InHierarchy */;
         break;
       case "file":
-        levelKeyword = 52 /* InFile */;
+        levelKeyword = 48 /* InFile */;
         break;
       case "package":
-        levelKeyword = 53 /* InPackage */;
+        levelKeyword = 49 /* InPackage */;
         break;
       default:
         Debug.never(hiding);
@@ -11811,7 +12041,7 @@ var SourceGenerationService = class extends ObservableObject7 {
       if (result === void 0) {
         const node = new EntityToSyntax(analyzer, packageEntity, localizationContext).convert();
         const code = new SyntaxToCode(node, { keywordsLocale: packageLocale }).convert();
-        const generatedPackageUri = new Uri(GeneratedSourceFileScheme, [key]);
+        const generatedPackageUri = new Uri(GeneratedSourceFileScheme, "", [key]);
         const generatedFileUri = generatedPackageUri.append(`${packageEntity.getName().toString()}.art`);
         const fileSystemTree = atomicRun2(() => new FileSystemTree());
         const packageDirectory = fileSystemTree.addDirectory(generatedPackageUri);
@@ -11908,14 +12138,13 @@ var SourceGenerationService = class extends ObservableObject7 {
       case 8 /* DereferenceOperator */:
       case 9 /* Constructor */:
       case 10 /* Destructor */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
+      case 15 /* Operator */:
         return this.checkIfEntityOfKindIsPresentInGeneratedCode(entity.getContainer().getEntity());
       case 13 /* PackageAlias */:
         return false;
-      case 17 /* Package */:
+      case 16 /* Package */:
         return false;
-      case 18 /* TypeExtension */:
+      case 17 /* TypeExtension */:
         return true;
       default:
         Debug.never(entity);
@@ -11974,6 +12203,8 @@ var EntityFinder = class {
         return this.findConstructorEntity(entity);
       case 10 /* Destructor */:
         return this.findDestructorEntity(entity);
+      case 15 /* Operator */:
+        return this.findOperatorEntity(entity);
       case 7 /* Indexer */:
         return this.findIndexerEntity(entity);
       case 8 /* DereferenceOperator */:
@@ -11985,10 +12216,8 @@ var EntityFinder = class {
       case 13 /* PackageAlias */:
       case 3 /* Getter */:
       case 4 /* Setter */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
-      case 17 /* Package */:
-      case 18 /* TypeExtension */:
+      case 16 /* Package */:
+      case 17 /* TypeExtension */:
         return void 0;
       default:
         Debug.never(entity);
@@ -12092,6 +12321,23 @@ var EntityFinder = class {
       return index >= 0 ? members[index] : void 0;
     }
   }
+  findOperatorEntity(entity) {
+    const containingType = this.findEntity(entity.getContainer().getEntity());
+    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
+      return void 0;
+    }
+    const members = containingType.getMembers().getOperators();
+    if (members.length === 0) {
+      return void 0;
+    } else if (members.length === 1) {
+      return members[0];
+    } else {
+      const referenceData = new DataForFindingOverloadedMember([], entity.getValueParameters());
+      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getValueParameters()));
+      const index = this.findOverloadedMemberIndex(referenceData, membersData);
+      return index >= 0 ? members[index] : void 0;
+    }
+  }
   findIndexerEntity(entity) {
     const containingType = this.findEntity(entity.getContainer().getEntity());
     if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
@@ -12154,6 +12400,8 @@ var EntityFinder = class {
         return entity.getValueParameters();
       case 11 /* MethodType */:
         return entity.getValueParameters();
+      case 15 /* Operator */:
+        return entity.getValueParameters();
       case 0 /* Variable */:
       case 1 /* Variant */:
       case 2 /* VariantType */:
@@ -12163,10 +12411,8 @@ var EntityFinder = class {
       case 12 /* StructuredType */:
       case 13 /* PackageAlias */:
       case 14 /* AliasType */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
-      case 17 /* Package */:
-      case 18 /* TypeExtension */:
+      case 16 /* Package */:
+      case 17 /* TypeExtension */:
       case 8 /* DereferenceOperator */:
         return void 0;
       default:
@@ -12195,10 +12441,9 @@ var EntityFinder = class {
       case 4 /* Setter */:
       case 6 /* TypeParameter */:
       case 13 /* PackageAlias */:
-      case 15 /* UnaryOperator */:
-      case 16 /* BinaryOperator */:
-      case 17 /* Package */:
-      case 18 /* TypeExtension */:
+      case 16 /* Package */:
+      case 17 /* TypeExtension */:
+      case 15 /* Operator */:
         return void 0;
       default:
         Debug.never(entity);
@@ -12882,7 +13127,7 @@ var LanguageServer = class {
       const sourceFileContext = yield this.getSourceFileContext(uri, token);
       if (sourceFileContext !== void 0) {
         const node = NodePath.parse(uri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
-        if (node?.kind === 94 /* AssignmentStatement */) {
+        if (node?.kind === 93 /* AssignmentStatement */) {
           const sourceFileEdit = this._addPropertyAssignmentService.createEditWithAssignment(
             sourceFileContext.sourceFile,
             node,
@@ -12919,7 +13164,7 @@ var LanguageServer = class {
         const node = NodePath.parse(uri.fragment).getNode(sourceFileContext.sourceFile.getSyntaxNode());
         if (node !== void 0) {
           let nodeForRange = node;
-          if (node.kind === 94 /* AssignmentStatement */) {
+          if (node.kind === 93 /* AssignmentStatement */) {
             nodeForRange = node.right;
           }
           result = this.convertSourceFileRange(sourceFileContext.sourceFile, nodeForRange.rangeWithoutTrivia);
@@ -13066,7 +13311,7 @@ ${e}`);
         const position = new Position(params.position.line, params.position.character);
         const offset = sourceFile.getOffsetAtPosition(position);
         const completions = this._completionService.getCompletions(analyzer, sourceFile, offset);
-        result = completions.map((c) => this.convertCompletionItem(c));
+        result = completions.map((c) => this.convertCompletionItem(c, sourceFile));
       }
       return result;
     });
@@ -13079,22 +13324,31 @@ ${e}`);
     const resolutionResult = this._completionService.resolveCompletionItem(cacheId, indexInCache);
     let result;
     if (resolutionResult.kind === "item") {
-      result = this.convertCompletionItem(resolutionResult.value);
+      result = this.convertCompletionItem(resolutionResult.value, resolutionResult.sourceFile);
+      result.textEdit = item.textEdit;
     } else {
       result = item;
     }
     return result;
   }
-  convertCompletionItem(item) {
+  convertCompletionItem(item, sourceFile) {
     const data = {
       cacheId: item.cacheId,
       indexInCache: item.indexInCache
     };
+    let textEdit;
+    if (item.editRange !== void 0) {
+      textEdit = ls3.TextEdit.replace(
+        this.convertSourceFileRange(sourceFile, item.editRange),
+        item.insertText ?? item.label
+      );
+    }
     return {
       label: item.label,
       kind: this.convertCompletionItemKind(item.kind),
       detail: item.details,
       insertText: item.insertText,
+      textEdit,
       sortText: item.sortText,
       data
     };
@@ -13109,42 +13363,46 @@ ${e}`);
         return ls3.CompletionItemKind.Property;
       case 3 /* TypeMethod */:
         return ls3.CompletionItemKind.Method;
-      case 4 /* TypeIndexer */:
+      case 5 /* TypeIndexer */:
         return ls3.CompletionItemKind.Property;
-      case 5 /* TypeConstructor */:
+      case 6 /* TypeConstructor */:
         return ls3.CompletionItemKind.Constructor;
-      case 11 /* Variant */:
+      case 12 /* Variant */:
         return ls3.CompletionItemKind.EnumMember;
-      case 6 /* PackageVariable */:
+      case 7 /* PackageVariable */:
         return ls3.CompletionItemKind.Variable;
-      case 7 /* PackageMethod */:
+      case 8 /* PackageMethod */:
         return ls3.CompletionItemKind.Function;
-      case 8 /* LocalVariable */:
+      case 9 /* LocalVariable */:
         return ls3.CompletionItemKind.Variable;
-      case 9 /* ParameterVariable */:
+      case 10 /* ParameterVariable */:
         return ls3.CompletionItemKind.Variable;
-      case 10 /* NestedMethod */:
+      case 11 /* NestedMethod */:
         return ls3.CompletionItemKind.Function;
-      case 12 /* RefObjectType */:
+      case 13 /* RefObjectType */:
         return ls3.CompletionItemKind.Class;
-      case 13 /* PlainObjectType */:
+      case 14 /* PlainObjectType */:
         return ls3.CompletionItemKind.Struct;
-      case 14 /* AspectType */:
+      case 15 /* AspectType */:
         return ls3.CompletionItemKind.Interface;
-      case 15 /* VariantType */:
+      case 16 /* VariantType */:
         return ls3.CompletionItemKind.Enum;
-      case 16 /* TypeParameter */:
+      case 17 /* TypeParameter */:
         return ls3.CompletionItemKind.TypeParameter;
-      case 17 /* MethodType */:
+      case 18 /* MethodType */:
         return ls3.CompletionItemKind.Function;
-      case 18 /* AliasType */:
+      case 19 /* AliasType */:
         return ls3.CompletionItemKind.Class;
-      case 19 /* InvalidType */:
+      case 20 /* InvalidType */:
         return ls3.CompletionItemKind.Class;
-      case 20 /* Keyword */:
+      case 21 /* Keyword */:
         return ls3.CompletionItemKind.Keyword;
-      case 21 /* TargetSignatureParameter */:
+      case 22 /* TargetSignatureParameter */:
         return ls3.CompletionItemKind.Variable;
+      case 4 /* Operator */:
+        return ls3.CompletionItemKind.Operator;
+      case 23 /* OperatorName */:
+        return ls3.CompletionItemKind.Operator;
       default:
         Debug.never(kind);
     }
@@ -13231,6 +13489,8 @@ ${e}`);
         return ls3.SemanticTokenTypes.function;
       case 6 /* TypeMethod */:
         return ls3.SemanticTokenTypes.method;
+      case 7 /* Operator */:
+        return ls3.SemanticTokenTypes.operator;
       default:
         Debug.never(kind);
     }
@@ -13424,22 +13684,10 @@ ${e}`);
     });
   }
   convertUriToVscodeUri(uri) {
-    return URI2.from({ scheme: uri.scheme, path: `/${uri.segments.join("/")}` });
+    return URI2.from({ scheme: uri.scheme, authority: uri.authority, path: uri.path });
   }
   convertVscodeUriToUri(uri) {
-    uri = Utils.resolvePath(uri);
-    const scheme = uri.scheme;
-    let path = uri.path;
-    if (path.startsWith("/")) {
-      path = path.slice(1);
-    }
-    let segments;
-    if (path === "") {
-      segments = [];
-    } else {
-      segments = path.split("/");
-    }
-    return new Uri(scheme, segments);
+    return Uri.from(uri.scheme, uri.authority, uri.path);
   }
   createCancellationToken(cancellationToken) {
     if (!this._enableRequestCancellation) {