@artel/artc 0.6.25229 → 0.6.25230

package/build/{chunk-6YPLDA76.js → chunk-ZUIGWNN5.js}

@@ -617,7 +617,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25229" : "";
+var ArtelVersion = true ? "0.6.25230" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -1214,7 +1214,7 @@ var KeywordKind = /* @__PURE__ */ ((KeywordKind5) => {
   KeywordKind5[KeywordKind5["Const"] = 36] = "Const";
   KeywordKind5[KeywordKind5["Hidden"] = 37] = "Hidden";
   KeywordKind5[KeywordKind5["Abstract"] = 38] = "Abstract";
-  KeywordKind5[KeywordKind5["Redefined"] = 39] = "Redefined";
+  KeywordKind5[KeywordKind5["Override"] = 39] = "Override";
   KeywordKind5[KeywordKind5["Async"] = 40] = "Async";
   KeywordKind5[KeywordKind5["Static"] = 41] = "Static";
   KeywordKind5[KeywordKind5["As"] = 42] = "As";
@@ -2058,8 +2058,7 @@ var englishKeywords = new Lazy(() => [
   { keyword: "in hierarchy", kind: 48 /* InHierarchy */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "in file", kind: 49 /* InFile */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "in package", kind: 50 /* InPackage */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "override", kind: 39 /* Redefined */, dialects: [1 /* Usual */] },
-  { keyword: "redefined", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "override", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "static", kind: 41 /* Static */, dialects: [1 /* Usual */, 2 /* Special */] }
 ]);
 var russianKeywords = new Lazy(() => [
@@ -2135,15 +2134,11 @@ var russianKeywords = new Lazy(() => [
   { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0435\u0435", kind: 41 /* Static */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0439", kind: 41 /* Static */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0432\u0441\u0435\u043E\u0431\u0449\u0438\u0435", kind: 41 /* Static */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0437\u0430\u043C\u0435\u043D\u0430", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0437\u0430\u043C\u0435\u043D\u0435\u043D", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0437\u0430\u043C\u0435\u043D\u0451\u043D", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0437\u0430\u043C\u0435\u043D\u0435\u043D\u0430", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0437\u0430\u043C\u0435\u043D\u0435\u043D\u043E", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u0430\u044F", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u043E\u0435", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0439", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
-  { keyword: "\u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0435", kind: 39 /* Redefined */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "\u0437\u0430\u043C", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u0430\u044F", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0435", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
+  { keyword: "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0435", kind: 39 /* Override */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E", kind: 37 /* Hidden */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0441\u043A\u0440\u044B\u0442\u044B\u0439", kind: 37 /* Hidden */, dialects: [1 /* Usual */, 2 /* Special */] },
   { keyword: "\u0441\u043A\u0440\u044B\u0442\u043E\u0435", kind: 37 /* Hidden */, dialects: [1 /* Usual */, 2 /* Special */] },
@@ -13021,7 +13016,7 @@ var russianErrorMessages = {
   [210 /* IndexerNotFound */]: "\u0418\u043D\u0434\u0435\u043A\u0441\u0430\u0442\u043E\u0440 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
   [244 /* BaseCannotBeUsedInThisContext */]: "'\u043E\u0441\u043D\u043E\u0432\u0430' \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435.",
   [247 /* BaseCannotBeUsedAsAnExpressionInItself */]: "'\u043E\u0441\u043D\u043E\u0432\u0430' \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0432 \u043A\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0441\u0430\u043C\u043E\u0441\u0442\u043E\u044F\u0442\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u0432\u044B\u0440\u0430\u0436\u0435\u043D\u0438\u044F.",
-  [245 /* OverriddenMethodNotFound */]: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
+  [245 /* OverriddenMethodNotFound */]: "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
   [246 /* ObjectCannotBeUsedInThisContext */]: "'\u043E\u0431\u044A\u0435\u043A\u0442' \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0432 \u044D\u0442\u043E\u043C \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0435.",
   [248 /* InterfacePackageMustNotContainImplementation */]: "\u0418\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u043D\u044B\u0439 \u043F\u0430\u043A\u0435\u0442 \u043D\u0435 \u0434\u043E\u043B\u0436\u0435\u043D \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0440\u0435\u0430\u043B\u0438\u0437\u0430\u0446\u0438\u044E.",
   [249 /* InterfacePackageVariablesMustNotHaveInitializers */]: "\u041F\u0435\u0440\u0435\u043C\u0435\u043D\u043D\u044B\u0435 \u0432 \u0438\u043D\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u043D\u043E\u043C \u043F\u0430\u043A\u0435\u0442\u0435 \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u044B \u0438\u043C\u0435\u0442\u044C \u043D\u0430\u0447\u0430\u043B\u044C\u043D\u044B\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u044F.",
@@ -13051,7 +13046,7 @@ var russianErrorMessages = {
   [273 /* FunctionIsDeclaredButNotUsed */]: "\u0424\u0443\u043D\u043A\u0446\u0438\u044F \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0430, \u043D\u043E \u043D\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F.",
   [274 /* TypeParameterIsDeclaredButNotUsed */]: "\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440 \u0442\u0438\u043F\u0430 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D, \u043D\u043E \u043D\u0435 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F.",
   [275 /* DefaultConstructorArgumentsMustBeNamed */]: "\u0410\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B \u043A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440\u0430 \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u0434\u043E\u043B\u0436\u043D\u044B \u043F\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0442\u044C\u0441\u044F \u0441 \u0443\u043A\u0430\u0437\u0430\u043D\u0438\u0435\u043C \u0438\u043C\u0435\u043D\u0438 \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0435\u0433\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430.",
-  [276 /* IncorrectBodyOfBasicAliasTypeMethod */]: "\u0422\u0435\u043B\u043E \u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u043E\u0433\u043E \u043C\u0435\u0442\u043E\u0434\u0430, \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u043D\u043E\u0433\u043E \u0432 \u0442\u043E\u0436\u0434\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u043C \u0442\u0438\u043F\u0435, \u0434\u043E\u043B\u0436\u043D\u043E \u0441\u043E\u0441\u0442\u043E\u044F\u0442\u044C \u0438\u0437 \u0432\u044B\u0437\u043E\u0432\u0430 \u0431\u0430\u0437\u043E\u0432\u043E\u0433\u043E \u043C\u0435\u0442\u043E\u0434\u0430 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0442\u0438\u043F\u0430 \u0441 \u0442\u0430\u043A\u0438\u043C\u0438 \u0436\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C\u0438 \u0438 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043C\u044B\u043C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435\u043C.",
+  [276 /* IncorrectBodyOfBasicAliasTypeMethod */]: "\u0422\u0435\u043B\u043E \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0433\u043E \u043C\u0435\u0442\u043E\u0434\u0430, \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u043D\u043E\u0433\u043E \u0432 \u0442\u043E\u0436\u0434\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u043C \u0442\u0438\u043F\u0435, \u0434\u043E\u043B\u0436\u043D\u043E \u0441\u043E\u0441\u0442\u043E\u044F\u0442\u044C \u0438\u0437 \u0432\u044B\u0437\u043E\u0432\u0430 \u0431\u0430\u0437\u043E\u0432\u043E\u0433\u043E \u043C\u0435\u0442\u043E\u0434\u0430 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u043E\u0433\u043E \u0442\u0438\u043F\u0430 \u0441 \u0442\u0430\u043A\u0438\u043C\u0438 \u0436\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430\u043C\u0438 \u0438 \u0432\u043E\u0437\u0432\u0440\u0430\u0449\u0430\u0435\u043C\u044B\u043C \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435\u043C.",
   [277 /* TheFollowingDeclarationsAreNotTranslated0 */]: "\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u044F \u043D\u0435 \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B: {0}.",
   [278 /* TheFollowingDeclarationAreNotTranslated0And1More */]: "\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u044F \u043D\u0435 \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u044B: {0} \u0438 \u0435\u0449\u0451 {1}.",
   [279 /* OperatorFunctionMustNotBeStatic */]: "\u0424\u0443\u043D\u043A\u0446\u0438\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u0432\u0441\u0435\u043E\u0431\u0449\u0435\u0439.",
@@ -13060,7 +13055,7 @@ var russianErrorMessages = {
   [282 /* OperatorFunction0MustHaveNoMoreThanOneParameter */]: "\u0424\u0443\u043D\u043A\u0446\u0438\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 '{0}' \u0434\u043E\u043B\u0436\u043D\u0430 \u0438\u043C\u0435\u0442\u044C \u043D\u0435 \u0431\u043E\u043B\u0435\u0435 \u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430.",
   [283 /* CorrespondingBasicTypeMemberNotFound */]: "\u041D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u0431\u0430\u0437\u043E\u0432\u044B\u0439 \u0447\u043B\u0435\u043D \u0442\u0438\u043F\u0430.",
   [284 /* ConstructorCannotBeDeclaredAsBasic */]: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D \u043A\u0430\u043A \u0431\u0430\u0437\u043E\u0432\u044B\u0439.",
-  [285 /* ConstructorCannotBeDeclaredAsOverridden */]: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D \u043A\u0430\u043A \u0438\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u043D\u044B\u0439.",
+  [285 /* ConstructorCannotBeDeclaredAsOverridden */]: "\u041A\u043E\u043D\u0441\u0442\u0440\u0443\u043A\u0442\u043E\u0440 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D \u043A\u0430\u043A \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439.",
   [286 /* AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier */]: "\u0410\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u0430\u044F \u0444\u0443\u043D\u043A\u0446\u0438\u044F \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0432\u044B\u0437\u0432\u0430\u043D\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u0438\u0437 \u0444\u0443\u043D\u043A\u0446\u0438\u0438, \u043F\u043E\u043C\u0435\u0447\u0435\u043D\u043D\u043E\u0439 \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u043C '\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u043E'.",
   [130 /* TagNameExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0442\u0435\u0433\u0430",
   [287 /* TagNotFound */]: "\u0422\u0435\u0433 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
@@ -16502,13 +16497,13 @@ var FunctionTypeBodyDisplayParts = class {
 };
 
 // source/entities/TypeEntity.ts
-var TypeEntityKind = /* @__PURE__ */ ((TypeEntityKind2) => {
-  TypeEntityKind2[TypeEntityKind2["Function"] = 0] = "Function";
-  TypeEntityKind2[TypeEntityKind2["Structured"] = 1] = "Structured";
-  TypeEntityKind2[TypeEntityKind2["Parameter"] = 2] = "Parameter";
-  TypeEntityKind2[TypeEntityKind2["Variant"] = 3] = "Variant";
-  TypeEntityKind2[TypeEntityKind2["Alias"] = 4] = "Alias";
-  return TypeEntityKind2;
+var TypeEntityKind = /* @__PURE__ */ ((TypeEntityKind4) => {
+  TypeEntityKind4[TypeEntityKind4["Function"] = 0] = "Function";
+  TypeEntityKind4[TypeEntityKind4["Structured"] = 1] = "Structured";
+  TypeEntityKind4[TypeEntityKind4["Parameter"] = 2] = "Parameter";
+  TypeEntityKind4[TypeEntityKind4["Variant"] = 3] = "Variant";
+  TypeEntityKind4[TypeEntityKind4["Alias"] = 4] = "Alias";
+  return TypeEntityKind4;
 })(TypeEntityKind || {});
 
 // source/entities/PackageMembers.ts
@@ -21093,7 +21088,7 @@ var ModifierParser = class {
         case 17 /* Basic */:
         case 38 /* Abstract */:
         case 41 /* Static */:
-        case 39 /* Redefined */:
+        case 39 /* Override */:
         case 40 /* Async */:
           return true;
         default:
@@ -23120,6 +23115,7 @@ __export(types_exports, {
   Constructor: () => Constructor,
   DereferenceOperator: () => DereferenceOperator,
   Destructor: () => Destructor,
+  Field: () => Field,
   FunctionType: () => FunctionType,
   Indexer: () => Indexer,
   IntersectionType: () => IntersectionType,
@@ -23133,7 +23129,6 @@ __export(types_exports, {
   UnionType: () => UnionType,
   UnresolvedType: () => UnresolvedType2,
   ValueParameter: () => ValueParameter,
-  Variable: () => Variable,
   VariantType: () => VariantType2
 });
 
@@ -23175,6 +23170,9 @@ var AliasType = class {
       default:
         Debug.never(mode);
     }
+    if (newSubstitutions === this._substitutions) {
+      return this;
+    }
     return this._analyzer.typeFactory.getAliasType(this._entity, newSubstitutions);
   }
   equals(other) {
@@ -23234,19 +23232,32 @@ var Substitutions = class _Substitutions {
   }
   substituteTypes(map) {
     const newMap = /* @__PURE__ */ new Map();
+    let mapChanged = false;
     for (const [parameter, type] of this.map) {
-      newMap.set(parameter, type.applySubstitutions(map));
+      const substitutedType = type.applySubstitutions(map);
+      mapChanged ||= substitutedType !== type;
+      newMap.set(parameter, substitutedType);
+    }
+    if (!mapChanged) {
+      return this;
     }
     return new _Substitutions(this._analyzer, newMap);
   }
   substituteTypesAndMerge(map) {
     const newMap = /* @__PURE__ */ new Map();
+    let mapChanged = false;
     for (const [parameter, type] of this.map) {
-      newMap.set(parameter, type.applySubstitutions(map));
+      const substitutedType = type.applySubstitutions(map);
+      mapChanged ||= substitutedType !== type;
+      newMap.set(parameter, substitutedType);
     }
     for (const [parameter, type] of map) {
+      mapChanged ||= this.map.get(parameter) !== type;
       newMap.set(parameter, type);
     }
+    if (!mapChanged) {
+      return this;
+    }
     return new _Substitutions(this._analyzer, newMap);
   }
   equals(other) {
@@ -23281,7 +23292,16 @@ var IntersectionType = class {
     return Substitutions.empty(this._analyzer);
   }
   applySubstitutions(map) {
-    const types = this.originalTypes.map((t) => t.applySubstitutions(map));
+    const types = new Array();
+    let typesChanged = false;
+    for (const type of this.originalTypes) {
+      const substitutedType = type.applySubstitutions(map);
+      typesChanged ||= substitutedType !== type;
+      types.push(substitutedType);
+    }
+    if (!typesChanged) {
+      return this;
+    }
     return this._analyzer.typeFactory.getIntersectionType(types);
   }
   getEntity() {
@@ -23338,6 +23358,9 @@ var FunctionType = class {
       default:
         Debug.never(mode);
     }
+    if (newSubstitutions === this._substitutions) {
+      return this;
+    }
     return this._analyzer.typeFactory.getFunctionType(this._entity, newSubstitutions);
   }
   equals(other) {
@@ -23619,6 +23642,9 @@ var StructuredType2 = class {
       default:
         Debug.never(mode);
     }
+    if (newSubstitutions === this._substitutions) {
+      return this;
+    }
     return this._analyzer.typeFactory.getStructuredType(this._entity, newSubstitutions);
   }
   isAspect() {
@@ -23835,11 +23861,11 @@ var ValueParameter = class {
     return this._entity.isVariadic();
   }
 };
-var Variable = class _Variable {
+var Field = class _Field {
   constructor(_entity, _substitutions) {
     this._entity = _entity;
     this._substitutions = _substitutions;
-    this.kind = "variable";
+    this.kind = "field";
   }
   getName() {
     return this._entity.getName();
@@ -23866,13 +23892,13 @@ var Variable = class _Variable {
     return this._entity.isVariant();
   }
   applySubstitutions(substitutions) {
-    return new _Variable(this._entity, this._substitutions.substituteTypes(substitutions.map));
+    return new _Field(this._entity, this._substitutions.substituteTypes(substitutions.map));
   }
   equals(other) {
     if (this === other) {
       return true;
     }
-    return other.kind === "variable" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
+    return other.kind === "field" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
 };
 var Operator = class _Operator {
@@ -24106,7 +24132,16 @@ var UnionType = class {
     return Substitutions.empty(this._analyzer);
   }
   applySubstitutions(map) {
-    const types = this.originalTypes.map((t) => t.applySubstitutions(map));
+    const types = new Array();
+    let typesChanged = false;
+    for (const type of this.originalTypes) {
+      const substitutedType = type.applySubstitutions(map);
+      typesChanged ||= substitutedType !== type;
+      types.push(substitutedType);
+    }
+    if (!typesChanged) {
+      return this;
+    }
     return this._analyzer.typeFactory.getUnionType(types);
   }
   getEntity() {
@@ -24188,6 +24223,9 @@ var VariantType2 = class {
       default:
         Debug.never(mode);
     }
+    if (newSubstitutions === this._substitutions) {
+      return this;
+    }
     return this._analyzer.typeFactory.getVariantType(this._entity, newSubstitutions);
   }
   getEntity() {
@@ -24440,7 +24478,7 @@ var TypeMemberLookupBase = class {
     if (mergeNonAspectShadowedMembersFirst) {
       for (const shadowedMembers of shadowedMembersFromMultipleTypes) {
         for (const shadowedMember of shadowedMembers) {
-          if (this.isAspectMember(shadowedMember)) {
+          if (TypeMemberEntity.isAspectTypeMember(shadowedMember.value.getEntity())) {
             continue;
           }
           if (shadowingMembers.some((shadowingMember) => this.checkShadowing(shadowingMember, shadowedMember))) {
@@ -24452,7 +24490,7 @@ var TypeMemberLookupBase = class {
       const newShadowingMembers = Array.from(result);
       for (const shadowedMembers of shadowedMembersFromMultipleTypes) {
         for (const shadowedMember of shadowedMembers) {
-          if (!this.isAspectMember(shadowedMember)) {
+          if (!TypeMemberEntity.isAspectTypeMember(shadowedMember.value.getEntity())) {
             continue;
           }
           if (newShadowingMembers.some((shadowingMember) => this.checkShadowing(shadowingMember, shadowedMember))) {
@@ -25085,7 +25123,7 @@ var NamedTypeMemberLookup = class extends TypeMemberLookupByKeyBase {
     return result;
   }
   checkShadowing(shadowing, shadowed) {
-    if (shadowing.value.kind === "variable" && shadowed.value.kind === "variable") {
+    if (shadowing.value.kind === "field" && shadowed.value.kind === "field") {
       return shadowing.name.value.considerEqual(shadowed.name.value);
     }
     if (shadowing.value.kind === "method" && shadowed.value.kind === "method") {
@@ -25095,24 +25133,10 @@ var NamedTypeMemberLookup = class extends TypeMemberLookupByKeyBase {
     }
     return shadowing.name.value.considerEqual(shadowed.name.value);
   }
-  isAspectMember(member) {
-    switch (member.value.kind) {
-      case "variable": {
-        const container = member.value.getEntity().getContainer();
-        return container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-      }
-      case "method": {
-        const container = member.value.getEntity().getContainer();
-        return container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-      }
-      default:
-        Debug.never(member.value);
-    }
-  }
   convertNamedMember(member, substitutions) {
     switch (member.kind) {
       case 0 /* Variable */:
-        return new Variable(member, substitutions);
+        return new Field(member, substitutions);
       case 1 /* Function */:
         return new Method(this._analyzer, member, substitutions);
       default:
@@ -25184,10 +25208,6 @@ var OperatorLookup = class extends TypeMemberLookupByKeyBase {
     const shadowedParameters = shadowed.value.getValueParameters();
     return shadowing.value.getOperatorKind() === shadowed.value.getOperatorKind() && shadowingParameters.length === shadowedParameters.length && Query.from(shadowingParameters).zip(shadowedParameters, (l, r) => l.getType().equals(r.getType())).all((v) => v);
   }
-  isAspectMember(member) {
-    const container = member.value.getEntity().getContainer();
-    return container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-  }
 };
 var IndexerLookup = class extends TypeMemberLookupBase {
   constructor(analyzer, localizationContext) {
@@ -25223,10 +25243,6 @@ var IndexerLookup = class extends TypeMemberLookupBase {
     const shadowedParameters = shadowed.value.getValueParameters();
     return shadowingParameters.length === shadowedParameters.length && Query.from(shadowingParameters).zip(shadowedParameters, (l, r) => l.getType().equals(r.getType())).all((v) => v);
   }
-  isAspectMember(member) {
-    const container = member.value.getEntity().getContainer();
-    return container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-  }
 };
 var DereferenceOperatorLookup = class extends TypeMemberLookupBase {
   constructor(analyzer, localizationContext) {
@@ -25260,10 +25276,6 @@ var DereferenceOperatorLookup = class extends TypeMemberLookupBase {
   checkShadowing(shadowing, shadowed) {
     return shadowing.value.getType().equals(shadowed.value.getType());
   }
-  isAspectMember(member) {
-    const container = member.value.getEntity().getContainer();
-    return container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-  }
 };
 var ConstructorLookup = class {
   constructor(analyzer, localizationContext) {
@@ -25651,10 +25663,10 @@ var TsTypeMembersCreator = class {
     }
     return symbol.declarations?.filter(
       (d) => ts.isMethodDeclaration(d) || ts.isMethodSignature(d)
-    ).map((d) => this.createFunctionEntityNoReplacement(symbol, d, forceStatic)) ?? [];
+    ).map((d) => this.createMethodEntityNoReplacement(symbol, d, forceStatic)) ?? [];
   }
-  createFunctionEntityNoReplacement(symbol, declaration, forceStatic) {
-    const entity = new TsFunctionEntity(this._tsctx, symbol, declaration, this._typeEntity, forceStatic);
+  createMethodEntityNoReplacement(symbol, declaration, forceStatic) {
+    const entity = new TsMethodEntity(this._tsctx, symbol, declaration, this._typeEntity, forceStatic);
     this.registerTypeParameters(declaration, entity.getTypeParameters());
     return entity;
   }
@@ -26494,8 +26506,8 @@ var TsPropertyEntity = class {
     const decl = this.getDeclaration();
     return this._forceStatic || decl !== void 0 && (ts2.getCombinedModifierFlags(decl) & ts2.ModifierFlags.Static) !== 0;
   }
-  isBasic() {
-    let result = !this.isStatic();
+  markedBasic() {
+    let result = !this.isStatic() && !this.markedAbstract();
     if (result) {
       const isHidden = this.isHidden();
       if (isHidden !== void 0) {
@@ -26511,19 +26523,18 @@ var TsPropertyEntity = class {
             Debug.never(isHidden);
         }
       }
+      if (result) {
+        result = !(this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect());
+      }
     }
     return result;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     const declaration = this.getDeclaration();
-    let result = declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
-    if (!result) {
-      result = this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect();
-    }
-    return result;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
   }
   getOverriddenMembers() {
     return this._overriddenMembers.getOrInsertWith(() => {
@@ -26534,7 +26545,7 @@ var TsPropertyEntity = class {
           result = TypeMemberLookup.ofType(this._tsctx.analyzer, baseType, void 0).getNamedMembersByName(
             new SearchName(this.getName(), true),
             1 /* OnlyInstanceMembers */
-          ).find((m) => m.value.kind === "variable")?.value;
+          ).find((m) => m.value.kind === "field")?.value;
         }
       }
       return result !== void 0 ? [result] : [];
@@ -26615,8 +26626,8 @@ var TsAccessorEntity = class {
     const declaration = this.getGetAccessorDeclaration();
     return this._forceStatic || declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Static) !== 0;
   }
-  isBasic() {
-    let result = !this.isStatic();
+  markedBasic() {
+    let result = !this.isStatic() && !this.markedAbstract();
     if (result) {
       const isHidden = this.isHidden();
       if (isHidden !== void 0) {
@@ -26632,19 +26643,18 @@ var TsAccessorEntity = class {
             Debug.never(isHidden);
         }
       }
+      if (result) {
+        result = !(this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect());
+      }
     }
     return result;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     const declaration = this.getGetAccessorDeclaration();
-    let result = declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
-    if (!result) {
-      result = this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect();
-    }
-    return result;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
   }
   getOverriddenMembers() {
     return this._overriddenMembers.getOrInsertWith(() => {
@@ -26655,7 +26665,7 @@ var TsAccessorEntity = class {
           result = TypeMemberLookup.ofType(this._tsctx.analyzer, baseType, void 0).getNamedMembersByName(
             new SearchName(this.getName(), true),
             1 /* OnlyInstanceMembers */
-          ).find((m) => m.value.kind === "variable")?.value;
+          ).find((m) => m.value.kind === "field")?.value;
         }
       }
       return result !== void 0 ? [result] : [];
@@ -26729,7 +26739,7 @@ var TsSetAccessorEntity = class {
 TsSetAccessorEntity = __decorateClass([
   entityToStringDecorator
 ], TsSetAccessorEntity);
-var TsFunctionEntity = class {
+var TsMethodEntity = class {
   constructor(_tsctx, _symbol, _declaration, _containingType, _forceStatic) {
     this._tsctx = _tsctx;
     this._symbol = _symbol;
@@ -26774,8 +26784,8 @@ var TsFunctionEntity = class {
   isStatic() {
     return this._forceStatic || (ts2.getCombinedModifierFlags(this._declaration) & ts2.ModifierFlags.Static) !== 0;
   }
-  isBasic() {
-    let result = !this.isStatic();
+  markedBasic() {
+    let result = !this.isStatic() && !this.markedAbstract();
     if (result) {
       const isHidden = this.isHidden();
       if (isHidden !== void 0) {
@@ -26791,18 +26801,17 @@ var TsFunctionEntity = class {
             Debug.never(isHidden);
         }
       }
+      if (result) {
+        result = !(this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect());
+      }
     }
     return result;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
-    let result = (ts2.getCombinedModifierFlags(this._declaration) & ts2.ModifierFlags.Abstract) !== 0;
-    if (!result) {
-      result = this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (ts2.getCombinedModifierFlags(this._declaration) & ts2.ModifierFlags.Abstract) !== 0;
   }
   isModifyingOwningPlainObject() {
     return false;
@@ -26841,9 +26850,9 @@ var TsFunctionEntity = class {
     });
   }
 };
-TsFunctionEntity = __decorateClass([
+TsMethodEntity = __decorateClass([
   entityToStringDecorator
-], TsFunctionEntity);
+], TsMethodEntity);
 var TsIteratorFunctionEntity = class {
   constructor(_tsctx, _symbol, _containingType) {
     this._tsctx = _tsctx;
@@ -26894,19 +26903,15 @@ var TsIteratorFunctionEntity = class {
   isStatic() {
     return false;
   }
-  isBasic() {
+  markedBasic() {
     return true;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     const declaration = this.getFirstDeclaration();
-    let result = declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
-    if (!result) {
-      result = this._containingType.typeEntityKind === 1 /* Structured */ && this._containingType.isAspect();
-    }
-    return result;
+    return declaration !== void 0 && (ts2.getCombinedModifierFlags(declaration) & ts2.ModifierFlags.Abstract) !== 0;
   }
   isModifyingOwningPlainObject() {
     return false;
@@ -27115,13 +27120,13 @@ var TsIndexSignatureEntity = class {
   isHidden() {
     return this._tsctx.getTypeMemberHiding(this._declaration, this._containingType);
   }
-  isBasic() {
+  markedBasic() {
     return false;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getTags() {
@@ -27172,7 +27177,7 @@ var TsConstructorEntity = class {
   isHidden() {
     return this._tsctx.getTypeMemberHiding(this._declaration, this._containingType);
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getTags() {
@@ -27210,7 +27215,7 @@ var TsSignatureBasedDefaultConstructorEntity = class {
   isHidden() {
     return void 0;
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getTags() {
@@ -27297,13 +27302,13 @@ var TsEnumMemberEntity = class {
   isStatic() {
     return true;
   }
-  isBasic() {
+  markedBasic() {
     return false;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getOverriddenMembers() {
@@ -27916,7 +27921,10 @@ var PackageVariableDeclarationEntity = class {
     this._hasReportedAllDiagnostics = false;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._node.name);
@@ -27992,7 +28000,10 @@ var ComputedPackageVariableDeclarationEntity = class {
     }
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._getterOrSetterDeclaration) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._getterOrSetterDeclaration);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._getterOrSetterDeclaration.name);
@@ -28051,7 +28062,10 @@ var FieldDeclarationEntity = class {
     this._node = node;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._node.name);
@@ -28096,22 +28110,17 @@ var FieldDeclarationEntity = class {
   isStatic() {
     return (this.modifierFlags & 64 /* Static */) !== 0;
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._node.initializer === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getOverriddenMembers() {
-    return this._overriddenMembers.getOrInsertWith(() => this._analyzer.overriddenMember.getOverriddenVariables(this._node));
+    return this._overriddenMembers.getOrInsertWith(() => this._analyzer.overriddenMember.getOverriddenFields(this._node));
   }
   isVariant() {
     return false;
@@ -28152,7 +28161,10 @@ var ComputedFieldDeclarationEntity = class {
     }
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._getterOrSetterDeclaration) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._getterOrSetterDeclaration);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._getterOrSetterDeclaration.name);
@@ -28176,19 +28188,14 @@ var ComputedFieldDeclarationEntity = class {
   isStatic() {
     return (this.modifierFlags & 64 /* Static */) !== 0;
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._getterOrSetterDeclaration.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getDefinition() {
     const nodes = [];
@@ -28213,7 +28220,7 @@ var ComputedFieldDeclarationEntity = class {
     return this.getGetter()?.getTags() ?? [];
   }
   getOverriddenMembers() {
-    return this._overriddenMembers.getOrInsertWith(() => this._analyzer.overriddenMember.getOverriddenVariables(this._getterOrSetterDeclaration));
+    return this._overriddenMembers.getOrInsertWith(() => this._analyzer.overriddenMember.getOverriddenFields(this._getterOrSetterDeclaration));
   }
   isVariant() {
     return false;
@@ -28269,13 +28276,13 @@ var VariantDeclarationEntity = class {
   isStatic() {
     return true;
   }
-  isBasic() {
+  markedBasic() {
     return false;
   }
-  isOverridden() {
+  isOverride() {
     return false;
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getOverriddenMembers() {
@@ -28787,14 +28794,14 @@ IntrinsicPackageVariableEntity = __decorateClass([
   entityToStringDecorator
 ], IntrinsicPackageVariableEntity);
 var IntrinsicFieldEntity = class {
-  constructor(_name, _type, _container, _isStatic, _isBasic, _isRedefined, _isAbstract, _isSpecial, _isHidden, _getter, _setter, _overriddenMembers) {
+  constructor(_name, _type, _container, _isStatic, _markedBasic, _isOverride, _markedAbstract, _isSpecial, _isHidden, _getter, _setter, _overriddenMembers) {
     this._name = _name;
     this._type = _type;
     this._container = _container;
     this._isStatic = _isStatic;
-    this._isBasic = _isBasic;
-    this._isRedefined = _isRedefined;
-    this._isAbstract = _isAbstract;
+    this._markedBasic = _markedBasic;
+    this._isOverride = _isOverride;
+    this._markedAbstract = _markedAbstract;
     this._isSpecial = _isSpecial;
     this._isHidden = _isHidden;
     this._getter = _getter;
@@ -28836,14 +28843,14 @@ var IntrinsicFieldEntity = class {
   isStatic() {
     return this._isStatic;
   }
-  isBasic() {
-    return this._isBasic;
+  markedBasic() {
+    return this._markedBasic;
   }
-  isOverridden() {
-    return this._isRedefined;
+  isOverride() {
+    return this._isOverride;
   }
-  isAbstract() {
-    return this._isAbstract;
+  markedAbstract() {
+    return this._markedAbstract;
   }
   getOverriddenMembers() {
     return this._overriddenMembers;
@@ -31721,14 +31728,14 @@ var DeclarationsUsageCounter = class {
             case "package-name-segment-access":
               break;
             case "static-field-access":
-              entity = meaning.variable.value.getEntity();
+              entity = meaning.field.value.getEntity();
               accessKind = meaning.accessKind;
               break;
             case "static-method-access":
               entity = meaning.singleSuitableFunction?.value.getEntity();
               break;
             case "instance-field-access":
-              entity = meaning.variable.value.getEntity();
+              entity = meaning.field.value.getEntity();
               accessKind = meaning.accessKind;
               break;
             case "instance-method-access":
@@ -31861,6 +31868,45 @@ var Meaning_unresolved4 = class {
   }
 };
 
+// source/analysis/FunctionOverloadResolver.ts
+var Resolver6 = class {
+  constructor(_analyzer) {
+    this._analyzer = _analyzer;
+  }
+  resolveByCallExpression(candidates, node) {
+    const typeArgumentCount = node.expression.kind === 89 /* GenericSpecializationExpression */ ? node.expression.typeArgumentClause.typeArgumentList.typeArguments.count() : 0;
+    const signatures = candidates.filter((c) => typeArgumentCount >= c.getRequiredTypeParameterCount() && typeArgumentCount <= c.getTypeParameterCount()).map((c) => new MatcherSignature2(c));
+    const args = node.argumentList.arguments.map((a) => new SourceArgument(this._analyzer, a)).toArray();
+    return new OverloadResolver(this._analyzer, signatures, args).resolveOverload().map((s) => s.value);
+  }
+  resolveByTargetType(candidates, targetType) {
+    return candidates.filter((c) => this._analyzer.isTypeAssignableTo(c.getSignatureType(), targetType));
+  }
+};
+var MatcherSignature2 = class {
+  constructor(value) {
+    this._parameters = new Cached();
+    this.value = value;
+  }
+  getParameters() {
+    return this._parameters.getOrInsertWith(() => this.value.getValueParameters().map((p) => new MatcherSignatureParameter2(p)));
+  }
+};
+var MatcherSignatureParameter2 = class {
+  constructor(value) {
+    this.value = value;
+  }
+  getName() {
+    return this.value.getName();
+  }
+  getType() {
+    return this.value.getType();
+  }
+  isOptional() {
+    return this.value.isOptional();
+  }
+};
+
 // source/analysis/SubstitutedFunction.ts
 var SubstitutedFunction_entity = class {
   constructor(entity, entitySignatureType, substitutions) {
@@ -31927,7 +31973,7 @@ var SubstitutedFunction_typeMember = class {
 };
 
 // source/analysis/IdentifierExpressionMeaning.ts
-var Resolver6 = class {
+var Resolver7 = class {
   constructor(analyzer, node, targetTypeHint) {
     this._semanticContext = new Cached();
     this._analyzer = analyzer;
@@ -32289,6 +32335,12 @@ var FunctionOverloadResolverCandidate = class {
   getSignatureType() {
     return this._analyzer.type.ofAccessedFunction(this.func);
   }
+  getTypeParameterCount() {
+    return this.func.value.getTypeParameters().length;
+  }
+  getRequiredTypeParameterCount() {
+    return getRequiredTypeParameterCount(this.func.value.getTypeParameters());
+  }
 };
 var OperatorOverloadResolverCandidate = class {
   constructor(analyzer, operator) {
@@ -32311,6 +32363,12 @@ var OperatorOverloadResolverCandidate = class {
   getSignatureType() {
     return this.operator.value.getSignatureType();
   }
+  getTypeParameterCount() {
+    return 0;
+  }
+  getRequiredTypeParameterCount() {
+    return 0;
+  }
 };
 var GenericOverloadResolverCandidateValueParameter = class {
   constructor(entity, type, localizedName) {
@@ -32406,7 +32464,7 @@ var ImportedPackage = class {
 };
 
 // source/analysis/IndexedAccessExpressionMeaning.ts
-var Resolver7 = class {
+var Resolver8 = class {
   constructor(_analyzer, _node) {
     this._analyzer = _analyzer;
     this._node = _node;
@@ -32618,7 +32676,7 @@ var PackageMemberLookup = class {
 };
 
 // source/analysis/MemberAccessExpressionMeaning.ts
-var Resolver8 = class {
+var Resolver9 = class {
   constructor(analyzer, node, targetTypeHint) {
     this._semanticContext = new Cached();
     this._analyzer = analyzer;
@@ -32814,7 +32872,7 @@ var Resolver8 = class {
     }
     if (namedMembers.length === 1) {
       const namedMember = namedMembers[0];
-      if (namedMember.value.kind === "variable") {
+      if (namedMember.value.kind === "field") {
         const variable = namedMember.value;
         const accessKind = this.convertSyntacticAccessKind(
           this._analyzer.getSyntacticAccessKind(this._node),
@@ -32908,7 +32966,7 @@ var Resolver8 = class {
     }
     if (namedMembers.length === 1) {
       const namedMember = namedMembers[0];
-      if (namedMember.value.kind === "variable") {
+      if (namedMember.value.kind === "field") {
         const variable = namedMember.value;
         const accessKind = this.convertSyntacticAccessKind(
           this._analyzer.getSyntacticAccessKind(this._node),
@@ -33084,9 +33142,9 @@ var Meaning_packageNameSegmentAccess2 = class {
   }
 };
 var Meaning_staticFieldAccess = class {
-  constructor(type, variable, accessKind) {
+  constructor(type, field, accessKind) {
     this.type = type;
-    this.variable = variable;
+    this.field = field;
     this.accessKind = accessKind;
     this.kind = "static-field-access";
   }
@@ -33103,8 +33161,8 @@ var Meaning_staticMethodAccess = class {
   }
 };
 var Meaning_instanceFieldAccess = class {
-  constructor(variable, accessKind) {
-    this.variable = variable;
+  constructor(field, accessKind) {
+    this.field = field;
     this.accessKind = accessKind;
     this.kind = "instance-field-access";
   }
@@ -33161,6 +33219,12 @@ var FunctionOverloadResolverCandidate2 = class {
   getSignatureType() {
     return this._analyzer.type.ofAccessedFunction(this.func);
   }
+  getTypeParameterCount() {
+    return this.func.value.getTypeParameters().length;
+  }
+  getRequiredTypeParameterCount() {
+    return getRequiredTypeParameterCount(this.func.value.getTypeParameters());
+  }
 };
 var OperatorOverloadResolverCandidate2 = class {
   constructor(analyzer, operator) {
@@ -33183,6 +33247,12 @@ var OperatorOverloadResolverCandidate2 = class {
   getSignatureType() {
     return this.operator.value.getSignatureType();
   }
+  getTypeParameterCount() {
+    return 0;
+  }
+  getRequiredTypeParameterCount() {
+    return 0;
+  }
 };
 var GenericOverloadResolverCandidateValueParameter2 = class {
   constructor(entity, type, localizedName) {
@@ -33500,7 +33570,7 @@ var TypeOverloadResolverCandidate3 = class {
 };
 
 // source/analysis/ObjectExpressionMeaning.ts
-var Resolver9 = class {
+var Resolver10 = class {
   constructor(analyzer, node) {
     this._analyzer = analyzer;
     this._node = node;
@@ -33598,44 +33668,6 @@ var Meaning_unresolved8 = class {
   }
 };
 
-// source/analysis/OperationOverloadResolver.ts
-var Resolver10 = class {
-  constructor(_analyzer) {
-    this._analyzer = _analyzer;
-  }
-  resolveByCallExpression(candidates, node) {
-    const signatures = candidates.map((c) => new MatcherSignature2(c));
-    const args = node.argumentList.arguments.map((a) => new SourceArgument(this._analyzer, a)).toArray();
-    return new OverloadResolver(this._analyzer, signatures, args).resolveOverload().map((s) => s.value);
-  }
-  resolveByTargetType(candidates, targetType) {
-    return candidates.filter((c) => this._analyzer.isTypeAssignableTo(c.getSignatureType(), targetType));
-  }
-};
-var MatcherSignature2 = class {
-  constructor(value) {
-    this._parameters = new Cached();
-    this.value = value;
-  }
-  getParameters() {
-    return this._parameters.getOrInsertWith(() => this.value.getValueParameters().map((p) => new MatcherSignatureParameter2(p)));
-  }
-};
-var MatcherSignatureParameter2 = class {
-  constructor(value) {
-    this.value = value;
-  }
-  getName() {
-    return this.value.getName();
-  }
-  getType() {
-    return this.value.getType();
-  }
-  isOptional() {
-    return this.value.isOptional();
-  }
-};
-
 // source/analysis/PackageMemberNameConflictsValidator.ts
 var PackageMemberNameConflictsValidator = class {
   constructor(_analyzer, _members) {
@@ -33663,99 +33695,60 @@ var PackageMemberNameConflictsValidator = class {
     return this._diagnostics;
   }
   validateFunctionNameConflicts(entities) {
-    const functionGroups = [];
     for (const entity of entities) {
-      let group = functionGroups.find((g) => g.length > 0 && this.areFunctionSignaturesEqual(g[0], entity));
-      if (group === void 0) {
-        group = [];
-        functionGroups.push(group);
-      }
-      group.push(entity);
-    }
-    for (const group of functionGroups) {
-      if (group.length <= 1) {
-        continue;
+      for (const entityToCheckAgainst of entities) {
+        if (entityToCheckAgainst === entity) {
+          continue;
+        }
+        if (this._analyzer.conflictsCheck.doFunctionSignaturesConflict(entity, entityToCheckAgainst) && this.shouldReportConflictWithMemberBasedOnHiding(entity, entityToCheckAgainst)) {
+          this.reportNameConflictDiagnostic(
+            entity,
+            299 /* PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes */
+          );
+          break;
+        }
       }
-      this.createAndAddNameConflictDiagnosticsForAllEntities(
-        group,
-        299 /* PackageAlreadyContainsFunctionWithTheSameNameAndParameterTypes */
-      );
     }
   }
-  areFunctionSignaturesEqual(entity1, entity2) {
-    const valueParameters1 = entity1.getValueParameters();
-    const valueParameters2 = entity2.getValueParameters();
-    return valueParameters1.length === valueParameters2.length && Query.from(valueParameters1).zip(valueParameters2, (p1, p2) => p1.getType().equals(p2.getType())).all((v) => v);
-  }
   validateTypeNameConflicts(entities) {
     for (const entity of entities) {
-      const typeParameters = entity.getTypeParameters();
-      const requiredTypeParameterCount = getRequiredTypeParameterCount(typeParameters);
-      let conflictingTypes;
-      for (const typeToCompareWith of entities) {
-        if (typeToCompareWith === entity) {
+      for (const entityToCheckAgainst of entities) {
+        if (entityToCheckAgainst === entity) {
           continue;
         }
-        const typeParametersOfTypeToCompareWith = typeToCompareWith.getTypeParameters();
-        if (this.typeParameterCountsIntersect(
-          requiredTypeParameterCount,
-          typeParameters.length,
-          getRequiredTypeParameterCount(typeParametersOfTypeToCompareWith),
-          typeParametersOfTypeToCompareWith.length
-        )) {
-          conflictingTypes ??= [];
-          conflictingTypes.push(typeToCompareWith);
+        if (this._analyzer.conflictsCheck.doPackageTypesConflict(entity, entityToCheckAgainst) && this.shouldReportConflictWithMemberBasedOnHiding(entity, entityToCheckAgainst)) {
+          this.reportNameConflictDiagnostic(
+            entity,
+            300 /* PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount */
+          );
+          break;
         }
       }
-      if (conflictingTypes !== void 0) {
-        this.createAndAddNameConflictDiagnostic(
-          entity,
-          conflictingTypes,
-          300 /* PackageAlreadyContainsTypeWithTheSameNameAndSameOrIntersectingTypeParameterCount */
-        );
-      }
     }
   }
-  typeParameterCountsIntersect(requiredCount1, count1, requiredCount2, count2) {
-    return requiredCount1 <= count2 && requiredCount2 <= count1;
-  }
   createAndAddNameConflictDiagnosticsForAllEntities(entities, diagnosticCode) {
     for (const entity of entities) {
-      this.createAndAddNameConflictDiagnostic(entity, entities, diagnosticCode);
+      if (entities.some((e) => e !== entity && this.shouldReportConflictWithMemberBasedOnHiding(entity, e))) {
+        this.reportNameConflictDiagnostic(entity, diagnosticCode);
+      }
     }
   }
-  createAndAddNameConflictDiagnostic(entity, conflictingEntities, diagnosticCode) {
-    const hiding = entity.isHidden();
-    if (hiding === void 0 || hiding.kind === "package") {
-      const conflictsWithOtherMembers = conflictingEntities.some((e) => {
-        if (e === entity) {
-          return false;
-        }
-        const hiding2 = e.isHidden();
-        return hiding2 === void 0 || hiding2.kind === "package";
-      });
-      if (conflictsWithOtherMembers) {
-        const diagnosticLocation = this.getDiagnosticLocation(entity);
-        if (diagnosticLocation !== void 0) {
-          const diagnosticData = DiagnosticData.withCode(diagnosticCode);
-          this._diagnostics.push(new Diagnostic(diagnosticData, diagnosticLocation));
-        }
-      }
-    } else if (hiding.kind === "file") {
-      const conflictsWithOtherMembers = conflictingEntities.some((e) => {
-        if (e === entity) {
-          return false;
-        }
-        const currentHiding = e.isHidden();
-        return currentHiding === void 0 || currentHiding.kind === "package" || currentHiding?.kind === "file" && currentHiding.sourceFile === hiding.sourceFile;
-      });
-      if (conflictsWithOtherMembers) {
-        const diagnosticLocation = this.getDiagnosticLocation(entity);
-        if (diagnosticLocation !== void 0) {
-          const diagnosticData = DiagnosticData.withCode(diagnosticCode);
-          this._diagnostics.push(new Diagnostic(diagnosticData, diagnosticLocation));
-        }
-      }
+  shouldReportConflictWithMemberBasedOnHiding(entity1, entity2) {
+    const entity1Hiding = entity1.isHidden();
+    const entity2Hiding = entity2.isHidden();
+    if (entity1Hiding === void 0 || entity1Hiding.kind === "package") {
+      return entity2Hiding === void 0 || entity2Hiding.kind === "package";
+    } else if (entity1Hiding.kind === "file") {
+      return entity2Hiding === void 0 || entity2Hiding.kind === "package" || entity2Hiding.kind === "file" && entity2Hiding.sourceFile === entity1Hiding.sourceFile;
+    } else {
+      return true;
+    }
+  }
+  reportNameConflictDiagnostic(entity, code) {
+    const diagnosticLocation = this.getDiagnosticLocation(entity);
+    if (diagnosticLocation !== void 0) {
+      const diagnosticData = DiagnosticData.withCode(code);
+      this._diagnostics.push(new Diagnostic(diagnosticData, diagnosticLocation));
     }
   }
   getDiagnosticLocation(entity) {
@@ -35207,14 +35200,14 @@ var NarrowableReference;
   }
   NarrowableReference2.PackageVariable = PackageVariable;
   class InstanceField {
-    constructor(_analyzer, variable, receiver) {
+    constructor(_analyzer, field, receiver) {
       this._analyzer = _analyzer;
-      this.variable = variable;
+      this.field = field;
       this.receiver = receiver;
       this.kind = "instance-field";
     }
     equals(other) {
-      return other.kind === "instance-field" && this.variable.equals(other.variable) && this.receiver.equals(other.receiver);
+      return other.kind === "instance-field" && this.field.equals(other.field) && this.receiver.equals(other.receiver);
     }
     contains(other) {
       if (this.receiver.equals(other)) {
@@ -35228,7 +35221,7 @@ var NarrowableReference;
           return false;
         }
         const meaning = this._analyzer.resolveIdentifierExpression(expression).meaning;
-        return meaning.kind === "variable-access" && meaning.variable.value.kind === "type-member" && meaning.variable.value.value.equals(this.variable);
+        return meaning.kind === "variable-access" && meaning.variable.value.kind === "type-member" && meaning.variable.value.value.equals(this.field);
       } else if (expression.kind === 78 /* MemberAccessExpression */) {
         const receiverExpression = unwrapExpressionForNarrowableReferenceCheck(expression.expression);
         if (!isNarrowableReferenceExpression(receiverExpression)) {
@@ -35238,7 +35231,7 @@ var NarrowableReference;
           return false;
         }
         const meaning = this._analyzer.resolveMemberAccessExpression(expression).meaning;
-        return meaning.kind === "instance-field-access" && meaning.variable.value.equals(this.variable);
+        return meaning.kind === "instance-field-access" && meaning.field.value.equals(this.field);
       } else {
         return false;
       }
@@ -35255,13 +35248,13 @@ var NarrowableReference;
   }
   NarrowableReference2.InstanceField = InstanceField;
   class StaticField {
-    constructor(_analyzer, variable) {
+    constructor(_analyzer, field) {
       this._analyzer = _analyzer;
-      this.variable = variable;
+      this.field = field;
       this.kind = "static-field";
     }
     equals(other) {
-      return other.kind === "static-field" && this.variable.equals(other.variable);
+      return other.kind === "static-field" && this.field.equals(other.field);
     }
     contains(_other) {
       return false;
@@ -35269,7 +35262,7 @@ var NarrowableReference;
     equalsExpression(expression) {
       if (expression.kind === 88 /* IdentifierExpression */) {
         const meaning = this._analyzer.resolveIdentifierExpression(expression).meaning;
-        return meaning.kind === "variable-access" && meaning.variable.value.kind === "type-member" && meaning.variable.value.value.equals(this.variable);
+        return meaning.kind === "variable-access" && meaning.variable.value.kind === "type-member" && meaning.variable.value.value.equals(this.field);
       } else if (expression.kind === 78 /* MemberAccessExpression */) {
         let result = NarrowableReferenceComparisonUtils.checkExpressionDenotesType(
           this._analyzer,
@@ -35277,7 +35270,7 @@ var NarrowableReference;
         );
         if (result) {
           const meaning = this._analyzer.resolveMemberAccessExpression(expression).meaning;
-          result = meaning.kind === "static-field-access" && meaning.variable.value.equals(this.variable);
+          result = meaning.kind === "static-field-access" && meaning.field.value.equals(this.field);
         }
         return result;
       } else {
@@ -35352,12 +35345,12 @@ function getReferenceAtNarrowableExpression(analyzer, node) {
         if (isNarrowableReferenceExpression(receiverExpression)) {
           const receiver = getReferenceAtNarrowableExpression(analyzer, receiverExpression);
           if (receiver !== void 0) {
-            return new NarrowableReference.InstanceField(analyzer, meaning.variable.value, receiver);
+            return new NarrowableReference.InstanceField(analyzer, meaning.field.value, receiver);
           }
         }
         return void 0;
       } else if (meaning.kind === "static-field-access") {
-        return new NarrowableReference.StaticField(analyzer, meaning.variable.value);
+        return new NarrowableReference.StaticField(analyzer, meaning.field.value);
       } else if (meaning.kind === "package-variable-access") {
         return new NarrowableReference.PackageVariable(analyzer, meaning.variable.value);
       }
@@ -37362,35 +37355,27 @@ var SemanticContextValidatingNameConflictsBase = class extends SemanticContextWi
     return this._memberEntitiesByNameKey;
   }
   validateNestedFunctionsConflicts(entities, sourceFile, diagnostics) {
-    const functionGroups = [];
     for (const entity of entities) {
-      let group = functionGroups.find((g) => g.length > 0 && this.areNestedFunctionSignaturesEqual(g[0], entity));
-      if (group === void 0) {
-        group = [];
-        functionGroups.push(group);
-      }
-      group.push(entity);
-    }
-    for (const group of functionGroups) {
-      if (group.length <= 1) {
-        continue;
-      }
-      const diagnosticData = DiagnosticData.withCode(
-        296 /* ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes */
-      );
-      for (const entity of group) {
-        const diagnosticRange = getDiagnosticRange(entity);
-        if (diagnosticRange !== void 0) {
-          diagnostics.addDiagnostic(new Diagnostic(diagnosticData, new DiagnosticLocation(diagnosticRange, sourceFile)));
+      for (const entityToCheckAgainst of entities) {
+        if (entityToCheckAgainst === entity) {
+          continue;
+        }
+        if (this._analyzer.conflictsCheck.doFunctionSignaturesConflict(entity, entityToCheckAgainst)) {
+          const diagnosticRange = getDiagnosticRange(entity);
+          if (diagnosticRange !== void 0) {
+            const diagnosticData = DiagnosticData.withCode(
+              296 /* ScopeAlreadyContainsFunctionWithTheSameNameAndParameterTypes */
+            );
+            diagnostics.addDiagnostic(new Diagnostic(
+              diagnosticData,
+              new DiagnosticLocation(diagnosticRange, sourceFile)
+            ));
+          }
+          break;
         }
       }
     }
   }
-  areNestedFunctionSignaturesEqual(entity1, entity2) {
-    const valueParameters1 = entity1.getValueParameters();
-    const valueParameters2 = entity2.getValueParameters();
-    return valueParameters1.length === valueParameters2.length && Query.from(valueParameters1).zip(valueParameters2, (p1, p2) => p1.getType().equals(p2.getType())).all((v) => v);
-  }
   createNamedDeclarations() {
     const locale = TreeQuery.fromNode(this.node).projectSourceFile(this._analyzer).package.locale;
     return this.memberEntities.map((e) => {
@@ -38283,7 +38268,7 @@ var TypeOrExtensionBodySemanticContext = class extends SemanticContextWithParent
   }
   convertNamedMember(member) {
     switch (member.value.kind) {
-      case "variable":
+      case "field":
         return member.withValue(new NamedDeclaration_variable(
           new NamedDeclarationVariable_typeMember(member.value)
         ));
@@ -38408,6 +38393,7 @@ var Analyzer = class _Analyzer {
     this.owningPlainObjectModificationCheck = new OwningPlainObjectModificationCheck(this);
     this.packageImports = new PackageImports(this);
     this.typeUtils = new TypeUtils(this);
+    this.conflictsCheck = new ConflictsCheck(this);
     const systemPackageName = PackageName3.parse("\u0410\u0440\u0442\u0435\u043B\u044C");
     const systemPackage = this.getPackageEntity(systemPackageName);
     if (systemPackage === void 0) {
@@ -38612,10 +38598,10 @@ var Analyzer = class _Analyzer {
     return result;
   }
   resolveFunctionOverloadByCallExpression(candidates, node) {
-    return new Resolver10(this).resolveByCallExpression(candidates, node);
+    return new Resolver6(this).resolveByCallExpression(candidates, node);
   }
   resolveFunctionOverloadByTargetType(candidates, targetType) {
-    return new Resolver10(this).resolveByTargetType(candidates, targetType);
+    return new Resolver6(this).resolveByTargetType(candidates, targetType);
   }
   resolveConstructorOverload(candidates, args) {
     return new Resolver(this).resolve(candidates, args);
@@ -38629,7 +38615,7 @@ var Analyzer = class _Analyzer {
       result = void 0;
     }
     if (result === void 0) {
-      result = new Resolver8(this, node, targetTypeHint).resolve();
+      result = new Resolver9(this, node, targetTypeHint).resolve();
       if (targetTypeHint === void 0 || !result.dependsOnTargetType) {
         this._memberAccessExpressionResolutionResults.set(node, result);
       }
@@ -38688,7 +38674,7 @@ var Analyzer = class _Analyzer {
   resolveIndexedAccessExpression(node) {
     let result = this._indexedAccessExpressionResolutionResults.get(node);
     if (result === void 0) {
-      result = new Resolver7(this, node).resolve();
+      result = new Resolver8(this, node).resolve();
       this._indexedAccessExpressionResolutionResults.set(node, result);
     }
     return result;
@@ -38720,7 +38706,7 @@ var Analyzer = class _Analyzer {
       result = void 0;
     }
     if (result === void 0) {
-      result = new Resolver6(this, node, targetTypeHint).resolve();
+      result = new Resolver7(this, node, targetTypeHint).resolve();
       if (targetTypeHint === void 0 || !result.dependsOnTargetType) {
         this._identifierExpressionResolutionResults.set(node, result);
       }
@@ -38738,7 +38724,7 @@ var Analyzer = class _Analyzer {
   getObjectExpressionMeaning(node) {
     let result = this._objectExpressionMeanings.get(node);
     if (result === void 0) {
-      result = new Resolver9(this, node).resolve();
+      result = new Resolver10(this, node).resolve();
       this._objectExpressionMeanings.set(node, result);
     }
     return result;
@@ -39616,7 +39602,7 @@ var Analyzer = class _Analyzer {
       if (!(member.kind === 0 /* Variable */ && isComputedVariableEntity(member))) {
         continue;
       }
-      if (member.isAbstract()) {
+      if (member.markedAbstract()) {
         continue;
       }
       const backingVariableName = member.getName().toBackingVariableName();
@@ -39751,7 +39737,7 @@ var Analyzer = class _Analyzer {
       return void 0;
     }
     const entity = this.entity.ofMethodDeclaration(node);
-    if (!entity.isBasic()) {
+    if (!entity.markedBasic()) {
       return void 0;
     }
     const container = entity.getContainer();
@@ -39800,7 +39786,7 @@ var Analyzer = class _Analyzer {
         Debug.never(meaning);
     }
     const calledFunctionEntity = calledFunction.getEntity();
-    if (calledFunctionEntity.subkind !== "method" || !calledFunctionEntity.isBasic()) {
+    if (calledFunctionEntity.subkind !== "method" || !TypeMemberEntity.isBasic(calledFunctionEntity)) {
       diagnostics?.addDiagnostic(this.createNodeDiagnostic(
         276 /* IncorrectBodyOfBasicAliasTypeMethod */,
         expression
@@ -39857,7 +39843,7 @@ var Analyzer = class _Analyzer {
       const displayService = new DisplayService(this, lctx);
       const typesText = members.map((d) => {
         switch (d.value.kind) {
-          case "variable": {
+          case "field": {
             const declaration = new VariableDeclaration_typeMember(d.value, d.localization);
             return displayService.displayVariableDeclaration(declaration);
           }
@@ -40476,7 +40462,7 @@ var Type4 = class {
         return result;
       }
       case "static-field-access": {
-        let result = meaning.variable.value.getType();
+        let result = meaning.field.value.getType();
         const narrowedType = this.getNarrowedTypeIfNarrowableReference(node, result);
         if (narrowedType !== void 0) {
           result = narrowedType;
@@ -40485,7 +40471,7 @@ var Type4 = class {
       }
       case "instance-field-access": {
         const declaredType = this._analyzer.includeNoneToTypeIfExpressionValidOutermostOptionalChaining(
-          meaning.variable.value.getType(),
+          meaning.field.value.getType(),
           node
         );
         const narrowedType = this.getNarrowedTypeIfNarrowableReference(node, declaredType);
@@ -42108,12 +42094,12 @@ var OverriddenMember = class {
   constructor(_analyzer) {
     this._analyzer = _analyzer;
   }
-  getOverriddenVariables(node) {
+  getOverriddenFields(node) {
     const entity = node.kind === 54 /* FieldDeclaration */ ? this._analyzer.entity.ofFieldDeclaration(node) : this._analyzer.entity.ofComputedFieldDeclaration(node);
     const result = new Array();
     if (this.entityCanOverride(entity)) {
       for (const lookup of this.enumerateTypeMemberLookupsForOverriddenMember(entity, node)) {
-        const overriddenMember = this.findOverriddenVariableInType(entity, lookup);
+        const overriddenMember = this.findOverriddenFieldInType(entity, lookup);
         if (overriddenMember !== void 0) {
           this.addTypeMemberIfUnique(result, overriddenMember);
         }
@@ -42173,11 +42159,11 @@ var OverriddenMember = class {
     }
     return result;
   }
-  findOverriddenVariableInType(variable, typeMemberLookup) {
+  findOverriddenFieldInType(variable, typeMemberLookup) {
     return typeMemberLookup.getNamedMembersByName(new SearchName(
       variable.getName(),
       (variable.getName().flags & 2 /* OriginalName */) !== 0
-    )).find((m) => m.value.kind === "variable" && this.checkVariableOverridesVariable(variable, m.value))?.value;
+    )).find((m) => m.value.kind === "field" && this.checkFieldOverridesField(variable, m.value))?.value;
   }
   findOverriddenMethodInType(method, typeMemberLookup) {
     return typeMemberLookup.getNamedMembersByName(new SearchName(method.getName(), (method.getName().flags & 2 /* OriginalName */) !== 0)).find((m) => m.value.kind === "method" && this.checkMethodOverridesMethod(method, m.value))?.value;
@@ -42191,8 +42177,8 @@ var OverriddenMember = class {
   findOverriddenDereferenceOperatorInType(dereferenceOperator, typeMemberLookup) {
     return typeMemberLookup.getDereferenceOperators().find((m) => this.checkDereferenceOperatorOverridesDereferenceOperator(dereferenceOperator, m.value))?.value;
   }
-  checkVariableOverridesVariable(_variableFromDerivedType, variableFromBaseType) {
-    return this.entityCanBeOverridden(variableFromBaseType.getEntity());
+  checkFieldOverridesField(_fieldFromDerivedType, fieldFromBaseType) {
+    return this.entityCanBeOverridden(fieldFromBaseType.getEntity());
   }
   checkMethodOverridesMethod(methodFromDerivedType, methodFromBaseType) {
     if (!this.entityCanBeOverridden(methodFromBaseType.getEntity())) {
@@ -42281,7 +42267,7 @@ var OverriddenMember = class {
     if (entity.isStatic()) {
       return false;
     }
-    if (!entity.isOverridden()) {
+    if (!entity.isOverride()) {
       return false;
     }
     const container = entity.getContainer();
@@ -42291,14 +42277,7 @@ var OverriddenMember = class {
     if (entity.isStatic()) {
       return false;
     }
-    if (entity.isBasic() || entity.isOverridden() || entity.isAbstract()) {
-      return true;
-    }
-    const baseContainer = entity.getContainer();
-    if (baseContainer.kind === "type" && baseContainer.typeEntity.typeEntityKind === 1 /* Structured */ && baseContainer.typeEntity.isAspect()) {
-      return true;
-    }
-    return false;
+    return TypeMemberEntity.isBasic(entity);
   }
   addTypeMemberIfUnique(members, member) {
     for (const existingMember of members) {
@@ -42443,7 +42422,7 @@ var LinkedEntity = class {
     }
     const containingPackage = getPackageContainingEntity(entity);
     const linkedPackage = this._analyzer.getLinkedMultiPlatformPackage(containingPackage, platform);
-    return linkedPackage?.getLinkedTypeWithMembers(container.typeEntity)?.getLinkedVariable(entity);
+    return linkedPackage?.getLinkedTypeWithMembers(container.typeEntity)?.getLinkedField(entity);
   }
   ofMethod(entity, platform) {
     const container = entity.getContainer();
@@ -42739,11 +42718,11 @@ var LinkedTypeWithMembers = class {
   get memberLookup() {
     return this._memberLookup.getOrInsertWith(() => TypeMemberLookup.ofTypeEntity(this.analyzer, this.targetType, void 0));
   }
-  getLinkedVariable(entity) {
+  getLinkedField(entity) {
     if (entity.getContainer().getEntity() !== this.externalType) {
       return void 0;
     }
-    return this.memberLookup.getNamedMembersByName(new SearchName(entity.getName(), false)).find((m) => m.value.kind === "variable")?.value.getEntity();
+    return this.memberLookup.getNamedMembersByName(new SearchName(entity.getName(), false)).find((m) => m.value.kind === "field")?.value.getEntity();
   }
   getLinkedMethod(entity) {
     if (entity.getContainer().getEntity() !== this.externalType) {
@@ -42907,7 +42886,7 @@ var OwningPlainObjectModificationCheck = class {
       case 78 /* MemberAccessExpression */: {
         const meaning = this._analyzer.resolveMemberAccessExpression(receiver).meaning;
         if (meaning.kind === "instance-field-access") {
-          const propertyType = meaning.variable.value.getType();
+          const propertyType = meaning.field.value.getType();
           if (propertyType.kind === "structured" && propertyType.getEntity().isPlainObject()) {
             result = this.checkReceiverModifiesPlainObjectRecursively(receiver.expression);
           }
@@ -43510,6 +43489,138 @@ var TypeUtils = class {
     return result;
   }
 };
+var ConflictsCheck = class {
+  constructor(_analyzer) {
+    this._analyzer = _analyzer;
+    this._stubParameterTypes = new Array();
+  }
+  /**
+   * Проверяет, конфликтуют ли две функции, т.е. могут ли такие функции находиться в одной области видимости.
+   * Метод не сравнивает имена.
+   *
+   * Отношение "функции конфликтуют" не является транзитивным, т.е. из того, что функция 1 конфликтует с функцией 2 и
+   * функция 2 конфликтует с функцией 3 не следует, что функция 1 конфликтует с функцией 3.
+   *
+   * Пример:
+   * ```artel
+   * 1. функция ф<Т1>()
+   * 2. функция ф<Т1, Т2>()
+   * 3. функция ф<Т1, Т2 = Объект>()
+   * ```
+   *
+   * Функции 1 и 2 не конфликтуют между собой, поскольку имеют разное количество количество параметров типа, однако
+   * каждая из них конфликтует с функций 3, которая может принимать от 1 до 2 параметров типа.
+   */
+  doFunctionSignaturesConflict(function1, function2) {
+    const parameters1 = function1.getValueParameters();
+    const parameters2 = function2.getValueParameters();
+    if (parameters1.length !== parameters2.length) {
+      return false;
+    }
+    const typeParameters1 = function1.getTypeParameters();
+    let substitutionMap1;
+    if (typeParameters1.length > 0) {
+      substitutionMap1 = this.createSubstitutionMapWithStubTypes(typeParameters1);
+    }
+    const typeParameters2 = function2.getTypeParameters();
+    let substitutionMap2;
+    if (typeParameters2.length > 0) {
+      substitutionMap2 = this.createSubstitutionMapWithStubTypes(typeParameters2);
+    }
+    let result = this.doParametersConflict(parameters1, parameters2, substitutionMap1, substitutionMap2);
+    if (result && typeParameters1.length !== typeParameters2.length) {
+      result = this.doTypeArgumentCountsIntersect(typeParameters1, typeParameters2);
+    }
+    return result;
+  }
+  /**
+   * Проверяет, конфликтуют две сущности, имеющие параметры, но не имеющие параметры типа.
+   */
+  doSignaturesWithoutTypeParametersConflict(entity1, entity2) {
+    return this.doParametersConflict(entity1.getValueParameters(), entity2.getValueParameters());
+  }
+  /**
+   * Проверяет, конфликтуют ли два типа, т.е. могут ли такие типы находиться в одном пакете. Метод не сравнивает имена.
+   *
+   * Отношение "типы конфликтуют" не является транзитивным (см. комментарий у метода
+   * {@link doFunctionSignaturesConflict}).
+   */
+  doPackageTypesConflict(type1, type2) {
+    return this.doTypeArgumentCountsIntersect(type1.getTypeParameters(), type2.getTypeParameters());
+  }
+  doTypeArgumentCountsIntersect(typeParameters1, typeParameters2) {
+    const requiredCount1 = getRequiredTypeParameterCount(typeParameters1);
+    const requiredCount2 = getRequiredTypeParameterCount(typeParameters2);
+    return requiredCount1 <= typeParameters2.length && requiredCount2 <= typeParameters1.length;
+  }
+  doParametersConflict(parameters1, parameters2, substitutionMap1, substitutionMap2) {
+    if (parameters1.length !== parameters2.length) {
+      return false;
+    }
+    for (let i = 0; i < parameters1.length; i++) {
+      let type1 = parameters1[i].getType();
+      if (substitutionMap1 !== void 0) {
+        type1 = type1.applySubstitutions(substitutionMap1);
+      }
+      let type2 = parameters2[i].getType();
+      if (substitutionMap2 !== void 0) {
+        type2 = type2.applySubstitutions(substitutionMap2);
+      }
+      if (!type1.equals(type2)) {
+        return false;
+      }
+    }
+    return true;
+  }
+  createSubstitutionMapWithStubTypes(typeParameters) {
+    const count = typeParameters.length;
+    if (this._stubParameterTypes.length < count) {
+      for (let i = this._stubParameterTypes.length; i < count; i++) {
+        this._stubParameterTypes.push(this._analyzer.typeFactory.getParameterType(new StubTypeParameterEntity(), false));
+      }
+    }
+    const substitutions = new Substitutions(
+      this._analyzer,
+      typeParameters,
+      this._stubParameterTypes.slice(0, count)
+    );
+    return substitutions.map;
+  }
+};
+var StubTypeParameterEntity = class {
+  constructor() {
+    this.kind = 2 /* Type */;
+    this.typeEntityKind = 2 /* Parameter */;
+    this._constraint = new Cached();
+  }
+  getName() {
+    return new Name("\u0422");
+  }
+  getConstraint() {
+    return this._constraint.getOrInsertWith(() => new TypeParameterConstraint(void 0));
+  }
+  getDefaultType() {
+    return void 0;
+  }
+  getDefinition() {
+    return { kind: 1 /* Intrinsic */ };
+  }
+  getArity() {
+    return 0;
+  }
+  getTypeParameters() {
+    return [];
+  }
+  getContainingEntity() {
+    Debug.unreachable("\u041C\u0435\u0442\u043E\u0434 getContainingEntity \u043D\u0435 \u0434\u043E\u043B\u0436\u0435\u043D \u0432\u044B\u0437\u044B\u0432\u0430\u0442\u044C\u0441\u044F \u043D\u0430 \u0437\u0430\u0433\u043B\u0443\u0448\u043A\u0435 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 \u0442\u0438\u043F\u0430.");
+  }
+  isHidden() {
+    return void 0;
+  }
+  getTags() {
+    return [];
+  }
+};
 var ExpressionDenotesFunctionCheckResult = class {
   constructor(candidates, suitableFunctions) {
     this.candidates = candidates;
@@ -44397,8 +44508,8 @@ var DiagnosticCollector = class _DiagnosticCollector {
         node.creationKeyword
       ));
     }
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         285 /* ConstructorCannotBeDeclaredAsOverridden */,
         node.creationKeyword
@@ -44412,15 +44523,15 @@ var DiagnosticCollector = class _DiagnosticCollector {
     if (node.block !== void 0) {
       this.checkPossibleGeneratorFunctionReturnType(entity, node.block, node.name);
       const container = entity.getContainer();
-      if (entity.isBasic() && container.kind === "type" && container.typeEntity.typeEntityKind === 4 /* Alias */) {
+      if (entity.markedBasic() && container.kind === "type" && container.typeEntity.typeEntityKind === 4 /* Alias */) {
         this._analyzer.checkBodyOfBasicAliasTypeMethod(node, this._diagnosticAcceptor);
       }
     }
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     if (node.typeParameterClause !== void 0) {
@@ -44439,11 +44550,11 @@ var DiagnosticCollector = class _DiagnosticCollector {
   checkOperatorDeclaration(node) {
     const entity = this._analyzer.entity.ofOperatorDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.name);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     const staticModifier = findModifier(node, 41 /* Static */);
@@ -44530,22 +44641,22 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
     const entity = this._analyzer.entity.ofFieldDeclaration(node);
     entity.ensureAllDiagnosticsReported?.();
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
   }
   checkFieldGetterDeclaration(node) {
     const entity = this._analyzer.entity.ofComputedFieldDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.name);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     this.checkAllCodePathsReturnOrResultVariableIsAssigned(
@@ -44558,22 +44669,22 @@ var DiagnosticCollector = class _DiagnosticCollector {
   checkFieldSetterDeclaration(node) {
     const entity = this._analyzer.entity.ofComputedFieldDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.name);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
   }
   checkIndexedElementGetterDeclaration(node) {
     const entity = this._analyzer.entity.ofIndexerDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.parameterClause);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     this._analyzer.semanticContext.ofIndexedElementAccessorDeclarationParameters(node).validateNameConflicts(this._diagnosticAcceptor);
@@ -44587,11 +44698,11 @@ var DiagnosticCollector = class _DiagnosticCollector {
   checkIndexedElementSetterDeclaration(node) {
     const entity = this._analyzer.entity.ofIndexerDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.parameterClause);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     this._analyzer.semanticContext.ofIndexedElementAccessorDeclarationParameters(node).validateNameConflicts(this._diagnosticAcceptor);
@@ -44599,11 +44710,11 @@ var DiagnosticCollector = class _DiagnosticCollector {
   checkDereferencedVariableGetterDeclaration(node) {
     const entity = this._analyzer.entity.ofDereferenceOperatorDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.caretToken);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
     this.checkAllCodePathsReturnOrResultVariableIsAssigned(
@@ -44616,11 +44727,11 @@ var DiagnosticCollector = class _DiagnosticCollector {
   checkDereferencedVariableSetterDeclaration(node) {
     const entity = this._analyzer.entity.ofDereferenceOperatorDeclaration(node);
     this.checkTypeMemberBodyPresence(entity, node.block, node.caretToken);
-    const redefinedModifier = findModifier(node, 39 /* Redefined */);
-    if (redefinedModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
+    const overrideModifier = findModifier(node, 39 /* Override */);
+    if (overrideModifier !== void 0 && entity.getOverriddenMembers().length === 0) {
       this.addDiagnostic(this._analyzer.createNodeDiagnostic(
         283 /* CorrespondingBasicTypeMemberNotFound */,
-        redefinedModifier
+        overrideModifier
       ));
     }
   }
@@ -44798,14 +44909,14 @@ var DiagnosticCollector = class _DiagnosticCollector {
     if (findTag(this._analyzer.wellKnownDeclarations.builtIntoPlatform, entity.getTags()) !== void 0) {
       return 3 /* DoesNotRequireBecauseHasBuiltIntoPlatformTag */;
     }
-    if (TypeMemberEntity2.isStatic(entity)) {
+    if (TypeMemberEntity.isStatic(entity)) {
       return 5 /* RequiresBecauseIsStaticMember */;
     }
-    const isAspectTypeMember = TypeMemberEntity2.isAspectTypeMember(entity);
-    if (entity.isAbstract() && !isAspectTypeMember) {
+    if (entity.markedAbstract()) {
       return 1 /* DoesNotRequireBecauseIsAbstract */;
     }
-    if (this.isBasicEntity(entity) && isAspectTypeMember) {
+    const isAspectTypeMember = TypeMemberEntity.isAspectTypeMember(entity);
+    if (TypeMemberEntity.markedBasic(entity) && isAspectTypeMember) {
       return 4 /* RequiresBecauseIsBasicAspectTypeMember */;
     }
     if (isAspectTypeMember) {
@@ -44813,27 +44924,6 @@ var DiagnosticCollector = class _DiagnosticCollector {
     }
     return 6 /* RequiresBecauseIsRegularMember */;
   }
-  // TODO: заменить на entity.isBasic().
-  isBasicEntity(entity) {
-    switch (entity.kind) {
-      case 0 /* Variable */:
-        return entity.isBasic();
-      case 1 /* Function */:
-        return entity.isBasic();
-      case 5 /* Indexer */:
-        return entity.isBasic();
-      case 6 /* DereferenceOperator */:
-        return entity.isBasic();
-      case 9 /* Operator */:
-        return entity.isBasic();
-      case 7 /* Constructor */:
-        return false;
-      case 8 /* Destructor */:
-        return false;
-      default:
-        Debug.never(entity);
-    }
-  }
   // TODO: учесть константы времени компиляции.
   // private validateVariantInitializer(expression: tree.Expression): void {
   //   if (expression.kind === tree.NodeKind.TokenExpression) {
@@ -45134,12 +45224,12 @@ var DiagnosticCollector = class _DiagnosticCollector {
         break;
       }
       case "static-field-access": {
-        this.checkAssignmentToField(meaning.variable.value.getEntity(), statement, node.propertyName, node);
+        this.checkAssignmentToField(meaning.field.value.getEntity(), statement, node.propertyName, node);
         this.checkOptionalChainingIsUsedOnTheLeftSideOfAssignment(statement.left);
         break;
       }
       case "instance-field-access": {
-        this.checkAssignmentToField(meaning.variable.value.getEntity(), statement, node.propertyName, node);
+        this.checkAssignmentToField(meaning.field.value.getEntity(), statement, node.propertyName, node);
         this.checkOptionalChainingIsUsedOnTheLeftSideOfAssignment(statement.left);
         break;
       }
@@ -45647,8 +45737,8 @@ function modifierToModifierFlag(modifier) {
       return 1024 /* Const */;
     case 38 /* Abstract */:
       return 128 /* Abstract */;
-    case 39 /* Redefined */:
-      return 256 /* Redefined */;
+    case 39 /* Override */:
+      return 256 /* Override */;
     case 40 /* Async */:
       return 512 /* Async */;
     case 41 /* Static */:
@@ -45886,7 +45976,10 @@ var PackageAliasTypeDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._node.name);
@@ -45979,7 +46072,10 @@ var ConstructorDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getValueParameters() {
     return this._valueParameters.getOrInsertWith(
@@ -45998,13 +46094,8 @@ var ConstructorDeclarationEntity = class {
   isHidden() {
     return this._analyzer.createTypeMemberHiding(this._node, this.modifierFlags);
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._node.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getTags() {
     return this._analyzer.tags.ofTagList(this._node.tagList);
@@ -46014,12 +46105,12 @@ ConstructorDeclarationEntity = __decorateClass([
   entityToStringDecorator
 ], ConstructorDeclarationEntity);
 var IntrinsicConstructorEntity = class {
-  constructor(_valueParameters, _containingEntity, _isDefault, _isHidden, _isAbstract) {
+  constructor(_valueParameters, _containingEntity, _isDefault, _isHidden, _markedAbstract) {
     this._valueParameters = _valueParameters;
     this._containingEntity = _containingEntity;
     this._isDefault = _isDefault;
     this._isHidden = _isHidden;
-    this._isAbstract = _isAbstract;
+    this._markedAbstract = _markedAbstract;
     this.kind = 7 /* Constructor */;
   }
   getValueParameters() {
@@ -46037,8 +46128,8 @@ var IntrinsicConstructorEntity = class {
   isHidden() {
     return this._isHidden;
   }
-  isAbstract() {
-    return this._isAbstract;
+  markedAbstract() {
+    return this._markedAbstract;
   }
   getTags() {
     return [];
@@ -46078,7 +46169,7 @@ var DefaultConstructorEntity = class {
   isHidden() {
     return void 0;
   }
-  isAbstract() {
+  markedAbstract() {
     return false;
   }
   getTags() {
@@ -46168,7 +46259,10 @@ var DereferenceOperatorDeclarationEntity = class {
     }
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._getterOrSetterDeclaration) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._getterOrSetterDeclaration);
+    }
+    return this._modifierFlags;
   }
   getType() {
     if (this._getterDeclaration !== void 0) {
@@ -46202,19 +46296,14 @@ var DereferenceOperatorDeclarationEntity = class {
     const getterEntity = this.getGetter();
     return getterEntity !== void 0 ? getterEntity.isHidden() : this.getSetter()?.isHidden();
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._getterOrSetterDeclaration.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getTags() {
     return this.getGetter()?.getTags() ?? [];
@@ -46237,7 +46326,10 @@ var DestructorDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getValueParameters() {
     return this._valueParameters.getOrInsertWith(
@@ -46253,13 +46345,8 @@ var DestructorDeclarationEntity = class {
   isHidden() {
     return this._analyzer.createTypeMemberHiding(this._node, this.modifierFlags);
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._node.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getTags() {
     return this._analyzer.tags.ofTagList(this._node.tagList);
@@ -46323,7 +46410,10 @@ var PackageVariableGetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getReturnType() {
     return this._analyzer.entity.ofComputedPackageVariableDeclaration(this._node).getType();
@@ -46355,7 +46445,10 @@ var FieldGetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getReturnType() {
     return this._analyzer.entity.ofComputedFieldDeclaration(this._node).getType();
@@ -46387,7 +46480,10 @@ var IndexedElementGetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getReturnType() {
     return this._analyzer.entity.ofIndexerDeclaration(this._node).getType();
@@ -46419,7 +46515,10 @@ var DereferencedVariableGetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getReturnType() {
     return this._analyzer.entity.ofDereferenceOperatorDeclaration(this._node).getType();
@@ -46496,7 +46595,10 @@ var IndexerDeclarationEntity = class {
     return this._parameters.getOrInsertWith(() => this.createParameters());
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._getterOrSetterDeclaration) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._getterOrSetterDeclaration);
+    }
+    return this._modifierFlags;
   }
   getParameter(node) {
     const entityByNode = this.parameters.entityByNode;
@@ -46539,19 +46641,14 @@ var IndexerDeclarationEntity = class {
     const getterEntity = this.getGetter();
     return getterEntity !== void 0 ? getterEntity.isHidden() : this.getSetter()?.isHidden();
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._getterOrSetterDeclaration.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   getTags() {
     return this.getGetter()?.getTags() ?? [];
@@ -46590,7 +46687,10 @@ var PackageFunctionDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._node.name);
@@ -46648,7 +46748,10 @@ var MethodDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getName() {
     return this._analyzer.createNameFromIdentifier(this._node.name);
@@ -46693,19 +46796,14 @@ var MethodDeclarationEntity = class {
   isStatic() {
     return (this.modifierFlags & 64 /* Static */) !== 0;
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._node.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   isModifyingOwningPlainObject() {
     return this._node.block !== void 0 ? this._analyzer.owningPlainObjectModificationCheck.ofDeclarationBody(this._node.block) : false;
@@ -46824,7 +46922,7 @@ IntrinsicPackageFunctionEntity = __decorateClass([
   entityToStringDecorator
 ], IntrinsicPackageFunctionEntity);
 var IntrinsicMethodEntity = class {
-  constructor(_name, _typeParameters, _valueParameters, _returnType, _isAsync, _isHidden, _tags, _isFunctionTypeInvokeMethod, _container, _isStatic, _isBasic, _isRedefined, _isAbstract, _isModifyingOwningPlainObject, _overriddenMembers) {
+  constructor(_name, _typeParameters, _valueParameters, _returnType, _isAsync, _isHidden, _tags, _isFunctionTypeInvokeMethod, _container, _isStatic, _isBasic, _isOverride, _isAbstract, _isModifyingOwningPlainObject, _overriddenMembers) {
     this._name = _name;
     this._typeParameters = _typeParameters;
     this._valueParameters = _valueParameters;
@@ -46836,7 +46934,7 @@ var IntrinsicMethodEntity = class {
     this._container = _container;
     this._isStatic = _isStatic;
     this._isBasic = _isBasic;
-    this._isRedefined = _isRedefined;
+    this._isOverride = _isOverride;
     this._isAbstract = _isAbstract;
     this._isModifyingOwningPlainObject = _isModifyingOwningPlainObject;
     this._overriddenMembers = _overriddenMembers;
@@ -46879,13 +46977,13 @@ var IntrinsicMethodEntity = class {
   isStatic() {
     return this._isStatic;
   }
-  isBasic() {
+  markedBasic() {
     return this._isBasic;
   }
-  isOverridden() {
-    return this._isRedefined;
+  isOverride() {
+    return this._isOverride;
   }
-  isAbstract() {
+  markedAbstract() {
     return this._isAbstract;
   }
   isModifyingOwningPlainObject() {
@@ -46917,7 +47015,10 @@ var PackageFunctionTypeDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getNaming() {
     return new EntityNaming_named(this.getName());
@@ -47249,7 +47350,10 @@ var OperatorDeclarationEntity = class {
     );
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getOperatorKind() {
     return this._operatorKind;
@@ -47272,19 +47376,14 @@ var OperatorDeclarationEntity = class {
   isStatic() {
     return (this.modifierFlags & 64 /* Static */) !== 0;
   }
-  isBasic() {
+  markedBasic() {
     return (this.modifierFlags & 32 /* Basic */) !== 0;
   }
-  isOverridden() {
-    return (this.modifierFlags & 256 /* Redefined */) !== 0;
+  isOverride() {
+    return (this.modifierFlags & 256 /* Override */) !== 0;
   }
-  isAbstract() {
-    let result = (this.modifierFlags & 128 /* Abstract */) !== 0;
-    if (!result && this._node.block === void 0) {
-      const container = this.getContainer();
-      result = container.kind === "type" && container.typeEntity.typeEntityKind === 1 /* Structured */ && container.typeEntity.isAspect();
-    }
-    return result;
+  markedAbstract() {
+    return (this.modifierFlags & 128 /* Abstract */) !== 0;
   }
   isHidden() {
     return this._analyzer.createTypeMemberHiding(this._node, this.modifierFlags);
@@ -47496,7 +47595,10 @@ var PackageVariableSetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -47525,7 +47627,10 @@ var FieldSetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -47554,7 +47659,10 @@ var IndexedElementSetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -47583,7 +47691,10 @@ var DereferencedVariableSetterDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getDefinition() {
     return { kind: 0 /* Source */, node: this._node };
@@ -47844,7 +47955,10 @@ var SourcePackageStructuredTypeDeclarationData = class {
     this._entity = entity;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getNaming() {
     return new EntityNaming_named(this.getName());
@@ -48280,7 +48394,10 @@ var SourceTypeExtensionEntity = class {
     this._node = node;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getMembers() {
     return this._members.getOrInsertWith(() => {
@@ -48613,7 +48730,10 @@ var PackageVariantTypeDeclarationEntity = class {
     this._modifierFlags = 2048 /* NotComputed */;
   }
   get modifierFlags() {
-    return this._modifierFlags === 2048 /* NotComputed */ ? createDeclaredModifierFlags(this._node) : this._modifierFlags;
+    if (this._modifierFlags === 2048 /* NotComputed */) {
+      this._modifierFlags = createDeclaredModifierFlags(this._node);
+    }
+    return this._modifierFlags;
   }
   getNaming() {
     return new EntityNaming_named(this.getName());
@@ -48907,7 +49027,7 @@ function isTypeMemberEntity(entity) {
       return false;
   }
 }
-var TypeMemberEntity2;
+var TypeMemberEntity;
 ((TypeMemberEntity6) => {
   function isAspectTypeMember(entity) {
     const container = entity.getContainer();
@@ -48917,13 +49037,9 @@ var TypeMemberEntity2;
   function isStatic(entity) {
     switch (entity.kind) {
       case 0 /* Variable */:
-        return entity.isStatic();
       case 1 /* Function */:
-        return entity.isStatic();
       case 5 /* Indexer */:
-        return entity.isStatic();
       case 6 /* DereferenceOperator */:
-        return entity.isStatic();
       case 9 /* Operator */:
         return entity.isStatic();
       case 8 /* Destructor */:
@@ -48934,7 +49050,43 @@ var TypeMemberEntity2;
     }
   }
   TypeMemberEntity6.isStatic = isStatic;
-})(TypeMemberEntity2 || (TypeMemberEntity2 = {}));
+  function markedBasic(entity) {
+    switch (entity.kind) {
+      case 0 /* Variable */:
+      case 1 /* Function */:
+      case 5 /* Indexer */:
+      case 6 /* DereferenceOperator */:
+      case 9 /* Operator */:
+        return entity.markedBasic();
+      case 8 /* Destructor */:
+      case 7 /* Constructor */:
+        return false;
+      default:
+        Debug.never(entity);
+    }
+  }
+  TypeMemberEntity6.markedBasic = markedBasic;
+  function isBasic(entity) {
+    switch (entity.kind) {
+      case 0 /* Variable */:
+      case 1 /* Function */:
+      case 5 /* Indexer */:
+      case 6 /* DereferenceOperator */:
+      case 9 /* Operator */:
+        return !isStatic(entity) && (entity.markedBasic() || entity.markedAbstract() || entity.isOverride() || isAspectTypeMember(entity));
+      case 8 /* Destructor */:
+      case 7 /* Constructor */:
+        return false;
+      default:
+        Debug.never(entity);
+    }
+  }
+  TypeMemberEntity6.isBasic = isBasic;
+  function isAbstract(entity) {
+    return entity.markedAbstract() || isAspectTypeMember(entity) && !markedBasic(entity) && !isStatic(entity);
+  }
+  TypeMemberEntity6.isAbstract = isAbstract;
+})(TypeMemberEntity || (TypeMemberEntity = {}));
 function entityToStringDecorator(constructor) {
   if (!("debuggerDisplay" in constructor.prototype)) {
     Object.defineProperty(constructor.prototype, "debuggerDisplay", {
@@ -49441,9 +49593,9 @@ var TypeOrExtensionEntityDetails = class {
     this.aliasedType = void 0;
     this.isDefaultExport = false;
     /**
-     * Является ли имя члена типа вычисляемым (`details.hasComputedName`) может зависеть от заменённых членов типа.
+     * Является ли имя члена типа вычисляемым (`details.hasComputedName`) может зависеть от переопределённых членов типа.
      * Если `areOwnComputedNamesOfMembersResolved` === `true`, поля `details.hasComputedName` членов типа хранят
-     * актуальную для них самих информацию, и анализ заменённых членов типа не требуется.
+     * актуальную для них самих информацию, и анализ переопределённых членов типа не требуется.
      */
     this.areOwnComputedNamesOfMembersResolved = false;
   }
@@ -50096,7 +50248,7 @@ var OrderedArguments = class _OrderedArguments {
     return new _OrderedArguments(this.values.map((p) => p.clone()), this.isLastArgumentSpreading, this.sourceLocation);
   }
 };
-var CallExpression4 = class _CallExpression {
+var CallExpression5 = class _CallExpression {
   constructor(expression, isOptionalAccess, args, isAsyncFunctionCall, returnType, sourceLocation, options = CallExpressionEmitOptions.default()) {
     this.expression = expression;
     this.isOptionalAccess = isOptionalAccess;
@@ -51645,8 +51797,8 @@ var EntityMap = class {
           const originalContainingEntity = entity.getContainer().getEntity();
           result.ifTypeMemberThenContainingType = this.getTypeOrExtensionEntity(originalContainingEntity);
           result.details.isStatic = entity.isStatic();
-          result.details.isAbstract = entity.isAbstract();
-          result.details.isBasic = entity.isBasic();
+          result.details.isAbstract = TypeMemberEntity.isAbstract(entity);
+          result.details.isBasic = TypeMemberEntity.isBasic(entity);
           result.details.overriddenMembers = entity.getOverriddenMembers().map((m) => this.getVariableEntity(m.getEntity()));
           const proxyTag = entity.getTags().find((t) => t.kind === "type" && this._analyzer.checkTypeIsBasedOnAspect(t.type, this._analyzer.wellKnownDeclarations.fieldProxy));
           if (proxyTag !== void 0) {
@@ -51657,8 +51809,6 @@ var EntityMap = class {
               constructor: this.getConstructorEntity(proxyTag.constructor_.getEntity())
             };
           }
-          result.details.isBasic = entity.isBasic();
-          result.details.isAbstract = entity.isAbstract();
         }
         const getter = entity.getGetter();
         if (getter !== void 0) {
@@ -51698,10 +51848,10 @@ var EntityMap = class {
         } else if (entity.subkind === "method") {
           result.ifTypeMemberThenContainingType = this.getTypeOrExtensionEntity(entity.getContainer().getEntity());
           result.details.isStatic = entity.isStatic();
-          result.details.isAbstract = entity.isAbstract();
-          result.details.isBasic = entity.isBasic();
+          result.details.isAbstract = TypeMemberEntity.isAbstract(entity);
+          result.details.isBasic = TypeMemberEntity.isBasic(entity);
           result.details.overriddenMembers = entity.getOverriddenMembers().map((m) => this.getFunctionEntity(m.getEntity()));
-          if (result.ifTypeMemberThenContainingType.typeOrExtensionKind === 1 /* AliasType */ && entity.isBasic()) {
+          if (result.ifTypeMemberThenContainingType.typeOrExtensionKind === 1 /* AliasType */ && entity.markedBasic()) {
             const realBasicMethod = this._analyzer.getBasicMethodOfOriginalTypeForBasicMethodOfAliasType(entity);
             if (realBasicMethod !== void 0) {
               result.details.ifBasicAliasTypeMethodThenRealMethod = this.getFunctionEntity(realBasicMethod);
@@ -51727,8 +51877,8 @@ var EntityMap = class {
         result.containingPackage = this.getContainingPackageAndAccumulateIfMember(entity, result);
         result.ifTypeMemberThenContainingType = this.getTypeOrExtensionEntity(entity.getContainer().getEntity());
         result.details.isStatic = entity.isStatic();
-        result.details.isAbstract = entity.isAbstract();
-        result.details.isBasic = entity.isBasic();
+        result.details.isAbstract = TypeMemberEntity.isAbstract(entity);
+        result.details.isBasic = TypeMemberEntity.isBasic(entity);
         result.name = EmitPhaseName.ofOperator(result.containingPackage.locale, entity.getOperatorKind());
         result.details.isBuiltInOperator = findTag(
           this._analyzer.wellKnownDeclarations.builtIntoPlatform,
@@ -51800,8 +51950,8 @@ var EntityMap = class {
                 this.getNameText(owningEntity.getName(), entity.getTags())
               );
               result.details.isStatic = owningEntity.isStatic();
-              result.details.isAbstract = owningEntity.isAbstract();
-              result.details.isBasic = owningEntity.isBasic();
+              result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+              result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
               result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((m) => this.getVariableEntity(m.getEntity()).getter).filter((g) => g !== void 0);
             } else {
               Debug.never(owningEntity);
@@ -51813,8 +51963,8 @@ var EntityMap = class {
               owningEntity.getContainer().getEntity()
             );
             result.details.isStatic = owningEntity.isStatic();
-            result.details.isAbstract = owningEntity.isAbstract();
-            result.details.isBasic = owningEntity.isBasic();
+            result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+            result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
             result.name = EmitPhaseName.ofIndexedElementGetter(result.containingPackage.locale);
             result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((i) => i.getEntity().getGetter()).filter((g) => g !== void 0).map((g) => this.getGetterEntity(g));
             break;
@@ -51824,8 +51974,8 @@ var EntityMap = class {
               owningEntity.getContainer().getEntity()
             );
             result.details.isStatic = owningEntity.isStatic();
-            result.details.isAbstract = owningEntity.isAbstract();
-            result.details.isBasic = owningEntity.isBasic();
+            result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+            result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
             result.name = EmitPhaseName.ofDereferencedVariableGetter(result.containingPackage.locale);
             result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((i) => i.getEntity().getGetter()).filter((g) => g !== void 0).map((g) => this.getGetterEntity(g));
             break;
@@ -51863,8 +52013,8 @@ var EntityMap = class {
                 this.getNameText(owningEntity.getName(), entity.getTags())
               );
               result.details.isStatic = owningEntity.isStatic();
-              result.details.isAbstract = owningEntity.isAbstract();
-              result.details.isBasic = owningEntity.isBasic();
+              result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+              result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
               result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((m) => this.getVariableEntity(m.getEntity()).setter).filter((s) => s !== void 0);
             } else {
               Debug.never(owningEntity);
@@ -51876,8 +52026,8 @@ var EntityMap = class {
               owningEntity.getContainer().getEntity()
             );
             result.details.isStatic = owningEntity.isStatic();
-            result.details.isAbstract = owningEntity.isAbstract();
-            result.details.isBasic = owningEntity.isBasic();
+            result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+            result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
             result.name = EmitPhaseName.ofIndexedElementSetter(result.containingPackage.locale);
             result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((i) => i.getEntity().getSetter()).filter((g) => g !== void 0).map((s) => this.getSetterEntity(s));
             break;
@@ -51887,8 +52037,8 @@ var EntityMap = class {
               owningEntity.getContainer().getEntity()
             );
             result.details.isStatic = owningEntity.isStatic();
-            result.details.isAbstract = owningEntity.isAbstract();
-            result.details.isBasic = owningEntity.isBasic();
+            result.details.isAbstract = TypeMemberEntity.isAbstract(owningEntity);
+            result.details.isBasic = TypeMemberEntity.isBasic(owningEntity);
             result.name = EmitPhaseName.ofDereferencedVariableSetter(result.containingPackage.locale);
             result.details.overriddenMembers = owningEntity.getOverriddenMembers().map((i) => i.getEntity().getSetter()).filter((g) => g !== void 0).map((s) => this.getSetterEntity(s));
             break;
@@ -54035,7 +54185,7 @@ var GeneralLoweringContext = class {
       }
       descriptorArgument = new JsObjectLiteral(descriptorProperties, void 0);
     }
-    return new CallExpression4(
+    return new CallExpression5(
       definePropertyAccess,
       false,
       new OrderedArguments([object, keyExpression, descriptorArgument], false),
@@ -54057,7 +54207,7 @@ var GeneralLoweringContext = class {
       this.ectx.standardTypes.func,
       void 0
     );
-    return new CallExpression4(
+    return new CallExpression5(
       getOwnPropertyDescriptorAccess,
       false,
       new OrderedArguments([object, keyExpression], false),
@@ -54150,7 +54300,7 @@ var HelperFunctions = class {
   createHelperFunctionCall(entity, args) {
     const functionAccess = new FunctionAccessExpression(AccessedFunction5.fromEntity(entity), true, void 0);
     const orderedArguments = new OrderedArguments(args, false);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       functionAccess,
       false,
       orderedArguments,
@@ -54343,7 +54493,7 @@ var TypeExtensionBasicMembersLowering = class {
           packageEntity
         );
         keyEntity.isPackageMember = true;
-        const keyInitializer = new CallExpression4(
+        const keyInitializer = new CallExpression5(
           new TypeAccessExpression(this._ctx.ectx.jsSymbolType, void 0),
           false,
           new OrderedArguments([], false),
@@ -54421,7 +54571,7 @@ var AspectsLowering = class {
       for (const declaration of pkg.ir.declarations) {
         if (declaration.kind === 24 /* PackageTypeDeclaration */ && this._ctx.ectx.isRefOrPlainObjectTypeEntity(declaration.entity)) {
           this.addRedirectingMembersForImplementedAspectMembersToPrototype(declaration);
-          statements.push(...this.addInheritedNotRedefinedAspectMembersToPrototype(declaration));
+          statements.push(...this.addInheritedNotOverriddenAspectMembersToPrototype(declaration));
         }
       }
       if (statements.length > 0) {
@@ -54439,7 +54589,7 @@ var AspectsLowering = class {
       packageEntity
     );
     keyEntity.isPackageMember = true;
-    const keyInitializer = new CallExpression4(
+    const keyInitializer = new CallExpression5(
       new TypeAccessExpression(this._ctx.ectx.jsSymbolType, void 0),
       false,
       new OrderedArguments([], false),
@@ -54545,7 +54695,7 @@ var AspectsLowering = class {
       void 0
     );
     const args = new OrderedArguments(parameterEntities.map((e) => VariableAccessExpression.get(e)), false);
-    const methodCall = new CallExpression4(
+    const methodCall = new CallExpression5(
       methodAccess,
       false,
       args,
@@ -54646,14 +54796,14 @@ var AspectsLowering = class {
     return new FieldSetterDeclaration3(setterEntity, [], body, parameterEntity, void 0);
   }
   getNotAbstractAspectMembersToAddToDerivedType(entity) {
-    const redefinedMembers = Query.from(entity.members).map((m) => this.getAllOverriddenAspectMembers(m)).filter((m) => m !== void 0).flatMap((m) => m).uniqueToSet();
+    const overriddenMembers = Query.from(entity.members).map((m) => this.getAllOverriddenAspectMembers(m)).filter((m) => m !== void 0).flatMap((m) => m).uniqueToSet();
     const result = /* @__PURE__ */ new Set();
     for (const aspect of enumerateOwnAspectsRecursively(entity)) {
       if (!aspect.containingPackage.details.isSource) {
         continue;
       }
       for (const member of aspect.members) {
-        if (!redefinedMembers.has(member) && !member.details.isAbstract && !member.details.isStatic) {
+        if (!overriddenMembers.has(member) && !member.details.isAbstract && !member.details.isStatic) {
           result.add(member);
         }
       }
@@ -54666,7 +54816,7 @@ var AspectsLowering = class {
       }
     }
   }
-  addInheritedNotRedefinedAspectMembersToPrototype(declaration) {
+  addInheritedNotOverriddenAspectMembersToPrototype(declaration) {
     const membersFromAspects = this.getNotAbstractAspectMembersToAddToDerivedType(declaration.entity);
     if (membersFromAspects.length === 0) {
       return [];
@@ -54681,7 +54831,7 @@ var AspectsLowering = class {
         Logger.error(`\u0427\u043B\u0435\u043D \u0430\u0441\u043F\u0435\u043A\u0442\u0430 ${containingType.name}.${member.name} \u0434\u043E\u043B\u0436\u0435\u043D \u0438\u043C\u0435\u0442\u044C \u0432\u044B\u0447\u0438\u0441\u043B\u044F\u0435\u043C\u043E\u0435 \u0438\u043C\u044F.`);
         continue;
       }
-      const statement = this.addNotRedefinedAspectMemberToPrototype(member, declaration.entity);
+      const statement = this.addNotOverriddenAspectMemberToPrototype(member, declaration.entity);
       result.push(statement);
     }
     if (variableDeclarations.length > 0) {
@@ -54692,7 +54842,7 @@ var AspectsLowering = class {
   }
   // Object.defineProperty(TargetType.prototype, key,
   //   Object.getOwnPropertyDescriptor(AspectType.prototype, 'entityName'))
-  addNotRedefinedAspectMemberToPrototype(entity, targetType) {
+  addNotOverriddenAspectMemberToPrototype(entity, targetType) {
     const containingType = entity.ifTypeMemberThenContainingType;
     Debug.assertNotNull(containingType);
     const computedNameInfo = entity.details.hasComputedName;
@@ -55022,7 +55172,7 @@ var AliasTypeAndExtensionMembersAccessLowering = class extends ExecutableCodeLow
     );
     const args = this._ctx.getOrderedArguments(node.args);
     const options = new CallExpressionEmitOptions().setIsAliasOrExtensionMethodCallLowered(true);
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       args,
@@ -55092,7 +55242,7 @@ var AliasTypeAndExtensionMembersAccessLowering = class extends ExecutableCodeLow
       void 0
     );
     const options = new CallExpressionEmitOptions().setIsAliasOrExtensionMethodCallLowered(true);
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       new OrderedArguments(newArguments, args.isLastArgumentSpreading),
@@ -55267,7 +55417,7 @@ var PlainObjectConstructorCallsLowering = class extends ExecutableCodeLowering {
       void 0,
       void 0
     );
-    return new CallExpression4(methodAccess, false, node.args, false, node.returnType, void 0);
+    return new CallExpression5(methodAccess, false, node.args, false, node.returnType, void 0);
   }
 };
 var OverloadedConstructorsLowering = class {
@@ -55649,7 +55799,7 @@ var CompoundDeclarationsAndOperatorsAccessLowering = class extends ExecutableCod
       void 0
     );
     const args = new OrderedArguments([], false);
-    return new CallExpression4(packageFunctionAccess, false, args, false, node.variable.type, node.sourceLocation);
+    return new CallExpression5(packageFunctionAccess, false, args, false, node.variable.type, node.sourceLocation);
   }
   lowerComputedPackageVariableSetAccessExpression(left, operatorKind, right, operator) {
     let value;
@@ -55675,7 +55825,7 @@ var CompoundDeclarationsAndOperatorsAccessLowering = class extends ExecutableCod
       void 0
     );
     const args = new OrderedArguments([value], false);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       packageFunctionAccess,
       false,
       args,
@@ -55706,7 +55856,7 @@ var IndexedAccessExpressionLowering = class extends ExecutableCodeLowering {
       void 0,
       void 0
     );
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       node.args,
@@ -55746,7 +55896,7 @@ var IndexedAccessExpressionLowering = class extends ExecutableCodeLowering {
     const originalArguments = this._ctx.getOrderedArguments(node.left.args);
     const argumentValues = Query.from(originalArguments.values).chain([node.right]).toArray();
     const args = new OrderedArguments(argumentValues, originalArguments.isLastArgumentSpreading);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       methodAccess,
       false,
       args,
@@ -55806,7 +55956,7 @@ var IndexedAccessExpressionLowering = class extends ExecutableCodeLowering {
     );
     const argumentValues = Query.from(argumentTempAssignments).chain([newValue]).toArray();
     const methodArguments = new OrderedArguments(argumentValues, false);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       methodAccess,
       false,
       methodArguments,
@@ -55839,7 +55989,7 @@ var DereferenceExpressionLowering = class extends ExecutableCodeLowering {
       void 0
     );
     const args = new OrderedArguments([], false);
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       args,
@@ -55877,7 +56027,7 @@ var DereferenceExpressionLowering = class extends ExecutableCodeLowering {
       void 0
     );
     const args = new OrderedArguments([node.right], false);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       methodAccess,
       false,
       args,
@@ -55927,7 +56077,7 @@ var DereferenceExpressionLowering = class extends ExecutableCodeLowering {
       void 0
     );
     const args = new OrderedArguments([newValue], false);
-    const callExpression2 = new CallExpression4(
+    const callExpression2 = new CallExpression5(
       methodAccess,
       false,
       args,
@@ -55990,7 +56140,7 @@ var FunctionObjectLowering = class _FunctionObjectLowering extends ExecutableCod
     );
     argsParameter.details.isVariadicParameter = true;
     const args = new OrderedArguments([VariableAccessExpression.get(argsParameter)], true);
-    const methodCall = new CallExpression4(methodAccess, false, args, false, node.method.returnType, void 0);
+    const methodCall = new CallExpression5(methodAccess, false, args, false, node.method.returnType, void 0);
     const returnStatement2 = new ReturnStatement3(methodCall, void 0);
     const parameter = new ValueParameterDeclaration(argsParameter, void 0, true, void 0);
     const functionLiteral = new FunctionLiteral3(
@@ -56510,7 +56660,7 @@ var OperatorsUsageLowering = class extends ExecutableCodeLowering {
   }
   lowerUnaryOperatorUsage(expression, operator, sourceLocation) {
     const methodAccess = new MethodAccessExpression(expression, false, operator, true, void 0, void 0);
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       new OrderedArguments([], false),
@@ -56522,7 +56672,7 @@ var OperatorsUsageLowering = class extends ExecutableCodeLowering {
   lowerBinaryOperatorUsage(left, right, operator, sourceLocation) {
     const methodAccess = new MethodAccessExpression(left, false, operator, true, void 0, void 0);
     const args = new OrderedArguments([right], false);
-    return new CallExpression4(
+    return new CallExpression5(
       methodAccess,
       false,
       args,
@@ -56713,7 +56863,7 @@ var ProxiedVariableAccessLowering = class extends ExecutableCodeLowering {
       this.createVariableDescriptor(proxiedVariableEntity),
       this.createAccessLocation(node)
     ], false);
-    const writeMethodCall = new CallExpression4(
+    const writeMethodCall = new CallExpression5(
       writeMethodAccess,
       false,
       writeMethodArguments,
@@ -56751,7 +56901,7 @@ var ProxiedVariableAccessLowering = class extends ExecutableCodeLowering {
       this.createVariableDescriptor(proxiedVariableEntity),
       this.createAccessLocation(node)
     ], false);
-    const readMethodCall = new CallExpression4(
+    const readMethodCall = new CallExpression5(
       readMethodAccess,
       false,
       readMethodArguments,
@@ -57949,7 +58099,7 @@ var IrBuilder = class {
   }
   buildFieldDeclaration(declaration) {
     const originalEntity = this._analyzer.entity.ofFieldDeclaration(declaration);
-    if (originalEntity.isAbstract()) {
+    if (TypeMemberEntity.isAbstract(originalEntity)) {
       return void 0;
     }
     const entity = this._entityMap.getVariableEntity(originalEntity);
@@ -58345,7 +58495,7 @@ var IrBuilder = class {
         void 0,
         void 0
       );
-      return new CallExpression4(
+      return new CallExpression5(
         methodAccess,
         false,
         new OrderedArguments([], false),
@@ -58540,7 +58690,7 @@ var IrBuilder = class {
         const args = this.buildArgumentList(expression.argumentList, parameters);
         const isAsyncFunctionCall = meaning.func.value.getEntity().isAsync();
         const returnType = this._entityMap.getType(meaning.func.value.getReturnType());
-        return new CallExpression4(
+        return new CallExpression5(
           receiver,
           false,
           args,
@@ -58573,7 +58723,7 @@ var IrBuilder = class {
         const args = this.buildArgumentList(expression.argumentList, parameters);
         const isAsyncFunctionCall = false;
         const returnType = this._entityMap.getType(meaning.operator.value.getReturnType());
-        return new CallExpression4(
+        return new CallExpression5(
           receiver,
           false,
           args,
@@ -58589,7 +58739,7 @@ var IrBuilder = class {
         const args = this.buildArgumentList(expression.argumentList, parameters);
         const isAsyncFunctionCall = meaning.type.isAsync();
         const returnType = this._entityMap.getType(meaning.type.getReturnType());
-        return new CallExpression4(
+        return new CallExpression5(
           irExpression,
           isOptionalAccess,
           args,
@@ -58807,8 +58957,8 @@ var IrBuilder = class {
       case "static-field-access": {
         const typeEntity = this.getEntityFromType(meaning.type);
         const typeAccess = new TypeAccessExpression(typeEntity, void 0);
-        const entity = this._entityMap.getVariableEntity(meaning.variable.value.getEntity());
-        const type = this._entityMap.getType(meaning.variable.value.getType());
+        const entity = this._entityMap.getVariableEntity(meaning.field.value.getEntity());
+        const type = this._entityMap.getType(meaning.field.value.getType());
         return new FieldAccessExpression(
           typeAccess,
           false,
@@ -58839,11 +58989,11 @@ var IrBuilder = class {
         );
       }
       case "instance-field-access": {
-        const originalEntity = meaning.variable.value.getEntity();
+        const originalEntity = meaning.field.value.getEntity();
         const expressionIr = this.buildExpression(expression.expression);
         const isOptionalAccess = expression.expression.kind === 64 /* AssumptionExpression */;
         const entity = this._entityMap.getVariableEntity(originalEntity);
-        const type = this._entityMap.getType(meaning.variable.value.getType());
+        const type = this._entityMap.getType(meaning.field.value.getType());
         return new FieldAccessExpression(
           expressionIr,
           isOptionalAccess,
@@ -59260,7 +59410,7 @@ var IrBuilder = class {
       true,
       this.getSourceLocation(tag.name)
     );
-    const functionCall = new CallExpression4(
+    const functionCall = new CallExpression5(
       functionAccess,
       false,
       args,
@@ -60877,7 +61027,7 @@ var Emitter = class _Emitter {
   }
   createMainFunction(packageConstructors, packageEntryPoints, containingPackage) {
     const functionCallStatements = Query.from(packageConstructors).chain(packageEntryPoints).map((o) => {
-      const expression = new CallExpression4(
+      const expression = new CallExpression5(
         new FunctionAccessExpression(AccessedFunction5.fromEntity(o.entity), true, void 0),
         false,
         new OrderedArguments([], false),
@@ -60902,7 +61052,7 @@ var Emitter = class _Emitter {
     return new PackageFunctionDeclaration3(modifiers, [], body, entity, false, void 0);
   }
   createMainFunctionCall(mainFunction) {
-    const functionCall = new CallExpression4(
+    const functionCall = new CallExpression5(
       new FunctionAccessExpression(AccessedFunction5.fromEntity(mainFunction.entity), true, void 0),
       false,
       new OrderedArguments([], false),
@@ -62101,7 +62251,7 @@ export {
   isPackageMemberEntity,
   isEntityWithTags,
   isTypeMemberEntity,
-  TypeMemberEntity2 as TypeMemberEntity,
+  TypeMemberEntity,
   entityToStringDecorator,
   TagType,
   TagFunction,
@@ -62148,7 +62298,6 @@ export {
   AnalyzedPackageImport,
   AnalyzedPackageImports,
   PackageImportInfo,
-  TypeUtils,
   ExpressionDenotesFunctionCheckResult,
   ExpressionDenotesOperatorCheckResult,
   DeclaredTypeMemberEntities,