@artel/artc 0.6.26016 → 0.6.26017

package/build/api/ApiServices.js

@@ -55,7 +55,7 @@ import {
   IntersectionTypeSpecifier,
   JavaScriptInterfacePackageImplementationConfig,
   JsonConfigurationFileNameSet,
-  Keyword,
+  Keyword2 as Keyword,
   KeywordExpression,
   LocaleByConfigurationDirectoryName,
   LocaleByJsonConfigurationFileName,
@@ -76,8 +76,6 @@ import {
   NodePath,
   NodeTypeUtils,
   NullableTypeSpecifier,
-  OperatorDeclaration,
-  OperatorDeclaration_typeMember,
   Option,
   PackageAliasTypeDeclaration,
   PackageAspectDeclaration,
@@ -186,7 +184,7 @@ import {
   unwrapParenthesizedExpressions,
   visitChildren,
   yieldTask
-} from "../chunk-46EEXYHP.js";
+} from "../chunk-SJFIPH42.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -541,25 +539,6 @@ var SyntaxFactory = class {
       void 0
     );
   }
-  static operatorDeclaration(tags, modifiers, name, parameters, returnTypeSpecifier, body, operatorKind) {
-    const tagList = tags instanceof Array ? new TagList(tags, void 0) : tags;
-    const modifierList = modifiers instanceof Array ? new ModifierList(modifiers, void 0) : modifiers;
-    const functionKeyword = this.keyword(16 /* Function */);
-    const nameIdentifier = this.identifier(name);
-    const parameterClause = this.parameterClause(parameters);
-    const returnTypeAnnotation = this.createTypeAnnotation(returnTypeSpecifier);
-    return new OperatorDeclaration(
-      tagList,
-      modifierList,
-      functionKeyword,
-      nameIdentifier,
-      parameterClause,
-      returnTypeAnnotation,
-      body,
-      operatorKind,
-      void 0
-    );
-  }
   static constructorDeclaration(tags, modifiers, parameters, body) {
     const tagList = tags instanceof Array ? new TagList(tags, void 0) : tags;
     const modifierList = modifiers instanceof Array ? new ModifierList(modifiers, void 0) : modifiers;
@@ -1053,16 +1032,6 @@ var SyntaxFactory = class {
           node.returnTypeAnnotation?.typeSpecifier,
           node.block
         );
-      case 48 /* OperatorDeclaration */:
-        return this.operatorDeclaration(
-          node.tagList,
-          modifierList,
-          node.name,
-          node.parameterClause.parameterList,
-          node.returnTypeAnnotation?.typeSpecifier,
-          node.block,
-          node.operatorKind
-        );
       case 49 /* FieldDeclaration */:
         return this.fieldDeclaration(
           node.tagList,
@@ -1465,20 +1434,6 @@ var SyntaxToCode = class _SyntaxToCode {
       this.writeDeclarationBody(node.block);
     }
   }
-  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.block !== void 0) {
-      this.writeDeclarationBody(node.block);
-    }
-  }
   writeConstructorDeclaration(node) {
     this.writeDeclarationTags(node.tagList);
     this.writeDeclarationModifiers(node.modifierList);
@@ -2071,7 +2026,6 @@ var SyntaxToCode = class _SyntaxToCode {
       case 43 /* IndexedElementSetterDeclaration */:
       case 46 /* DereferencedVariableSetterDeclaration */:
       case 47 /* MethodDeclaration */:
-      case 48 /* OperatorDeclaration */:
       case 22 /* PackageEntryPointDeclaration */:
         return 3155970 /* SingularFemNoun */;
       case 19 /* PackageAliasTypeDeclaration */:
@@ -2198,7 +2152,6 @@ var SyntaxToCode = class _SyntaxToCode {
       [45 /* DereferencedVariableGetterDeclaration */]: this.prototype.writeDereferencedVariableGetterDeclaration,
       [46 /* DereferencedVariableSetterDeclaration */]: this.prototype.writeDereferencedVariableSetterDeclaration,
       [47 /* MethodDeclaration */]: this.prototype.writeMethodDeclaration,
-      [48 /* OperatorDeclaration */]: this.prototype.writeOperatorDeclaration,
       [49 /* FieldDeclaration */]: this.prototype.writeFieldDeclaration,
       [50 /* FieldGetterDeclaration */]: this.prototype.writeFieldGetterDeclaration,
       [51 /* FieldSetterDeclaration */]: this.prototype.writeFieldSetterDeclaration,
@@ -2862,8 +2815,6 @@ var TranslationsGenerator = class _TranslationsGenerator {
         return this.createConstructorTranslation(entity);
       case 5 /* Indexer */:
         return this.createIndexerTranslation(entity);
-      case 9 /* Operator */:
-        return this.createOperatorTranslation(entity);
       case 6 /* DereferenceOperator */:
       case 8 /* Destructor */:
         return void 0;
@@ -2876,7 +2827,13 @@ var TranslationsGenerator = class _TranslationsGenerator {
     return SyntaxFactory.fieldOrVariantTranslation(name, name);
   }
   createMethodTranslation(entity) {
-    const name = this.getNameText(entity.getName());
+    let name;
+    const operatorKind = entity.getOperatorKind();
+    if (operatorKind === void 0) {
+      name = this.getNameText(entity.getName());
+    } else {
+      name = `'${LocalizationHelper.localizeOperatorKind(operatorKind, this.locale, this.dialect)}'`;
+    }
     const typeParameters = entity.getTypeParameters().map((p) => this.getNameText(p.getName()));
     const parameters = this.createParameters(entity.getParameters());
     return SyntaxFactory.methodTranslation(name, typeParameters, parameters, name, typeParameters, parameters);
@@ -2889,17 +2846,11 @@ var TranslationsGenerator = class _TranslationsGenerator {
     const parameters = this.createParameters(entity.getParameters());
     return SyntaxFactory.indexerTranslation(parameters, parameters);
   }
-  createOperatorTranslation(entity) {
-    const name = `'${LocalizationHelper.localizeOperatorKind(entity.getOperatorKind(), this.locale, this.dialect)}'`;
-    const parameters = this.createParameters(entity.getParameters());
-    return SyntaxFactory.methodTranslation(name, [], parameters, name, [], parameters);
-  }
   createParameters(parameters) {
     return parameters.map((p) => {
-      const name = p.getName();
       const nameText = this.getNameText(p.getName());
       let flags = 0 /* None */;
-      if ((name.flags & 64 /* ObjectParameterName */) !== 0) {
+      if (p.isObjectParameter()) {
         flags |= 2048 /* ObjectParameterName */;
       }
       return SyntaxFactory.identifier(nameText, flags);
@@ -3119,15 +3070,6 @@ var SignatureForNode = class _SignatureForNode {
         });
         return new SignaturesWithSingleSuitable(signatures, suitableSignatureIndex);
       }
-      case "operator-call": {
-        let suitableSignatureIndex;
-        const singleOperator = meaning.singleOperator;
-        if (singleOperator !== void 0) {
-          suitableSignatureIndex = meaning.candidates.findIndex((c) => c.equals(singleOperator));
-        }
-        const signatures = meaning.candidates.map((c) => new OperatorSignature(c));
-        return new SignaturesWithSingleSuitable(signatures, suitableSignatureIndex);
-      }
       case "object-function-call": {
         const signature = new FunctionTypeSignature(meaning.type);
         return new SignaturesWithSingleSuitable([signature], 0);
@@ -3353,16 +3295,6 @@ var AccessedFunctionSignature = class {
     return this.parameters.getOrInsertWith(() => this.func.getParameters().map((p) => new UniversalParameter(p.type, p.entity)));
   }
 };
-var OperatorSignature = class {
-  constructor(operator) {
-    this.kind = "operator";
-    this.parameters = new Cached();
-    this.operator = operator;
-  }
-  getParameters() {
-    return this.parameters.getOrInsertWith(() => this.operator.getParameters().map((p) => new UniversalParameter(p.getType(), p.getEntity())));
-  }
-};
 var FunctionTypeSignature = class {
   constructor(functionType) {
     this.kind = "function-type";
@@ -3501,7 +3433,7 @@ var CompletionService = class {
     if (syntaxContext.isInComment || syntaxContext.isInText) {
       return { kind: "none" };
     }
-    if (syntaxContext.isInQuotedIdentifier !== void 0 && (syntaxContext.isInQuotedIdentifier.parent.kind === 48 /* OperatorDeclaration */ || syntaxContext.isInQuotedIdentifier.parent.kind === 47 /* MethodDeclaration */)) {
+    if (syntaxContext.isInQuotedIdentifier !== void 0 && syntaxContext.isInQuotedIdentifier.parent.kind === 47 /* MethodDeclaration */) {
       return new OperatorNameCompletionContext(syntaxContext.isInQuotedIdentifier);
     }
     const tokenOrKeyword = positionDescription.tokenOrKeyword;
@@ -3910,14 +3842,16 @@ var CompletionService = class {
     if (syntaxContext.isExpressionContext !== void 0) {
       kinds.add(47 /* Not */).add(56 /* Yes */).add(57 /* No */).add(61 /* Null */).add(44 /* Async */).add(16 /* Function */).add(58 /* Reference */).add(2 /* Autotype */).add(34 /* Cond */).add(35 /* Creation */);
       const objectVariableInfo = semanticContext.getObjectVariableInfo();
-      if (objectVariableInfo !== void 0) {
+      if (objectVariableInfo !== void 0 && !(objectVariableInfo.kind === "containing-type-context" && semanticContext.isStatic())) {
         kinds.add(7 /* Object */);
       }
-      const container = semanticContext.getContainingTypeOrTypeExtension();
-      if (container !== void 0 && container.kind === "type") {
-        const typeEntity = container.value;
-        if (typeEntity?.typeEntityKind === 1 /* Structured */ && typeEntity.getBaseObjectType() !== void 0 || typeEntity?.typeEntityKind === 3 /* Variant */ || typeEntity?.typeEntityKind === 4 /* Alias */) {
-          kinds.add(60 /* Base */);
+      if (!semanticContext.isStatic()) {
+        const container = semanticContext.getContainingTypeOrTypeExtension();
+        if (container !== void 0 && container.kind === "type") {
+          const typeEntity = container.value;
+          if (typeEntity?.typeEntityKind === 1 /* Structured */ && typeEntity.getBaseObjectType() !== void 0 || typeEntity?.typeEntityKind === 3 /* Variant */ || typeEntity?.typeEntityKind === 4 /* Alias */) {
+            kinds.add(60 /* Base */);
+          }
         }
       }
     }
@@ -4080,12 +4014,13 @@ var CompletionService = class {
   }
   getScopeCompletionItemInfos(semanticContext) {
     return Query.from(semanticContext.getNamedDeclarations()).mapAndFilter((d) => {
-      if ((d.getName().flags & 64 /* ObjectParameterName */) !== 0) {
-        return void 0;
-      }
       switch (d.kind) {
         case "variable": {
           if (d.value.kind === "entity") {
+            const entity = d.value.value;
+            if (entity.subkind === "parameter" && entity.isObjectParameter()) {
+              return void 0;
+            }
             return new VariableEntityCompletionItemInfo(this.completionItemInfoContext, d.value.value);
           } else {
             return new FieldCompletionItemInfo(this.completionItemInfoContext, d.value.value);
@@ -4108,9 +4043,7 @@ var CompletionService = class {
         default:
           Debug.never(d);
       }
-    }).chain(
-      Query.from(semanticContext.getOperators()).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o))
-    );
+    });
   }
   getTypeCompletionItemInfos(ctx) {
     let result;
@@ -4271,7 +4204,7 @@ var CompletionService = class {
         default:
           Debug.never(m);
       }
-    }).concat(memberLookup.getOperators(ctx.lookupContext, ctx.lookupOptions).map((o) => new OperatorCompletionItemInfo(this.completionItemInfoContext, o)));
+    });
   }
   getPackageImportCompletionItemInfos(ctx) {
     const result = this.analyzer.packageImports.getPackagesAvailableForImport(this.sourceFile.package).map((p) => p.getName()).filter((n) => {
@@ -4420,8 +4353,7 @@ var CompletionService = class {
     for (const itemInfo of completionItemInfos) {
       switch (itemInfo.kind) {
         case "method":
-        case "function-entity":
-        case "operator": {
+        case "function-entity": {
           const label = itemInfo.getLabel();
           const functionInfo = functionInfoByLabel.get(label);
           if (functionInfo !== void 0) {
@@ -4775,10 +4707,17 @@ var MethodCompletionItemInfo = class {
     this.kind = "method";
   }
   getLabel() {
-    return this.ctx.getInsertTextForName(this.method.getName());
+    let result;
+    const operatorKind = this.method.getOperatorKind();
+    if (operatorKind === void 0) {
+      result = this.ctx.getInsertTextForName(this.method.getName());
+    } else {
+      result = `'${this.ctx.displayService.displayOperatorKind(operatorKind)}'`;
+    }
+    return result;
   }
   getCompletionItemKind() {
-    return 3 /* Method */;
+    return this.method.getOperatorKind() === void 0 ? 3 /* Method */ : 4 /* Operator */;
   }
   getDetails() {
     return this.ctx.displayService.displayTypeMember(this.method);
@@ -4793,31 +4732,6 @@ var MethodCompletionItemInfo = class {
     return void 0;
   }
 };
-var OperatorCompletionItemInfo = class {
-  constructor(ctx, operator) {
-    this.ctx = ctx;
-    this.operator = operator;
-    this.kind = "operator";
-  }
-  getLabel() {
-    return `'${this.ctx.displayService.displayOperatorKind(this.operator.getOperatorKind())}'`;
-  }
-  getCompletionItemKind() {
-    return 4 /* Operator */;
-  }
-  getDetails() {
-    return this.ctx.displayService.displayTypeMember(this.operator);
-  }
-  getInsertText() {
-    return void 0;
-  }
-  getSortText() {
-    return void 0;
-  }
-  getEditRange() {
-    return void 0;
-  }
-};
 var VariableEntityCompletionItemInfo = class {
   constructor(ctx, entity) {
     this.ctx = ctx;
@@ -4861,14 +4775,21 @@ var FunctionEntityCompletionItemInfo = class {
     this.kind = "function-entity";
   }
   getLabel() {
-    return this.ctx.getInsertTextForName(this.entity.getName());
+    let result;
+    const operatorKind = this.entity.subkind === "method" ? this.entity.getOperatorKind() : void 0;
+    if (operatorKind === void 0) {
+      result = this.ctx.getInsertTextForName(this.entity.getName());
+    } else {
+      result = `'${this.ctx.displayService.displayOperatorKind(operatorKind)}'`;
+    }
+    return result;
   }
   getCompletionItemKind() {
     switch (this.entity.subkind) {
       case "package":
         return 8 /* PackageFunction */;
       case "method":
-        return 3 /* Method */;
+        return this.entity.subkind === "method" && this.entity.getOperatorKind() !== void 0 ? 4 /* Operator */ : 3 /* Method */;
       case "nested":
         return 11 /* NestedFunction */;
       default:
@@ -5614,7 +5535,7 @@ var SyntaxContextFactory = class {
     ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(
       tokenOrKeyword,
       46 /* DereferencedVariableSetterDeclaration */
-    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 47 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 48 /* OperatorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 40 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 41 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 145 /* VariantValueDeclaration */)) {
+    ) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 47 /* MethodDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 40 /* ConstructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 41 /* DestructorDeclaration */) || SyntaxContextUtils.tokenOrKeywordIsValidEndOfNode(tokenOrKeyword, 145 /* VariantValueDeclaration */)) {
       return true;
     }
     if (tokenOrKeyword.isKeyword() && tokenOrKeyword.parent.kind === 152 /* Modifier */ && tokenOrKeyword.value === tokenOrKeyword.parent.value && tokenOrKeyword.parent.openParenthesisToken === void 0 && NodeTypeUtils.isTypeMemberDeclaration(tokenOrKeyword.parent.parent.parent)) {
@@ -6055,9 +5976,6 @@ var NodeSemanticInfoService = class {
       case 47 /* MethodDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofMethodDeclaration(parent));
         break;
-      case 48 /* OperatorDeclaration */:
-        result = new DefinitionNodeSemanticInfo(analyzer.entity.ofOperatorDeclaration(parent));
-        break;
       case 49 /* FieldDeclaration */:
         result = new DefinitionNodeSemanticInfo(analyzer.entity.ofFieldDeclaration(parent));
         break;
@@ -6145,14 +6063,6 @@ var NodeSemanticInfoService = class {
         }
         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-function-access": {
         let functions;
         if (meaning.singleNotSuitableSubstitutedCandidate !== void 0) {
@@ -6215,10 +6125,6 @@ var NodeSemanticInfoService = class {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
-    function createOperatorsReference(operators, isAmbiguous) {
-      const targets = operators.map((o) => new OperatorReferenceTarget(o));
-      return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
-    }
   }
   static ofQualifiedNameQualifier(analyzer, node, qualifier, options7) {
     switch (node.parent.kind) {
@@ -6415,14 +6321,6 @@ var NodeSemanticInfoService = class {
         }
         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": {
         let narrowedType;
         if (isNarrowableReferenceExpression(node)) {
@@ -6480,10 +6378,6 @@ var NodeSemanticInfoService = class {
       result = this.getBetterReferenceTargetsOrPreserve(result);
     }
     return result;
-    function createOperatorsReference(operators, isAmbiguous) {
-      const targets = operators.map((o) => new OperatorReferenceTarget(o));
-      return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), isAmbiguous);
-    }
   }
   static ofConstructorDeclaration(analyzer, node) {
     const entity = analyzer.entity.ofConstructorDeclaration(node);
@@ -6522,7 +6416,7 @@ var NodeSemanticInfoService = class {
     if (operatorKind !== void 0) {
       const operator = analyzer.resolveCompoundAssignmentStatementOperator(node, operatorKind);
       if (operator !== void 0) {
-        const target = new OperatorReferenceTarget(operator);
+        const target = new AccessedFunctionReferenceTarget(new AccessedFunction_typeMember(operator));
         let result = new ReferenceNodeSemanticInfo([target], false);
         if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6537,7 +6431,7 @@ var NodeSemanticInfoService = class {
     if (classificationResult.kind === "user-definable") {
       const operator = analyzer.resolveBinaryExpressionUserDefinableOperator(node, classificationResult.operatorKind);
       if (operator !== void 0) {
-        const target = new OperatorReferenceTarget(operator);
+        const target = new AccessedFunctionReferenceTarget(new AccessedFunction_typeMember(operator));
         let result = new ReferenceNodeSemanticInfo([target], false);
         if (options7.includeBetterReferenceTargets) {
           result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6550,7 +6444,7 @@ var NodeSemanticInfoService = class {
   static ofPrefixUnaryExpressionOperator(analyzer, node, options7) {
     const operator = analyzer.resolvePrefixUnaryExpressionUserDefinableOperator(node);
     if (operator !== void 0) {
-      const target = new OperatorReferenceTarget(operator);
+      const target = new AccessedFunctionReferenceTarget(new AccessedFunction_typeMember(operator));
       let result = new ReferenceNodeSemanticInfo([target], false);
       if (options7.includeBetterReferenceTargets) {
         result = this.getBetterReferenceTargetsOrPreserve(result);
@@ -6663,11 +6557,6 @@ var NodeSemanticInfoService = class {
       case "overridden-method-access": {
         return this.ofAccessedFunctions([meaning.method]);
       }
-      case "overridden-operator-access": {
-        const target = new OperatorReferenceTarget(meaning.operator);
-        result = new ReferenceNodeSemanticInfo([target], false);
-        break;
-      }
       case "unresolved":
         break;
       default:
@@ -7024,12 +6913,6 @@ var AccessedFunctionReferenceTarget = class {
     this.kind = "accessed-function";
   }
 };
-var OperatorReferenceTarget = class {
-  constructor(operator) {
-    this.operator = operator;
-    this.kind = "operator";
-  }
-};
 var MatchResultParameterReferenceTarget = class {
   constructor(parameter, accessKind) {
     this.parameter = parameter;
@@ -7134,7 +7017,6 @@ function getEntitySourceLocations(analyzer, entity) {
         case 53 /* NestedFunctionDeclaration */:
         case 47 /* MethodDeclaration */:
         case 146 /* TypeParameterDeclaration */:
-        case 48 /* OperatorDeclaration */:
         case 27 /* PackageClassDeclaration */:
         case 28 /* PackageStructureDeclaration */:
         case 29 /* PackageAspectDeclaration */:
@@ -7361,8 +7243,6 @@ var DefinitionService = class {
         return getEntitySourceLocations(analyzer, target.constructor_.getEntity());
       case "accessed-function":
         return getEntitySourceLocations(analyzer, target.func.getEntity());
-      case "operator":
-        return getEntitySourceLocations(analyzer, target.operator.getEntity());
       case "type-dereference-operator":
         return getEntitySourceLocations(analyzer, target.operator.getEntity());
       case "match-result-value-parameter":
@@ -7399,8 +7279,6 @@ var DefinitionService = class {
         return target.parameter.getEntity();
       case "type-constructor":
         return target.constructor_.getEntity();
-      case "operator":
-        return target.operator.getEntity();
       case "type-dereference-operator":
         return target.operator.getEntity();
       case "accessed-function":
@@ -7475,9 +7353,6 @@ var DefinitionService = class {
       case 46 /* DereferencedVariableSetterDeclaration */:
         range = node.caretToken.rangeWithoutTrivia;
         break;
-      case 48 /* OperatorDeclaration */:
-        range = node.name.rangeWithoutTrivia;
-        break;
       case 63 /* FunctionBlockLiteral */:
         range = node.block.openBraceToken.rangeWithoutTrivia;
         break;
@@ -7519,7 +7394,6 @@ var DefinitionService = class {
           result.push(target.type);
           break;
         case "type-constructor":
-        case "operator":
         case "type-dereference-operator":
         case "accessed-function":
         case "type-indexer":
@@ -7955,8 +7829,6 @@ var ReferencesService = class {
             return new DefinitionInfo(t.parameter.getEntity(), accessKindToReferenceKind(t.accessKind));
           case "type-constructor":
             return new DefinitionInfo(t.constructor_.getEntity(), 0 /* Read */);
-          case "operator":
-            return new DefinitionInfo(t.operator.getEntity(), 0 /* Read */);
           case "type-dereference-operator":
             return new DefinitionInfo(t.operator.getEntity(), accessKindToReferenceKind(t.accessKind));
           case "accessed-function":
@@ -8003,15 +7875,6 @@ var ReferencesService = class {
       result.canBeAutotypeCall = true;
       result.canBeConstructorDeclaration = true;
     }
-    if (definition.value.kind === 9 /* Operator */) {
-      const operatorKind = definition.value.getOperatorKind();
-      if (isUnaryOperator(operatorKind)) {
-        result.canBePrefixUnaryOperator = true;
-      } else {
-        result.canBeBinaryExpressionOperator = true;
-        result.canBeAssignmentStatementOperator = true;
-      }
-    }
     if (definition.value.kind === 6 /* DereferenceOperator */) {
       result.canBeDereferenceOperator = true;
     }
@@ -8027,6 +7890,17 @@ var ReferencesService = class {
     if (definition.value.kind === 0 /* Variable */ && definition.value.subkind === "parameter" && definition.value.isObjectParameter()) {
       result.canBeObjectParameter = true;
     }
+    if (definition.value.kind === 1 /* Function */ && definition.value.subkind === "method") {
+      const operatorKind = definition.value.getOperatorKind();
+      if (operatorKind !== void 0) {
+        if (isUnaryOperator(operatorKind)) {
+          result.canBePrefixUnaryOperator = true;
+        } else {
+          result.canBeBinaryExpressionOperator = true;
+          result.canBeAssignmentStatementOperator = true;
+        }
+      }
+    }
     return result;
   }
   ifReferenceToSomeOfDefinitionsThenKind(definitions, potentialReferenceSemanticInfo, allowAmbiguous, isForRename) {
@@ -8140,7 +8014,6 @@ var ReferencesService = class {
       case 6 /* DereferenceOperator */:
       case 12 /* Package */:
       case 11 /* TypeExtension */:
-      case 9 /* Operator */:
       case 13 /* TextTranslation */:
         return void 0;
       default:
@@ -8333,7 +8206,6 @@ var EvaluatableExpressionService = class {
       case 34 /* PackageVariableSetterDeclaration */:
       case 50 /* FieldGetterDeclaration */:
       case 51 /* FieldSetterDeclaration */:
-      case 48 /* OperatorDeclaration */:
       case 144 /* TranslationTextTemplateParameter */:
       case 27 /* PackageClassDeclaration */:
       case 28 /* PackageStructureDeclaration */:
@@ -8471,10 +8343,6 @@ var HoverService = class {
         const declaration = new ConstructorDeclaration_typeMember(firstTarget.constructor_);
         return new Hover(this.displayService.displayConstructorDeclaration(declaration), range);
       }
-      case "operator": {
-        const operator = new OperatorDeclaration_typeMember(firstTarget.operator);
-        return new Hover(this.displayService.displayOperatorDeclaration(operator), range);
-      }
       case "type-dereference-operator": {
         const operator = new DereferenceOperatorDeclaration_typeMember(firstTarget.operator);
         return new Hover(this.displayService.displayDereferenceOperatorDeclaration(operator), range);
@@ -8637,9 +8505,6 @@ var RenameService = class {
           case "match-result-value-parameter":
             canBeRenamed = this.entityCanBeRenamed(analyzer, target.parameter.entity);
             break;
-          case "operator":
-            canBeRenamed = this.entityCanBeRenamed(analyzer, target.operator.getEntity());
-            break;
           case "type-constructor":
           case "type-dereference-operator":
           case "package":
@@ -8965,13 +8830,6 @@ var SemanticTokensService = class {
                 )
               );
             }
-            if (meaning.kind === "operator-access") {
-              result.push(new SemanticToken(
-                node.rangeWithoutTrivia,
-                7 /* Operator */,
-                new SemanticTokenModifiers()
-              ));
-            }
           }
           if (node.kind === 73 /* MemberAccessExpression */) {
             const meaning = analyzer.resolveMemberAccessExpression(node);
@@ -9009,13 +8867,6 @@ var SemanticTokensService = class {
                 )
               );
             }
-            if (meaning.kind === "operator-access") {
-              result.push(new SemanticToken(
-                node.memberName.rangeWithoutTrivia,
-                7 /* Operator */,
-                new SemanticTokenModifiers()
-              ));
-            }
           }
           if (node.kind === 145 /* VariantValueDeclaration */) {
             result.push(
@@ -9045,13 +8896,10 @@ var SemanticTokensService = class {
             );
           }
           if (node.kind === 47 /* MethodDeclaration */) {
+            const entity = analyzer.entity.ofMethodDeclaration(node);
+            const kind = this.getSemanticTokenKindForNamedFunctionEntity(entity);
             result.push(
-              new SemanticToken(node.name.rangeWithoutTrivia, 6 /* Method */, new SemanticTokenModifiers().makeDeclaration().setCapitalized(this.isCapitalizedName(node.name.value)))
-            );
-          }
-          if (node.kind === 48 /* OperatorDeclaration */) {
-            result.push(
-              new SemanticToken(node.name.rangeWithoutTrivia, 7 /* Operator */, new SemanticTokenModifiers().makeDeclaration())
+              new SemanticToken(node.name.rangeWithoutTrivia, kind, new SemanticTokenModifiers().makeDeclaration().setCapitalized(this.isCapitalizedName(node.name.value)))
             );
           }
           return void 0;
@@ -9068,7 +8916,7 @@ var SemanticTokensService = class {
       case "package":
         return 4 /* PackageFunction */;
       case "method":
-        return 6 /* Method */;
+        return entity.getOperatorKind() === void 0 ? 6 /* Method */ : 7 /* Operator */;
       case "nested":
         return 5 /* NestedFunction */;
       default:
@@ -9621,11 +9469,6 @@ var ParametersSignatureHelpProvider = class {
         const displayParts = this.signatureContext.displayService.getFunctionDeclarationDisplayParts(func);
         return this.signatureContext.convertFunctionDisplayParts(displayParts);
       }
-      case "operator": {
-        const operator = new OperatorDeclaration_typeMember(signature.operator);
-        const displayParts = this.signatureContext.displayService.getOperatorDeclarationDisplayParts(operator);
-        return this.signatureContext.convertOperatorDisplayParts(displayParts);
-      }
       case "function-type": {
         const displayParts = this.signatureContext.displayService.getFunctionTypeBodyDisplayParts(signature.functionType);
         return this.signatureContext.convertFunctionTypeBodyDisplayParts(displayParts);
@@ -9716,16 +9559,7 @@ var SignatureInfo = class {
 };
 
 // source/services/source-generation/SourceGenerationService.ts
-import {
-  transaction as transaction6,
-  signal as signal7,
-  RxMap as RxMap6,
-  RxObject as RxObject7,
-  options as options6,
-  reaction as reaction6,
-  Reentrance as Reentrance3,
-  Transaction as Transaction4
-} from "reactronic";
+import { options as options6, reaction as reaction6, Reentrance as Reentrance3, RxMap as RxMap6, RxObject as RxObject7, signal as signal7, transaction as transaction6, Transaction as Transaction4 } from "reactronic";
 
 // source/services/workspace/ClientTrackedSourceFiles.ts
 import { RxMap, RxObject, signal, transaction, disposeRxObject } from "reactronic";
@@ -12962,7 +12796,6 @@ var SourceGenerationService = class extends RxObject7 {
       case 6 /* DereferenceOperator */:
       case 7 /* Constructor */:
       case 8 /* Destructor */:
-      case 9 /* Operator */:
         return this.checkIfEntityOfKindIsPresentInGeneratedCode(entity.getContainingEntity());
       case 10 /* PackageAlias */:
         return false;
@@ -13065,8 +12898,6 @@ var EntityFinder = class {
         return this.findConstructorEntity(entity);
       case 8 /* Destructor */:
         return this.findDestructorEntity(entity);
-      case 9 /* Operator */:
-        return this.findOperatorEntity(entity);
       case 5 /* Indexer */:
         return this.findIndexerEntity(entity);
       case 6 /* DereferenceOperator */:
@@ -13182,23 +13013,6 @@ var EntityFinder = class {
       return index >= 0 ? members[index] : void 0;
     }
   }
-  findOperatorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getOperators();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
-  }
   findIndexerEntity(entity) {
     const containingType = this.findEntity(entity.getContainingEntity());
     if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
@@ -13258,8 +13072,6 @@ var EntityFinder = class {
         }
         return void 0;
       }
-      case 9 /* Operator */:
-        return entity.getParameters();
       case 0 /* Variable */:
       case 3 /* Getter */:
       case 4 /* Setter */:
@@ -13294,7 +13106,6 @@ var EntityFinder = class {
       case 10 /* PackageAlias */:
       case 12 /* Package */:
       case 11 /* TypeExtension */:
-      case 9 /* Operator */:
       case 13 /* TextTranslation */:
         return void 0;
       default: