@artel/artc 0.6.26021 → 0.6.26023

package/build/api/ApiServices.js

@@ -8,9 +8,6 @@ import {
   ConfigurationConverter,
   ConfigurationDirectoryNameSet,
   ConfigurationFileParser,
-  Constructor,
-  ConstructorDeclaration_entity,
-  ConstructorDeclaration_typeMember,
   Debug,
   DefaultDialect,
   DefaultLocale,
@@ -35,6 +32,7 @@ import {
   LocaleByJsonConfigurationFileName,
   LocalizationHelperA,
   Logger,
+  Method,
   Name,
   NamedType_alias,
   NamedType_reduced,
@@ -62,7 +60,8 @@ import {
   TsInteropInputs,
   TsProgramLoader,
   TsProgramState,
-  TypeMemberLookup,
+  TypeMemberEntity,
+  TypeMemberLookupA,
   TypeWithMembersOrExtensionEntity,
   Uri,
   VariableDeclaration_entity,
@@ -110,7 +109,7 @@ import {
   sortModifiers,
   traverseTreeAsync,
   yieldTask
-} from "../chunk-DWHH53A7.js";
+} from "../chunk-RQOGIK5O.js";
 
 // source/services/CustomRequests.ts
 import * as ls from "vscode-languageserver";
@@ -350,26 +349,14 @@ var TranslationsGenerationServiceA = class {
     if (tokenOrKeyword.isToken(9 /* Identifier */) && tokenOrKeyword.parent.kind === 137 /* TypeTranslationDeclaration */ && tokenOrKeyword.value === tokenOrKeyword.parent.sourceName) {
       const translationPackage = analyzer.entity.ofTranslationPackage(sourceFile.package).getResolvedTranslationPackage();
       if (translationPackage !== void 0) {
-        const generator = new TranslationsGenerator(
-          analyzer,
-          sourceFile,
-          translationPackage,
-          sourceFile.locale,
-          sourceFile.dialect
-        );
+        const generator = new TranslationsGenerator(analyzer, sourceFile, translationPackage, sourceFile.locale);
         result = generator.generateMissingTypeMemberTranslations(tokenOrKeyword.parent);
       }
     }
     if (result === void 0 && tokenOrKeyword.isKeyword(59 /* Translations */) && tokenOrKeyword.parent.kind === 121 /* TranslationsDeclaration */) {
       const translationPackage = analyzer.entity.ofTranslationPackage(sourceFile.package).getResolvedTranslationPackage();
       if (translationPackage !== void 0) {
-        const generator = new TranslationsGenerator(
-          analyzer,
-          sourceFile,
-          translationPackage,
-          sourceFile.locale,
-          sourceFile.dialect
-        );
+        const generator = new TranslationsGenerator(analyzer, sourceFile, translationPackage, sourceFile.locale);
         if (onlyTypeMembers) {
           result = generator.generateMissingTranslationsForPartiallyTranslatedTypes(tokenOrKeyword.parent);
         } else {
@@ -394,23 +381,16 @@ var TranslationsGenerationServiceA = class {
     if (translationPackage === void 0) {
       return false;
     }
-    const generator = new TranslationsGenerator(
-      analyzer,
-      sourceFile,
-      translationPackage,
-      sourceFile.locale,
-      sourceFile.dialect
-    );
+    const generator = new TranslationsGenerator(analyzer, sourceFile, translationPackage, sourceFile.locale);
     return Query.from(tokenOrKeyword.parent.translationList.translationDeclarations).filter((t) => t.kind === 137 /* TypeTranslationDeclaration */).mapAndFilter((t) => translationPackage.getPackageMemberTranslationTargets(t)?.values).flatMap((t) => t).any((t) => isPackageTypeEntity(t) && generator.collectNotTranslatedTypeMembers(t).length > 0);
   }
 };
 var TranslationsGenerator = class _TranslationsGenerator {
-  constructor(analyzer, sourceFile, translationPackage, locale, dialect) {
+  constructor(analyzer, sourceFile, translationPackage, locale) {
     this.analyzer = analyzer;
     this.sourceFile = sourceFile;
     this.translationPackage = translationPackage;
     this.locale = locale;
-    this.dialect = dialect;
   }
   static {
     this.translationArrowRegExp = /-> /g;
@@ -422,7 +402,6 @@ var TranslationsGenerator = class _TranslationsGenerator {
       const newLine = this.detectNewLine();
       const syntaxToCodeOptions = {
         keywordsLocale: this.locale,
-        keywordsDialect: this.dialect,
         initialIndentation: this.detectIndentationForPackageMemberTranslations(translationsDeclaration),
         indentationStep: this.detectIndentationStepForTypeMemberTranslations(translationsDeclaration),
         newLine
@@ -483,7 +462,6 @@ var TranslationsGenerator = class _TranslationsGenerator {
     const newLine = this.detectNewLine();
     const syntaxToCodeOptions = {
       keywordsLocale: this.locale,
-      keywordsDialect: this.dialect,
       initialIndentation: this.detectIndentationForTypeMemberTranslations(typeTranslation),
       indentationStep: this.detectIndentationStepForTypeMemberTranslations(typeTranslation),
       newLine
@@ -515,7 +493,7 @@ var TranslationsGenerator = class _TranslationsGenerator {
   }
   collectNotTranslatedTypeMembers(entity) {
     const translatedTypeEntity = this.translationPackage.localizationContext.getLocalizedPackageTypeEntity(entity);
-    return translatedTypeEntity.getMembers().getAll().filter((m) => this.isNotTranslatedEntity(m) && ResolvedTranslationPackage.isTypeMemberEntityThatShouldBeTranslatedByUser(m));
+    return translatedTypeEntity.getMembers().getAll().filter((m) => this.isNotTranslatedEntity(m) && ResolvedTranslationPackage.isTypeMemberEntityThatShouldBeTranslatedByUser(m)).map((m) => m.getOriginalEntity());
   }
   detectIndentationForPackageMemberTranslations(translationsDeclaration) {
     let indentationSize;
@@ -588,8 +566,8 @@ var TranslationsGenerator = class _TranslationsGenerator {
         }
         return this.createPackageTypeWithMembersTranslation(entity);
       }
-      case 11 /* TypeExtension */:
-      case 13 /* TextTranslation */:
+      case 8 /* TypeExtension */:
+      case 10 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -623,12 +601,9 @@ var TranslationsGenerator = class _TranslationsGenerator {
         return this.createFieldTranslation(entity);
       case 1 /* Function */:
         return this.createMethodTranslation(entity);
-      case 7 /* Constructor */:
-        return this.createConstructorTranslation(entity);
       case 5 /* Indexer */:
         return this.createIndexerTranslation(entity);
       case 6 /* DereferenceOperator */:
-      case 8 /* Destructor */:
         return void 0;
       default:
         Debug.never(entity);
@@ -639,20 +614,36 @@ var TranslationsGenerator = class _TranslationsGenerator {
     return SyntaxFactory.fieldOrVariantTranslation(name, name);
   }
   createMethodTranslation(entity) {
-    let name;
-    const operatorKind = entity.getOperatorKind();
-    if (operatorKind === void 0) {
-      name = this.getNameText(entity.getName());
-    } else {
-      name = `'${LocalizationHelperA.localizeOperatorKind(operatorKind, this.locale, this.dialect)}'`;
+    switch (entity.methodKind) {
+      case 0 /* Ordinary */: {
+        const name = this.getNameText(entity.getName());
+        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);
+      }
+      case 3 /* Operator */: {
+        const sourceName = this.getNameText(entity.getName());
+        const operatorKind = entity.getOperatorKind();
+        let translatedName = sourceName;
+        if (operatorKind !== void 0) {
+          const operatorNameText = LocalizationHelperA.localizeOperatorKind(
+            operatorKind,
+            this.translationPackage.getTranslationLocale()
+          );
+          translatedName = `'${operatorNameText}'`;
+        }
+        const parameters = this.createParameters(entity.getParameters());
+        return SyntaxFactory.methodTranslation(sourceName, [], parameters, translatedName, [], parameters);
+      }
+      case 1 /* Constructor */: {
+        const parameters = this.createParameters(entity.getParameters());
+        return SyntaxFactory.constructorTranslation(parameters, parameters);
+      }
+      case 2 /* Destructor */:
+        return void 0;
+      default:
+        Debug.never(entity.methodKind);
     }
-    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);
-  }
-  createConstructorTranslation(entity) {
-    const parameters = this.createParameters(entity.getParameters());
-    return SyntaxFactory.constructorTranslation(parameters, parameters);
   }
   createIndexerTranslation(entity) {
     const parameters = this.createParameters(entity.getParameters());
@@ -858,7 +849,12 @@ var SignatureForNode = class _SignatureForNode {
         let functions;
         if (meaning.suitableOrSingleFunction !== void 0) {
           const suitableOrSingleFunction = meaning.suitableOrSingleFunction;
-          functions = [suitableOrSingleFunction];
+          functions = meaning.candidates.map((c) => {
+            if (c.getEntity().getOriginalEntity() === suitableOrSingleFunction.getEntity().getOriginalEntity()) {
+              return suitableOrSingleFunction;
+            }
+            return c;
+          });
           suitableSignatureIndex = meaning.candidates.findIndex((f) => f.getEntity().getOriginalEntity() === suitableOrSingleFunction.getEntity().getOriginalEntity());
         } else {
           functions = meaning.candidates;
@@ -892,7 +888,12 @@ var SignatureForNode = class _SignatureForNode {
         let constructors;
         if (meaning.suitableOrSingleConstructor !== void 0) {
           const constructor = meaning.suitableOrSingleConstructor;
-          constructors = [constructor];
+          constructors = meaning.candidates.map((c) => {
+            if (c.getEntity().getOriginalEntity() === constructor.getEntity().getOriginalEntity()) {
+              return constructor;
+            }
+            return c;
+          });
           suitableSignatureIndex = meaning.candidates.findIndex((f) => f.getEntity().getOriginalEntity() === constructor.getEntity().getOriginalEntity());
         } else {
           constructors = meaning.candidates;
@@ -984,7 +985,7 @@ var SignatureForNode = class _SignatureForNode {
           analyzer,
           Array.from(substitutions.getParameters())
         );
-        c = new Constructor(analyzer, c.getEntity(), identitySubstitutions);
+        c = new Method(analyzer, c.getEntity(), identitySubstitutions);
       }
       return new ConstructorSignature(c);
     });
@@ -1157,9 +1158,9 @@ var CompletionServiceA = class {
   get completionItemInfoContext() {
     return this.completionItemInfoContext_.getOrInsertWith(
       () => new CompletionItemInfoContext(
-        new DisplayService(this.analyzer, this.locale, this.dialect, this.sourceFile),
+        new DisplayService(this.analyzer, this.locale, 0 /* ArtelA */, this.sourceFile),
         this.locale,
-        Query.from(getOrCreateKeywordDictionary(this.locale, this.dialect).values()).flatMap((k) => k).mapAndFilter((k) => k.kind === 1 /* EndKeywordPart */ ? k.value : void 0).uniqueToSet()
+        Query.from(getOrCreateKeywordDictionary(this.locale, 0 /* ArtelA */).values()).flatMap((k) => k).mapAndFilter((k) => k.kind === 1 /* EndKeywordPart */ ? k.value : void 0).uniqueToSet()
       )
     );
   }
@@ -1168,7 +1169,6 @@ var CompletionServiceA = class {
     this.analyzer = analyzer;
     this.completionItemInfoContext_.clear();
     this.locale = sourceFile.locale;
-    this.dialect = sourceFile.dialect;
     const positionDescription = this.createPositionDescription(sourceFile.getSyntaxNode(), offset);
     const semanticContext = this.createSemanticContextAtPosition(positionDescription);
     const syntaxContext = SyntaxContextFactory.fromPositionDescription(sourceFile, positionDescription);
@@ -1701,7 +1701,7 @@ var CompletionServiceA = class {
     if (positionDescription.kind === "after-token-or-keyword" && positionDescription.tokenOrKeyword.isKeyword(44 /* Async */) && (positionDescription.tokenOrKeyword.parent.kind === 53 /* NestedFunctionDeclaration */ || positionDescription.tokenOrKeyword.parent.kind === 62 /* FunctionLiteral */ || positionDescription.tokenOrKeyword.parent.kind === 17 /* AnonymousFunctionTypeDeclaration */)) {
       kinds.add(16 /* Function */);
     }
-    return Query.from(kinds.values()).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i).toArray();
+    return Query.from(kinds.values()).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i).toArray();
   }
   isRepeatWhileKeywordContext(positionDescription) {
     if (positionDescription.kind !== "after-token-or-keyword") {
@@ -1838,9 +1838,12 @@ var CompletionServiceA = class {
         }
         case "function": {
           if (d.value.kind === "entity") {
-            return new FunctionEntityCompletionItemInfo(this.completionItemInfoContext, d.value.value);
+            return new OrdinaryFunctionOrOperatorEntityCompletionItemInfo(
+              this.completionItemInfoContext,
+              d.value.value
+            );
           } else {
-            return new MethodCompletionItemInfo(this.completionItemInfoContext, d.value.value);
+            return new OrdinaryMethodOrOperatorCompletionItemInfo(this.completionItemInfoContext, d.value.value);
           }
         }
         case "type": {
@@ -1934,7 +1937,7 @@ var CompletionServiceA = class {
       if (m.kind === 2 /* Type */) {
         return new NamedTypeCompletionItemInfo(this.completionItemInfoContext, m);
       } else if (m.kind === 1 /* Function */) {
-        return new FunctionEntityCompletionItemInfo(this.completionItemInfoContext, m);
+        return new OrdinaryFunctionOrOperatorEntityCompletionItemInfo(this.completionItemInfoContext, m);
       }
       return void 0;
     }).filter((i) => i !== void 0);
@@ -1948,7 +1951,7 @@ var CompletionServiceA = class {
           if (m.kind === 2 /* Type */) {
             return new NamedTypeCompletionItemInfo(this.completionItemInfoContext, m);
           } else if (m.kind === 1 /* Function */) {
-            return new FunctionEntityCompletionItemInfo(this.completionItemInfoContext, m);
+            return new OrdinaryFunctionOrOperatorEntityCompletionItemInfo(this.completionItemInfoContext, m);
           }
           return void 0;
         }).filter((i) => i !== void 0)
@@ -1962,7 +1965,10 @@ var CompletionServiceA = class {
         case "type":
           return new NamedTypeCompletionItemInfo(this.completionItemInfoContext, d.value);
         case "function":
-          return new FunctionEntityCompletionItemInfo(this.completionItemInfoContext, d.value.getEntity());
+          return new OrdinaryFunctionOrOperatorEntityCompletionItemInfo(
+            this.completionItemInfoContext,
+            d.value.getEntity()
+          );
         case "package-name-segment":
           return new PackageNameSegmentCompletionItemInfo(this.completionItemInfoContext, d.value.name);
         case "package-alias":
@@ -1992,7 +1998,7 @@ var CompletionServiceA = class {
       case 0 /* Variable */:
         return new VariableEntityCompletionItemInfo(this.completionItemInfoContext, member);
       case 1 /* Function */:
-        return new FunctionEntityCompletionItemInfo(this.completionItemInfoContext, member);
+        return new OrdinaryFunctionOrOperatorEntityCompletionItemInfo(this.completionItemInfoContext, member);
       case 2 /* Type */:
         return this.createTypeEntityCompletionItemInfo(member);
       default:
@@ -2004,11 +2010,11 @@ var CompletionServiceA = class {
   }
   getTypeMemberCompletionItemInfos(ctx) {
     const type = this.analyzer.excludeNullFromType(ctx.type);
-    const memberLookup = TypeMemberLookup.ofType(this.analyzer, type);
+    const memberLookup = TypeMemberLookupA.ofType(this.analyzer, type);
     return memberLookup.getNamedMembers(ctx.lookupContext, ctx.lookupOptions).map((m) => {
       switch (m.kind) {
         case "method":
-          return new MethodCompletionItemInfo(this.completionItemInfoContext, m);
+          return new OrdinaryMethodOrOperatorCompletionItemInfo(this.completionItemInfoContext, m);
         case "field":
           return new FieldCompletionItemInfo(this.completionItemInfoContext, m);
         default:
@@ -2034,7 +2040,7 @@ var CompletionServiceA = class {
     if (ctx.translationKind === 1 /* Method */) {
       result = Query.from(ctx.packageMemberLookup.getNamedMembers(ctx.lookupContext)).mapAndFilter((d) => {
         if (d.kind === 1 /* Function */) {
-          return new TranslationsSourceFunctionCompletionItemInfo(
+          return new TranslationsSourceOrdinaryFunctionOrOperatorCompletionItemInfo(
             this.completionItemInfoContext,
             d,
             !ctx.hasPrecedingKeyword
@@ -2059,7 +2065,7 @@ var CompletionServiceA = class {
           case 0 /* Variable */:
             return new TranslationsSourceVariableCompletionItemInfo(this.completionItemInfoContext, d);
           case 1 /* Function */:
-            return new TranslationsSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceOrdinaryFunctionOrOperatorCompletionItemInfo(
               this.completionItemInfoContext,
               d,
               !ctx.hasPrecedingKeyword
@@ -2083,7 +2089,7 @@ var CompletionServiceA = class {
         16 /* Function */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -2092,9 +2098,9 @@ var CompletionServiceA = class {
     let result = Query.empty();
     if (ctx.typeEntity !== void 0) {
       if (ctx.translationKind === 1 /* Method */) {
-        result = Query.from(ctx.typeEntity.getMembers().getNamedMembers()).mapAndFilter((m) => {
+        result = Query.from(ctx.typeEntity.getMembers().getNamedMembersA()).mapAndFilter((m) => {
           if (m.kind === 1 /* Function */) {
-            return new TranslationsSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceOrdinaryFunctionOrOperatorCompletionItemInfo(
               this.completionItemInfoContext,
               m,
               !ctx.hasPrecedingKeyword
@@ -2111,11 +2117,11 @@ var CompletionServiceA = class {
       } else if (ctx.translationKind === 2 /* Indexer */) {
         result = Query.from(ctx.typeEntity.getMembers().getIndexers()).map((i) => new TranslationsSourceIndexerCompletionItemInfo(this.completionItemInfoContext, i));
       } else if (ctx.translationKind === 0 /* Any */) {
-        result = Query.from(ctx.typeEntity.getMembers().getNamedMembers()).mapAndFilter((m) => {
+        result = Query.from(ctx.typeEntity.getMembers().getNamedMembersA()).mapAndFilter((m) => {
           if (m.kind === 0 /* Variable */) {
             return new TranslationsSourceVariableCompletionItemInfo(this.completionItemInfoContext, m);
           } else if (m.kind === 1 /* Function */) {
-            return new TranslationsSourceFunctionCompletionItemInfo(
+            return new TranslationsSourceOrdinaryFunctionOrOperatorCompletionItemInfo(
               this.completionItemInfoContext,
               m,
               !ctx.hasPrecedingKeyword
@@ -2141,7 +2147,7 @@ var CompletionServiceA = class {
         35 /* Creation */
       ];
       result = result.chain(
-        Query.from(keywords).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale, this.dialect).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
+        Query.from(keywords).map((k) => LocalizationHelperA.localizeKeyword(k, this.locale).map((v) => new KeywordCompletionItemInfo(this.completionItemInfoContext, k, v.value))).flatMap((i) => i)
       );
     }
     return result.toArray();
@@ -2153,7 +2159,7 @@ var CompletionServiceA = class {
       editRange = new Range(identifierRange.start + 1, identifierRange.end - 1);
     }
     return operatorKinds.map((k) => {
-      const value = LocalizationHelperA.localizeSyntacticalOperatorKind(k, this.locale, this.dialect);
+      const value = LocalizationHelperA.localizeSyntacticalOperatorKind(k, this.locale);
       return new OperatorNameCompletionItemInfo(this.completionItemInfoContext, value, editRange);
     });
   }
@@ -2486,21 +2492,14 @@ var FieldCompletionItemInfo = class {
     return void 0;
   }
 };
-var MethodCompletionItemInfo = class {
+var OrdinaryMethodOrOperatorCompletionItemInfo = class {
   constructor(ctx, method) {
     this.ctx = ctx;
     this.method = method;
     this.kind = "method";
   }
   getLabel() {
-    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;
+    return this.ctx.getInsertTextForName(this.method.getName());
   }
   getCompletionItemKind() {
     return this.method.getOperatorKind() === void 0 ? 3 /* Method */ : 4 /* Operator */;
@@ -2554,28 +2553,21 @@ var VariableEntityCompletionItemInfo = class {
     return void 0;
   }
 };
-var FunctionEntityCompletionItemInfo = class {
+var OrdinaryFunctionOrOperatorEntityCompletionItemInfo = class {
   constructor(ctx, entity) {
     this.ctx = ctx;
     this.entity = entity;
     this.kind = "function-entity";
   }
   getLabel() {
-    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;
+    return this.ctx.getInsertTextForName(this.entity.getName());
   }
   getCompletionItemKind() {
     switch (this.entity.subkind) {
       case "package":
         return 8 /* PackageFunction */;
       case "method":
-        return this.entity.subkind === "method" && this.entity.getOperatorKind() !== void 0 ? 4 /* Operator */ : 3 /* Method */;
+        return this.entity.subkind === "method" && this.entity.methodKind === 3 /* Operator */ ? 4 /* Operator */ : 3 /* Method */;
       case "nested":
         return 11 /* NestedFunction */;
       default:
@@ -2764,7 +2756,7 @@ var TranslationsSourceVariableCompletionItemInfo = class {
     return void 0;
   }
 };
-var TranslationsSourceFunctionCompletionItemInfo = class {
+var TranslationsSourceOrdinaryFunctionOrOperatorCompletionItemInfo = class {
   constructor(ctx, func, includeFunctionKeyword) {
     this.ctx = ctx;
     this.func = func;
@@ -2902,8 +2894,8 @@ var TranslationsSourceConstructorCompletionItemInfo = class {
   }
   get label() {
     return this.label_.getOrInsertWith(() => {
-      const constructorDeclaration = new ConstructorDeclaration_entity(this.constructor_);
-      const displayParts = this.ctx.displayService.getConstructorDeclarationDisplayParts(constructorDeclaration);
+      const constructorDeclaration = new FunctionDeclaration_entity(this.constructor_);
+      const displayParts = this.ctx.displayService.getFunctionDeclarationDisplayParts(constructorDeclaration);
       const creationKeyword = this.ctx.displayService.a.displayKeyword(35 /* Creation */);
       return creationKeyword + "(" + displayParts.parameters.join(displayParts.parameterSeparator) + ")";
     });
@@ -3386,9 +3378,6 @@ var SyntaxContextFactory = class {
     if (tokenOrKeyword.isToken(32 /* Comma */) && (tokenOrKeyword.parent.kind === 24 /* BaseTypeList */ || tokenOrKeyword.parent.kind === 156 /* TypeArgumentList */)) {
       return { allowsAnonymousTypes: tokenOrKeyword.parent.kind === 156 /* TypeArgumentList */ };
     }
-    if (tokenOrKeyword.isToken(42 /* HashSign */) && tokenOrKeyword.parent.kind === 150 /* Tag */) {
-      return { allowsAnonymousTypes: false };
-    }
     if ((tokenOrKeyword.isToken(31 /* Colon */) || tokenOrKeyword.isToken(64 /* Equals */)) && tokenOrKeyword.parent.kind === 146 /* TypeParameterDeclaration */) {
       return { allowsAnonymousTypes: false };
     }
@@ -3628,12 +3617,6 @@ var TypeParameterReferenceTarget = class {
     this.kind = "type-value-parameter";
   }
 };
-var ConstructorReferenceTarget = class {
-  constructor(constructor_) {
-    this.constructor_ = constructor_;
-    this.kind = "type-constructor";
-  }
-};
 var DereferenceOperatorReferenceTarget = class {
   constructor(operator, accessKind) {
     this.operator = operator;
@@ -4670,9 +4653,9 @@ var NodeSemanticInfoServiceA = class {
             }
           }
         }
-      } else if (currentTarget.kind === "type-constructor") {
-        const entity = currentTarget.constructor_.getEntity();
-        if (entity.getDefinition().kind === 1 /* Intrinsic */) {
+      } else if (currentTarget.kind === "accessed-function") {
+        const entity = currentTarget.func.getEntity();
+        if (entity.subkind === "method" && TypeMemberEntity.isConstructor(entity) && entity.getDefinition().kind === 1 /* Intrinsic */) {
           const containingEntity = entity.getContainingEntity();
           if (containingEntity.kind === 2 /* Type */ && containingEntity.getDefinition().kind === 0 /* Source */) {
             betterTarget = new EntityReferenceTarget(containingEntity, 0 /* Get */);
@@ -4722,18 +4705,18 @@ var NodeSemanticInfoServiceA = class {
           analyzer,
           Array.from(substitutions.getParameters())
         );
-        return new Constructor(analyzer, c.getEntity(), identitySubstitutions);
+        return new Method(analyzer, c.getEntity(), identitySubstitutions);
       }
       return c;
     });
-    const targets = constructors.map((c) => new ConstructorReferenceTarget(c));
+    const targets = constructors.map((c) => new AccessedFunctionReferenceTarget(new AccessedFunction_typeMember(c)));
     return new ReferenceNodeSemanticInfo(createNonEmptyArray(targets), targets.length > 1);
   }
 };
 
 // source/services/common/Utils.ts
 function getEntitySourceLocations(analyzer, entity) {
-  if (entity.kind === 12 /* Package */) {
+  if (entity.kind === 9 /* Package */) {
     return void 0;
   }
   let result;
@@ -4772,7 +4755,7 @@ function getEntitySourceLocations(analyzer, entity) {
         return new SourceLocation(sourceFile, range);
       });
     }
-  } else if (entity.kind === 13 /* TextTranslation */) {
+  } else if (entity.kind === 10 /* TextTranslation */) {
     const definition = entity.getDefinition();
     if (definition.kind === 0 /* Source */) {
       const range = definition.node.rangeWithoutTrivia;
@@ -4995,8 +4978,6 @@ var DefinitionService = class {
         return getEntitySourceLocations(analyzer, target.entity);
       case "field":
         return this.getSourceLocationsOfVariableEntity(analyzer, target.field.getEntity());
-      case "type-constructor":
-        return getEntitySourceLocations(analyzer, target.constructor_.getEntity());
       case "accessed-function":
         return getEntitySourceLocations(analyzer, target.func.getEntity());
       case "type-dereference-operator":
@@ -5033,8 +5014,6 @@ var DefinitionService = class {
         return target.field.getEntity();
       case "type-value-parameter":
         return target.parameter.getEntity();
-      case "type-constructor":
-        return target.constructor_.getEntity();
       case "type-dereference-operator":
         return target.operator.getEntity();
       case "accessed-function":
@@ -5102,7 +5081,6 @@ var DefinitionService = class {
         case "type-context":
           result.push(target.type);
           break;
-        case "type-constructor":
         case "type-dereference-operator":
         case "accessed-function":
         case "type-indexer":
@@ -5378,10 +5356,6 @@ var HoverService = class {
         );
         return new Hover(this.displayService.displayVariableDeclaration(declaration), range);
       }
-      case "type-constructor": {
-        const declaration = new ConstructorDeclaration_typeMember(firstTarget.constructor_);
-        return new Hover(this.displayService.displayConstructorDeclaration(declaration), range);
-      }
       case "type-dereference-operator": {
         const operator = new DereferenceOperatorDeclaration_typeMember(firstTarget.operator);
         return new Hover(this.displayService.displayDereferenceOperatorDeclaration(operator), range);
@@ -5537,8 +5511,6 @@ var ReferencesSearchUtils = class {
             return new DefinitionInfo(t.field.getEntity(), accessKindToReferenceKind(t.accessKind));
           case "type-value-parameter":
             return new DefinitionInfo(t.parameter.getEntity(), accessKindToReferenceKind(t.accessKind));
-          case "type-constructor":
-            return new DefinitionInfo(t.constructor_.getEntity(), 0 /* Read */);
           case "type-dereference-operator":
             return new DefinitionInfo(t.operator.getEntity(), accessKindToReferenceKind(t.accessKind));
           case "accessed-function":
@@ -5679,7 +5651,8 @@ var ReferencesFinderA = class extends ReferencesFinder {
   findReferencesInSourceFileA(sourceFile, result, taskController) {
     return __async(this, null, function* () {
       let semanticInfoOptions;
-      if (this.definitions[0].value.kind === 7 /* Constructor */) {
+      const firstDefinition = this.definitions[0].value;
+      if (firstDefinition.kind === 1 /* Function */ && firstDefinition.subkind === "method" && TypeMemberEntity.isConstructor(firstDefinition)) {
         semanticInfoOptions = {
           preferredTargetOfExplicitConstructorCall: "constructor-declaration",
           includeBetterReferenceTargets: true
@@ -5957,73 +5930,10 @@ var ReferencesService = class {
         Debug.never(sourceFile);
     }
   }
-  getDefinitionsFromNodeSemanticInfo(info) {
-    switch (info.kind) {
-      case "definition":
-        return [new DefinitionInfo(info.entity, 2 /* Declaration */)];
-      case "reference":
-        return getDefinitionOfReference(info);
-      case "default-switch-match":
-        return [];
-      default:
-        Debug.never(info);
-    }
-    function accessKindToReferenceKind(kind) {
-      switch (kind) {
-        case 0 /* Get */:
-          return 0 /* Read */;
-        case 1 /* Set */:
-          return 1 /* Write */;
-        case 2 /* GetSet */:
-          return 1 /* Write */;
-        default:
-          Debug.never(kind);
-      }
-    }
-    function getDefinitionOfReference(reference) {
-      const targets = reference.betterTargets ?? reference.targets;
-      return targets.map((t) => {
-        switch (t.kind) {
-          case "entity":
-            return new DefinitionInfo(t.entity, accessKindToReferenceKind(t.accessKind));
-          case "field":
-            return new DefinitionInfo(t.field.getEntity(), accessKindToReferenceKind(t.accessKind));
-          case "type-value-parameter":
-            return new DefinitionInfo(t.parameter.getEntity(), accessKindToReferenceKind(t.accessKind));
-          case "type-constructor":
-            return new DefinitionInfo(t.constructor_.getEntity(), 0 /* Read */);
-          case "type-dereference-operator":
-            return new DefinitionInfo(t.operator.getEntity(), accessKindToReferenceKind(t.accessKind));
-          case "accessed-function":
-            return new DefinitionInfo(t.func.getEntity(), 0 /* Read */);
-          case "match-result-value-parameter":
-            return new DefinitionInfo(t.parameter.entity, 0 /* Read */);
-          case "package":
-            return new DefinitionInfo(t.package_, 0 /* Read */);
-          case "type-context": {
-            const entity = t.type.getEntity();
-            if (entity !== void 0) {
-              return new DefinitionInfo(entity, 0 /* Read */);
-            }
-            return void 0;
-          }
-          case "type-indexer":
-            return new DefinitionInfo(t.indexer.getEntity(), accessKindToReferenceKind(t.accessKind));
-          case "package-name-tree-node":
-            if (t.node.package !== void 0) {
-              return new DefinitionInfo(t.node.package, 0 /* Read */);
-            }
-            return void 0;
-          default:
-            Debug.never(t);
-        }
-      }).filter((t) => t !== void 0);
-    }
-  }
   getReferenceRestrictions(definition, _options) {
     const result = new ReferenceRestrictions();
     let namedDefinitionInfo;
-    if (definition.value.kind === 7 /* Constructor */) {
+    if (definition.value.kind === 1 /* Function */ && definition.value.subkind === "method" && TypeMemberEntity.isConstructor(definition.value)) {
       const type = TypeWithMembersOrExtensionEntity.getContextualTypeEntity(definition.value.getContainingEntity());
       if (type !== void 0) {
         namedDefinitionInfo = this.isEntityWithRegularName(type);
@@ -6034,14 +5944,15 @@ var ReferencesService = class {
     if (namedDefinitionInfo !== void 0) {
       result.canBeIdentifier = true;
     }
-    if (definition.value.kind === 7 /* Constructor */) {
+    const isConstructor = definition.value.kind === 1 /* Function */ && definition.value.subkind === "method" && TypeMemberEntity.isConstructor(definition.value);
+    if (isConstructor) {
       result.canBeAutotypeCall = true;
       result.canBeConstructorDeclaration = true;
     }
     if (definition.value.kind === 6 /* DereferenceOperator */) {
       result.canBeDereferenceOperator = true;
     }
-    if (isTypeEntity(definition.value) || definition.value.kind === 7 /* Constructor */) {
+    if (isTypeEntity(definition.value) || isConstructor) {
       result.canBeOwnOrBaseConstructorCall = true;
     }
     if (definition.value.kind === 1 /* Function */) {
@@ -6053,7 +5964,7 @@ 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") {
+    if (definition.value.kind === 1 /* Function */ && definition.value.subkind === "method" && definition.value.methodKind === 3 /* Operator */) {
       const operatorKind = definition.value.getOperatorKind();
       if (operatorKind !== void 0) {
         if (isUnaryOperator(operatorKind)) {
@@ -6066,6 +5977,8 @@ var ReferencesService = class {
     }
     return result;
   }
+  // TODO: вынести эту логику в сервис, зависящий от диалекта. В диалекта А конструктор нельзя переименовать,
+  // в диалекте М - можно.
   isEntityWithRegularName(entity) {
     switch (entity.kind) {
       case 0 /* Variable */:
@@ -6110,17 +6023,15 @@ var ReferencesService = class {
         }
         return void 0;
       }
-      case 10 /* PackageAlias */:
+      case 7 /* PackageAlias */:
         return { name: entity.getName() };
       case 3 /* Getter */:
       case 4 /* Setter */:
-      case 7 /* Constructor */:
-      case 8 /* Destructor */:
       case 5 /* Indexer */:
       case 6 /* DereferenceOperator */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
-      case 13 /* TextTranslation */:
+      case 9 /* Package */:
+      case 8 /* TypeExtension */:
+      case 10 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -6208,7 +6119,6 @@ var RenameService = class {
           case "match-result-value-parameter":
             canBeRenamed = this.entityCanBeRenamed(analyzer, target.parameter.entity);
             break;
-          case "type-constructor":
           case "type-dereference-operator":
           case "package":
           case "type-context":
@@ -6697,7 +6607,7 @@ var SemanticTokensServiceA = class {
       case "package":
         return 4 /* PackageFunction */;
       case "method":
-        return entity.getOperatorKind() === void 0 ? 6 /* Method */ : 7 /* Operator */;
+        return entity.methodKind === 3 /* Operator */ ? 7 /* Operator */ : 6 /* Method */;
       case "nested":
         return 5 /* NestedFunction */;
       default:
@@ -6884,9 +6794,9 @@ var ParametersSignatureHelpProvider = class {
         return this.signatureContext.convertFunctionTypeBodyDisplayParts(displayParts);
       }
       case "constructor": {
-        const constructor = new ConstructorDeclaration_typeMember(signature.constructor_);
-        const displayParts = this.signatureContext.displayService.getConstructorDeclarationDisplayParts(constructor);
-        return this.signatureContext.convertConstructorDisplayParts(displayParts);
+        const constructor = new FunctionDeclaration_typeMember(signature.constructor_);
+        const displayParts = this.signatureContext.displayService.getFunctionDeclarationDisplayParts(constructor);
+        return this.signatureContext.convertFunctionDisplayParts(displayParts);
       }
       case "indexer": {
         const indexer = new IndexerDeclaration_typeMember(signature.indexer);
@@ -6919,12 +6829,6 @@ var SignatureContext = class {
     const postfix = parts.afterParameters;
     return new SignatureDisplayParts(prefix, parameters, parts.parameterSeparator, postfix);
   }
-  convertConstructorDisplayParts(parts) {
-    const prefix = parts.beforeParameters;
-    const parameters = parts.parameters;
-    const postfix = parts.afterParameters;
-    return new SignatureDisplayParts(prefix, parameters, parts.parameterSeparator, postfix);
-  }
   convertIndexerDisplayParts(parts) {
     const prefix = parts.beforeParameters;
     const parameters = parts.parameters;
@@ -7311,9 +7215,6 @@ var SourceFileItemsServiceA = class {
   get locale() {
     return this.sourceFile.locale;
   }
-  get dialect() {
-    return this.sourceFile.dialect;
-  }
   getChildItems(node) {
     const result = new Array();
     forEachChild(node, false, (node2) => {
@@ -7548,32 +7449,32 @@ var SourceFileItemsServiceA = class {
       case 4 /* PackageFunction */:
       case 17 /* Method */:
       case 21 /* NestedFunction */:
-        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(16 /* Function */, this.locale, this.dialect)}>`;
+        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(16 /* Function */, this.locale)}>`;
       case 5 /* StructuredType */:
       case 6 /* FunctionType */:
       case 7 /* VariantType */:
       case 8 /* ReducedType */:
       case 10 /* InvalidType */:
       case 9 /* AliasType */:
-        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(20 /* Type */, this.locale, this.dialect)}>`;
+        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(20 /* Type */, this.locale)}>`;
       case 12 /* Constructor */:
-        return name ?? LocalizationHelperA.localizeKeywordAndTakeFirst(35 /* Creation */, this.locale, this.dialect);
+        return name ?? LocalizationHelperA.localizeKeywordAndTakeFirst(35 /* Creation */, this.locale);
       case 13 /* Destructor */:
-        return name ?? LocalizationHelperA.localizeKeywordAndTakeFirst(51 /* Destruction */, this.locale, this.dialect);
+        return name ?? LocalizationHelperA.localizeKeywordAndTakeFirst(51 /* Destruction */, this.locale);
       case 11 /* VariantValue */:
-        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(8 /* Variant */, this.locale, this.dialect)}>`;
+        return name ?? `<${LocalizationHelperA.localizeKeywordAndTakeFirst(8 /* Variant */, this.locale)}>`;
       case 20 /* TypeParameter */:
         return name ?? `<${LocalizationHelperA.localizeHelperPhrase(2 /* TypeParameter */, this.locale)}>`;
       case 2 /* PackageVariableGetter */:
       case 15 /* FieldGetter */:
-        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(62 /* Get */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(62 /* Get */, this.locale)} ${name ?? ""}`;
       case 3 /* PackageVariableSetter */:
       case 16 /* FieldSetter */:
-        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(63 /* Set */, this.locale, this.dialect)} ${name ?? ""}`;
+        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(63 /* Set */, this.locale)} ${name ?? ""}`;
       case 18 /* IndexedElementGetter */:
-        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(62 /* Get */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(62 /* Get */, this.locale)} []`;
       case 19 /* IndexedElementSetter */:
-        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(63 /* Set */, this.locale, this.dialect)} []`;
+        return `${LocalizationHelperA.localizeKeywordAndTakeFirst(63 /* Set */, this.locale)} []`;
       default:
         Debug.never(kind);
     }
@@ -10079,17 +9980,25 @@ var EntityToSyntax = class {
     return sortModifiers(modifiers);
   }
   convertTypeEntityMembers(members) {
-    const variables = members.getNamedMembers().filter((m) => m.kind === 0 /* Variable */).flatMap((m) => this.convertField(m));
+    const variables = members.getNamedMembers(127 /* All */).filter((m) => m.kind === 0 /* Variable */).flatMap((m) => this.convertField(m));
     const groupedVariables = this.groupTypeMemberDeclarations(variables);
-    const methods = members.getNamedMembers().filter((m) => m.kind !== 0 /* Variable */).map((m) => this.convertMethod(m));
-    const groupedMethods = this.groupTypeMemberDeclarations(methods);
-    const constructors = members.getConstructors().map((c) => this.convertConstructor(c));
+    const ordinaryMethods = members.getNamedMembers(127 /* All */).filter((m) => TypeMemberEntity.isOrdinaryMethod(m)).map((m) => this.convertMethod(m));
+    const groupedOrdinaryMethods = this.groupTypeMemberDeclarations(ordinaryMethods);
+    const operators = members.getOperators().map((m) => this.convertMethod(m));
+    const groupedOperators = this.groupTypeMemberDeclarations(operators);
+    const constructors = members.getConstructors().map((c) => this.convertMethod(c));
     const groupedConstructors = this.groupTypeMemberDeclarations(constructors);
-    const destructors = members.getDestructors().map((d) => this.convertDestructor(d));
+    const destructors = members.getDestructors().map((d) => this.convertMethod(d));
     const groupedDestructors = this.groupTypeMemberDeclarations(destructors);
     const indexers = members.getIndexers().flatMap((i) => this.convertIndexer(i));
     const groupedIndexers = this.groupTypeMemberDeclarations(indexers);
-    return groupedVariables.concat(groupedIndexers, groupedConstructors, groupedMethods, groupedDestructors);
+    return groupedVariables.concat(
+      groupedIndexers,
+      groupedConstructors,
+      groupedOrdinaryMethods,
+      groupedOperators,
+      groupedDestructors
+    );
   }
   convertField(entity) {
     if (entity.isVariant()) {
@@ -10139,13 +10048,32 @@ var EntityToSyntax = class {
     return sortModifiers(modifiers);
   }
   convertMethod(entity) {
-    const tags = this.convertTags(entity.getTags());
-    const modifiers = this.convertMethodModifiers(entity);
-    const name = this.getEntityName(entity);
-    const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
-    const parameters = this.convertParameters(entity.getParameters());
-    const returnType = this.convertTypeIfNotNullType(entity.getReturnType());
-    return SyntaxFactory.methodDeclaration(tags, modifiers, name, typeParameters, parameters, returnType, void 0);
+    switch (entity.methodKind) {
+      case 0 /* Ordinary */:
+      case 3 /* Operator */: {
+        const tags = this.convertTags(entity.getTags());
+        const modifiers = this.convertMethodModifiers(entity);
+        const name = this.getEntityName(entity);
+        const typeParameters = this.convertTypeParameters(entity.getTypeParameters());
+        const parameters = this.convertParameters(entity.getParameters());
+        const returnType = this.convertTypeIfNotNullType(entity.getReturnType());
+        return SyntaxFactory.methodDeclaration(tags, modifiers, name, typeParameters, parameters, returnType, void 0);
+      }
+      case 1 /* Constructor */: {
+        const tags = this.convertTags(entity.getTags());
+        const modifiers = this.convertConstructorModifiers(entity);
+        const parameters = this.convertParameters(entity.getParameters());
+        return SyntaxFactory.constructorDeclaration(tags, modifiers, parameters, void 0);
+      }
+      case 2 /* Destructor */: {
+        const tags = this.convertTags(entity.getTags());
+        const modifiers = this.convertDestructorModifiers(entity);
+        const parameters = this.convertParameters(entity.getParameters());
+        return SyntaxFactory.destructorDeclaration(tags, modifiers, parameters, void 0);
+      }
+      default:
+        Debug.never(entity.methodKind);
+    }
   }
   convertMethodModifiers(entity) {
     const modifiers = new Array();
@@ -10167,12 +10095,6 @@ var EntityToSyntax = class {
     }
     return sortModifiers(modifiers);
   }
-  convertConstructor(entity) {
-    const tags = this.convertTags(entity.getTags());
-    const modifiers = this.convertConstructorModifiers(entity);
-    const parameters = this.convertParameters(entity.getParameters());
-    return SyntaxFactory.constructorDeclaration(tags, modifiers, parameters, void 0);
-  }
   convertConstructorModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
@@ -10184,12 +10106,6 @@ var EntityToSyntax = class {
     }
     return sortModifiers(modifiers);
   }
-  convertDestructor(entity) {
-    const tags = this.convertTags(entity.getTags());
-    const modifiers = this.convertDestructorModifiers(entity);
-    const parameters = this.convertParameters(entity.getParameters());
-    return SyntaxFactory.destructorDeclaration(tags, modifiers, parameters, void 0);
-  }
   convertDestructorModifiers(entity) {
     const modifiers = new Array();
     const isHidden = entity.isHidden();
@@ -10718,16 +10634,14 @@ var SourceGenerationService = class extends RxObject7 {
         return this.checkIfEntityOfKindIsPresentInGeneratedCode(entity.getOwningEntity());
       case 5 /* Indexer */:
       case 6 /* DereferenceOperator */:
-      case 7 /* Constructor */:
-      case 8 /* Destructor */:
         return this.checkIfEntityOfKindIsPresentInGeneratedCode(entity.getContainingEntity());
-      case 10 /* PackageAlias */:
+      case 7 /* PackageAlias */:
         return false;
-      case 12 /* Package */:
+      case 9 /* Package */:
         return false;
-      case 11 /* TypeExtension */:
+      case 8 /* TypeExtension */:
         return true;
-      case 13 /* TextTranslation */:
+      case 10 /* TextTranslation */:
         return true;
       default:
         Debug.never(entity);
@@ -10805,34 +10719,30 @@ var EntityFinder = class {
           case 1 /* Structured */:
           case 0 /* Function */: {
             if (entity.subkind === "package") {
-              return this.findPackageTypeEntityByNameAndArity(this.getEntityName(entity), entity.getArity());
+              return this.findPackageTypeEntityByNameAndArity(entity.getName(), entity.getArity());
             }
             return void 0;
           }
           case 4 /* Alias */:
-            return this.findPackageTypeEntityByNameAndArity(this.getEntityName(entity), entity.getArity());
+            return this.findPackageTypeEntityByNameAndArity(entity.getName(), entity.getArity());
           case 5 /* Reduced */:
-            return this.findPackageTypeEntityByNameAndArity(this.getEntityName(entity), entity.getArity());
+            return this.findPackageTypeEntityByNameAndArity(entity.getName(), entity.getArity());
           case 2 /* Parameter */:
             return this.findTypeParameterEntity(entity);
           default:
             Debug.never(entity);
         }
-      case 7 /* Constructor */:
-        return this.findConstructorEntity(entity);
-      case 8 /* Destructor */:
-        return this.findDestructorEntity(entity);
       case 5 /* Indexer */:
         return this.findIndexerEntity(entity);
       case 6 /* DereferenceOperator */:
         return this.findDereferenceOperatorEntity(entity);
-      case 10 /* PackageAlias */:
+      case 7 /* PackageAlias */:
       case 3 /* Getter */:
       case 4 /* Setter */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
+      case 9 /* Package */:
+      case 8 /* TypeExtension */:
         return void 0;
-      case 13 /* TextTranslation */:
+      case 10 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -10840,20 +10750,18 @@ var EntityFinder = class {
   }
   findVariableEntity(entity) {
     if (entity.subkind === "package") {
-      return this.packageEntity.getMembers().getNamedMembersByName(this.getEntityName(entity)).at(0);
+      return this.packageEntity.getMembers().getNamedMembersByName(entity.getName()).at(0);
     } else if (entity.subkind === "field") {
       const containingType = this.findEntity(entity.getContainingEntity());
       if (containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType)) {
-        return containingType.getMembers().getNamedMembersByName(this.getEntityName(entity))[0];
+        return containingType.getMembers().getNamedMembersByName(entity.getName(), 127 /* All */)[0];
       }
     } else if (entity.subkind === "parameter") {
       const originalContainingEntity = entity.getContainingEntity();
-      if (originalContainingEntity.kind !== 12 /* Package */) {
-        const index = originalContainingEntity.getParameters().indexOf(entity);
-        const containingEntity = this.findEntity(originalContainingEntity);
-        if (containingEntity !== void 0 && index >= 0) {
-          return this.ifEntityWithParametersThenParameters(containingEntity)?.[index];
-        }
+      const index = originalContainingEntity.getParameters().indexOf(entity);
+      const containingEntity = this.findEntity(originalContainingEntity);
+      if (containingEntity !== void 0 && index >= 0) {
+        return this.ifEntityWithParametersThenParameters(containingEntity)?.[index];
       }
     }
     return void 0;
@@ -10861,7 +10769,7 @@ var EntityFinder = class {
   findFunctionEntity(entity) {
     switch (entity.subkind) {
       case "package": {
-        const members = this.packageEntity.getMembers().getNamedMembersByName(this.getEntityName(entity)).filter((m) => m.kind === 1 /* Function */);
+        const members = this.packageEntity.getMembers().getNamedMembersByName(entity.getName()).filter((m) => m.kind === 1 /* Function */);
         if (members.length === 0) {
           return void 0;
         } else if (members.length === 1) {
@@ -10881,7 +10789,7 @@ var EntityFinder = class {
         if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
           return void 0;
         }
-        const members = containingType.getMembers().getNamedMembersByName(this.getEntityName(entity)).filter((m) => m.kind === 1 /* Function */);
+        const members = containingType.getMembers().getNamedMembersByName(entity.getSpecialNameOrName(), 127 /* All */).filter((m) => m.kind === 1 /* Function */);
         if (members.length === 0) {
           return void 0;
         } else if (members.length === 1) {
@@ -10903,40 +10811,6 @@ var EntityFinder = class {
         Debug.never(entity);
     }
   }
-  findConstructorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getConstructors();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
-  }
-  findDestructorEntity(entity) {
-    const containingType = this.findEntity(entity.getContainingEntity());
-    if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
-      return void 0;
-    }
-    const members = containingType.getMembers().getDestructors();
-    if (members.length === 0) {
-      return void 0;
-    } else if (members.length === 1) {
-      return members[0];
-    } else {
-      const referenceData = new DataForFindingOverloadedMember([], entity.getParameters());
-      const membersData = members.map((m) => new DataForFindingOverloadedMember([], m.getParameters()));
-      const index = this.findOverloadedMemberIndex(referenceData, membersData);
-      return index >= 0 ? members[index] : void 0;
-    }
-  }
   findIndexerEntity(entity) {
     const containingType = this.findEntity(entity.getContainingEntity());
     if (!(containingType !== void 0 && isTypeEntity(containingType) && isTypeEntityWithMembers(containingType))) {
@@ -10986,10 +10860,6 @@ var EntityFinder = class {
         return entity.getParameters();
       case 5 /* Indexer */:
         return entity.getParameters();
-      case 7 /* Constructor */:
-        return entity.getParameters();
-      case 8 /* Destructor */:
-        return entity.getParameters();
       case 2 /* Type */: {
         if (entity.typeEntityKind === 0 /* Function */) {
           return entity.getParameters();
@@ -10999,12 +10869,12 @@ var EntityFinder = class {
       case 0 /* Variable */:
       case 3 /* Getter */:
       case 4 /* Setter */:
-      case 10 /* PackageAlias */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
+      case 7 /* PackageAlias */:
+      case 9 /* Package */:
+      case 8 /* TypeExtension */:
       case 6 /* DereferenceOperator */:
         return void 0;
-      case 13 /* TextTranslation */:
+      case 10 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -11020,17 +10890,15 @@ var EntityFinder = class {
         }
         return void 0;
       }
-      case 8 /* Destructor */:
-      case 7 /* Constructor */:
       case 5 /* Indexer */:
       case 6 /* DereferenceOperator */:
       case 0 /* Variable */:
       case 3 /* Getter */:
       case 4 /* Setter */:
-      case 10 /* PackageAlias */:
-      case 12 /* Package */:
-      case 11 /* TypeExtension */:
-      case 13 /* TextTranslation */:
+      case 7 /* PackageAlias */:
+      case 9 /* Package */:
+      case 8 /* TypeExtension */:
+      case 10 /* TextTranslation */:
         return void 0;
       default:
         Debug.never(entity);
@@ -11045,7 +10913,7 @@ var EntityFinder = class {
       const parametersAreEqual = Query.zip(
         memberData.parameters,
         referenceData.parameters,
-        (r, m) => this.getEntityName(r).considerEqual(this.getEntityName(m))
+        (r, m) => r.getName().considerEqual(m.getName())
       ).all((v) => v);
       if (parametersAreEqual) {
         return i;
@@ -11053,9 +10921,6 @@ var EntityFinder = class {
     }
     return -1;
   }
-  getEntityName(entity) {
-    return entity.getName();
-  }
 };
 var DataForFindingOverloadedMember = class {
   constructor(typeParameters, parameters) {