@artel/artc 0.6.25233 → 0.6.25234

package/build/{chunk-T4JAN46C.js → chunk-YAYSHO33.js}

@@ -70,11 +70,11 @@ var __yieldStar = (value) => {
 };
 
 // source/common/PackageDialect.ts
-var PackageDialect = /* @__PURE__ */ ((PackageDialect7) => {
-  PackageDialect7[PackageDialect7["Mixed"] = 0] = "Mixed";
-  PackageDialect7[PackageDialect7["Usual"] = 1] = "Usual";
-  PackageDialect7[PackageDialect7["Special"] = 2] = "Special";
-  return PackageDialect7;
+var PackageDialect = /* @__PURE__ */ ((PackageDialect8) => {
+  PackageDialect8[PackageDialect8["Mixed"] = 0] = "Mixed";
+  PackageDialect8[PackageDialect8["Usual"] = 1] = "Usual";
+  PackageDialect8[PackageDialect8["Special"] = 2] = "Special";
+  return PackageDialect8;
 })(PackageDialect || {});
 
 // source/common/PackageLocale.ts
@@ -195,6 +195,9 @@ var Query = class _Query {
     return void 0;
   }
   toMap(keySelector, valueSelector) {
+    if (keySelector === void 0 || valueSelector === void 0) {
+      return new Map(this);
+    }
     const result = /* @__PURE__ */ new Map();
     for (const e of this) {
       const key = keySelector(e);
@@ -617,7 +620,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.25233" : "";
+var ArtelVersion = true ? "0.6.25234" : "";
 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");
@@ -761,6 +764,9 @@ var ArrayUtils = class {
   static pushElementIfUniqueComparingWithEquals(array, element) {
     if (!array.some((e) => e.equals(element))) {
       array.push(element);
+      return true;
+    } else {
+      return false;
     }
   }
   static pushElementsIfUniqueComparingWithEquals(array, elements) {
@@ -1542,60 +1548,60 @@ var TokenKind = /* @__PURE__ */ ((TokenKind6) => {
   TokenKind6[TokenKind6["TextTemplateHead"] = 7] = "TextTemplateHead";
   TokenKind6[TokenKind6["TextTemplatePart"] = 8] = "TextTemplatePart";
   TokenKind6[TokenKind6["TextTemplateTail"] = 9] = "TextTemplateTail";
-  TokenKind6[TokenKind6["Ampersand"] = 10] = "Ampersand";
-  TokenKind6[TokenKind6["AmpersandAmpersand"] = 11] = "AmpersandAmpersand";
-  TokenKind6[TokenKind6["AmpersandEquals"] = 12] = "AmpersandEquals";
-  TokenKind6[TokenKind6["Asterisk"] = 13] = "Asterisk";
-  TokenKind6[TokenKind6["AsteriskAsterisk"] = 14] = "AsteriskAsterisk";
-  TokenKind6[TokenKind6["AsteriskEquals"] = 15] = "AsteriskEquals";
-  TokenKind6[TokenKind6["BackQuote"] = 16] = "BackQuote";
-  TokenKind6[TokenKind6["Bar"] = 17] = "Bar";
-  TokenKind6[TokenKind6["BarBar"] = 18] = "BarBar";
-  TokenKind6[TokenKind6["Caret"] = 19] = "Caret";
-  TokenKind6[TokenKind6["CloseBrace"] = 20] = "CloseBrace";
-  TokenKind6[TokenKind6["CloseParenthesis"] = 21] = "CloseParenthesis";
-  TokenKind6[TokenKind6["CloseSquareBracket"] = 22] = "CloseSquareBracket";
-  TokenKind6[TokenKind6["Colon"] = 23] = "Colon";
-  TokenKind6[TokenKind6["Comma"] = 24] = "Comma";
-  TokenKind6[TokenKind6["CommercialAt"] = 25] = "CommercialAt";
-  TokenKind6[TokenKind6["Dot"] = 26] = "Dot";
-  TokenKind6[TokenKind6["DoublePeriod"] = 27] = "DoublePeriod";
-  TokenKind6[TokenKind6["Ellipsis"] = 28] = "Ellipsis";
-  TokenKind6[TokenKind6["EqualsEquals"] = 29] = "EqualsEquals";
-  TokenKind6[TokenKind6["EqualsGreaterThan"] = 30] = "EqualsGreaterThan";
-  TokenKind6[TokenKind6["Exclamation"] = 31] = "Exclamation";
-  TokenKind6[TokenKind6["ExclamationEquals"] = 32] = "ExclamationEquals";
-  TokenKind6[TokenKind6["GreaterThan"] = 33] = "GreaterThan";
-  TokenKind6[TokenKind6["GreaterThanOrEqual"] = 34] = "GreaterThanOrEqual";
-  TokenKind6[TokenKind6["HashSign"] = 35] = "HashSign";
-  TokenKind6[TokenKind6["LessThan"] = 36] = "LessThan";
-  TokenKind6[TokenKind6["LessThanOrEqual"] = 37] = "LessThanOrEqual";
-  TokenKind6[TokenKind6["LessThanMinus"] = 38] = "LessThanMinus";
-  TokenKind6[TokenKind6["Minus"] = 39] = "Minus";
-  TokenKind6[TokenKind6["MinusMinus"] = 40] = "MinusMinus";
-  TokenKind6[TokenKind6["MinusEquals"] = 41] = "MinusEquals";
-  TokenKind6[TokenKind6["MinusGreaterThan"] = 42] = "MinusGreaterThan";
-  TokenKind6[TokenKind6["OpenBrace"] = 43] = "OpenBrace";
-  TokenKind6[TokenKind6["OpenParenthesis"] = 44] = "OpenParenthesis";
-  TokenKind6[TokenKind6["OpenSquareBracket"] = 45] = "OpenSquareBracket";
-  TokenKind6[TokenKind6["Plus"] = 46] = "Plus";
-  TokenKind6[TokenKind6["PlusPlus"] = 47] = "PlusPlus";
-  TokenKind6[TokenKind6["PlusEquals"] = 48] = "PlusEquals";
-  TokenKind6[TokenKind6["Question"] = 49] = "Question";
-  TokenKind6[TokenKind6["QuestionQuestion"] = 50] = "QuestionQuestion";
-  TokenKind6[TokenKind6["Semicolon"] = 51] = "Semicolon";
-  TokenKind6[TokenKind6["Slash"] = 52] = "Slash";
-  TokenKind6[TokenKind6["SlashEquals"] = 53] = "SlashEquals";
-  TokenKind6[TokenKind6["Tilde"] = 54] = "Tilde";
-  TokenKind6[TokenKind6["TildeTilde"] = 55] = "TildeTilde";
-  TokenKind6[TokenKind6["Underscore"] = 56] = "Underscore";
-  TokenKind6[TokenKind6["Equals"] = 57] = "Equals";
-  TokenKind6[TokenKind6["Percent"] = 58] = "Percent";
-  TokenKind6[TokenKind6["PercentPercent"] = 59] = "PercentPercent";
-  TokenKind6[TokenKind6["Backslash"] = 60] = "Backslash";
-  TokenKind6[TokenKind6["BackslashEquals"] = 61] = "BackslashEquals";
-  TokenKind6[TokenKind6["BackslashBackslash"] = 62] = "BackslashBackslash";
-  TokenKind6[TokenKind6["Identifier"] = 63] = "Identifier";
+  TokenKind6[TokenKind6["Identifier"] = 10] = "Identifier";
+  TokenKind6[TokenKind6["Ampersand"] = 11] = "Ampersand";
+  TokenKind6[TokenKind6["AmpersandAmpersand"] = 12] = "AmpersandAmpersand";
+  TokenKind6[TokenKind6["AmpersandEquals"] = 13] = "AmpersandEquals";
+  TokenKind6[TokenKind6["Asterisk"] = 14] = "Asterisk";
+  TokenKind6[TokenKind6["AsteriskAsterisk"] = 15] = "AsteriskAsterisk";
+  TokenKind6[TokenKind6["AsteriskEquals"] = 16] = "AsteriskEquals";
+  TokenKind6[TokenKind6["BackQuote"] = 17] = "BackQuote";
+  TokenKind6[TokenKind6["Bar"] = 18] = "Bar";
+  TokenKind6[TokenKind6["BarBar"] = 19] = "BarBar";
+  TokenKind6[TokenKind6["Caret"] = 20] = "Caret";
+  TokenKind6[TokenKind6["CloseBrace"] = 21] = "CloseBrace";
+  TokenKind6[TokenKind6["CloseParenthesis"] = 22] = "CloseParenthesis";
+  TokenKind6[TokenKind6["CloseSquareBracket"] = 23] = "CloseSquareBracket";
+  TokenKind6[TokenKind6["Colon"] = 24] = "Colon";
+  TokenKind6[TokenKind6["Comma"] = 25] = "Comma";
+  TokenKind6[TokenKind6["CommercialAt"] = 26] = "CommercialAt";
+  TokenKind6[TokenKind6["Dot"] = 27] = "Dot";
+  TokenKind6[TokenKind6["DoublePeriod"] = 28] = "DoublePeriod";
+  TokenKind6[TokenKind6["Ellipsis"] = 29] = "Ellipsis";
+  TokenKind6[TokenKind6["EqualsEquals"] = 30] = "EqualsEquals";
+  TokenKind6[TokenKind6["EqualsGreaterThan"] = 31] = "EqualsGreaterThan";
+  TokenKind6[TokenKind6["Exclamation"] = 32] = "Exclamation";
+  TokenKind6[TokenKind6["ExclamationEquals"] = 33] = "ExclamationEquals";
+  TokenKind6[TokenKind6["GreaterThan"] = 34] = "GreaterThan";
+  TokenKind6[TokenKind6["GreaterThanOrEqual"] = 35] = "GreaterThanOrEqual";
+  TokenKind6[TokenKind6["HashSign"] = 36] = "HashSign";
+  TokenKind6[TokenKind6["LessThan"] = 37] = "LessThan";
+  TokenKind6[TokenKind6["LessThanOrEqual"] = 38] = "LessThanOrEqual";
+  TokenKind6[TokenKind6["LessThanMinus"] = 39] = "LessThanMinus";
+  TokenKind6[TokenKind6["Minus"] = 40] = "Minus";
+  TokenKind6[TokenKind6["MinusMinus"] = 41] = "MinusMinus";
+  TokenKind6[TokenKind6["MinusEquals"] = 42] = "MinusEquals";
+  TokenKind6[TokenKind6["MinusGreaterThan"] = 43] = "MinusGreaterThan";
+  TokenKind6[TokenKind6["OpenBrace"] = 44] = "OpenBrace";
+  TokenKind6[TokenKind6["OpenParenthesis"] = 45] = "OpenParenthesis";
+  TokenKind6[TokenKind6["OpenSquareBracket"] = 46] = "OpenSquareBracket";
+  TokenKind6[TokenKind6["Plus"] = 47] = "Plus";
+  TokenKind6[TokenKind6["PlusPlus"] = 48] = "PlusPlus";
+  TokenKind6[TokenKind6["PlusEquals"] = 49] = "PlusEquals";
+  TokenKind6[TokenKind6["Question"] = 50] = "Question";
+  TokenKind6[TokenKind6["QuestionQuestion"] = 51] = "QuestionQuestion";
+  TokenKind6[TokenKind6["Semicolon"] = 52] = "Semicolon";
+  TokenKind6[TokenKind6["Slash"] = 53] = "Slash";
+  TokenKind6[TokenKind6["SlashEquals"] = 54] = "SlashEquals";
+  TokenKind6[TokenKind6["Tilde"] = 55] = "Tilde";
+  TokenKind6[TokenKind6["TildeTilde"] = 56] = "TildeTilde";
+  TokenKind6[TokenKind6["Underscore"] = 57] = "Underscore";
+  TokenKind6[TokenKind6["Equals"] = 58] = "Equals";
+  TokenKind6[TokenKind6["Percent"] = 59] = "Percent";
+  TokenKind6[TokenKind6["PercentPercent"] = 60] = "PercentPercent";
+  TokenKind6[TokenKind6["Backslash"] = 61] = "Backslash";
+  TokenKind6[TokenKind6["BackslashEquals"] = 62] = "BackslashEquals";
+  TokenKind6[TokenKind6["BackslashBackslash"] = 63] = "BackslashBackslash";
   return TokenKind6;
 })(TokenKind || {});
 var tokenKindValues = {
@@ -1609,60 +1615,60 @@ var tokenKindValues = {
   [7 /* TextTemplateHead */]: "",
   [8 /* TextTemplatePart */]: "",
   [9 /* TextTemplateTail */]: "",
-  [10 /* Ampersand */]: "&",
-  [11 /* AmpersandAmpersand */]: "&&",
-  [12 /* AmpersandEquals */]: "&=",
-  [13 /* Asterisk */]: "*",
-  [14 /* AsteriskAsterisk */]: "**",
-  [15 /* AsteriskEquals */]: "*=",
-  [16 /* BackQuote */]: "`",
-  [17 /* Bar */]: "|",
-  [18 /* BarBar */]: "||",
-  [19 /* Caret */]: "^",
-  [20 /* CloseBrace */]: "}",
-  [21 /* CloseParenthesis */]: ")",
-  [22 /* CloseSquareBracket */]: "]",
-  [23 /* Colon */]: ":",
-  [24 /* Comma */]: ",",
-  [25 /* CommercialAt */]: "@",
-  [26 /* Dot */]: ".",
-  [27 /* DoublePeriod */]: "..",
-  [28 /* Ellipsis */]: "...",
-  [29 /* EqualsEquals */]: "==",
-  [30 /* EqualsGreaterThan */]: "=>",
-  [31 /* Exclamation */]: "!",
-  [32 /* ExclamationEquals */]: "!=",
-  [33 /* GreaterThan */]: ">",
-  [34 /* GreaterThanOrEqual */]: ">=",
-  [35 /* HashSign */]: "#",
-  [36 /* LessThan */]: "<",
-  [37 /* LessThanOrEqual */]: "<=",
-  [38 /* LessThanMinus */]: "<-",
-  [39 /* Minus */]: "-",
-  [40 /* MinusMinus */]: "--",
-  [41 /* MinusEquals */]: "-=",
-  [42 /* MinusGreaterThan */]: "->",
-  [43 /* OpenBrace */]: "{",
-  [44 /* OpenParenthesis */]: "(",
-  [45 /* OpenSquareBracket */]: "[",
-  [46 /* Plus */]: "+",
-  [47 /* PlusPlus */]: "++",
-  [48 /* PlusEquals */]: "+=",
-  [49 /* Question */]: "?",
-  [50 /* QuestionQuestion */]: "??",
-  [51 /* Semicolon */]: ";",
-  [52 /* Slash */]: "/",
-  [53 /* SlashEquals */]: "/=",
-  [54 /* Tilde */]: "~",
-  [55 /* TildeTilde */]: "~~",
-  [56 /* Underscore */]: "_",
-  [57 /* Equals */]: "=",
-  [58 /* Percent */]: "%",
-  [59 /* PercentPercent */]: "%%",
-  [60 /* Backslash */]: "\\",
-  [61 /* BackslashEquals */]: "\\=",
-  [62 /* BackslashBackslash */]: "\\\\",
-  [63 /* Identifier */]: ""
+  [10 /* Identifier */]: "",
+  [11 /* Ampersand */]: "&",
+  [12 /* AmpersandAmpersand */]: "&&",
+  [13 /* AmpersandEquals */]: "&=",
+  [14 /* Asterisk */]: "*",
+  [15 /* AsteriskAsterisk */]: "**",
+  [16 /* AsteriskEquals */]: "*=",
+  [17 /* BackQuote */]: "`",
+  [18 /* Bar */]: "|",
+  [19 /* BarBar */]: "||",
+  [20 /* Caret */]: "^",
+  [21 /* CloseBrace */]: "}",
+  [22 /* CloseParenthesis */]: ")",
+  [23 /* CloseSquareBracket */]: "]",
+  [24 /* Colon */]: ":",
+  [25 /* Comma */]: ",",
+  [26 /* CommercialAt */]: "@",
+  [27 /* Dot */]: ".",
+  [28 /* DoublePeriod */]: "..",
+  [29 /* Ellipsis */]: "...",
+  [30 /* EqualsEquals */]: "==",
+  [31 /* EqualsGreaterThan */]: "=>",
+  [32 /* Exclamation */]: "!",
+  [33 /* ExclamationEquals */]: "!=",
+  [34 /* GreaterThan */]: ">",
+  [35 /* GreaterThanOrEqual */]: ">=",
+  [36 /* HashSign */]: "#",
+  [37 /* LessThan */]: "<",
+  [38 /* LessThanOrEqual */]: "<=",
+  [39 /* LessThanMinus */]: "<-",
+  [40 /* Minus */]: "-",
+  [41 /* MinusMinus */]: "--",
+  [42 /* MinusEquals */]: "-=",
+  [43 /* MinusGreaterThan */]: "->",
+  [44 /* OpenBrace */]: "{",
+  [45 /* OpenParenthesis */]: "(",
+  [46 /* OpenSquareBracket */]: "[",
+  [47 /* Plus */]: "+",
+  [48 /* PlusPlus */]: "++",
+  [49 /* PlusEquals */]: "+=",
+  [50 /* Question */]: "?",
+  [51 /* QuestionQuestion */]: "??",
+  [52 /* Semicolon */]: ";",
+  [53 /* Slash */]: "/",
+  [54 /* SlashEquals */]: "/=",
+  [55 /* Tilde */]: "~",
+  [56 /* TildeTilde */]: "~~",
+  [57 /* Underscore */]: "_",
+  [58 /* Equals */]: "=",
+  [59 /* Percent */]: "%",
+  [60 /* PercentPercent */]: "%%",
+  [61 /* Backslash */]: "\\",
+  [62 /* BackslashEquals */]: "\\=",
+  [63 /* BackslashBackslash */]: "\\\\"
 };
 
 // source/tree/TriviaKind.ts
@@ -2483,61 +2489,61 @@ var TokenKind2 = /* @__PURE__ */ ((TokenKind6) => {
   TokenKind6[TokenKind6["TextTemplateTail"] = 13] = "TextTemplateTail";
   TokenKind6[TokenKind6["LocalizableTextLiteral"] = 14] = "LocalizableTextLiteral";
   TokenKind6[TokenKind6["LocalizableTextTemplateHead"] = 15] = "LocalizableTextTemplateHead";
-  TokenKind6[TokenKind6["Ampersand"] = 16] = "Ampersand";
-  TokenKind6[TokenKind6["AmpersandAmpersand"] = 17] = "AmpersandAmpersand";
-  TokenKind6[TokenKind6["AmpersandEquals"] = 18] = "AmpersandEquals";
-  TokenKind6[TokenKind6["Asterisk"] = 19] = "Asterisk";
-  TokenKind6[TokenKind6["AsteriskAsterisk"] = 20] = "AsteriskAsterisk";
-  TokenKind6[TokenKind6["AsteriskEquals"] = 21] = "AsteriskEquals";
-  TokenKind6[TokenKind6["BackQuote"] = 22] = "BackQuote";
-  TokenKind6[TokenKind6["Bar"] = 23] = "Bar";
-  TokenKind6[TokenKind6["BarBar"] = 24] = "BarBar";
-  TokenKind6[TokenKind6["Caret"] = 25] = "Caret";
-  TokenKind6[TokenKind6["RightBrace"] = 26] = "RightBrace";
-  TokenKind6[TokenKind6["RightParenthesis"] = 27] = "RightParenthesis";
-  TokenKind6[TokenKind6["RightSquareBracket"] = 28] = "RightSquareBracket";
-  TokenKind6[TokenKind6["Colon"] = 29] = "Colon";
-  TokenKind6[TokenKind6["Comma"] = 30] = "Comma";
-  TokenKind6[TokenKind6["CommercialAt"] = 31] = "CommercialAt";
-  TokenKind6[TokenKind6["Dot"] = 32] = "Dot";
-  TokenKind6[TokenKind6["DoublePeriod"] = 33] = "DoublePeriod";
-  TokenKind6[TokenKind6["Ellipsis"] = 34] = "Ellipsis";
-  TokenKind6[TokenKind6["EqualsEquals"] = 35] = "EqualsEquals";
-  TokenKind6[TokenKind6["EqualsRightAngle"] = 36] = "EqualsRightAngle";
-  TokenKind6[TokenKind6["Exclamation"] = 37] = "Exclamation";
-  TokenKind6[TokenKind6["ExclamationEquals"] = 38] = "ExclamationEquals";
-  TokenKind6[TokenKind6["RightAngle"] = 39] = "RightAngle";
-  TokenKind6[TokenKind6["RightAngleEquals"] = 40] = "RightAngleEquals";
-  TokenKind6[TokenKind6["HashSign"] = 41] = "HashSign";
-  TokenKind6[TokenKind6["LeftAngle"] = 42] = "LeftAngle";
-  TokenKind6[TokenKind6["LeftAngleEquals"] = 43] = "LeftAngleEquals";
-  TokenKind6[TokenKind6["LeftAngleMinus"] = 44] = "LeftAngleMinus";
-  TokenKind6[TokenKind6["Minus"] = 45] = "Minus";
-  TokenKind6[TokenKind6["MinusMinus"] = 46] = "MinusMinus";
-  TokenKind6[TokenKind6["MinusEquals"] = 47] = "MinusEquals";
-  TokenKind6[TokenKind6["MinusRightAngle"] = 48] = "MinusRightAngle";
-  TokenKind6[TokenKind6["LeftBrace"] = 49] = "LeftBrace";
-  TokenKind6[TokenKind6["LeftParenthesis"] = 50] = "LeftParenthesis";
-  TokenKind6[TokenKind6["LeftSquareBracket"] = 51] = "LeftSquareBracket";
-  TokenKind6[TokenKind6["Plus"] = 52] = "Plus";
-  TokenKind6[TokenKind6["PlusPlus"] = 53] = "PlusPlus";
-  TokenKind6[TokenKind6["PlusEquals"] = 54] = "PlusEquals";
-  TokenKind6[TokenKind6["Question"] = 55] = "Question";
-  TokenKind6[TokenKind6["QuestionQuestion"] = 56] = "QuestionQuestion";
-  TokenKind6[TokenKind6["Semicolon"] = 57] = "Semicolon";
-  TokenKind6[TokenKind6["Slash"] = 58] = "Slash";
-  TokenKind6[TokenKind6["SlashEquals"] = 59] = "SlashEquals";
-  TokenKind6[TokenKind6["Tilde"] = 60] = "Tilde";
-  TokenKind6[TokenKind6["TildeTilde"] = 61] = "TildeTilde";
-  TokenKind6[TokenKind6["Underscore"] = 62] = "Underscore";
-  TokenKind6[TokenKind6["Equals"] = 63] = "Equals";
-  TokenKind6[TokenKind6["Percent"] = 64] = "Percent";
-  TokenKind6[TokenKind6["PercentPercent"] = 65] = "PercentPercent";
-  TokenKind6[TokenKind6["BackSlash"] = 66] = "BackSlash";
-  TokenKind6[TokenKind6["BackSlashEquals"] = 67] = "BackSlashEquals";
-  TokenKind6[TokenKind6["BackSlashBackSlash"] = 68] = "BackSlashBackSlash";
-  TokenKind6[TokenKind6["Identifier"] = 69] = "Identifier";
-  TokenKind6[TokenKind6["QuotedIdentifier"] = 70] = "QuotedIdentifier";
+  TokenKind6[TokenKind6["Identifier"] = 16] = "Identifier";
+  TokenKind6[TokenKind6["QuotedIdentifier"] = 17] = "QuotedIdentifier";
+  TokenKind6[TokenKind6["Ampersand"] = 18] = "Ampersand";
+  TokenKind6[TokenKind6["AmpersandAmpersand"] = 19] = "AmpersandAmpersand";
+  TokenKind6[TokenKind6["AmpersandEquals"] = 20] = "AmpersandEquals";
+  TokenKind6[TokenKind6["Asterisk"] = 21] = "Asterisk";
+  TokenKind6[TokenKind6["AsteriskAsterisk"] = 22] = "AsteriskAsterisk";
+  TokenKind6[TokenKind6["AsteriskEquals"] = 23] = "AsteriskEquals";
+  TokenKind6[TokenKind6["BackQuote"] = 24] = "BackQuote";
+  TokenKind6[TokenKind6["Bar"] = 25] = "Bar";
+  TokenKind6[TokenKind6["BarBar"] = 26] = "BarBar";
+  TokenKind6[TokenKind6["Caret"] = 27] = "Caret";
+  TokenKind6[TokenKind6["RightBrace"] = 28] = "RightBrace";
+  TokenKind6[TokenKind6["RightParenthesis"] = 29] = "RightParenthesis";
+  TokenKind6[TokenKind6["RightSquareBracket"] = 30] = "RightSquareBracket";
+  TokenKind6[TokenKind6["Colon"] = 31] = "Colon";
+  TokenKind6[TokenKind6["Comma"] = 32] = "Comma";
+  TokenKind6[TokenKind6["CommercialAt"] = 33] = "CommercialAt";
+  TokenKind6[TokenKind6["Dot"] = 34] = "Dot";
+  TokenKind6[TokenKind6["DoublePeriod"] = 35] = "DoublePeriod";
+  TokenKind6[TokenKind6["Ellipsis"] = 36] = "Ellipsis";
+  TokenKind6[TokenKind6["EqualsEquals"] = 37] = "EqualsEquals";
+  TokenKind6[TokenKind6["EqualsRightAngle"] = 38] = "EqualsRightAngle";
+  TokenKind6[TokenKind6["Exclamation"] = 39] = "Exclamation";
+  TokenKind6[TokenKind6["ExclamationEquals"] = 40] = "ExclamationEquals";
+  TokenKind6[TokenKind6["RightAngle"] = 41] = "RightAngle";
+  TokenKind6[TokenKind6["RightAngleEquals"] = 42] = "RightAngleEquals";
+  TokenKind6[TokenKind6["HashSign"] = 43] = "HashSign";
+  TokenKind6[TokenKind6["LeftAngle"] = 44] = "LeftAngle";
+  TokenKind6[TokenKind6["LeftAngleEquals"] = 45] = "LeftAngleEquals";
+  TokenKind6[TokenKind6["LeftAngleMinus"] = 46] = "LeftAngleMinus";
+  TokenKind6[TokenKind6["Minus"] = 47] = "Minus";
+  TokenKind6[TokenKind6["MinusMinus"] = 48] = "MinusMinus";
+  TokenKind6[TokenKind6["MinusEquals"] = 49] = "MinusEquals";
+  TokenKind6[TokenKind6["MinusRightAngle"] = 50] = "MinusRightAngle";
+  TokenKind6[TokenKind6["LeftBrace"] = 51] = "LeftBrace";
+  TokenKind6[TokenKind6["LeftParenthesis"] = 52] = "LeftParenthesis";
+  TokenKind6[TokenKind6["LeftSquareBracket"] = 53] = "LeftSquareBracket";
+  TokenKind6[TokenKind6["Plus"] = 54] = "Plus";
+  TokenKind6[TokenKind6["PlusPlus"] = 55] = "PlusPlus";
+  TokenKind6[TokenKind6["PlusEquals"] = 56] = "PlusEquals";
+  TokenKind6[TokenKind6["Question"] = 57] = "Question";
+  TokenKind6[TokenKind6["QuestionQuestion"] = 58] = "QuestionQuestion";
+  TokenKind6[TokenKind6["Semicolon"] = 59] = "Semicolon";
+  TokenKind6[TokenKind6["Slash"] = 60] = "Slash";
+  TokenKind6[TokenKind6["SlashEquals"] = 61] = "SlashEquals";
+  TokenKind6[TokenKind6["Tilde"] = 62] = "Tilde";
+  TokenKind6[TokenKind6["TildeTilde"] = 63] = "TildeTilde";
+  TokenKind6[TokenKind6["Underscore"] = 64] = "Underscore";
+  TokenKind6[TokenKind6["Equals"] = 65] = "Equals";
+  TokenKind6[TokenKind6["Percent"] = 66] = "Percent";
+  TokenKind6[TokenKind6["PercentPercent"] = 67] = "PercentPercent";
+  TokenKind6[TokenKind6["BackSlash"] = 68] = "BackSlash";
+  TokenKind6[TokenKind6["BackSlashEquals"] = 69] = "BackSlashEquals";
+  TokenKind6[TokenKind6["BackSlashBackSlash"] = 70] = "BackSlashBackSlash";
   return TokenKind6;
 })(TokenKind2 || {});
 
@@ -2647,74 +2653,74 @@ var Scanner = class _Scanner {
         case "!":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 38 /* ExclamationEquals */;
+            kind = 40 /* ExclamationEquals */;
           } else {
             this.currentPosition++;
-            kind = 37 /* Exclamation */;
+            kind = 39 /* Exclamation */;
           }
           break;
         case "&":
           if (this.text.charAt(this.currentPosition + 1) === "&") {
             this.currentPosition += 2;
-            kind = 17 /* AmpersandAmpersand */;
+            kind = 19 /* AmpersandAmpersand */;
           } else if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 18 /* AmpersandEquals */;
+            kind = 20 /* AmpersandEquals */;
           } else {
             this.currentPosition++;
-            kind = 16 /* Ampersand */;
+            kind = 18 /* Ampersand */;
           }
           break;
         case "(":
           this.currentPosition++;
-          kind = 50 /* LeftParenthesis */;
+          kind = 52 /* LeftParenthesis */;
           break;
         case ")":
           this.currentPosition++;
-          kind = 27 /* RightParenthesis */;
+          kind = 29 /* RightParenthesis */;
           break;
         case "*":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 21 /* AsteriskEquals */;
+            kind = 23 /* AsteriskEquals */;
           } else if (this.text.charAt(this.currentPosition + 1) === "*") {
             this.currentPosition += 2;
-            kind = 20 /* AsteriskAsterisk */;
+            kind = 22 /* AsteriskAsterisk */;
           } else {
             this.currentPosition++;
-            kind = 19 /* Asterisk */;
+            kind = 21 /* Asterisk */;
           }
           break;
         case "+":
           if (this.text.charAt(this.currentPosition + 1) === "+") {
             this.currentPosition += 2;
-            kind = 53 /* PlusPlus */;
+            kind = 55 /* PlusPlus */;
           } else if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 54 /* PlusEquals */;
+            kind = 56 /* PlusEquals */;
           } else {
             this.currentPosition++;
-            kind = 52 /* Plus */;
+            kind = 54 /* Plus */;
           }
           break;
         case "-":
           if (this.text.charAt(this.currentPosition + 1) === "-") {
             this.currentPosition += 2;
-            kind = 46 /* MinusMinus */;
+            kind = 48 /* MinusMinus */;
           } else if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 47 /* MinusEquals */;
+            kind = 49 /* MinusEquals */;
           } else if (this.text.charAt(this.currentPosition + 1) === ">") {
             this.currentPosition += 2;
-            kind = 48 /* MinusRightAngle */;
+            kind = 50 /* MinusRightAngle */;
           } else {
             this.currentPosition++;
-            kind = 45 /* Minus */;
+            kind = 47 /* Minus */;
           }
           break;
         case ",":
           this.currentPosition++;
-          kind = 30 /* Comma */;
+          kind = 32 /* Comma */;
           break;
         case ".":
           if (_Scanner.isDigit(this.text.charCodeAt(this.currentPosition + 1))) {
@@ -2723,17 +2729,17 @@ var Scanner = class _Scanner {
             unterminated = r.unterminated;
           } else {
             this.currentPosition++;
-            kind = 32 /* Dot */;
+            kind = 34 /* Dot */;
           }
           break;
         case "`":
           this.currentPosition++;
-          kind = 22 /* BackQuote */;
+          kind = 24 /* BackQuote */;
           break;
         case "/":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 59 /* SlashEquals */;
+            kind = 61 /* SlashEquals */;
           } else if (this.text.charAt(this.currentPosition + 1) === "/") {
             this.currentPosition += 2;
             this.scanSingleLineComment();
@@ -2745,16 +2751,16 @@ var Scanner = class _Scanner {
             unterminated = !r;
           } else {
             this.currentPosition++;
-            kind = 58 /* Slash */;
+            kind = 60 /* Slash */;
           }
           break;
         case "%":
           if (this.text.charAt(this.currentPosition + 1) === "%") {
             this.currentPosition += 2;
-            kind = 65 /* PercentPercent */;
+            kind = 67 /* PercentPercent */;
           } else {
             this.currentPosition++;
-            kind = 64 /* Percent */;
+            kind = 66 /* Percent */;
           }
           break;
         case "0":
@@ -2774,67 +2780,67 @@ var Scanner = class _Scanner {
         }
         case ":":
           this.currentPosition++;
-          kind = 29 /* Colon */;
+          kind = 31 /* Colon */;
           break;
         case ";":
           this.currentPosition++;
-          kind = 57 /* Semicolon */;
+          kind = 59 /* Semicolon */;
           break;
         case "<":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 43 /* LeftAngleEquals */;
+            kind = 45 /* LeftAngleEquals */;
           } else if (this.text.charAt(this.currentPosition + 1) === "-") {
             this.currentPosition += 2;
-            kind = 44 /* LeftAngleMinus */;
+            kind = 46 /* LeftAngleMinus */;
           } else {
             this.currentPosition++;
-            kind = 42 /* LeftAngle */;
+            kind = 44 /* LeftAngle */;
           }
           break;
         case "=":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 35 /* EqualsEquals */;
+            kind = 37 /* EqualsEquals */;
           } else if (this.text.charAt(this.currentPosition + 1) === ">") {
             this.currentPosition += 2;
-            kind = 36 /* EqualsRightAngle */;
+            kind = 38 /* EqualsRightAngle */;
           } else {
             this.currentPosition++;
-            kind = 63 /* Equals */;
+            kind = 65 /* Equals */;
           }
           break;
         case ">":
           if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 40 /* RightAngleEquals */;
+            kind = 42 /* RightAngleEquals */;
           } else {
             this.currentPosition++;
-            kind = 39 /* RightAngle */;
+            kind = 41 /* RightAngle */;
           }
           break;
         case "?":
           if (this.text.charAt(this.currentPosition + 1) === "?") {
             this.currentPosition += 2;
-            kind = 56 /* QuestionQuestion */;
+            kind = 58 /* QuestionQuestion */;
           } else {
             this.currentPosition++;
-            kind = 55 /* Question */;
+            kind = 57 /* Question */;
           }
           break;
         case "|":
           if (this.text.charAt(this.currentPosition + 1) === "|") {
             this.currentPosition += 2;
-            kind = 24 /* BarBar */;
+            kind = 26 /* BarBar */;
           } else {
             this.currentPosition++;
-            kind = 23 /* Bar */;
+            kind = 25 /* Bar */;
           }
           break;
         case "{":
           this.braceBalance++;
           this.currentPosition++;
-          kind = 49 /* LeftBrace */;
+          kind = 51 /* LeftBrace */;
           break;
         case "}":
           if (this.isCloseBraceEndingTextTemplate()) {
@@ -2844,21 +2850,21 @@ var Scanner = class _Scanner {
           } else {
             this.braceBalance--;
             this.currentPosition++;
-            kind = 26 /* RightBrace */;
+            kind = 28 /* RightBrace */;
           }
           break;
         case "[":
           this.currentPosition++;
-          kind = 51 /* LeftSquareBracket */;
+          kind = 53 /* LeftSquareBracket */;
           break;
         case "]":
           this.currentPosition++;
-          kind = 28 /* RightSquareBracket */;
+          kind = 30 /* RightSquareBracket */;
           break;
         case "~":
           if (this.text.charAt(this.currentPosition + 1) === "~") {
             this.currentPosition += 2;
-            kind = 61 /* TildeTilde */;
+            kind = 63 /* TildeTilde */;
           } else if (this.text.charAt(this.currentPosition + 1) === '"') {
             this.currentPosition++;
             const r = this.scanCharOrTextOrTextTemplateElement(true);
@@ -2866,50 +2872,50 @@ var Scanner = class _Scanner {
             unterminated = r.unterminated;
           } else if (this.text.charAt(this.currentPosition + 1) === "'") {
             const r = this.scanQuotedIdentifier();
-            kind = 70 /* QuotedIdentifier */;
+            kind = 17 /* QuotedIdentifier */;
             unterminated = !r;
           } else if (_Scanner.isIdentifierStart(this.text.charCodeAt(this.currentPosition + 1))) {
             this.scanIdentifier();
-            kind = 69 /* Identifier */;
+            kind = 16 /* Identifier */;
           } else {
             this.currentPosition++;
-            kind = 60 /* Tilde */;
+            kind = 62 /* Tilde */;
           }
           break;
         case "@":
           this.currentPosition++;
-          kind = 31 /* CommercialAt */;
+          kind = 33 /* CommercialAt */;
           break;
         case "#":
           this.currentPosition++;
-          kind = 41 /* HashSign */;
+          kind = 43 /* HashSign */;
           break;
         case "^":
           this.currentPosition++;
-          kind = 25 /* Caret */;
+          kind = 27 /* Caret */;
           break;
         case "\\":
           if (this.text.charAt(this.currentPosition + 1) === "\\") {
             this.currentPosition += 2;
-            kind = 68 /* BackSlashBackSlash */;
+            kind = 70 /* BackSlashBackSlash */;
           } else if (this.text.charAt(this.currentPosition + 1) === "=") {
             this.currentPosition += 2;
-            kind = 67 /* BackSlashEquals */;
+            kind = 69 /* BackSlashEquals */;
           } else {
             this.currentPosition++;
-            kind = 66 /* BackSlash */;
+            kind = 68 /* BackSlash */;
           }
           break;
         case "'": {
           const r = this.scanQuotedIdentifier();
-          kind = 70 /* QuotedIdentifier */;
+          kind = 17 /* QuotedIdentifier */;
           unterminated = !r;
           break;
         }
         default:
           if (_Scanner.isIdentifierStart(this.text.charCodeAt(this.currentPosition))) {
             this.scanIdentifier();
-            kind = 69 /* Identifier */;
+            kind = 16 /* Identifier */;
           } else {
             this.currentPosition++;
             kind = 0 /* Unknown */;
@@ -4554,7 +4560,7 @@ function childRangeStart(parent, childIndex) {
 
 // source/tree/red/Utils.ts
 function isIdentifier(node) {
-  return node.kind === 0 /* Token */ && node.tokenKind === 63 /* Identifier */;
+  return node.kind === 0 /* Token */ && node.tokenKind === 10 /* Identifier */;
 }
 function isToken(node, kind) {
   if (node.kind !== 0 /* Token */) {
@@ -12805,6 +12811,8 @@ var DiagnosticCode = /* @__PURE__ */ ((DiagnosticCode2) => {
   DiagnosticCode2[DiagnosticCode2["OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0"] = 346] = "OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0";
   DiagnosticCode2[DiagnosticCode2["TypeDoesNotImplementMember0"] = 347] = "TypeDoesNotImplementMember0";
   DiagnosticCode2[DiagnosticCode2["CanNotAccessAbstractMemberOfBaseType"] = 348] = "CanNotAccessAbstractMemberOfBaseType";
+  DiagnosticCode2[DiagnosticCode2["TheFollowingBaseTypeMembersConflictAndMustBeOverridden0"] = 349] = "TheFollowingBaseTypeMembersConflictAndMustBeOverridden0";
+  DiagnosticCode2[DiagnosticCode2["TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1"] = 350] = "TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1";
   DiagnosticCode2[DiagnosticCode2["CannotFindTsLibDirectoryBaseSearchPaths0"] = 401] = "CannotFindTsLibDirectoryBaseSearchPaths0";
   DiagnosticCode2[DiagnosticCode2["SourceFile0IsNotPartOfThePackageAndWontBeLoaded"] = 402] = "SourceFile0IsNotPartOfThePackageAndWontBeLoaded";
   DiagnosticCode2[DiagnosticCode2["ProgramWithoutMainPackageCannotBeCompiled"] = 403] = "ProgramWithoutMainPackageCannotBeCompiled";
@@ -13036,6 +13044,8 @@ var englishErrorMessages = {
   [346 /* OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0 */]: "Overriding field must not be 'const' or have write function to match base field '{0}'",
   [347 /* TypeDoesNotImplementMember0 */]: "Type does not implement member '{0}'.",
   [348 /* CanNotAccessAbstractMemberOfBaseType */]: "Can not access abstract member of base type.",
+  [349 /* TheFollowingBaseTypeMembersConflictAndMustBeOverridden0 */]: "The following base type members conflict and must be overridden:{0}",
+  [350 /* TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1 */]: "The following base type members conflict because they have the same original name '{0}' and must be overridden:{1}",
   [401 /* CannotFindTsLibDirectoryBaseSearchPaths0 */]: "Can not find directory with TypeScript library. Base search paths: {0}.",
   [402 /* SourceFile0IsNotPartOfThePackageAndWontBeLoaded */]: "Source file '{0}' is not part of the package and won't be loaded.",
   [403 /* ProgramWithoutMainPackageCannotBeCompiled */]: "Program without main package can not be compiled.",
@@ -13069,7 +13079,7 @@ var russianErrorMessages = {
   [118 /* CatchClauseOrFinallyClauseExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u0431\u043B\u043E\u043A '\u043B\u043E\u0432\u0443\u0448\u043A\u0430' \u0438\u043B\u0438 '\u043D\u0430\u043F\u043E\u0441\u043B\u0435\u0434\u043E\u043A'.",
   [119 /* PackageImportExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043F\u0430\u043A\u0435\u0442\u0430.",
   [120 /* DeclarationOrPackageImportExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u043E\u0431\u044A\u044F\u0432\u043B\u0435\u043D\u0438\u0435 \u0438\u043B\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043F\u0430\u043A\u0435\u0442\u0430.",
-  [121 /* Expected0But1Found */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C '{0}', \u043D\u043E \u0432\u0441\u0442\u0440\u0435\u0442\u0438\u043B\u043E\u0441\u044C '{1}'.",
+  [121 /* Expected0But1Found */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0430\u0441\u044C \u043B\u0435\u043A\u0441\u0435\u043C\u0430 '{0}', \u043D\u043E \u0432\u0441\u0442\u0440\u0435\u0442\u0438\u043B\u0430\u0441\u044C \u043B\u0435\u043A\u0441\u0435\u043C\u0430 '{1}'.",
   [122 /* InvalidTextTemplateLiteral */]: "\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442\u043E\u0432\u044B\u0439 \u0448\u0430\u0431\u043B\u043E\u043D.",
   [123 /* ModifierListExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u0441\u043F\u0438\u0441\u043E\u043A \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u0432.",
   [124 /* RunKeywordCreationKeywordOrModifierListExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u043B\u0443\u0436\u0435\u0431\u043D\u043E\u0435 \u0441\u043B\u043E\u0432\u043E '\u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u044C' \u0438\u043B\u0438 \u0441\u043B\u0443\u0436\u0435\u0431\u043D\u043E\u0435 \u0441\u043B\u043E\u0432\u043E '\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435', \u0438\u043B\u0438 \u0441\u043F\u0438\u0441\u043E\u043A \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u0432.",
@@ -13229,6 +13239,8 @@ var russianErrorMessages = {
   [345 /* OverridingMethodMustNotBeAsyncBecauseBaseMethod0IsNotAsync */]: "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 \u043D\u0435 \u0434\u043E\u043B\u0436\u0435\u043D \u0431\u044B\u0442\u044C \u043F\u043E\u043C\u0435\u0447\u0435\u043D \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u043C '\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u044B\u0439', \u043F\u043E\u0441\u043A\u043E\u043B\u044C\u043A\u0443 \u0431\u0430\u0437\u043E\u0432\u044B\u0439 \u043C\u0435\u0442\u043E\u0434 '{0}' \u043D\u0435 \u043F\u043E\u043C\u0435\u0447\u0435\u043D \u0442\u0430\u043A\u0438\u043C \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u043C.",
   [346 /* OverridingFieldMustNotBeConstOrHaveWriteFunctionToMatchBaseField0 */]: "\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u043D\u043E\u0435 \u043F\u043E\u043B\u0435 \u043D\u0435 \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u043F\u043E\u043C\u0435\u0447\u0435\u043D\u043E \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u043C '\u043A\u043E\u043D\u0441\u0442' \u0438\u043B\u0438 \u0434\u043E\u043B\u0436\u043D\u043E \u0438\u043C\u0435\u0442\u044C \u0444\u0443\u043D\u043A\u0446\u0438\u0438 \u0437\u0430\u043F\u0438\u0441\u0438, \u0447\u0442\u043E\u0431\u044B \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C \u0431\u0430\u0437\u043E\u0432\u043E\u043C\u0443 \u043F\u043E\u043B\u044E '{0}'.",
   [348 /* CanNotAccessAbstractMemberOfBaseType */]: "\u041D\u0435\u043B\u044C\u0437\u044F \u043E\u0431\u0440\u0430\u0442\u0438\u0442\u044C\u0441\u044F \u043A \u0430\u0431\u0441\u0442\u0440\u0430\u043A\u0442\u043D\u043E\u043C\u0443 \u0447\u043B\u0435\u043D\u0443 \u0431\u0430\u0437\u043E\u0432\u043E\u0433\u043E \u0442\u0438\u043F\u0430.",
+  [349 /* TheFollowingBaseTypeMembersConflictAndMustBeOverridden0 */]: "\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u0447\u043B\u0435\u043D\u044B \u0431\u0430\u0437\u043E\u0432\u044B\u0445 \u0442\u0438\u043F\u043E\u0432 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u044E\u0442 \u043C\u0435\u0436\u0434\u0443 \u0441\u043E\u0431\u043E\u0439 \u0438 \u0434\u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u044B:{0}",
+  [350 /* TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1 */]: "\u0421\u043B\u0435\u0434\u0443\u044E\u0449\u0438\u0435 \u0447\u043B\u0435\u043D\u044B \u0431\u0430\u0437\u043E\u0432\u044B\u0445 \u0442\u0438\u043F\u043E\u0432 \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u044E\u0442 \u043C\u0435\u0436\u0434\u0443 \u0441\u043E\u0431\u043E\u0439, \u043F\u043E\u0442\u043E\u043C\u0443 \u0447\u0442\u043E \u0438\u0445 \u0438\u043C\u0435\u043D\u0430 '{0}' \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u044E\u0442 \u043D\u0430 \u044F\u0437\u044B\u043A\u0435 \u043E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u0430, \u0438 \u0434\u043E\u043B\u0436\u043D\u044B \u0431\u044B\u0442\u044C \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043D\u044B:{1}",
   [401 /* CannotFindTsLibDirectoryBaseSearchPaths0 */]: "\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u043D\u0430\u0439\u0442\u0438 \u043F\u0430\u043F\u043A\u0443 \u0441\u043E \u0441\u0442\u0430\u043D\u0434\u0430\u0440\u0442\u043D\u043E\u0439 \u0431\u0438\u0431\u043B\u0438\u043E\u0442\u0435\u043A\u043E\u0439 TypeScript. \u041F\u0443\u0442\u0438, \u043E\u0442\u043D\u043E\u0441\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u043A\u043E\u0442\u043E\u0440\u044B\u0445 \u043E\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043B\u044F\u043B\u0441\u044F \u043F\u043E\u0438\u0441\u043A: {0}.",
   [402 /* SourceFile0IsNotPartOfThePackageAndWontBeLoaded */]: "\u0418\u0441\u0445\u043E\u0434\u043D\u044B\u0439 \u0444\u0430\u0439\u043B '{0}' \u043D\u0435 \u044F\u0432\u043B\u044F\u0435\u0442\u0441\u044F \u0447\u0430\u0441\u0442\u044C\u044E \u043F\u0430\u043A\u0435\u0442\u0430 \u0438 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u0433\u0440\u0443\u0436\u0435\u043D.",
   [403 /* ProgramWithoutMainPackageCannotBeCompiled */]: "\u041F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u0430 \u0431\u0435\u0437 \u0433\u043B\u0430\u0432\u043D\u043E\u0433\u043E \u043F\u0430\u043A\u0435\u0442\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0441\u043A\u043E\u043C\u043F\u0438\u043B\u0438\u0440\u043E\u0432\u0430\u043D\u0430.",
@@ -14516,10 +14528,14 @@ var LocalizationContext = class {
   getEntityName(entity) {
     const containingPackage = getPackageContainingEntity(entity);
     const translationPackage = this._translationPackageByTranslated.get(containingPackage);
-    if (translationPackage === void 0) {
-      return entity.getName();
+    const translatedName = translationPackage?.getEntityName(entity);
+    if (translationPackage !== void 0 && translatedName !== void 0) {
+      return new LocalizedName.Translated(
+        translatedName,
+        new Localization.Translated(new Translation(translationPackage))
+      );
     }
-    return translationPackage.getEntityName(entity) ?? entity.getName();
+    return new LocalizedName.Original(entity.getName(), new Localization.Original(containingPackage.getLocale()));
   }
 };
 
@@ -15314,7 +15330,7 @@ var DisplayService = class {
           Debug.never(localization);
       }
     }
-    return this._lctxOrLocale instanceof LocalizationContext ? this._lctxOrLocale.getEntityName(entity) : entity.getName();
+    return this._lctxOrLocale instanceof LocalizationContext ? this._lctxOrLocale.getEntityName(entity).value : entity.getName();
   }
 };
 function typeToTypeUsage(type) {
@@ -16702,7 +16718,8 @@ __export(types_exports, {
   UnionType: () => UnionType,
   UnresolvedType: () => UnresolvedType2,
   ValueParameter: () => ValueParameter,
-  VariantType: () => VariantType2
+  VariantType: () => VariantType2,
+  isNamedTypeMember: () => isNamedTypeMember
 });
 
 // source/types/AliasType.ts
@@ -17357,6 +17374,9 @@ var TypeFactory = class {
 };
 
 // source/types/TypeMembers.ts
+function isNamedTypeMember(member) {
+  return member.kind === "field" || member.kind === "method";
+}
 var Method = class _Method {
   constructor(_analyzer, _entity, _substitutions) {
     this._analyzer = _analyzer;
@@ -17366,6 +17386,9 @@ var Method = class _Method {
     this._valueParameters = new Cached();
     this._signatureEntity = new Cached();
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getName() {
     return this._entity.getName();
   }
@@ -17437,6 +17460,9 @@ var Method = class _Method {
     }
     return other.kind === "method" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 var ValueParameter = class {
   constructor(_entity, _substitutions) {
@@ -17468,6 +17494,9 @@ var Field = class _Field {
     this._substitutions = _substitutions;
     this.kind = "field";
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getName() {
     return this._entity.getName();
   }
@@ -17501,6 +17530,9 @@ var Field = class _Field {
     }
     return other.kind === "field" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 var Operator = class _Operator {
   constructor(_analyzer, _entity, _substitutions) {
@@ -17511,6 +17543,9 @@ var Operator = class _Operator {
     this._valueParameters = new Cached();
     this._signatureEntity = new Cached();
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getOperatorKind() {
     return this._entity.getOperatorKind();
   }
@@ -17581,6 +17616,9 @@ var Constructor = class _Constructor {
     this.kind = "constructor";
     this._valueParameters = new Cached();
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getValueParameters() {
     return this._valueParameters.getOrInsertWith(
       () => this._entity.getValueParameters().map((p) => new ValueParameter(p, this._substitutions))
@@ -17607,6 +17645,9 @@ var Constructor = class _Constructor {
     }
     return other.kind === "constructor" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 var Destructor = class _Destructor {
   constructor(_entity, _substitutions) {
@@ -17615,6 +17656,9 @@ var Destructor = class _Destructor {
     this.kind = "destructor";
     this._valueParameters = new Cached();
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getValueParameters() {
     return this._valueParameters.getOrInsertWith(
       () => this._entity.getValueParameters().map((p) => new ValueParameter(p, this._substitutions))
@@ -17641,6 +17685,9 @@ var Destructor = class _Destructor {
     }
     return other.kind === "destructor" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 var Indexer = class _Indexer {
   constructor(_entity, _substitutions) {
@@ -17649,6 +17696,9 @@ var Indexer = class _Indexer {
     this.kind = "indexer";
     this._valueParameters = new Cached();
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getValueParameters() {
     return this._valueParameters.getOrInsertWith(
       () => this._entity.getValueParameters().map((p) => new ValueParameter(p, this._substitutions))
@@ -17678,6 +17728,9 @@ var Indexer = class _Indexer {
     }
     return other.kind === "indexer" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 var DereferenceOperator = class _DereferenceOperator {
   constructor(_entity, _substitutions) {
@@ -17685,6 +17738,9 @@ var DereferenceOperator = class _DereferenceOperator {
     this._substitutions = _substitutions;
     this.kind = "dereference-operator";
   }
+  get debuggerDisplay() {
+    return this.toString();
+  }
   getType() {
     return this._entity.getType().applySubstitutions(this._substitutions.map);
   }
@@ -17709,6 +17765,9 @@ var DereferenceOperator = class _DereferenceOperator {
     }
     return other.kind === "dereference-operator" && this._entity === other._entity && this._substitutions.equals(other._substitutions);
   }
+  toString() {
+    return new DisplayService(void 0, 1 /* Ru */).displayTypeMember(this);
+  }
 };
 
 // source/types/UnionType.ts
@@ -17873,6 +17932,23 @@ var VariantType2 = class {
 };
 
 // source/entities/TypeEntity.ts
+var TypeEntity2;
+((TypeEntity10) => {
+  function isAbstract(entity) {
+    switch (entity.typeEntityKind) {
+      case 1 /* Structured */:
+        return entity.isAbstract() || entity.isAspect();
+      case 0 /* Function */:
+      case 2 /* Parameter */:
+      case 3 /* Variant */:
+      case 4 /* Alias */:
+        return false;
+      default:
+        Debug.never(entity);
+    }
+  }
+  TypeEntity10.isAbstract = isAbstract;
+})(TypeEntity2 || (TypeEntity2 = {}));
 var TypeEntityKind = /* @__PURE__ */ ((TypeEntityKind4) => {
   TypeEntityKind4[TypeEntityKind4["Function"] = 0] = "Function";
   TypeEntityKind4[TypeEntityKind4["Structured"] = 1] = "Structured";
@@ -20098,6 +20174,150 @@ __decorateClass([
   atomicBlock
 ], FileInternal.prototype, "update", 1);
 
+// source/diagnostic/TokenDiagnostic.ts
+function getTokenName(tokenKind) {
+  const userLocale2 = getUserLocale();
+  let names = englishTokenNames;
+  if (userLocale2 !== void 0) {
+    if (userLocale2.startsWith("ru")) {
+      names = russianTokenNames;
+    }
+  }
+  return names[tokenKind];
+}
+var englishTokenNames = {
+  [0 /* Unknown */]: "unknown",
+  [1 /* EndOfFile */]: "end of file",
+  [2 /* IntegerLiteral */]: "integer literal",
+  [3 /* RealLiteral */]: "real literal",
+  [4 /* MeasureLiteral */]: "measure literal",
+  [5 /* CharLiteral */]: "character literal",
+  [6 /* TextLiteral */]: "text literal",
+  [7 /* TextTemplateHead */]: "text template literal",
+  [8 /* TextTemplatePart */]: "text template literal",
+  [9 /* TextTemplateTail */]: "text template literal",
+  [10 /* Identifier */]: "identifier",
+  [11 /* Ampersand */]: "&",
+  [12 /* AmpersandAmpersand */]: "&&",
+  [13 /* AmpersandEquals */]: "&=",
+  [14 /* Asterisk */]: "*",
+  [15 /* AsteriskAsterisk */]: "**",
+  [16 /* AsteriskEquals */]: "*=",
+  [17 /* BackQuote */]: "`",
+  [18 /* Bar */]: "|",
+  [19 /* BarBar */]: "||",
+  [20 /* Caret */]: "^",
+  [21 /* CloseBrace */]: "}",
+  [22 /* CloseParenthesis */]: ")",
+  [23 /* CloseSquareBracket */]: "]",
+  [24 /* Colon */]: ":",
+  [25 /* Comma */]: ",",
+  [26 /* CommercialAt */]: "@",
+  [27 /* Dot */]: ".",
+  [28 /* DoublePeriod */]: "..",
+  [29 /* Ellipsis */]: "...",
+  [30 /* EqualsEquals */]: "==",
+  [31 /* EqualsGreaterThan */]: "=>",
+  [32 /* Exclamation */]: "!",
+  [33 /* ExclamationEquals */]: "!=",
+  [34 /* GreaterThan */]: ">",
+  [35 /* GreaterThanOrEqual */]: ">=",
+  [36 /* HashSign */]: "#",
+  [37 /* LessThan */]: "<",
+  [38 /* LessThanOrEqual */]: "<=",
+  [39 /* LessThanMinus */]: "<-",
+  [40 /* Minus */]: "-",
+  [41 /* MinusMinus */]: "--",
+  [42 /* MinusEquals */]: "-=",
+  [43 /* MinusGreaterThan */]: "->",
+  [44 /* OpenBrace */]: "{",
+  [45 /* OpenParenthesis */]: "(",
+  [46 /* OpenSquareBracket */]: "[",
+  [47 /* Plus */]: "+",
+  [48 /* PlusPlus */]: "++",
+  [49 /* PlusEquals */]: "+=",
+  [50 /* Question */]: "?",
+  [51 /* QuestionQuestion */]: "??",
+  [52 /* Semicolon */]: ";",
+  [53 /* Slash */]: "/",
+  [54 /* SlashEquals */]: "/=",
+  [55 /* Tilde */]: "~",
+  [56 /* TildeTilde */]: "~~",
+  [57 /* Underscore */]: "_",
+  [58 /* Equals */]: "=",
+  [59 /* Percent */]: "%",
+  [60 /* PercentPercent */]: "%%",
+  [61 /* Backslash */]: "\\",
+  [62 /* BackslashEquals */]: "\\=",
+  [63 /* BackslashBackslash */]: "\\\\"
+};
+var russianTokenNames = {
+  [0 /* Unknown */]: "\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F",
+  [1 /* EndOfFile */]: "\u043A\u043E\u043D\u0435\u0446 \u0444\u0430\u0439\u043B\u0430",
+  [2 /* IntegerLiteral */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0446\u0435\u043B\u043E\u0435 \u0447\u0438\u0441\u043B\u043E",
+  [3 /* RealLiteral */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0432\u0435\u0449\u0435\u0441\u0442\u0432\u0435\u043D\u043D\u043E\u0435 \u0447\u0438\u0441\u043B\u043E",
+  [4 /* MeasureLiteral */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0447\u0438\u0441\u043B\u043E \u0441 \u0435\u0434\u0438\u043D\u0438\u0446\u0435\u0439 \u0438\u0437\u043C\u0435\u0440\u0435\u043D\u0438\u044F",
+  [5 /* CharLiteral */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0441\u0438\u043C\u0432\u043E\u043B \u0442\u0435\u043A\u0441\u0442\u0430",
+  [6 /* TextLiteral */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0442\u0435\u043A\u0441\u0442",
+  [7 /* TextTemplateHead */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0448\u0430\u0431\u043B\u043E\u043D \u0442\u0435\u043A\u0441\u0442\u0430",
+  [8 /* TextTemplatePart */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0448\u0430\u0431\u043B\u043E\u043D \u0442\u0435\u043A\u0441\u0442\u0430",
+  [9 /* TextTemplateTail */]: "\u0431\u0443\u043A\u0432\u0430\u043B\u044C\u043D\u043E \u0448\u0430\u0431\u043B\u043E\u043D \u0442\u0435\u043A\u0441\u0442\u0430",
+  [10 /* Identifier */]: "\u0438\u043C\u044F",
+  [11 /* Ampersand */]: "&",
+  [12 /* AmpersandAmpersand */]: "&&",
+  [13 /* AmpersandEquals */]: "&=",
+  [14 /* Asterisk */]: "*",
+  [15 /* AsteriskAsterisk */]: "**",
+  [16 /* AsteriskEquals */]: "*=",
+  [17 /* BackQuote */]: "`",
+  [18 /* Bar */]: "|",
+  [19 /* BarBar */]: "||",
+  [20 /* Caret */]: "^",
+  [21 /* CloseBrace */]: "}",
+  [22 /* CloseParenthesis */]: ")",
+  [23 /* CloseSquareBracket */]: "]",
+  [24 /* Colon */]: ":",
+  [25 /* Comma */]: ",",
+  [26 /* CommercialAt */]: "@",
+  [27 /* Dot */]: ".",
+  [28 /* DoublePeriod */]: "..",
+  [29 /* Ellipsis */]: "...",
+  [30 /* EqualsEquals */]: "==",
+  [31 /* EqualsGreaterThan */]: "=>",
+  [32 /* Exclamation */]: "!",
+  [33 /* ExclamationEquals */]: "!=",
+  [34 /* GreaterThan */]: ">",
+  [35 /* GreaterThanOrEqual */]: ">=",
+  [36 /* HashSign */]: "#",
+  [37 /* LessThan */]: "<",
+  [38 /* LessThanOrEqual */]: "<=",
+  [39 /* LessThanMinus */]: "<-",
+  [40 /* Minus */]: "-",
+  [41 /* MinusMinus */]: "--",
+  [42 /* MinusEquals */]: "-=",
+  [43 /* MinusGreaterThan */]: "->",
+  [44 /* OpenBrace */]: "{",
+  [45 /* OpenParenthesis */]: "(",
+  [46 /* OpenSquareBracket */]: "[",
+  [47 /* Plus */]: "+",
+  [48 /* PlusPlus */]: "++",
+  [49 /* PlusEquals */]: "+=",
+  [50 /* Question */]: "?",
+  [51 /* QuestionQuestion */]: "??",
+  [52 /* Semicolon */]: ";",
+  [53 /* Slash */]: "/",
+  [54 /* SlashEquals */]: "/=",
+  [55 /* Tilde */]: "~",
+  [56 /* TildeTilde */]: "~~",
+  [57 /* Underscore */]: "_",
+  [58 /* Equals */]: "=",
+  [59 /* Percent */]: "%",
+  [60 /* PercentPercent */]: "%%",
+  [61 /* Backslash */]: "\\",
+  [62 /* BackslashEquals */]: "\\=",
+  [63 /* BackslashBackslash */]: "\\\\"
+};
+
 // source/parser/ConvertTokenKind.ts
 function scannerTokenKindToTreeTokenKind(kind) {
   return getOrCreateTokenMapping()[kind];
@@ -20122,61 +20342,61 @@ function getOrCreateTokenMapping() {
     result[13 /* TextTemplateTail */] = 9 /* TextTemplateTail */;
     result[14 /* LocalizableTextLiteral */] = 6 /* TextLiteral */;
     result[15 /* LocalizableTextTemplateHead */] = 7 /* TextTemplateHead */;
-    result[16 /* Ampersand */] = 10 /* Ampersand */;
-    result[17 /* AmpersandAmpersand */] = 11 /* AmpersandAmpersand */;
-    result[18 /* AmpersandEquals */] = 12 /* AmpersandEquals */;
-    result[19 /* Asterisk */] = 13 /* Asterisk */;
-    result[20 /* AsteriskAsterisk */] = 14 /* AsteriskAsterisk */;
-    result[21 /* AsteriskEquals */] = 15 /* AsteriskEquals */;
-    result[22 /* BackQuote */] = 16 /* BackQuote */;
-    result[23 /* Bar */] = 17 /* Bar */;
-    result[24 /* BarBar */] = 18 /* BarBar */;
-    result[25 /* Caret */] = 19 /* Caret */;
-    result[26 /* RightBrace */] = 20 /* CloseBrace */;
-    result[27 /* RightParenthesis */] = 21 /* CloseParenthesis */;
-    result[28 /* RightSquareBracket */] = 22 /* CloseSquareBracket */;
-    result[29 /* Colon */] = 23 /* Colon */;
-    result[30 /* Comma */] = 24 /* Comma */;
-    result[31 /* CommercialAt */] = 25 /* CommercialAt */;
-    result[32 /* Dot */] = 26 /* Dot */;
-    result[33 /* DoublePeriod */] = 27 /* DoublePeriod */;
-    result[34 /* Ellipsis */] = 28 /* Ellipsis */;
-    result[35 /* EqualsEquals */] = 29 /* EqualsEquals */;
-    result[36 /* EqualsRightAngle */] = 30 /* EqualsGreaterThan */;
-    result[37 /* Exclamation */] = 31 /* Exclamation */;
-    result[38 /* ExclamationEquals */] = 32 /* ExclamationEquals */;
-    result[39 /* RightAngle */] = 33 /* GreaterThan */;
-    result[40 /* RightAngleEquals */] = 34 /* GreaterThanOrEqual */;
-    result[41 /* HashSign */] = 35 /* HashSign */;
-    result[42 /* LeftAngle */] = 36 /* LessThan */;
-    result[43 /* LeftAngleEquals */] = 37 /* LessThanOrEqual */;
-    result[44 /* LeftAngleMinus */] = 38 /* LessThanMinus */;
-    result[45 /* Minus */] = 39 /* Minus */;
-    result[46 /* MinusMinus */] = 40 /* MinusMinus */;
-    result[47 /* MinusEquals */] = 41 /* MinusEquals */;
-    result[48 /* MinusRightAngle */] = 42 /* MinusGreaterThan */;
-    result[49 /* LeftBrace */] = 43 /* OpenBrace */;
-    result[50 /* LeftParenthesis */] = 44 /* OpenParenthesis */;
-    result[51 /* LeftSquareBracket */] = 45 /* OpenSquareBracket */;
-    result[52 /* Plus */] = 46 /* Plus */;
-    result[53 /* PlusPlus */] = 47 /* PlusPlus */;
-    result[54 /* PlusEquals */] = 48 /* PlusEquals */;
-    result[55 /* Question */] = 49 /* Question */;
-    result[56 /* QuestionQuestion */] = 50 /* QuestionQuestion */;
-    result[57 /* Semicolon */] = 51 /* Semicolon */;
-    result[58 /* Slash */] = 52 /* Slash */;
-    result[59 /* SlashEquals */] = 53 /* SlashEquals */;
-    result[60 /* Tilde */] = 54 /* Tilde */;
-    result[61 /* TildeTilde */] = 55 /* TildeTilde */;
-    result[62 /* Underscore */] = 56 /* Underscore */;
-    result[63 /* Equals */] = 57 /* Equals */;
-    result[69 /* Identifier */] = 63 /* Identifier */;
-    result[70 /* QuotedIdentifier */] = 63 /* Identifier */;
-    result[64 /* Percent */] = 58 /* Percent */;
-    result[65 /* PercentPercent */] = 59 /* PercentPercent */;
-    result[66 /* BackSlash */] = 60 /* Backslash */;
-    result[67 /* BackSlashEquals */] = 61 /* BackslashEquals */;
-    result[68 /* BackSlashBackSlash */] = 62 /* BackslashBackslash */;
+    result[16 /* Identifier */] = 10 /* Identifier */;
+    result[17 /* QuotedIdentifier */] = 10 /* Identifier */;
+    result[18 /* Ampersand */] = 11 /* Ampersand */;
+    result[19 /* AmpersandAmpersand */] = 12 /* AmpersandAmpersand */;
+    result[20 /* AmpersandEquals */] = 13 /* AmpersandEquals */;
+    result[21 /* Asterisk */] = 14 /* Asterisk */;
+    result[22 /* AsteriskAsterisk */] = 15 /* AsteriskAsterisk */;
+    result[23 /* AsteriskEquals */] = 16 /* AsteriskEquals */;
+    result[24 /* BackQuote */] = 17 /* BackQuote */;
+    result[25 /* Bar */] = 18 /* Bar */;
+    result[26 /* BarBar */] = 19 /* BarBar */;
+    result[27 /* Caret */] = 20 /* Caret */;
+    result[28 /* RightBrace */] = 21 /* CloseBrace */;
+    result[29 /* RightParenthesis */] = 22 /* CloseParenthesis */;
+    result[30 /* RightSquareBracket */] = 23 /* CloseSquareBracket */;
+    result[31 /* Colon */] = 24 /* Colon */;
+    result[32 /* Comma */] = 25 /* Comma */;
+    result[33 /* CommercialAt */] = 26 /* CommercialAt */;
+    result[34 /* Dot */] = 27 /* Dot */;
+    result[35 /* DoublePeriod */] = 28 /* DoublePeriod */;
+    result[36 /* Ellipsis */] = 29 /* Ellipsis */;
+    result[37 /* EqualsEquals */] = 30 /* EqualsEquals */;
+    result[38 /* EqualsRightAngle */] = 31 /* EqualsGreaterThan */;
+    result[39 /* Exclamation */] = 32 /* Exclamation */;
+    result[40 /* ExclamationEquals */] = 33 /* ExclamationEquals */;
+    result[41 /* RightAngle */] = 34 /* GreaterThan */;
+    result[42 /* RightAngleEquals */] = 35 /* GreaterThanOrEqual */;
+    result[43 /* HashSign */] = 36 /* HashSign */;
+    result[44 /* LeftAngle */] = 37 /* LessThan */;
+    result[45 /* LeftAngleEquals */] = 38 /* LessThanOrEqual */;
+    result[46 /* LeftAngleMinus */] = 39 /* LessThanMinus */;
+    result[47 /* Minus */] = 40 /* Minus */;
+    result[48 /* MinusMinus */] = 41 /* MinusMinus */;
+    result[49 /* MinusEquals */] = 42 /* MinusEquals */;
+    result[50 /* MinusRightAngle */] = 43 /* MinusGreaterThan */;
+    result[51 /* LeftBrace */] = 44 /* OpenBrace */;
+    result[52 /* LeftParenthesis */] = 45 /* OpenParenthesis */;
+    result[53 /* LeftSquareBracket */] = 46 /* OpenSquareBracket */;
+    result[54 /* Plus */] = 47 /* Plus */;
+    result[55 /* PlusPlus */] = 48 /* PlusPlus */;
+    result[56 /* PlusEquals */] = 49 /* PlusEquals */;
+    result[57 /* Question */] = 50 /* Question */;
+    result[58 /* QuestionQuestion */] = 51 /* QuestionQuestion */;
+    result[59 /* Semicolon */] = 52 /* Semicolon */;
+    result[60 /* Slash */] = 53 /* Slash */;
+    result[61 /* SlashEquals */] = 54 /* SlashEquals */;
+    result[62 /* Tilde */] = 55 /* Tilde */;
+    result[63 /* TildeTilde */] = 56 /* TildeTilde */;
+    result[64 /* Underscore */] = 57 /* Underscore */;
+    result[65 /* Equals */] = 58 /* Equals */;
+    result[66 /* Percent */] = 59 /* Percent */;
+    result[67 /* PercentPercent */] = 60 /* PercentPercent */;
+    result[68 /* BackSlash */] = 61 /* Backslash */;
+    result[69 /* BackSlashEquals */] = 62 /* BackslashEquals */;
+    result[70 /* BackSlashBackSlash */] = 63 /* BackslashBackslash */;
     for (let i = 0; i < result.length; i++) {
       if (result[i] === void 0) {
         throw new Error(`Mapping for token ${TokenKind2[i]} not specified.`);
@@ -20265,7 +20485,7 @@ var TextParser = class {
     this.tryReportDiagnosticAtCurrentRange(
       121 /* Expected0But1Found */,
       0 /* Error */,
-      tokenKindValues[kind],
+      getTokenName(kind),
       this._currentTokenOrKeyword.toString()
     );
     return this.createMissingToken(kind);
@@ -20315,7 +20535,7 @@ var TextParser = class {
     return result;
   }
   parseIdentifier(declarationKind = 0 /* None */, diagnosticKind = 101 /* IdentifierExpected */) {
-    if (this._currentTokenOrKeyword.kind === "token" && this._currentTokenOrKeyword.value.tokenKind === 63 /* Identifier */) {
+    if (this._currentTokenOrKeyword.kind === "token" && this._currentTokenOrKeyword.value.tokenKind === 10 /* Identifier */) {
       const range = this._currentTokenOrKeyword.getRangeWithoutTrivia();
       const identifier2 = this.tokenWithSkippedTokens(
         this._currentTokenOrKeyword.value,
@@ -20329,13 +20549,13 @@ var TextParser = class {
       return identifier2;
     }
     this.tryReportDiagnosticAtCurrentRange(diagnosticKind);
-    return this.createMissingToken(63 /* Identifier */);
+    return this.createMissingToken(10 /* Identifier */);
   }
   parseSemicolonOrLineBreak() {
     if (this._currentTokenOrKeyword.hasPrecedingLineBreak()) {
       return void 0;
     }
-    return this.parseExpectedToken(51 /* Semicolon */);
+    return this.parseExpectedToken(52 /* Semicolon */);
   }
   parseQualifiedName(diagnosticKindForFirstMissingIdentifier) {
     const qualifiedNameStart = this.tokenOrKeywordStartPosition();
@@ -20343,17 +20563,17 @@ var TextParser = class {
       0 /* None */,
       diagnosticKindForFirstMissingIdentifier
     )];
-    let dotToken = this.parseOptionalToken(26 /* Dot */);
+    let dotToken = this.parseOptionalToken(27 /* Dot */);
     while (dotToken !== void 0) {
       parts.push(dotToken);
       parts.push(this.parseIdentifier());
-      dotToken = this.parseOptionalToken(26 /* Dot */);
+      dotToken = this.parseOptionalToken(27 /* Dot */);
     }
     const result = new QualifiedName2(parts);
     return this.intern(result, qualifiedNameStart);
   }
   parseOptionalFunctionBlock(allowSingleExpression = true) {
-    if (this.currentTokenOrKeyword.isToken(43 /* OpenBrace */)) {
+    if (this.currentTokenOrKeyword.isToken(44 /* OpenBrace */)) {
       return this.statementParser.parseFunctionBlock(allowSingleExpression);
     }
     return void 0;
@@ -20421,7 +20641,7 @@ var TextParser = class {
     return this._nodeInterner.intern(node, startPosition);
   }
   parseComma() {
-    return this.parseExpectedToken(24 /* Comma */);
+    return this.parseExpectedToken(25 /* Comma */);
   }
   tokenOrKeywordStartPosition() {
     let startPosition;
@@ -20503,7 +20723,7 @@ var TextParser = class {
   tryParseKeywordParts(dictionary) {
     let result = void 0;
     const token = this._nextToken;
-    if (token.tokenKind === 63 /* Identifier */) {
+    if (token.tokenKind === 10 /* Identifier */) {
       const identifier2 = token;
       const keywordPart = dictionary.get(identifier2.value);
       if (keywordPart !== void 0) {
@@ -20533,7 +20753,7 @@ var TextParser = class {
     this.validateScannerToken(scannerToken);
     const kind = scannerTokenKindToTreeTokenKind(scannerToken.kind);
     let result;
-    if (kind === 63 /* Identifier */) {
+    if (kind === 10 /* Identifier */) {
       result = this.intern(this.createIdentifierToken(scannerToken.value, trivia), tokenStart);
     } else {
       result = this.intern(this.createNonIdentifierToken(kind, scannerToken.value, trivia), tokenStart);
@@ -20565,7 +20785,7 @@ var TextParser = class {
           code = 3 /* UnterminatedTextOrTextTemplate */;
           break;
         }
-        case 70 /* QuotedIdentifier */: {
+        case 17 /* QuotedIdentifier */: {
           code = 4 /* UnterminatedQuotedIdentifier */;
           break;
         }
@@ -20622,7 +20842,7 @@ var TextParser = class {
     if (!Scanner.isPlainIdentifier(valueWithoutQuotes)) {
       flags |= 8 /* RequiresQuotes */;
     }
-    return new Token6(63 /* Identifier */, value, trivia, flags, operatorKind);
+    return new Token6(10 /* Identifier */, value, trivia, flags, operatorKind);
   }
   createNonIdentifierToken(kind, value, trivia) {
     const flags = 0 /* None */;
@@ -20756,8 +20976,8 @@ var PackageImportDirectiveParser = class {
     );
     this._packageImportSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parsePackageImport(),
       () => this.parser.parseSemicolonOrLineBreak(),
@@ -20773,12 +20993,12 @@ var PackageImportDirectiveParser = class {
   parsePackageImportDirective() {
     const packageImportDirectiveStart = this.parser.tokenOrKeywordStartPosition();
     const usingKeyword = this.parser.parseExpectedKeyword(18 /* Import */);
-    const openBraceToken = this.parser.parseOptionalToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseOptionalToken(44 /* OpenBrace */);
     let result;
     if (openBraceToken !== void 0) {
       const elements = this._packageImportSequenceParser.parse();
       const packageImports = new PackageImportList2(elements);
-      const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+      const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
       result = new PackageGroupImportDirective2(usingKeyword, openBraceToken, packageImports, closeBraceToken);
     } else {
       const packageImport = this.parsePackageImport();
@@ -20790,13 +21010,13 @@ var PackageImportDirectiveParser = class {
     const packageImportStart = this.parser.tokenOrKeywordStartPosition();
     const hasAlias = this.parser.lookAhead(() => {
       this.parser.parseIdentifier();
-      return this.parser.currentTokenOrKeyword.isToken(57 /* Equals */);
+      return this.parser.currentTokenOrKeyword.isToken(58 /* Equals */);
     });
     let alias;
     let equalsToken;
     if (hasAlias) {
       alias = this.parser.parseIdentifier();
-      equalsToken = this.parser.parseExpectedToken(57 /* Equals */);
+      equalsToken = this.parser.parseExpectedToken(58 /* Equals */);
     }
     const packageName = this.parsePackageName();
     const result = new PackageImport2(alias, equalsToken, packageName);
@@ -20808,8 +21028,8 @@ var PackageImportDirectiveParser = class {
       0 /* None */,
       103 /* PackageNameExpected */
     )];
-    while (this.parser.currentTokenOrKeyword.isToken(26 /* Dot */)) {
-      parts.push(this.parser.parseExpectedToken(26 /* Dot */));
+    while (this.parser.currentTokenOrKeyword.isToken(27 /* Dot */)) {
+      parts.push(this.parser.parseExpectedToken(27 /* Dot */));
       parts.push(this.parser.parseIdentifier());
     }
     const result = new PackageName2(parts);
@@ -20822,7 +21042,7 @@ var StatementParser = class {
     this._statementSequenceParser = new SequenceParser(
       this.parser,
       () => this.isStartOfStatement(),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parseStatement(),
       () => this.parser.parseSemicolonOrLineBreak(),
@@ -20832,7 +21052,7 @@ var StatementParser = class {
     this._switchStatementParser = new SwitchStatementParser(this.parser);
     this._forStatementVariableSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
       () => this.isEnumerationVariableSequenceTerminator(),
       () => true,
       () => this.parseEnumerationVariableDeclaration(),
@@ -20850,15 +21070,15 @@ var StatementParser = class {
     );
   }
   isStartOfBlock() {
-    return this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */);
+    return this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */);
   }
   parseStatementBlock() {
     let result;
     const blockStart = this.parser.tokenOrKeywordStartPosition();
-    const openBraceToken = this.parser.parseExpectedToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseExpectedToken(44 /* OpenBrace */);
     if (!openBraceToken.isMissing) {
       const statementList = this.parseStatementList();
-      const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+      const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
       result = this.parser.intern(
         new StatementBlock2(openBraceToken, statementList, closeBraceToken),
         blockStart
@@ -20867,21 +21087,20 @@ var StatementParser = class {
       const statementList = this.parser.intern(new StatementList2([]), blockStart);
       const flags = 1 /* Missing */;
       const closeBraceToken = this.parser.intern(
-        new Token6(20 /* CloseBrace */, "", [], flags, void 0),
+        new Token6(21 /* CloseBrace */, "", [], flags, void 0),
         blockStart
       );
       result = this.parser.intern(
         new StatementBlock2(openBraceToken, statementList, closeBraceToken),
         blockStart
       );
-      result = this.parser.intern(result, blockStart);
     }
     return result;
   }
   parseFunctionBlock(allowSingleExpression = true) {
     let result;
     const blockStart = this.parser.tokenOrKeywordStartPosition();
-    const openBraceToken = this.parser.parseExpectedToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseExpectedToken(44 /* OpenBrace */);
     if (!openBraceToken.isMissing) {
       let expressionOrStatementList;
       if (allowSingleExpression) {
@@ -20890,7 +21109,7 @@ var StatementParser = class {
       if (expressionOrStatementList === void 0) {
         expressionOrStatementList = this.parseStatementList();
       }
-      const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+      const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
       result = this.parser.intern(
         new FunctionBlock2(openBraceToken, expressionOrStatementList, closeBraceToken),
         blockStart
@@ -20899,14 +21118,13 @@ var StatementParser = class {
       const expressionOrStatementList = this.parser.intern(new StatementList2([]), blockStart);
       const flags = 1 /* Missing */;
       const closeBraceToken = this.parser.intern(
-        new Token6(20 /* CloseBrace */, "", [], flags, void 0),
+        new Token6(21 /* CloseBrace */, "", [], flags, void 0),
         blockStart
       );
       result = this.parser.intern(
         new FunctionBlock2(openBraceToken, expressionOrStatementList, closeBraceToken),
         blockStart
       );
-      result = this.parser.intern(result, blockStart);
     }
     return result;
   }
@@ -20928,7 +21146,7 @@ var StatementParser = class {
   }
   parseEmptyStatement() {
     const statementStart = this.parser.tokenOrKeywordStartPosition();
-    const semicolonToken = this.parser.parseExpectedToken(51 /* Semicolon */);
+    const semicolonToken = this.parser.parseExpectedToken(52 /* Semicolon */);
     const result = new EmptyStatement2(semicolonToken);
     return this.parser.intern(result, statementStart);
   }
@@ -20978,7 +21196,7 @@ var StatementParser = class {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
     const catchKeyword = this.parser.parseExpectedKeyword(32 /* Catch */);
     let errorVariable;
-    if (this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */)) {
       errorVariable = this.parseErrorVariableDeclaration();
     }
     const block = this.parseStatementBlock();
@@ -21018,7 +21236,7 @@ var StatementParser = class {
     return this.parser.intern(result, statementStart);
   }
   isEnumerationVariableSequenceTerminator() {
-    return this.parser.currentTokenOrKeyword.isKeyword(9 /* From */) || this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */);
+    return this.parser.currentTokenOrKeyword.isKeyword(9 /* From */) || this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */);
   }
   parseEnumerationVariableDeclaration() {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
@@ -21033,7 +21251,7 @@ var StatementParser = class {
     } else {
       result = this.parser.tryParse(() => {
         const expression = this.parser.expressionParser.parseExpression(false);
-        return this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */) ? expression : void 0;
+        return this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */) ? expression : void 0;
       });
     }
     return result;
@@ -21132,7 +21350,7 @@ var StatementParser = class {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     }
     let initializer;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       initializer = this.parser.expressionParser.parseExpression(false);
     }
@@ -21153,12 +21371,12 @@ var StatementParser = class {
   isAssignmentOperator() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 57 /* Equals */:
-        case 15 /* AsteriskEquals */:
-        case 41 /* MinusEquals */:
-        case 48 /* PlusEquals */:
-        case 53 /* SlashEquals */:
-        case 61 /* BackslashEquals */:
+        case 58 /* Equals */:
+        case 16 /* AsteriskEquals */:
+        case 42 /* MinusEquals */:
+        case 49 /* PlusEquals */:
+        case 54 /* SlashEquals */:
+        case 62 /* BackslashEquals */:
           return true;
         default:
           return false;
@@ -21197,10 +21415,10 @@ var StatementParser = class {
     let result;
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 51 /* Semicolon */:
+        case 52 /* Semicolon */:
           result = () => this.parseEmptyStatement();
           break;
-        case 43 /* OpenBrace */:
+        case 44 /* OpenBrace */:
           result = () => this.parseRunStatement();
           break;
       }
@@ -21319,12 +21537,12 @@ var ExpressionParser = class {
     this._indexedAccessArgumentListParser = new ArgumentListParser(
       this.parser,
       () => this.parser.tryReportDiagnosticAtCurrentRange(114 /* IndexedAccessArgumentExpected */),
-      22 /* CloseSquareBracket */
+      23 /* CloseSquareBracket */
     );
     this._callArgumentListParser = new ArgumentListParser(
       this.parser,
       () => this.parser.tryReportDiagnosticAtCurrentRange(113 /* FunctionCallArgumentExpected */),
-      21 /* CloseParenthesis */
+      22 /* CloseParenthesis */
     );
   }
   // isFollowedByStatementBlock = true если по синтаксису сразу после выражения следует блок.
@@ -21342,7 +21560,7 @@ var ExpressionParser = class {
   parseNoneCoalescingExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
     let result = this.parseDisjunctiveExpression(isFollowedByStatementBlock);
-    while (this.parser.currentTokenOrKeyword.isToken(50 /* QuestionQuestion */)) {
+    while (this.parser.currentTokenOrKeyword.isToken(51 /* QuestionQuestion */)) {
       const operator = this.parser.parseTokenOrKeyword();
       const right = this.parseDisjunctiveExpression(isFollowedByStatementBlock);
       result = new BinaryExpression2(result, operator.value, right);
@@ -21394,7 +21612,7 @@ var ExpressionParser = class {
     return result;
   }
   isRelationOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(29 /* EqualsEquals */) || tokenOrKeyword.isToken(32 /* ExclamationEquals */) || tokenOrKeyword.isToken(36 /* LessThan */) || tokenOrKeyword.isToken(33 /* GreaterThan */) || tokenOrKeyword.isToken(37 /* LessThanOrEqual */) || tokenOrKeyword.isToken(34 /* GreaterThanOrEqual */) || tokenOrKeyword.isKeyword(14 /* Is */);
+    return tokenOrKeyword.isToken(30 /* EqualsEquals */) || tokenOrKeyword.isToken(33 /* ExclamationEquals */) || tokenOrKeyword.isToken(37 /* LessThan */) || tokenOrKeyword.isToken(34 /* GreaterThan */) || tokenOrKeyword.isToken(38 /* LessThanOrEqual */) || tokenOrKeyword.isToken(35 /* GreaterThanOrEqual */) || tokenOrKeyword.isKeyword(14 /* Is */);
   }
   parseAdditiveExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -21408,7 +21626,7 @@ var ExpressionParser = class {
     return result;
   }
   isAdditiveOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(46 /* Plus */) || tokenOrKeyword.isToken(39 /* Minus */);
+    return tokenOrKeyword.isToken(47 /* Plus */) || tokenOrKeyword.isToken(40 /* Minus */);
   }
   parseMultiplicativeExpression(isFollowedByStatementBlock) {
     if (this.parser.dialect === 1 /* Usual */ || this.parser.dialect === 0 /* Mixed */) {
@@ -21434,7 +21652,7 @@ var ExpressionParser = class {
     }
   }
   isMultiplicativeOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(13 /* Asterisk */) || tokenOrKeyword.isToken(52 /* Slash */) || tokenOrKeyword.isToken(60 /* Backslash */) || tokenOrKeyword.isToken(62 /* BackslashBackslash */);
+    return tokenOrKeyword.isToken(14 /* Asterisk */) || tokenOrKeyword.isToken(53 /* Slash */) || tokenOrKeyword.isToken(61 /* Backslash */) || tokenOrKeyword.isToken(63 /* BackslashBackslash */);
   }
   parseBitwiseDisjunctiveExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -21448,7 +21666,7 @@ var ExpressionParser = class {
     return result;
   }
   isBitwiseDisjunctiveOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(17 /* Bar */) || tokenOrKeyword.isToken(18 /* BarBar */);
+    return tokenOrKeyword.isToken(18 /* Bar */) || tokenOrKeyword.isToken(19 /* BarBar */);
   }
   parseBitwiseConjunctiveExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -21462,7 +21680,7 @@ var ExpressionParser = class {
     return result;
   }
   isBitwiseConjunctiveOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(10 /* Ampersand */);
+    return tokenOrKeyword.isToken(11 /* Ampersand */);
   }
   parseAsExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -21494,7 +21712,7 @@ var ExpressionParser = class {
     return result;
   }
   isPrefixUnaryOperator(tokenOrKeyword) {
-    return tokenOrKeyword.isToken(46 /* Plus */) || tokenOrKeyword.isToken(39 /* Minus */) || tokenOrKeyword.isKeyword(43 /* Not */);
+    return tokenOrKeyword.isToken(47 /* Plus */) || tokenOrKeyword.isToken(40 /* Minus */) || tokenOrKeyword.isKeyword(43 /* Not */);
   }
   parsePostfixUnaryExpression(isFollowedByStatementBlock) {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
@@ -21505,7 +21723,7 @@ var ExpressionParser = class {
           throw internalCompilerError();
         }
         switch (this.parser.currentTokenOrKeyword.tokenKind) {
-          case 36 /* LessThan */: {
+          case 37 /* LessThan */: {
             const hasTypeArguments = this.parser.typeArgumentParser.canParseTypeArgumentClause();
             if (!hasTypeArguments) {
               break parsingLoop;
@@ -21517,32 +21735,32 @@ var ExpressionParser = class {
             );
             break;
           }
-          case 31 /* Exclamation */: {
-            const exclamationToken = this.parser.parseExpectedToken(31 /* Exclamation */);
+          case 32 /* Exclamation */: {
+            const exclamationToken = this.parser.parseExpectedToken(32 /* Exclamation */);
             expression = this.parser.intern(
               new AssertionExpression2(expression, exclamationToken),
               expressionStart
             );
             break;
           }
-          case 49 /* Question */: {
-            const questionToken = this.parser.parseExpectedToken(49 /* Question */);
+          case 50 /* Question */: {
+            const questionToken = this.parser.parseExpectedToken(50 /* Question */);
             expression = this.parser.intern(
               new AssumptionExpression2(expression, questionToken),
               expressionStart
             );
             break;
           }
-          case 19 /* Caret */: {
-            const caretToken = this.parser.parseExpectedToken(19 /* Caret */);
+          case 20 /* Caret */: {
+            const caretToken = this.parser.parseExpectedToken(20 /* Caret */);
             expression = this.parser.intern(
               new DereferenceExpression2(expression, caretToken),
               expressionStart
             );
             break;
           }
-          case 26 /* Dot */: {
-            const dotToken = this.parser.parseExpectedToken(26 /* Dot */);
+          case 27 /* Dot */: {
+            const dotToken = this.parser.parseExpectedToken(27 /* Dot */);
             let memberName;
             const runKeyword = this.parser.parseOptionalKeyword(7 /* Run */);
             if (runKeyword !== void 0) {
@@ -21557,20 +21775,20 @@ var ExpressionParser = class {
             );
             break;
           }
-          case 45 /* OpenSquareBracket */: {
-            const openBracketToken = this.parser.parseExpectedToken(45 /* OpenSquareBracket */);
+          case 46 /* OpenSquareBracket */: {
+            const openBracketToken = this.parser.parseExpectedToken(46 /* OpenSquareBracket */);
             const argumentList = this._indexedAccessArgumentListParser.parseArgumentList();
-            const closeSquareBracketToken = this.parser.parseExpectedToken(22 /* CloseSquareBracket */);
+            const closeSquareBracketToken = this.parser.parseExpectedToken(23 /* CloseSquareBracket */);
             expression = this.parser.intern(
               new IndexedAccessExpression2(expression, openBracketToken, argumentList, closeSquareBracketToken),
               expressionStart
             );
             break;
           }
-          case 44 /* OpenParenthesis */: {
-            const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+          case 45 /* OpenParenthesis */: {
+            const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
             const argumentList = this._callArgumentListParser.parseArgumentList();
-            const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+            const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
             expression = this.parser.intern(
               new CallExpression2(expression, openParenthesisToken, argumentList, closeParenthesisToken),
               expressionStart
@@ -21584,13 +21802,13 @@ var ExpressionParser = class {
   isStartOfPostfixUnaryExpression() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 36 /* LessThan */:
-        case 31 /* Exclamation */:
-        case 44 /* OpenParenthesis */:
-        case 26 /* Dot */:
-        case 19 /* Caret */:
-        case 49 /* Question */:
-        case 45 /* OpenSquareBracket */:
+        case 37 /* LessThan */:
+        case 32 /* Exclamation */:
+        case 45 /* OpenParenthesis */:
+        case 27 /* Dot */:
+        case 20 /* Caret */:
+        case 50 /* Question */:
+        case 46 /* OpenSquareBracket */:
           return true;
         default:
           return false;
@@ -21602,10 +21820,10 @@ var ExpressionParser = class {
     let result = false;
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 44 /* OpenParenthesis */:
-        case 45 /* OpenSquareBracket */:
+        case 45 /* OpenParenthesis */:
+        case 46 /* OpenSquareBracket */:
         case 7 /* TextTemplateHead */:
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
         case 5 /* CharLiteral */:
         case 6 /* TextLiteral */:
         case 2 /* IntegerLiteral */:
@@ -21613,7 +21831,7 @@ var ExpressionParser = class {
         case 4 /* MeasureLiteral */:
           result = true;
           break;
-        case 43 /* OpenBrace */:
+        case 44 /* OpenBrace */:
           result = !isFollowedByStatementBlock;
           break;
       }
@@ -21624,7 +21842,7 @@ var ExpressionParser = class {
           result = this.parser.lookAhead(() => {
             this.parser.parseOptionalKeyword(40 /* Async */);
             const functionKeyword = this.parser.parseOptionalKeyword(12 /* Function */);
-            return functionKeyword !== void 0 && this.parser.currentTokenOrKeyword.isToken(44 /* OpenParenthesis */);
+            return functionKeyword !== void 0 && this.parser.currentTokenOrKeyword.isToken(45 /* OpenParenthesis */);
           });
           break;
         case 52 /* Yes */:
@@ -21645,21 +21863,21 @@ var ExpressionParser = class {
     let result = void 0;
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 44 /* OpenParenthesis */:
+        case 45 /* OpenParenthesis */:
           result = this.parseParenthesizedExpression();
           break;
-        case 45 /* OpenSquareBracket */:
+        case 46 /* OpenSquareBracket */:
           result = this._arrayLiteralParser.parseArrayLiteral();
           break;
         case 7 /* TextTemplateHead */:
           result = this.parseTextTemplateLiteral();
           break;
-        case 43 /* OpenBrace */:
+        case 44 /* OpenBrace */:
           if (!isFollowedByStatementBlock) {
             result = this.parseFunctionBlockLiteral();
           }
           break;
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           result = this.parseIdentifierExpression();
           break;
         case 5 /* CharLiteral */:
@@ -21723,9 +21941,9 @@ var ExpressionParser = class {
   parseReferenceExpression() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
     const referenceKeyword = this.parser.parseExpectedKeyword(54 /* Reference */);
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const expression = this.parseExpression(false);
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new ReferenceExpression2(
       referenceKeyword,
       openParenthesisToken,
@@ -21737,9 +21955,9 @@ var ExpressionParser = class {
   parseAutotypeCallExpression() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
     const colonKeyword = this.parser.parseExpectedKeyword(2 /* Autotype */);
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const argumentList = this._callArgumentListParser.parseArgumentList();
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new AutotypeCallExpression2(
       colonKeyword,
       openParenthesisToken,
@@ -21756,25 +21974,25 @@ var ExpressionParser = class {
   }
   parseParenthesizedExpression() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const expression = this.parseExpression(false);
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new ParenthesizedExpression2(openParenthesisToken, expression, closeParenthesisToken);
     return this.parser.intern(result, expressionStart);
   }
   parseConditionalExpression() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
     const condKeyword = this.parser.parseExpectedKeyword(30 /* Cond */);
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const condition = this.parseExpression(false);
-    const firstComma = this.parser.parseExpectedToken(24 /* Comma */);
+    const firstComma = this.parser.parseExpectedToken(25 /* Comma */);
     const first = this.parseExpression(false);
-    const secondComma = this.parser.parseOptionalToken(24 /* Comma */);
+    const secondComma = this.parser.parseOptionalToken(25 /* Comma */);
     let second = void 0;
     if (secondComma !== void 0) {
       second = this.parseExpression(false);
     }
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new ConditionalExpression2(
       condKeyword,
       openParenthesisToken,
@@ -21801,9 +22019,6 @@ var ExpressionParser = class {
     return this.parser.intern(result, expressionStart);
   }
   parseTextTemplateLiteral() {
-    if (!this.parser.currentTokenOrKeyword.isToken(7 /* TextTemplateHead */)) {
-      throw internalCompilerError();
-    }
     const literalStart = this.parser.tokenOrKeywordStartPosition();
     const head = this.parser.parseExpectedToken(7 /* TextTemplateHead */);
     const spanListStart = this.parser.tokenOrKeywordStartPosition();
@@ -21886,7 +22101,7 @@ var PackageMemberDeclarationParser = class {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     }
     let initializer;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       initializer = this.parser.expressionParser.parseExpression(false);
     }
@@ -21957,16 +22172,16 @@ var PackageMemberDeclarationParser = class {
     const declarationsParser = new SequenceParser(
       this.parser,
       () => this.isStartOfPackageMemberDeclaration(),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parsePackageMemberDeclaration(),
       () => this.parser.parseSemicolonOrLineBreak(),
       () => this.parser.tryReportDiagnosticAtCurrentRange(105 /* PackageMemberDeclarationExpected */)
     );
-    const openBraceToken = this.parser.parseExpectedToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseExpectedToken(44 /* OpenBrace */);
     const listStart = this.parser.tokenOrKeywordStartPosition();
     const elements = declarationsParser.parse();
-    const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+    const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
     const declarationList = this.parser.intern(new PackageMemberDeclarationList2(elements), listStart);
     const result = new PackageMemberGroupDeclaration2(
       tagList,
@@ -21983,7 +22198,7 @@ var PackageMemberDeclarationParser = class {
         return false;
       }
       this.parseExtendedTypeClause();
-      return this.parser.currentTokenOrKeyword.isToken(48 /* PlusEquals */);
+      return this.parser.currentTokenOrKeyword.isToken(49 /* PlusEquals */);
     });
     if (isTypeExtensionDeclaration) {
       return this.parseTypeExtensionDeclaration(declarationStart, tagList, modifierList);
@@ -21998,7 +22213,7 @@ var PackageMemberDeclarationParser = class {
     if (this.parser.typeParameterParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterParser.parseTypeParameterClause();
     }
-    const equalsToken = this.parser.parseExpectedToken(57 /* Equals */);
+    const equalsToken = this.parser.parseExpectedToken(58 /* Equals */);
     const body = this.parser.typeDeclarationBodyParser.parseTypeDeclarationBody();
     let result;
     switch (body.kind) {
@@ -22054,7 +22269,7 @@ var PackageMemberDeclarationParser = class {
   parseTypeExtensionDeclaration(declarationStart, tagList, modifierList) {
     const typeKeyword = this.parser.parseExpectedKeyword(16 /* Type */);
     const extendedTypeClause = this.parseExtendedTypeClause();
-    const plusEqualsToken = this.parser.parseExpectedToken(48 /* PlusEquals */);
+    const plusEqualsToken = this.parser.parseExpectedToken(49 /* PlusEquals */);
     const memberBlock = this.parser.typeMemberDeclarationParser.parseTypeMemberDeclarationBlock(false);
     const result = new TypeExtensionDeclaration2(
       tagList,
@@ -22069,17 +22284,17 @@ var PackageMemberDeclarationParser = class {
   parseExtendedTypeClause() {
     const extendedTypeClauseStart = this.parser.tokenOrKeywordStartPosition();
     const qualifiedName = this.parser.parseQualifiedName(102 /* TypeNameExpected */);
-    const lessThanToken = this.parser.parseOptionalToken(36 /* LessThan */);
+    const lessThanToken = this.parser.parseOptionalToken(37 /* LessThan */);
     let commaList;
     let greaterThanToken;
     if (lessThanToken !== void 0) {
       const commas = new Array();
       const listStart = this.parser.tokenOrKeywordStartPosition();
-      while (this.parser.currentTokenOrKeyword.isToken(24 /* Comma */)) {
+      while (this.parser.currentTokenOrKeyword.isToken(25 /* Comma */)) {
         commas.push(this.parser.parseComma());
       }
       commaList = this.parser.intern(new ExtendedTypeClauseCommaList2(commas), listStart);
-      greaterThanToken = this.parser.parseExpectedToken(33 /* GreaterThan */);
+      greaterThanToken = this.parser.parseExpectedToken(34 /* GreaterThan */);
     }
     const result = new ExtendedTypeClause2(qualifiedName, lessThanToken, commaList, greaterThanToken);
     return this.parser.intern(result, extendedTypeClauseStart);
@@ -22087,9 +22302,9 @@ var PackageMemberDeclarationParser = class {
   getPackageMemberDeclarationParsingFunction(allowGroupDeclaration) {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           return (declarationStart, tagList, modifierList) => this.parsePackageVariableDeclaration(declarationStart, tagList, modifierList);
-        case 43 /* OpenBrace */:
+        case 44 /* OpenBrace */:
           return (declarationStart, tagList, modifierList) => {
             if (!allowGroupDeclaration) {
               this.parser.tryReportDiagnosticAtCurrentRange(
@@ -22129,7 +22344,7 @@ var TypeMemberDeclarationParser = class {
     const declarationsParser = new SequenceParser(
       this.parser,
       () => this.isStartOfTypeMemberDeclaration(parseVariantInsteadOfVariable),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parseTypeMemberDeclaration(parseVariantInsteadOfVariable),
       () => this.parser.parseSemicolonOrLineBreak(),
@@ -22140,15 +22355,15 @@ var TypeMemberDeclarationParser = class {
     return this.parser.intern(result, listStart);
   }
   isStartOfTypeMemberDeclarationBlock() {
-    return this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */);
+    return this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */);
   }
   parseTypeMemberDeclarationBlock(parseVariantInsteadOfVariable) {
     const blockStart = this.parser.tokenOrKeywordStartPosition();
-    const openBraceToken = this.parser.parseExpectedToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseExpectedToken(44 /* OpenBrace */);
     const memberList = this.parser.typeMemberDeclarationParser.parseTypeMemberDeclarationList(
       parseVariantInsteadOfVariable
     );
-    const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+    const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
     const result = new TypeMemberDeclarationBlock2(openBraceToken, memberList, closeBraceToken);
     return this.parser.intern(result, blockStart);
   }
@@ -22174,7 +22389,7 @@ var TypeMemberDeclarationParser = class {
   parseVariantDeclaration(declarationStart, tagList, modifierList) {
     const identifier2 = this.parser.parseIdentifier(4 /* Other */);
     let value;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       value = this.parser.expressionParser.parseExpression(false);
     }
@@ -22260,7 +22475,7 @@ var TypeMemberDeclarationParser = class {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     }
     let initializer;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       initializer = this.parser.expressionParser.parseExpression(false);
     }
@@ -22276,9 +22491,9 @@ var TypeMemberDeclarationParser = class {
   }
   parseTypeMemberGetterDeclaration(declarationStart, tagList, modifierList) {
     const getKeyword = this.parser.parseExpectedKeyword(58 /* Get */);
-    if (this.parser.currentTokenOrKeyword.isToken(45 /* OpenSquareBracket */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(46 /* OpenSquareBracket */)) {
       return this.parseIndexedElementGetterDeclaration(declarationStart, tagList, modifierList, getKeyword);
-    } else if (this.parser.currentTokenOrKeyword.isToken(19 /* Caret */)) {
+    } else if (this.parser.currentTokenOrKeyword.isToken(20 /* Caret */)) {
       return this.parseDereferencedVariableGetterDeclaration(declarationStart, tagList, modifierList, getKeyword);
     } else {
       return this.parseFieldGetterDeclaration(declarationStart, tagList, modifierList, getKeyword);
@@ -22299,7 +22514,7 @@ var TypeMemberDeclarationParser = class {
     return this.parser.intern(result, declarationStart);
   }
   parseDereferencedVariableGetterDeclaration(declarationStart, tagList, modifierList, getKeyword) {
-    const caretToken = this.parser.parseExpectedToken(19 /* Caret */);
+    const caretToken = this.parser.parseExpectedToken(20 /* Caret */);
     const typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     const block = this.parser.parseOptionalFunctionBlock();
     const result = new DereferencedVariableGetterDeclaration2(
@@ -22328,9 +22543,9 @@ var TypeMemberDeclarationParser = class {
   }
   parseTypeMemberSetterDeclaration(declarationStart, tagList, modifierList) {
     const setKeyword = this.parser.parseExpectedKeyword(59 /* Set */);
-    if (this.parser.currentTokenOrKeyword.isToken(45 /* OpenSquareBracket */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(46 /* OpenSquareBracket */)) {
       return this.parseIndexedElementSetterDeclaration(declarationStart, tagList, modifierList, setKeyword);
-    } else if (this.parser.currentTokenOrKeyword.isToken(19 /* Caret */)) {
+    } else if (this.parser.currentTokenOrKeyword.isToken(20 /* Caret */)) {
       return this.parseDereferencedVariableSetterDeclaration(declarationStart, tagList, modifierList, setKeyword);
     } else {
       return this.parseFieldSetterDeclaration(declarationStart, tagList, modifierList, setKeyword);
@@ -22343,7 +22558,7 @@ var TypeMemberDeclarationParser = class {
     return this.parser.intern(result, declarationStart);
   }
   parseDereferencedVariableSetterDeclaration(declarationStart, tagList, modifierList, setKeyword) {
-    const caretToken = this.parser.parseExpectedToken(19 /* Caret */);
+    const caretToken = this.parser.parseExpectedToken(20 /* Caret */);
     const block = this.parser.parseOptionalFunctionBlock(false);
     const result = new DereferencedVariableSetterDeclaration2(
       tagList,
@@ -22368,13 +22583,13 @@ var TypeMemberDeclarationParser = class {
   getTypeMemberDeclarationParsingFunction(allowGroupDeclaration, parseVariantInsteadOfVariable) {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           if (parseVariantInsteadOfVariable) {
             return (declarationStart, tags, modifiers) => this.parseVariantDeclaration(declarationStart, tags, modifiers);
           } else {
             return (declarationStart, tags, modifiers) => this.parseFieldDeclaration(declarationStart, tags, modifiers);
           }
-        case 43 /* OpenBrace */:
+        case 44 /* OpenBrace */:
           return (declarationStart, tags, modifiers) => {
             if (!allowGroupDeclaration) {
               this.parser.tryReportDiagnosticAtCurrentRange(123 /* ModifierListExpected */);
@@ -22410,11 +22625,11 @@ var TagParser = class {
     this._argumentListParser = new ArgumentListParser(
       this.parser,
       () => this.parser.tryReportDiagnosticAtCurrentRange(115 /* TagArgumentExpected */),
-      21 /* CloseParenthesis */
+      22 /* CloseParenthesis */
     );
   }
   isStartOfTag() {
-    return this.parser.currentTokenOrKeyword.isToken(35 /* HashSign */);
+    return this.parser.currentTokenOrKeyword.isToken(36 /* HashSign */);
   }
   parseTagList() {
     const listStart = this.parser.tokenOrKeywordStartPosition();
@@ -22427,7 +22642,7 @@ var TagParser = class {
   }
   parseTag() {
     const tagStart = this.parser.tokenOrKeywordStartPosition();
-    const hashSignToken = this.parser.parseExpectedToken(35 /* HashSign */);
+    const hashSignToken = this.parser.parseExpectedToken(36 /* HashSign */);
     const name = this.parser.parseQualifiedName(130 /* TagNameExpected */);
     let typeArgumentClause;
     if (this.parser.typeArgumentParser.isStartOfTypeArgumentClause()) {
@@ -22436,10 +22651,10 @@ var TagParser = class {
     let openParenthesisToken;
     let argumentList;
     let closeParenthesisToken;
-    if (this.parser.currentTokenOrKeyword.isToken(44 /* OpenParenthesis */)) {
-      openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    if (this.parser.currentTokenOrKeyword.isToken(45 /* OpenParenthesis */)) {
+      openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
       argumentList = this._argumentListParser.parseArgumentList();
-      closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+      closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     }
     const result = new Tag2(
       hashSignToken,
@@ -22490,7 +22705,7 @@ var ModifierParser = class {
     const value = this.parser.parseTokenOrKeyword().asKeyword();
     let constraint;
     let closeParenthesisToken;
-    const openParenthesisToken = this.parser.parseOptionalToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseOptionalToken(45 /* OpenParenthesis */);
     if (openParenthesisToken !== void 0) {
       if (this.parser.currentTokenOrKeyword.kind === "keyword") {
         switch (this.parser.currentTokenOrKeyword.keywordKind) {
@@ -22505,7 +22720,7 @@ var ModifierParser = class {
       if (constraint === void 0) {
         this.parser.tryReportDiagnosticAtCurrentRange(125 /* HidingLevelExpected */);
       }
-      closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+      closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     }
     const result = new Modifier2(value, openParenthesisToken, constraint, closeParenthesisToken);
     return this.parser.intern(result, modifierStart);
@@ -22516,7 +22731,7 @@ var ArgumentListParser = class {
     this.parser = parser2;
     this._sequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */) || this.parser.expressionParser.isStartOfExpression(false),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */) || this.parser.expressionParser.isStartOfExpression(false),
       () => this.parser.currentTokenOrKeyword.isToken(closingBracketKind),
       () => true,
       () => this.parseExpectedArgument(),
@@ -22535,11 +22750,11 @@ var ArgumentListParser = class {
     let name;
     let equalsToken;
     const isNamedArgumentDeclaration = this.parser.lookAhead(() => {
-      return !this.parser.parseIdentifier().isMissing && this.parser.currentTokenOrKeyword.isToken(57 /* Equals */);
+      return !this.parser.parseIdentifier().isMissing && this.parser.currentTokenOrKeyword.isToken(58 /* Equals */);
     });
     if (isNamedArgumentDeclaration) {
       name = this.parser.parseIdentifier();
-      equalsToken = this.parser.parseExpectedToken(57 /* Equals */);
+      equalsToken = this.parser.parseExpectedToken(58 /* Equals */);
     }
     const expression = this.parser.expressionParser.parseExpression(false);
     const result = new Argument2(name, equalsToken, expression);
@@ -22552,7 +22767,7 @@ var TypeArgumentParser = class {
     this._sequenceParser = new SequenceParser(
       this.parser,
       () => this.parser.typeSpecifierParser.isStartOfTypeSpecifier(),
-      () => !this.parser.currentTokenOrKeyword.isToken(24 /* Comma */),
+      () => !this.parser.currentTokenOrKeyword.isToken(25 /* Comma */),
       () => false,
       () => this.parser.typeSpecifierParser.parseTypeSpecifier(),
       () => this.parser.parseComma(),
@@ -22561,9 +22776,9 @@ var TypeArgumentParser = class {
   }
   parseTypeArgumentClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const lessThanToken = this.parser.parseExpectedToken(36 /* LessThan */);
+    const lessThanToken = this.parser.parseExpectedToken(37 /* LessThan */);
     const typeArgumentList = this.parseTypeArgumentList();
-    const greaterThanToken = this.parser.parseExpectedToken(33 /* GreaterThan */);
+    const greaterThanToken = this.parser.parseExpectedToken(34 /* GreaterThan */);
     const result = new TypeArgumentClause2(lessThanToken, typeArgumentList, greaterThanToken);
     return this.parser.intern(result, clauseStart);
   }
@@ -22574,7 +22789,7 @@ var TypeArgumentParser = class {
     return this.parser.intern(result, listStart);
   }
   isStartOfTypeArgumentClause() {
-    return this.parser.currentTokenOrKeyword.isToken(36 /* LessThan */);
+    return this.parser.currentTokenOrKeyword.isToken(37 /* LessThan */);
   }
   canParseTypeArgumentClause() {
     return this.parser.lookAhead(() => {
@@ -22588,22 +22803,22 @@ var TypeParameterParser = class {
     this.parser = parser2;
     this._sequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
       () => this.isTypeParameterSequenceTerminator(),
-      () => this.parser.currentTokenOrKeyword.isToken(33 /* GreaterThan */),
+      () => this.parser.currentTokenOrKeyword.isToken(34 /* GreaterThan */),
       () => this.parseTypeParameterDeclaration(),
       () => this.parser.parseComma(),
       () => this.parser.tryReportDiagnosticAtCurrentRange(116 /* TypeParameterExpected */)
     );
   }
   isStartOfTypeParameterClause() {
-    return this.parser.currentTokenOrKeyword.isToken(36 /* LessThan */);
+    return this.parser.currentTokenOrKeyword.isToken(37 /* LessThan */);
   }
   parseTypeParameterClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const lessThanToken = this.parser.parseExpectedToken(36 /* LessThan */);
+    const lessThanToken = this.parser.parseExpectedToken(37 /* LessThan */);
     const typeParameterList = this.parseTypeParameterList();
-    const greaterThanToken = this.parser.parseExpectedToken(33 /* GreaterThan */);
+    const greaterThanToken = this.parser.parseExpectedToken(34 /* GreaterThan */);
     const result = new TypeParameterClause2(lessThanToken, typeParameterList, greaterThanToken);
     return this.parser.intern(result, clauseStart);
   }
@@ -22616,10 +22831,10 @@ var TypeParameterParser = class {
   isTypeParameterSequenceTerminator() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 33 /* GreaterThan */:
+        case 34 /* GreaterThan */:
           return true;
-        case 44 /* OpenParenthesis */:
-        case 57 /* Equals */:
+        case 45 /* OpenParenthesis */:
+        case 58 /* Equals */:
           return true;
         default:
           return false;
@@ -22631,12 +22846,12 @@ var TypeParameterParser = class {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
     const name = this.parser.parseIdentifier(4 /* Other */);
     let typeConstraint;
-    const colonToken = this.parser.parseOptionalToken(23 /* Colon */);
+    const colonToken = this.parser.parseOptionalToken(24 /* Colon */);
     if (colonToken !== void 0) {
       typeConstraint = this.parser.typeSpecifierParser.parseTypeSpecifier();
     }
     let defaultValue;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       defaultValue = this.parser.typeSpecifierParser.parseTypeSpecifier();
     }
@@ -22649,8 +22864,8 @@ var ParameterParser = class {
     this.parser = parser2;
     this._parameterSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */) || this.parser.tagParser.isStartOfTag(),
-      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseParenthesis */) || this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */) || this.parser.tagParser.isStartOfTag(),
+      () => this.parser.currentTokenOrKeyword.isToken(22 /* CloseParenthesis */) || this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */),
       // For better error recovery.
       () => true,
       () => this.parseParameterDeclaration(),
@@ -22659,8 +22874,8 @@ var ParameterParser = class {
     );
     this._indexParameterSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.tagParser.isStartOfTag() || this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(22 /* CloseSquareBracket */),
+      () => this.parser.tagParser.isStartOfTag() || this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(23 /* CloseSquareBracket */),
       () => true,
       () => this.parser.parameterParser.parseParameterDeclaration(),
       () => this.parser.parseComma(),
@@ -22669,9 +22884,9 @@ var ParameterParser = class {
   }
   parseParameterClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const parameterList = this.parseParameterList();
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new ParameterClause2(openParenthesisToken, parameterList, closeParenthesisToken);
     return this.parser.intern(result, clauseStart);
   }
@@ -22683,9 +22898,9 @@ var ParameterParser = class {
   }
   parseIndexParameterClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const openBracketToken = this.parser.parseExpectedToken(45 /* OpenSquareBracket */);
+    const openBracketToken = this.parser.parseExpectedToken(46 /* OpenSquareBracket */);
     const parameterList = this.parseIndexParameterList();
-    const closeSquareBracketToken = this.parser.parseExpectedToken(22 /* CloseSquareBracket */);
+    const closeSquareBracketToken = this.parser.parseExpectedToken(23 /* CloseSquareBracket */);
     const result = new IndexParameterClause2(openBracketToken, parameterList, closeSquareBracketToken);
     return this.parser.intern(result, clauseStart);
   }
@@ -22704,7 +22919,7 @@ var ParameterParser = class {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     }
     let defaultValue;
-    const equalsToken = this.parser.parseOptionalToken(57 /* Equals */);
+    const equalsToken = this.parser.parseOptionalToken(58 /* Equals */);
     if (equalsToken !== void 0) {
       defaultValue = this.parser.expressionParser.parseExpression(false);
     }
@@ -22718,7 +22933,7 @@ var ArrayLiteralParser = class {
     this._elementParser = new SequenceParser(
       this.parser,
       () => this.parser.expressionParser.isStartOfExpression(false),
-      () => this.parser.currentTokenOrKeyword.isToken(22 /* CloseSquareBracket */),
+      () => this.parser.currentTokenOrKeyword.isToken(23 /* CloseSquareBracket */),
       () => true,
       () => this.parser.expressionParser.parseExpression(false),
       () => this.parser.parseComma(),
@@ -22727,11 +22942,11 @@ var ArrayLiteralParser = class {
   }
   parseArrayLiteral() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
-    const openSquareBracketToken = this.parser.parseExpectedToken(45 /* OpenSquareBracket */);
+    const openSquareBracketToken = this.parser.parseExpectedToken(46 /* OpenSquareBracket */);
     const listStart = this.parser.tokenOrKeywordStartPosition();
     const elements = this._elementParser.parse();
     const elementList = this.parser.intern(new ArrayLiteralElementList2(elements), listStart);
-    const closeSquareBracketToken = this.parser.parseExpectedToken(22 /* CloseSquareBracket */);
+    const closeSquareBracketToken = this.parser.parseExpectedToken(23 /* CloseSquareBracket */);
     const result = new ArrayLiteral2(openSquareBracketToken, elementList, closeSquareBracketToken);
     return this.parser.intern(result, expressionStart);
   }
@@ -22750,11 +22965,11 @@ var SwitchStatementParser = class {
     );
     this._matchExpressionSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(13 /* Asterisk */) || this.parser.expressionParser.isStartOfExpression(true),
-      () => this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(14 /* Asterisk */) || this.parser.expressionParser.isStartOfExpression(true),
+      () => this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */),
       () => true,
       () => {
-        if (this.parser.currentTokenOrKeyword.isToken(13 /* Asterisk */)) {
+        if (this.parser.currentTokenOrKeyword.isToken(14 /* Asterisk */)) {
           return this.parseDefaultMatchExpression();
         }
         return this.parser.expressionParser.parseExpression(true);
@@ -22785,7 +23000,7 @@ var SwitchStatementParser = class {
   }
   parseDefaultMatchExpression() {
     const expressionStart = this.parser.tokenOrKeywordStartPosition();
-    const asteriskToken = this.parser.parseExpectedToken(13 /* Asterisk */);
+    const asteriskToken = this.parser.parseExpectedToken(14 /* Asterisk */);
     const result = new DefaultMatchExpression2(asteriskToken);
     return this.parser.intern(result, expressionStart);
   }
@@ -22795,8 +23010,8 @@ var TranslationsDeclarationParser = class {
     this.parser = parser2;
     this._parameterSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseParenthesis */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(22 /* CloseParenthesis */),
       () => true,
       () => this.parser.parseIdentifier(4 /* Other */),
       () => this.parser.parseComma(),
@@ -22804,8 +23019,8 @@ var TranslationsDeclarationParser = class {
     );
     this._typeParameterSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(33 /* GreaterThan */) || this.parser.currentTokenOrKeyword.isToken(57 /* Equals */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(34 /* GreaterThan */) || this.parser.currentTokenOrKeyword.isToken(58 /* Equals */),
       /* for better error recovery */
       () => true,
       () => this.parser.parseIdentifier(4 /* Other */),
@@ -22815,7 +23030,7 @@ var TranslationsDeclarationParser = class {
     this._typeMemberTranslationSequenceParser = new SequenceParser(
       this.parser,
       () => this.isStartOfTypeMemberTranslation(),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parseTypeMemberTranslation(),
       () => this.parser.parseSemicolonOrLineBreak(),
@@ -22824,7 +23039,7 @@ var TranslationsDeclarationParser = class {
     this._topLevelTranslationSequenceParser = new SequenceParser(
       this.parser,
       () => this.isStartOfTopLevelTranslation(),
-      () => this.parser.currentTokenOrKeyword.isToken(20 /* CloseBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(21 /* CloseBrace */),
       () => true,
       () => this.parseTopLevelTranslation(),
       () => this.parser.parseSemicolonOrLineBreak(),
@@ -22832,8 +23047,8 @@ var TranslationsDeclarationParser = class {
     );
     this._indexParameterSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(22 /* CloseSquareBracket */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(23 /* CloseSquareBracket */),
       () => true,
       () => this.parser.parseIdentifier(4 /* Other */),
       () => this.parser.parseComma(),
@@ -22848,14 +23063,14 @@ var TranslationsDeclarationParser = class {
   }
   parseTranslationsDeclaration(declarationStart, tags, modifiers) {
     const translationsKeyword = this.parser.parseExpectedKeyword(55 /* Translations */);
-    const openBraceToken = this.parser.parseExpectedToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseExpectedToken(44 /* OpenBrace */);
     const listStart = this.parser.tokenOrKeywordStartPosition();
     const translationListElements = this._topLevelTranslationSequenceParser.parse();
     const translationList = this.parser.intern(
       new TopLevelTranslationList2(translationListElements),
       listStart
     );
-    const closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+    const closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
     const result = new TranslationsDeclaration2(
       tags,
       modifiers,
@@ -22883,7 +23098,7 @@ var TranslationsDeclarationParser = class {
   getTopLevelTranslationParsingFunction() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           return () => this.parsePackageVariableTranslation();
         case 6 /* TextLiteral */:
           return () => this.parseTextLiteralTranslation();
@@ -22905,9 +23120,9 @@ var TranslationsDeclarationParser = class {
   getTypeMemberTranslationParsingFunction() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           return () => this.parseFieldOrVariantTranslation();
-        case 45 /* OpenSquareBracket */:
+        case 46 /* OpenSquareBracket */:
           return () => this.parseIndexerTranslation();
       }
     } else {
@@ -22924,7 +23139,7 @@ var TranslationsDeclarationParser = class {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const importKeyword = this.parser.parseExpectedKeyword(18 /* Import */);
     const sourceName = this.parser.parseQualifiedName(103 /* PackageNameExpected */);
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseQualifiedName(103 /* PackageNameExpected */);
     const result = new PackageImportTranslation2(importKeyword, sourceName, minusGreaterThanToken, translatedName);
     return this.parser.intern(result, translationStart);
@@ -22932,7 +23147,7 @@ var TranslationsDeclarationParser = class {
   parsePackageVariableTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const sourceName = this.parser.parseIdentifier(4 /* Other */);
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(4 /* Other */);
     const result = new PackageVariableTranslation2(sourceName, minusGreaterThanToken, translatedName);
     return this.parser.intern(result, translationStart);
@@ -22943,7 +23158,7 @@ var TranslationsDeclarationParser = class {
     const sourceName = this.parser.parseIdentifier(4 /* Other */);
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
     const sourceParameterClause = this.parseParameterClause();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(4 /* Other */);
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
@@ -22965,7 +23180,7 @@ var TranslationsDeclarationParser = class {
     const sourceName = this.parser.parseIdentifier(4 /* Other */);
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
     const sourceParameterClause = this.parseParameterClause();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(4 /* Other */);
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
@@ -22984,7 +23199,7 @@ var TranslationsDeclarationParser = class {
   parseFieldOrVariantTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const sourceName = this.parser.parseIdentifier(3 /* FieldTranslation */);
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(3 /* FieldTranslation */);
     const result = new FieldOrVariantTranslation2(sourceName, minusGreaterThanToken, translatedName);
     return this.parser.intern(result, translationStart);
@@ -22993,7 +23208,7 @@ var TranslationsDeclarationParser = class {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const creationKeyword = this.parser.parseExpectedKeyword(31 /* Creation */);
     const sourceParameterClause = this.parseParameterClause();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedParameterClause = this.parseParameterClause();
     const result = new ConstructorTranslation2(
       creationKeyword,
@@ -23006,23 +23221,23 @@ var TranslationsDeclarationParser = class {
   parseIndexerTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const sourceParameterClause = this.parseIndexParameterClause();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedParameterClause = this.parseIndexParameterClause();
     const result = new IndexerTranslation2(sourceParameterClause, minusGreaterThanToken, translatedParameterClause);
     return this.parser.intern(result, translationStart);
   }
   parseOptionalTypeParameterClause() {
     let result;
-    if (this.parser.currentTokenOrKeyword.isToken(36 /* LessThan */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(37 /* LessThan */)) {
       const clauseStart = this.parser.tokenOrKeywordStartPosition();
-      const lessThanToken = this.parser.parseExpectedToken(36 /* LessThan */);
+      const lessThanToken = this.parser.parseExpectedToken(37 /* LessThan */);
       const listStart = this.parser.tokenOrKeywordStartPosition();
       const elements = this._typeParameterSequenceParser.parse();
       const parameterList = this.parser.intern(
         new TranslationTypeParameterList2(elements),
         listStart
       );
-      const greaterThanToken = this.parser.parseExpectedToken(33 /* GreaterThan */);
+      const greaterThanToken = this.parser.parseExpectedToken(34 /* GreaterThan */);
       result = this.parser.intern(
         new TranslationTypeParameterClause2(lessThanToken, parameterList, greaterThanToken),
         clauseStart
@@ -23032,21 +23247,21 @@ var TranslationsDeclarationParser = class {
   }
   parseParameterClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const listStart = this.parser.tokenOrKeywordStartPosition();
     const elements = this._parameterSequenceParser.parse();
     const parameterList = this.parser.intern(new TranslationParameterList2(elements), listStart);
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new TranslationParameterClause2(openParenthesisToken, parameterList, closeParenthesisToken);
     return this.parser.intern(result, clauseStart);
   }
   parseIndexParameterClause() {
     const clauseStart = this.parser.tokenOrKeywordStartPosition();
-    const openBracketToken = this.parser.parseExpectedToken(45 /* OpenSquareBracket */);
+    const openBracketToken = this.parser.parseExpectedToken(46 /* OpenSquareBracket */);
     const listStart = this.parser.tokenOrKeywordStartPosition();
     const elements = this._indexParameterSequenceParser.parse();
     const parameterList = this.parser.intern(new TranslationParameterList2(elements), listStart);
-    const closeSquareBracketToken = this.parser.parseExpectedToken(22 /* CloseSquareBracket */);
+    const closeSquareBracketToken = this.parser.parseExpectedToken(23 /* CloseSquareBracket */);
     const result = new IndexParameterTranslationClause2(openBracketToken, parameterList, closeSquareBracketToken);
     return this.parser.intern(result, clauseStart);
   }
@@ -23055,24 +23270,24 @@ var TranslationsDeclarationParser = class {
     const typeKeyword = this.parser.parseExpectedKeyword(16 /* Type */);
     const sourceName = this.parser.parseIdentifier(4 /* Other */);
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
-    if (this.parser.currentTokenOrKeyword.isToken(44 /* OpenParenthesis */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(45 /* OpenParenthesis */)) {
       return this.parseFunctionTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause);
     } else {
       return this.parseTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause);
     }
   }
   parseTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause) {
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(4 /* Other */);
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     let memberList;
     let closeBraceToken;
-    const openBraceToken = this.parser.parseOptionalToken(43 /* OpenBrace */);
+    const openBraceToken = this.parser.parseOptionalToken(44 /* OpenBrace */);
     if (openBraceToken !== void 0) {
       const listStart = this.parser.tokenOrKeywordStartPosition();
       const elements = this._typeMemberTranslationSequenceParser.parse();
       memberList = this.parser.intern(new TypeMemberTranslationList2(elements), listStart);
-      closeBraceToken = this.parser.parseExpectedToken(20 /* CloseBrace */);
+      closeBraceToken = this.parser.parseExpectedToken(21 /* CloseBrace */);
     }
     const result = new TypeTranslation2(
       typeKeyword,
@@ -23089,7 +23304,7 @@ var TranslationsDeclarationParser = class {
   }
   parseFunctionTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause) {
     const sourceParameterClause = this.parseParameterClause();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedName = this.parser.parseIdentifier(4 /* Other */);
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
@@ -23108,7 +23323,7 @@ var TranslationsDeclarationParser = class {
   parseTextLiteralTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const sourceTextLiteral = this.parser.parseExpectedToken(6 /* TextLiteral */);
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedTextLiteral = this.parser.parseExpectedToken(6 /* TextLiteral */);
     const result = new TextLiteralTranslation2(
       sourceTextLiteral,
@@ -23120,7 +23335,7 @@ var TranslationsDeclarationParser = class {
   parseTextTemplateLiteralTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const sourceTextTemplateLiteral = this.parser.expressionParser.parseTextTemplateLiteral();
-    const minusGreaterThanToken = this.parser.parseExpectedToken(42 /* MinusGreaterThan */);
+    const minusGreaterThanToken = this.parser.parseExpectedToken(43 /* MinusGreaterThan */);
     const translatedTextTemplateLiteral = this.parser.expressionParser.parseTextTemplateLiteral();
     const result = new TextTemplateLiteralTranslation2(
       sourceTextTemplateLiteral,
@@ -23143,10 +23358,10 @@ var TypeSpecifierParser = class {
   parseUnionTypeSpecifier() {
     const specifierStart = this.parser.tokenOrKeywordStartPosition();
     let result = this.parseIntersectionTypeSpecifier();
-    if (this.parser.currentTokenOrKeyword.isToken(17 /* Bar */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(18 /* Bar */)) {
       const typeListElements = [result];
-      while (this.parser.currentTokenOrKeyword.isToken(17 /* Bar */)) {
-        typeListElements.push(this.parser.parseExpectedToken(17 /* Bar */));
+      while (this.parser.currentTokenOrKeyword.isToken(18 /* Bar */)) {
+        typeListElements.push(this.parser.parseExpectedToken(18 /* Bar */));
         typeListElements.push(this.parseIntersectionTypeSpecifier());
       }
       result = this.parser.intern(new UnionTypeSpecifier2(typeListElements), specifierStart);
@@ -23156,10 +23371,10 @@ var TypeSpecifierParser = class {
   parseIntersectionTypeSpecifier() {
     const specifierStart = this.parser.tokenOrKeywordStartPosition();
     let result = this.parsePostfixTypeSpecifier();
-    if (this.parser.currentTokenOrKeyword.isToken(10 /* Ampersand */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(11 /* Ampersand */)) {
       const typeListElements = [result];
-      while (this.parser.currentTokenOrKeyword.isToken(10 /* Ampersand */)) {
-        typeListElements.push(this.parser.parseExpectedToken(10 /* Ampersand */));
+      while (this.parser.currentTokenOrKeyword.isToken(11 /* Ampersand */)) {
+        typeListElements.push(this.parser.parseExpectedToken(11 /* Ampersand */));
         typeListElements.push(this.parsePostfixTypeSpecifier());
       }
       result = this.parser.intern(new IntersectionTypeSpecifier2(typeListElements), specifierStart);
@@ -23169,8 +23384,8 @@ var TypeSpecifierParser = class {
   parsePostfixTypeSpecifier() {
     const specifierStart = this.parser.tokenOrKeywordStartPosition();
     let typeSpecifier = this.parsePrimaryTypeSpecifier();
-    if (this.parser.currentTokenOrKeyword.isToken(49 /* Question */) && (typeSpecifier.kind === 10 /* NamedTypeSpecifier */ || typeSpecifier.kind === 13 /* ParenthesizedTypeSpecifier */)) {
-      const questionToken = this.parser.parseExpectedToken(49 /* Question */);
+    if (this.parser.currentTokenOrKeyword.isToken(50 /* Question */) && (typeSpecifier.kind === 10 /* NamedTypeSpecifier */ || typeSpecifier.kind === 13 /* ParenthesizedTypeSpecifier */)) {
+      const questionToken = this.parser.parseExpectedToken(50 /* Question */);
       typeSpecifier = this.parser.intern(
         new NullableTypeSpecifier2(typeSpecifier, questionToken),
         specifierStart
@@ -23191,7 +23406,7 @@ var TypeSpecifierParser = class {
     const specifierStart = this.parser.tokenOrKeywordStartPosition();
     const qualifiedName = this.parser.parseQualifiedName(102 /* TypeNameExpected */);
     let typeArgumentClause;
-    if (this.parser.currentTokenOrKeyword.isToken(36 /* LessThan */)) {
+    if (this.parser.currentTokenOrKeyword.isToken(37 /* LessThan */)) {
       typeArgumentClause = this.parser.typeArgumentParser.parseTypeArgumentClause();
     }
     const result = new NamedTypeSpecifier2(qualifiedName, typeArgumentClause);
@@ -23199,9 +23414,9 @@ var TypeSpecifierParser = class {
   }
   parseParenthesizedTypeSpecifier() {
     const specifierStart = this.parser.tokenOrKeywordStartPosition();
-    const openParenthesisToken = this.parser.parseExpectedToken(44 /* OpenParenthesis */);
+    const openParenthesisToken = this.parser.parseExpectedToken(45 /* OpenParenthesis */);
     const typeSpecifier = this.parseTypeSpecifier();
-    const closeParenthesisToken = this.parser.parseExpectedToken(21 /* CloseParenthesis */);
+    const closeParenthesisToken = this.parser.parseExpectedToken(22 /* CloseParenthesis */);
     const result = new ParenthesizedTypeSpecifier2(openParenthesisToken, typeSpecifier, closeParenthesisToken);
     return this.parser.intern(result, specifierStart);
   }
@@ -23258,9 +23473,9 @@ var TypeSpecifierParser = class {
   getPrimaryTypeSpecifierParsingFunction() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
+        case 10 /* Identifier */:
           return () => this.parseNamedTypeSpecifier();
-        case 44 /* OpenParenthesis */:
+        case 45 /* OpenParenthesis */:
           return () => this.parseParenthesizedTypeSpecifier();
       }
     } else {
@@ -23286,8 +23501,8 @@ var TypeDeclarationBodyParser = class {
     this.parser = parser2;
     this._baseTypesSequenceParser = new SequenceParser(
       this.parser,
-      () => this.parser.currentTokenOrKeyword.isToken(63 /* Identifier */),
-      () => this.parser.currentTokenOrKeyword.isToken(43 /* OpenBrace */),
+      () => this.parser.currentTokenOrKeyword.isToken(10 /* Identifier */),
+      () => this.parser.currentTokenOrKeyword.isToken(44 /* OpenBrace */),
       () => true,
       () => this.parser.typeSpecifierParser.parseNamedTypeSpecifier(),
       () => this.parser.parseComma(),
@@ -23378,8 +23593,8 @@ var TypeDeclarationBodyParser = class {
   getTypeDeclarationBodyParsingFunction() {
     if (this.parser.currentTokenOrKeyword.kind === "token") {
       switch (this.parser.currentTokenOrKeyword.tokenKind) {
-        case 63 /* Identifier */:
-        case 44 /* OpenParenthesis */:
+        case 10 /* Identifier */:
+        case 45 /* OpenParenthesis */:
           return () => this.parseAliasTypeDeclarationBody();
       }
     } else {
@@ -23405,11 +23620,11 @@ var TypeAnnotationParser = class {
     this.parser = parser2;
   }
   isStartOfTypeAnnotation() {
-    return this.parser.currentTokenOrKeyword.isToken(23 /* Colon */);
+    return this.parser.currentTokenOrKeyword.isToken(24 /* Colon */);
   }
   parseTypeAnnotation() {
     const typeAnnotationStart = this.parser.tokenOrKeywordStartPosition();
-    const colonToken = this.parser.parseExpectedToken(23 /* Colon */);
+    const colonToken = this.parser.parseExpectedToken(24 /* Colon */);
     const typeSpecifier = this.parser.typeSpecifierParser.parseTypeSpecifier();
     const result = new TypeAnnotation2(colonToken, typeSpecifier);
     return this.parser.intern(result, typeAnnotationStart);
@@ -23431,7 +23646,11 @@ var TokenDetails = class {
     return this.value.tokenKind;
   }
   toString() {
-    return this.value.value;
+    let value = this.value.value;
+    if (value === "") {
+      value = `(${getTokenName(this.value.tokenKind)})`;
+    }
+    return value;
   }
   isToken(kind) {
     return this.value.tokenKind === kind;
@@ -27906,11 +28125,9 @@ function modifierToModifierFlag(modifier) {
 
 // source/analysis/ModifierValidator.ts
 var ModifierValidator = class _ModifierValidator {
-  constructor(_analyzer, _diagnostics, _locale, _dialect) {
+  constructor(_analyzer, _diagnostics) {
     this._analyzer = _analyzer;
     this._diagnostics = _diagnostics;
-    this._locale = _locale;
-    this._dialect = _dialect;
     this.effectiveModifiers = [];
   }
   static {
@@ -28163,7 +28380,7 @@ var ModifierValidator = class _ModifierValidator {
             break;
           }
           case 22 /* PackageAliasTypeDeclaration */: {
-            const declarationKind = 1 /* AliasTypeDeclaration */;
+            const declarationKind = declaration.body.aliasedTypeSpecifier.kind !== 16 /* InvalidTypeSpecifier */ ? 1 /* AliasTypeDeclaration */ : 15 /* InvalidDeclaration */;
             this.validatePackageMemberModifierList(declaration.modifierList, declarationKind, parentGroupFlags);
             this.validatePackageMemberCanBePlacedInGroupWithModifiers(
               declarationKind,
@@ -28218,7 +28435,6 @@ var ModifierValidator = class _ModifierValidator {
           case 43 /* InvalidPackageMemberDeclaration */: {
             const declarationKind = 15 /* InvalidDeclaration */;
             this.validatePackageMemberModifierList(declaration.modifierList, declarationKind, parentGroupFlags);
-            this.validatePackageMemberCanBePlacedInGroupWithModifiers(declarationKind, declaration, parentGroupFlags);
             break;
           }
           case 26 /* PackageEntryPointDeclaration */:
@@ -28256,7 +28472,7 @@ var ModifierValidator = class _ModifierValidator {
           const flag = 128 /* Basic */;
           if ((flags & flag) !== 0) {
             this.reportDuplicateModifier(modifier, flag, parentGroupFlags);
-          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 8 /* ObjectTypeDeclaration */)) {
+          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 8 /* ObjectTypeDeclaration */ || declarationKind === 15 /* InvalidDeclaration */)) {
             this._diagnostics.addDiagnostic(this._analyzer.createNodeDiagnostic(
               332 /* BasicModifierCanOnlyBeAppliedToObjectTypes */,
               modifier
@@ -28274,7 +28490,7 @@ var ModifierValidator = class _ModifierValidator {
           const flag = 64 /* Abstract */;
           if ((flags & flag) !== 0) {
             this.reportDuplicateModifier(modifier, flag, parentGroupFlags);
-          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 8 /* ObjectTypeDeclaration */)) {
+          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 8 /* ObjectTypeDeclaration */ || declarationKind === 15 /* InvalidDeclaration */)) {
             this._diagnostics.addDiagnostic(this._analyzer.createNodeDiagnostic(
               333 /* AbstractModifierCanOnlyBeAppliedToObjectTypes */,
               modifier
@@ -28297,7 +28513,7 @@ var ModifierValidator = class _ModifierValidator {
               modifier,
               this.findModifier(512 /* Async */)
             );
-          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 11 /* VariableDeclaration */)) {
+          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 11 /* VariableDeclaration */ || declarationKind === 15 /* InvalidDeclaration */)) {
             this.reportModifierIsNotAllowedHere(modifier);
           }
           flags |= flag;
@@ -28312,7 +28528,7 @@ var ModifierValidator = class _ModifierValidator {
               modifier,
               this.findModifier(1024 /* Const */)
             );
-          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 6 /* FunctionDeclaration */)) {
+          } else if (!(declarationKind === 2 /* MemberGroupDeclaration */ || declarationKind === 6 /* FunctionDeclaration */ || declarationKind === 15 /* InvalidDeclaration */)) {
             this.reportModifierIsNotAllowedHere(modifier);
           }
           flags |= flag;
@@ -28471,11 +28687,6 @@ var ModifierValidator = class _ModifierValidator {
             );
             break;
           case 57 /* InvalidTypeMemberDeclaration */:
-            this.validateTypeMemberCanBePlacedInGroupWithModifiers(
-              declaration.kind,
-              declaration,
-              parentGroupFlags
-            );
             break;
           case 142 /* VariantDeclaration */:
             this.validateTypeMemberCanBePlacedInGroupWithModifiers(
@@ -28643,7 +28854,7 @@ var ModifierValidator = class _ModifierValidator {
               modifier,
               this.findModifier(512 /* Async */)
             );
-          } else if (!(typeMemberDeclarationKind === 44 /* TypeMemberGroupDeclaration */ || typeMemberDeclarationKind === 54 /* FieldDeclaration */)) {
+          } else if (!(typeMemberDeclarationKind === 44 /* TypeMemberGroupDeclaration */ || typeMemberDeclarationKind === 54 /* FieldDeclaration */ || typeMemberDeclarationKind === 57 /* InvalidTypeMemberDeclaration */)) {
             this.reportModifierIsNotAllowedHere(modifier);
           }
           flags |= flag;
@@ -28658,7 +28869,7 @@ var ModifierValidator = class _ModifierValidator {
               modifier,
               this.findModifier(1024 /* Const */)
             );
-          } else if (!(typeMemberDeclarationKind === 44 /* TypeMemberGroupDeclaration */ || typeMemberDeclarationKind === 52 /* MethodDeclaration */)) {
+          } else if (!(typeMemberDeclarationKind === 44 /* TypeMemberGroupDeclaration */ || typeMemberDeclarationKind === 52 /* MethodDeclaration */ || typeMemberDeclarationKind === 57 /* InvalidTypeMemberDeclaration */)) {
             this.reportModifierIsNotAllowedHere(modifier);
           }
           flags |= flag;
@@ -35944,7 +36155,7 @@ var GraphBuilder = class {
   }
   visitAssignmentStatement(node) {
     this.visitChildren(node);
-    if (node.operator.tokenKind === 57 /* Equals */ && isNarrowableExpression(node.left)) {
+    if (node.operator.tokenKind === 58 /* Equals */ && isNarrowableExpression(node.left)) {
       this.setAssignmentAsCurrentPredecessor(new AssignmentNode(this._currentPredecessor, node));
     }
   }
@@ -36211,7 +36422,7 @@ var GraphBuilder = class {
       this.visitCondition(node.left, leftFlowTargets);
       this._currentPredecessor = rightPredecessor.toNode();
       this.visitCondition(node.right, conditionTargets);
-    } else if (operator.kind === 0 /* Token */ && (operator.tokenKind === 29 /* EqualsEquals */ || operator.tokenKind === 32 /* ExclamationEquals */) && (isNarrowableExpression(node.left) || isNarrowableExpression(node.right))) {
+    } else if (operator.kind === 0 /* Token */ && (operator.tokenKind === 30 /* EqualsEquals */ || operator.tokenKind === 33 /* ExclamationEquals */) && (isNarrowableExpression(node.left) || isNarrowableExpression(node.right))) {
       this.visitChildren(node);
       conditionTargets?.createAndAddConditionPredecessor(node, this._currentPredecessor);
     } else {
@@ -36703,9 +36914,9 @@ var TypeNarrower = class {
         const left = unwrapParenthesizedExpressions(node.syntaxNode.left);
         const right = unwrapParenthesizedExpressions(node.syntaxNode.right);
         const operator = node.syntaxNode.operator;
-        if (operator.kind === 0 /* Token */ && (operator.tokenKind === 29 /* EqualsEquals */ || operator.tokenKind === 32 /* ExclamationEquals */)) {
+        if (operator.kind === 0 /* Token */ && (operator.tokenKind === 30 /* EqualsEquals */ || operator.tokenKind === 33 /* ExclamationEquals */)) {
           if (this.isSameReferenceAsNarrowedExpression(left) && NodeTypeUtils.isNoneLiteral(right) || this.isSameReferenceAsNarrowedExpression(right) && NodeTypeUtils.isNoneLiteral(left)) {
-            const isEqual = node.isTrue ? operator.tokenKind === 29 /* EqualsEquals */ : !(operator.tokenKind === 29 /* EqualsEquals */);
+            const isEqual = node.isTrue ? operator.tokenKind === 30 /* EqualsEquals */ : !(operator.tokenKind === 30 /* EqualsEquals */);
             return this.getTypeAtComparisonWithNone(typeAtPredecessor, isEqual);
           }
         }
@@ -36718,7 +36929,7 @@ var TypeNarrower = class {
     }
   }
   getTypeAtAssignment(node) {
-    if (node.syntaxNode.operator.tokenKind !== 57 /* Equals */) {
+    if (node.syntaxNode.operator.tokenKind !== 58 /* Equals */) {
       return this.getTypeAtControlFlowNode(node.predecessor);
     }
     const reference = getReferenceAtExpressionIfNarrowable(this._analyzer, node.syntaxNode.left);
@@ -37010,9 +37221,9 @@ var UserDefinableUnaryOperatorResolver = class {
     const operator = this._node.operator;
     if (operator.kind === 0 /* Token */) {
       switch (operator.tokenKind) {
-        case 46 /* Plus */:
+        case 47 /* Plus */:
           return 0 /* UnaryPlus */;
-        case 39 /* Minus */:
+        case 40 /* Minus */:
           return 1 /* UnaryMinus */;
       }
     } else if (operator.kind === 3 /* Keyword */) {
@@ -39758,7 +39969,7 @@ var Analyzer = class _Analyzer {
       return 3 /* ReferencedValue */;
     }
     if (parent.kind === 91 /* AssignmentStatement */ && unwrapParenthesizedExpressions(parent.left) === node) {
-      return parent.operator.tokenKind === 57 /* Equals */ ? 1 /* Set */ : 2 /* GetSet */;
+      return parent.operator.tokenKind === 58 /* Equals */ ? 1 /* Set */ : 2 /* GetSet */;
     }
     return 0 /* Get */;
   }
@@ -40309,37 +40520,37 @@ var Analyzer = class _Analyzer {
   classifyBinaryExpressionOperator(operator) {
     if (operator.kind === 0 /* Token */) {
       switch (operator.tokenKind) {
-        case 13 /* Asterisk */:
+        case 14 /* Asterisk */:
           return { kind: "user-definable", operatorKind: 5 /* Multiply */ };
-        case 29 /* EqualsEquals */:
+        case 30 /* EqualsEquals */:
           return { kind: "equals" };
-        case 32 /* ExclamationEquals */:
+        case 33 /* ExclamationEquals */:
           return { kind: "not-equals" };
-        case 33 /* GreaterThan */:
+        case 34 /* GreaterThan */:
           return { kind: "user-definable", operatorKind: 10 /* GreaterThan */ };
-        case 34 /* GreaterThanOrEqual */:
+        case 35 /* GreaterThanOrEqual */:
           return { kind: "user-definable", operatorKind: 12 /* GreaterThanOrEqual */ };
-        case 36 /* LessThan */:
+        case 37 /* LessThan */:
           return { kind: "user-definable", operatorKind: 9 /* LessThan */ };
-        case 37 /* LessThanOrEqual */:
+        case 38 /* LessThanOrEqual */:
           return { kind: "user-definable", operatorKind: 11 /* LessThanOrEqual */ };
-        case 39 /* Minus */:
+        case 40 /* Minus */:
           return { kind: "user-definable", operatorKind: 4 /* Subtract */ };
-        case 46 /* Plus */:
+        case 47 /* Plus */:
           return { kind: "user-definable", operatorKind: 3 /* Add */ };
-        case 50 /* QuestionQuestion */:
+        case 51 /* QuestionQuestion */:
           return { kind: "question-question" };
-        case 52 /* Slash */:
+        case 53 /* Slash */:
           return { kind: "user-definable", operatorKind: 6 /* Divide */ };
-        case 60 /* Backslash */:
+        case 61 /* Backslash */:
           return { kind: "user-definable", operatorKind: 7 /* IntegerDivide */ };
-        case 62 /* BackslashBackslash */:
+        case 63 /* BackslashBackslash */:
           return { kind: "user-definable", operatorKind: 8 /* Modulo */ };
-        case 10 /* Ampersand */:
+        case 11 /* Ampersand */:
           return { kind: "user-definable", operatorKind: 16 /* BitwiseAnd */ };
-        case 17 /* Bar */:
+        case 18 /* Bar */:
           return { kind: "user-definable", operatorKind: 17 /* BitwiseOr */ };
-        case 18 /* BarBar */:
+        case 19 /* BarBar */:
           return { kind: "user-definable", operatorKind: 18 /* BitwiseXor */ };
         default:
           Debug.never(operator);
@@ -40359,17 +40570,17 @@ var Analyzer = class _Analyzer {
   }
   getBinaryOperatorKindIfCompoundAssignmentOperator(operator) {
     switch (operator.tokenKind) {
-      case 57 /* Equals */:
+      case 58 /* Equals */:
         return void 0;
-      case 48 /* PlusEquals */:
+      case 49 /* PlusEquals */:
         return 3 /* Add */;
-      case 41 /* MinusEquals */:
+      case 42 /* MinusEquals */:
         return 4 /* Subtract */;
-      case 15 /* AsteriskEquals */:
+      case 16 /* AsteriskEquals */:
         return 5 /* Multiply */;
-      case 53 /* SlashEquals */:
+      case 54 /* SlashEquals */:
         return 6 /* Divide */;
-      case 61 /* BackslashEquals */:
+      case 62 /* BackslashEquals */:
         return 7 /* IntegerDivide */;
       default:
         Debug.never(operator);
@@ -40564,7 +40775,7 @@ var Analyzer = class _Analyzer {
       const localizationContext = this.semanticContext.containing(node).getLocalizationContext();
       result = type.getValueParameters().map(
         (p) => new IntrinsicParameterVariableEntity(
-          localizationContext.getEntityName(p.getEntity()),
+          localizationContext.getEntityName(p.getEntity()).value,
           p.getType(),
           new ParameterVariableEntityContainer.FunctionLiteral(containingEntity),
           p.isOptional(),
@@ -41155,17 +41366,18 @@ var Analyzer = class _Analyzer {
       const type = this.instantiateTypeByIdentitySubstitution(typeEntity);
       const abstractMembers = new Array();
       const overriddenMembers = new Array();
+      const isAbstractType = TypeEntity2.isAbstract(typeEntity);
       const ownMembers = typeEntity.getMembers().getAll();
       for (const ownMember of ownMembers) {
         ArrayUtils.pushElementsIfUniqueComparingWithEquals(
           overriddenMembers,
           TypeMemberEntity.getOverriddenMembers(ownMember)
         );
-        if (TypeMemberEntity.isAbstract(ownMember)) {
+        if (isAbstractType && TypeMemberEntity.isAbstract(ownMember)) {
           abstractMembers.push(TypeMemberEntity.instantiate(this, ownMember, type.getSubstitutions()));
         }
       }
-      const baseTypes = this.typeUtils.getBaseTypes(type);
+      const baseTypes = this.typeUtils.getBaseOrAliasedTypes(type);
       for (const baseType of baseTypes) {
         const unaliasedBaseType = unaliasType(baseType);
         const baseTypeEntity = unaliasedBaseType.getEntity();
@@ -42162,7 +42374,7 @@ var TargetType = class {
       return void 0;
     }
     Debug.assert(child === parent.right);
-    if (parent.operator.tokenKind === 57 /* Equals */) {
+    if (parent.operator.tokenKind === 58 /* Equals */) {
       return this._analyzer.type.ofExpression(parent.left);
     }
     return void 0;
@@ -43572,6 +43784,34 @@ var OverriddenAndShadowedMembers = class {
     this.shadowedMembers = shadowedMembers;
   }
 };
+function isOverridableTypeMemberEntity(entity) {
+  switch (entity.kind) {
+    case 0 /* Variable */:
+    case 1 /* Function */:
+    case 5 /* Indexer */:
+    case 6 /* DereferenceOperator */:
+    case 9 /* Operator */:
+      return true;
+    default:
+      Debug.typeIsAssignableTo();
+      Debug.typeIsAssignableTo();
+      return false;
+  }
+}
+function isOverridableTypeMember(entity) {
+  switch (entity.kind) {
+    case "field":
+    case "method":
+    case "operator":
+    case "indexer":
+    case "dereference-operator":
+      return true;
+    default:
+      Debug.typeIsAssignableTo();
+      Debug.typeIsAssignableTo();
+      return false;
+  }
+}
 var Tags = class {
   constructor(_analyzer) {
     this._analyzer = _analyzer;
@@ -44672,8 +44912,7 @@ var TypeUtils = class {
     }
     return;
   }
-  getBaseTypes(type) {
-    type = unaliasType(type);
+  getBaseOrAliasedTypes(type) {
     switch (type.kind) {
       case "function": {
         const baseType = type.getBaseType();
@@ -44690,6 +44929,7 @@ var TypeUtils = class {
         return baseType !== void 0 ? [baseType] : [];
       }
       case "alias":
+        return [type.getAliasedType()];
       case "unresolved":
       case "parameter":
       case "union":
@@ -44699,12 +44939,12 @@ var TypeUtils = class {
         Debug.never(type);
     }
   }
-  getBaseTypesRecursively(type) {
+  getBaseAndAliasedTypesRecursively(type) {
     const result = new Array();
-    this.collectBaseTypesRecursively(type, result);
+    this.collectBaseAndAliasedTypesRecursively(type, result);
     return result;
   }
-  collectBaseTypesRecursively(type, result) {
+  collectBaseAndAliasedTypesRecursively(type, result) {
     switch (type.kind) {
       case "function": {
         addTypeAndContinueIfUnique(this, type.getBaseType(), result);
@@ -44722,8 +44962,7 @@ var TypeUtils = class {
         break;
       }
       case "alias": {
-        const unaliased = unaliasType(type);
-        this.collectBaseTypesRecursively(unaliased, result);
+        addTypeAndContinueIfUnique(this, type.getAliasedType(), result);
         break;
       }
       case "unresolved":
@@ -44737,7 +44976,7 @@ var TypeUtils = class {
     function addTypeAndContinueIfUnique(this_, type2, result2) {
       if (type2 !== void 0 && !result2.some((t) => t.equals(type2))) {
         result2.push(type2);
-        this_.collectBaseTypesRecursively(type2, result2);
+        this_.collectBaseAndAliasedTypesRecursively(type2, result2);
       }
     }
   }
@@ -44899,6 +45138,31 @@ var ConflictsCheck = class {
     }
     return result;
   }
+  /**
+   * Метод аналогичен методу {@link doFunctionSignaturesConflict}.
+   */
+  doMethodSignaturesConflict(method1, method2) {
+    const parameters1 = method1.getValueParameters();
+    const parameters2 = method2.getValueParameters();
+    if (parameters1.length !== parameters2.length) {
+      return false;
+    }
+    const typeParameters1 = method1.getTypeParameters();
+    let substitutionMap1;
+    if (typeParameters1.length > 0) {
+      substitutionMap1 = this.createSubstitutionMapWithStubTypes(typeParameters1);
+    }
+    const typeParameters2 = method2.getTypeParameters();
+    let substitutionMap2;
+    if (typeParameters2.length > 0) {
+      substitutionMap2 = this.createSubstitutionMapWithStubTypes(typeParameters2);
+    }
+    let result = this.doTypeMemberParametersConflict(parameters1, parameters2, substitutionMap1, substitutionMap2);
+    if (result && typeParameters1.length !== typeParameters2.length) {
+      result = this.doTypeArgumentCountsIntersect(typeParameters1, typeParameters2);
+    }
+    return result;
+  }
   /**
    * Проверяет, конфликтуют две сущности, имеющие параметры, но не имеющие параметры типа.
    *
@@ -44907,6 +45171,9 @@ var ConflictsCheck = class {
   doSignaturesWithoutTypeParametersConflict(entity1, entity2) {
     return this.doParametersConflict(entity1.getValueParameters(), entity2.getValueParameters());
   }
+  doTypeMemberSignaturesWithoutTypeParametersConflict(member1, member2) {
+    return this.doTypeMemberParametersConflict(member1.getValueParameters(), member2.getValueParameters());
+  }
   /**
    * Проверяет, конфликтуют ли два типа, т.е. могут ли такие типы находиться в одном пакете. Метод не сравнивает имена.
    *
@@ -44940,6 +45207,25 @@ var ConflictsCheck = class {
     }
     return true;
   }
+  doTypeMemberParametersConflict(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) {
@@ -45128,6 +45414,247 @@ var AssignmentChecker = class {
   }
 };
 
+// source/analysis/BaseMemberConflictsValidator.ts
+var BaseMemberConflictsValidator = class {
+  constructor(_analyzer, _typeEntity, _hidingMatcher, _localizationContext, _dialect, _diagnostics, _nodeForDiagnostic) {
+    this._analyzer = _analyzer;
+    this._typeEntity = _typeEntity;
+    this._hidingMatcher = _hidingMatcher;
+    this._localizationContext = _localizationContext;
+    this._dialect = _dialect;
+    this._diagnostics = _diagnostics;
+    this._nodeForDiagnostic = _nodeForDiagnostic;
+  }
+  get displayService() {
+    return this._displayService ??= new DisplayService(this._analyzer, this._localizationContext, this._dialect);
+  }
+  validate() {
+    const type = this._analyzer.instantiateTypeByIdentitySubstitution(this._typeEntity);
+    if (this._analyzer.typeUtils.getBaseOrAliasedTypes(type).length <= 1) {
+      return;
+    }
+    const members = this.getAllNotShadowedNotOverriddenMembers(type);
+    const namedMembers = new Array();
+    const anonymousMembers = new Array();
+    for (let i = members.length - 1; i >= 0; i--) {
+      const member = members[i];
+      if (TypeMemberEntity.isAbstract(member.value.getEntity())) {
+        continue;
+      }
+      if (member.kind === "named") {
+        namedMembers.push(member);
+      } else {
+        anonymousMembers.push(member);
+      }
+    }
+    const diagnosticReporter = this.reportMembersConflictDiagnostic.bind(this);
+    if (this.validateMemberConflictsMutatingMap(namedMembers, diagnosticReporter)) {
+      this.validateNamedMemberConflictsUsingOriginalNames(namedMembers);
+    }
+    this.validateMemberConflictsMutatingMap(anonymousMembers, diagnosticReporter);
+  }
+  getAllNotShadowedNotOverriddenMembers(type) {
+    const overriddenMembers = new Array();
+    this._typeEntity.getMembers().getAll().forEach((m) => {
+      const instantiated = TypeMemberEntity.instantiate(this._analyzer, m, type.getSubstitutions());
+      this.addOverriddenMembersRecursively(instantiated, overriddenMembers);
+    });
+    const result = new Array();
+    const allBaseTypes = this._analyzer.typeUtils.getBaseAndAliasedTypesRecursively(type);
+    for (const baseType of allBaseTypes) {
+      const baseTypeEntity = baseType.getEntity();
+      if (baseTypeEntity === void 0 || !isTypeEntityWithMembers(baseTypeEntity)) {
+        continue;
+      }
+      for (const baseTypeMemberEntity of baseTypeEntity.getMembers().getAll()) {
+        if (!isOverridableTypeMemberEntity(baseTypeMemberEntity)) {
+          continue;
+        }
+        const baseTypeMember = TypeMemberEntity.instantiate(
+          this._analyzer,
+          baseTypeMemberEntity,
+          baseType.getSubstitutions()
+        );
+        let localizedBaseTypeMember;
+        if (isNamedTypeMember(baseTypeMember)) {
+          const name = this._localizationContext.getEntityName(baseTypeMember.getEntity());
+          localizedBaseTypeMember = new LocalizedNamedTypeMember(baseTypeMember, name);
+        } else {
+          const translationPackage = this._localizationContext.getTranslatedTypeOrExtensionEntityMembers(this._typeEntity)?.translationPackage;
+          const localization = translationPackage !== void 0 ? new Localization.Translated(new Translation(translationPackage)) : Localization.Original.ofEntity(baseTypeMemberEntity);
+          localizedBaseTypeMember = new LocalizedAnonymousTypeMember(baseTypeMember, localization);
+        }
+        if (!result.some((m) => m.value.equals(localizedBaseTypeMember.value))) {
+          result.push(localizedBaseTypeMember);
+          this.addOverriddenMembersRecursively(baseTypeMember, overriddenMembers);
+        }
+      }
+    }
+    return result.filter((m) => this.typeMemberMatchesHiding(m.value) && !overriddenMembers.some((om) => om.equals(m.value)));
+  }
+  validateMemberConflictsMutatingMap(members, reportDiagnostic) {
+    const membersByContainer = Query.from(members).groupByToMap((m) => m.value.getEntity().getContainer().getEntity());
+    let hasConflicts = false;
+    for (const [container, members2] of membersByContainer) {
+      for (let i = members2.length - 1; i >= 0; i--) {
+        const member = members2[i];
+        let conflictingMembers;
+        for (const [containerToCheckAgainst, membersToCheckAgainst] of membersByContainer) {
+          if (containerToCheckAgainst === container) {
+            continue;
+          }
+          for (let j = membersToCheckAgainst.length - 1; j >= 0; j--) {
+            const memberToCheckAgainst = membersToCheckAgainst[j];
+            if (this.doTypeMembersConflict(member, memberToCheckAgainst)) {
+              if (conflictingMembers === void 0) {
+                conflictingMembers = [];
+                conflictingMembers.push(member);
+              }
+              conflictingMembers.push(memberToCheckAgainst);
+              ArrayUtils.removeElement(membersToCheckAgainst, j);
+            }
+          }
+        }
+        if (conflictingMembers !== void 0) {
+          reportDiagnostic(conflictingMembers);
+          hasConflicts ||= true;
+        }
+        ArrayUtils.removeElement(members2, i);
+      }
+    }
+    return !hasConflicts;
+  }
+  validateNamedMemberConflictsUsingOriginalNames(members) {
+    let someNamesChanged = false;
+    const membersWithOriginalNames = members.map((m) => {
+      const nameOfLeastOverriddenMember = this.getOriginalNameOfLeastOverriddenMember(m.value.getEntity());
+      if (nameOfLeastOverriddenMember !== void 0) {
+        someNamesChanged ||= !nameOfLeastOverriddenMember.value.considerEqual(m.name.value);
+        return new LocalizedNamedTypeMember(m.value, nameOfLeastOverriddenMember);
+      }
+      if (m.name.kind === "translated") {
+        const entity = m.value.getEntity();
+        someNamesChanged ||= !entity.getName().considerEqual(m.name.value);
+        return new LocalizedNamedTypeMember(m.value, new LocalizedName.Original(
+          entity.getName(),
+          Localization.Original.ofEntity(entity)
+        ));
+      }
+      return m;
+    });
+    if (someNamesChanged) {
+      this.validateMemberConflictsMutatingMap(membersWithOriginalNames, (conflictingMembers) => {
+        Debug.assert(conflictingMembers.length > 0 && conflictingMembers[0].kind === "named");
+        this.reportMembersOriginalNameConflictConflictDiagnostic(conflictingMembers, conflictingMembers[0].name.value);
+      });
+    }
+  }
+  doTypeMembersConflict(member1, member2) {
+    if (member1.kind === "named" && member2.kind === "named") {
+      if (!member1.name.value.considerEqual(member2.name.value)) {
+        return false;
+      }
+      if (member1.value.kind === "method" && member2.value.kind === "method") {
+        return this._analyzer.conflictsCheck.doMethodSignaturesConflict(member1.value, member2.value);
+      }
+      return true;
+    }
+    switch (member1.value.kind) {
+      case "operator":
+        return member2.value.kind === "operator" && member1.value.getOperatorKind() === member2.value.getOperatorKind();
+      case "constructor":
+        return member2.value.kind === "constructor" && this._analyzer.conflictsCheck.doTypeMemberSignaturesWithoutTypeParametersConflict(
+          member1.value,
+          member2.value
+        );
+      case "destructor":
+        return member2.value.kind === "destructor" && this._analyzer.conflictsCheck.doTypeMemberSignaturesWithoutTypeParametersConflict(
+          member1.value,
+          member2.value
+        );
+      case "indexer":
+        return member2.value.kind === "indexer" && this._analyzer.conflictsCheck.doTypeMemberSignaturesWithoutTypeParametersConflict(
+          member1.value,
+          member2.value
+        );
+      case "dereference-operator":
+        return member2.value.kind === "dereference-operator";
+      case "field":
+      case "method":
+        return false;
+      default:
+        Debug.never(member1.value);
+    }
+  }
+  reportMembersConflictDiagnostic(conflictingMembers) {
+    if (conflictingMembers.length === 0) {
+      return;
+    }
+    const membersText = "\n" + conflictingMembers.map((m) => `'${this.displayService.displayTypeMember(m.value, m.localization)}'`).join("\n");
+    this._diagnostics.addDiagnostic(this._analyzer.createNodeDiagnostic(
+      349 /* TheFollowingBaseTypeMembersConflictAndMustBeOverridden0 */,
+      this._nodeForDiagnostic,
+      [membersText]
+    ));
+  }
+  reportMembersOriginalNameConflictConflictDiagnostic(conflictingMembers, originalName) {
+    if (conflictingMembers.length === 0) {
+      return;
+    }
+    const membersText = "\n" + conflictingMembers.map((m) => `'${this.displayService.displayTypeMember(m.value, m.localization)}'`).join("\n");
+    this._diagnostics.addDiagnostic(this._analyzer.createNodeDiagnostic(
+      350 /* TheFollowingBaseTypeMembersConflictBecauseTheyHaveTheSameOriginalName0AndMustBeOverridden1 */,
+      this._nodeForDiagnostic,
+      [originalName.unescapedOriginal, membersText]
+    ));
+  }
+  addOverriddenMembersRecursively(member, result) {
+    const overriddenMemberEntities = TypeMemberEntity.getOverriddenMembers(member.getEntity());
+    for (const overriddenMember of overriddenMemberEntities) {
+      const substitutedOverriddenMember = overriddenMember.applySubstitutions(member.getSubstitutions());
+      if (ArrayUtils.pushElementIfUniqueComparingWithEquals(result, substitutedOverriddenMember)) {
+        this.addOverriddenMembersRecursively(substitutedOverriddenMember, result);
+      }
+    }
+  }
+  typeMemberMatchesHiding(member) {
+    const hiding = member.isHidden();
+    return hiding === void 0 || this._hidingMatcher.matches(hiding);
+  }
+  getOriginalNameOfLeastOverriddenMember(entity) {
+    let leastOverriddenMember = void 0;
+    let currentOverriddenMembers = entity.getOverriddenMembers();
+    while (currentOverriddenMembers !== void 0 && currentOverriddenMembers.length > 0) {
+      leastOverriddenMember = currentOverriddenMembers[0].getEntity();
+      currentOverriddenMembers = leastOverriddenMember.getOverriddenMembers();
+    }
+    if (leastOverriddenMember === void 0) {
+      return void 0;
+    }
+    return new LocalizedName.Original(
+      leastOverriddenMember.getName(),
+      Localization.Original.ofEntity(leastOverriddenMember)
+    );
+  }
+};
+var LocalizedNamedTypeMember = class {
+  constructor(value, name) {
+    this.value = value;
+    this.name = name;
+    this.kind = "named";
+  }
+  get localization() {
+    return this.name.localization;
+  }
+};
+var LocalizedAnonymousTypeMember = class {
+  constructor(value, localization) {
+    this.value = value;
+    this.localization = localization;
+    this.kind = "anonymous";
+  }
+};
+
 // source/analysis/TypeMemberConflictsValidator.ts
 var TypeMemberConflictsValidator = class {
   constructor(_analyzer, _members, _diagnostics) {
@@ -45391,12 +45918,7 @@ var DiagnosticCollector = class _DiagnosticCollector {
       analyzer.createLocalizationContext(sourceFile),
       sourceFile.package.dialect
     );
-    this._modifierValidator = new ModifierValidator(
-      analyzer,
-      this._diagnosticAcceptor,
-      sourceFile.package.locale,
-      sourceFile.package.dialect
-    );
+    this._modifierValidator = new ModifierValidator(analyzer, this._diagnosticAcceptor);
   }
   static {
     this.CancellationTokenThrottleTime = 50;
@@ -45594,6 +46116,16 @@ var DiagnosticCollector = class _DiagnosticCollector {
           this._analyzer.semanticContext.ofTypeDeclarationTypeParameters(node, node.typeParameterClause).validateNameConflicts(this._diagnosticAcceptor);
         }
         new TypeMemberConflictsValidator(this._analyzer, entity.getMembers(), this._diagnosticAcceptor).validate();
+        const semanticContext = this._analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(node);
+        new BaseMemberConflictsValidator(
+          this._analyzer,
+          entity,
+          semanticContext.getHidingMatcher(),
+          semanticContext.getLocalizationContext(),
+          this._sourceFile.package.dialect,
+          this._diagnosticAcceptor,
+          node.name
+        ).validate();
         new TypeMemberImplementationValidator(this._analyzer, entity, this._displayService, this._diagnosticAcceptor).validate();
         break;
       }
@@ -45603,6 +46135,16 @@ var DiagnosticCollector = class _DiagnosticCollector {
         }
         const entity = this._analyzer.entity.ofPackageVariantTypeDeclaration(node);
         new TypeMemberConflictsValidator(this._analyzer, entity.getMembers(), this._diagnosticAcceptor).validate();
+        const semanticContext = this._analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(node);
+        new BaseMemberConflictsValidator(
+          this._analyzer,
+          entity,
+          semanticContext.getHidingMatcher(),
+          semanticContext.getLocalizationContext(),
+          this._sourceFile.package.dialect,
+          this._diagnosticAcceptor,
+          node.name
+        ).validate();
         new TypeMemberImplementationValidator(this._analyzer, entity, this._displayService, this._diagnosticAcceptor).validate();
         break;
       }
@@ -45870,6 +46412,16 @@ var DiagnosticCollector = class _DiagnosticCollector {
           this._analyzer.semanticContext.ofTypeDeclarationTypeParameters(node, node.typeParameterClause).validateNameConflicts(this._diagnosticAcceptor);
         }
         new TypeMemberConflictsValidator(this._analyzer, entity.getMembers(), this._diagnosticAcceptor).validate();
+        const semanticContext = this._analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(node);
+        new BaseMemberConflictsValidator(
+          this._analyzer,
+          entity,
+          semanticContext.getHidingMatcher(),
+          semanticContext.getLocalizationContext(),
+          this._sourceFile.package.dialect,
+          this._diagnosticAcceptor,
+          node.name
+        ).validate();
         break;
       }
       case 143 /* TypeParameterDeclaration */: {
@@ -45930,12 +46482,32 @@ var DiagnosticCollector = class _DiagnosticCollector {
       case 18 /* AnonymousStructuredTypeDeclaration */: {
         const entity = this._analyzer.entity.ofAnonymousStructuredTypeDeclaration(node);
         new TypeMemberConflictsValidator(this._analyzer, entity.getMembers(), this._diagnosticAcceptor).validate();
+        const semanticContext = this._analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(node);
+        new BaseMemberConflictsValidator(
+          this._analyzer,
+          entity,
+          semanticContext.getHidingMatcher(),
+          semanticContext.getLocalizationContext(),
+          this._sourceFile.package.dialect,
+          this._diagnosticAcceptor,
+          node.body.structuredTypeKindKeyword
+        ).validate();
         new TypeMemberImplementationValidator(this._analyzer, entity, this._displayService, this._diagnosticAcceptor).validate();
         break;
       }
       case 19 /* AnonymousVariantTypeDeclaration */: {
         const entity = this._analyzer.entity.ofAnonymousVariantTypeDeclaration(node);
         new TypeMemberConflictsValidator(this._analyzer, entity.getMembers(), this._diagnosticAcceptor).validate();
+        const semanticContext = this._analyzer.semanticContext.outermostSemanticContextOfTypeDeclaration(node);
+        new BaseMemberConflictsValidator(
+          this._analyzer,
+          entity,
+          semanticContext.getHidingMatcher(),
+          semanticContext.getLocalizationContext(),
+          this._sourceFile.package.dialect,
+          this._diagnosticAcceptor,
+          node.body.variantKeyword
+        ).validate();
         new TypeMemberImplementationValidator(this._analyzer, entity, this._displayService, this._diagnosticAcceptor).validate();
         break;
       }
@@ -49204,16 +49776,7 @@ var SourcePackageEntity = class {
     return this._package.name;
   }
   getLocale() {
-    switch (this._package.kind) {
-      case "program":
-        return this._package.configuration.locale;
-      case "translation": {
-        const analyzedPackage = this._analyzer.getAnalyzedTranslationPackageIfTargetResolved(this._package);
-        return analyzedPackage?.getTranslatedPackage().getLocale() ?? DefaultLocale;
-      }
-      default:
-        Debug.never(this._package);
-    }
+    return this._package.configuration.locale;
   }
   getMembers() {
     return this._members.getOrInsertWith(() => this._analyzer.createPackageMembers(this._package));
@@ -59612,22 +60175,22 @@ var IrBuilder = class {
     }
     let operatorKind;
     switch (statement.operator.tokenKind) {
-      case 15 /* AsteriskEquals */:
+      case 16 /* AsteriskEquals */:
         operatorKind = 3 /* MultiplyEquals */;
         break;
-      case 57 /* Equals */:
+      case 58 /* Equals */:
         operatorKind = 0 /* Equals */;
         break;
-      case 41 /* MinusEquals */:
+      case 42 /* MinusEquals */:
         operatorKind = 2 /* SubtractEquals */;
         break;
-      case 48 /* PlusEquals */:
+      case 49 /* PlusEquals */:
         operatorKind = 1 /* AddEquals */;
         break;
-      case 53 /* SlashEquals */:
+      case 54 /* SlashEquals */:
         operatorKind = 4 /* DivideEquals */;
         break;
-      case 61 /* BackslashEquals */:
+      case 62 /* BackslashEquals */:
         operatorKind = 5 /* IntegerDivideEquals */;
         break;
       default:
@@ -60634,52 +61197,52 @@ var IrBuilder = class {
     let operatorKind;
     if (expression.operator.kind === 0 /* Token */) {
       switch (expression.operator.tokenKind) {
-        case 13 /* Asterisk */:
+        case 14 /* Asterisk */:
           operatorKind = 2 /* Multiply */;
           break;
-        case 29 /* EqualsEquals */:
+        case 30 /* EqualsEquals */:
           operatorKind = 5 /* Equals */;
           break;
-        case 32 /* ExclamationEquals */:
+        case 33 /* ExclamationEquals */:
           operatorKind = 6 /* NotEquals */;
           break;
-        case 33 /* GreaterThan */:
+        case 34 /* GreaterThan */:
           operatorKind = 8 /* GreaterThan */;
           break;
-        case 34 /* GreaterThanOrEqual */:
+        case 35 /* GreaterThanOrEqual */:
           operatorKind = 10 /* GreaterThanOrEqual */;
           break;
-        case 36 /* LessThan */:
+        case 37 /* LessThan */:
           operatorKind = 7 /* LessThan */;
           break;
-        case 37 /* LessThanOrEqual */:
+        case 38 /* LessThanOrEqual */:
           operatorKind = 9 /* LessThanOrEqual */;
           break;
-        case 39 /* Minus */:
+        case 40 /* Minus */:
           operatorKind = 1 /* Subtract */;
           break;
-        case 46 /* Plus */:
+        case 47 /* Plus */:
           operatorKind = 0 /* Add */;
           break;
-        case 50 /* QuestionQuestion */:
+        case 51 /* QuestionQuestion */:
           operatorKind = 14 /* QuestionQuestion */;
           break;
-        case 52 /* Slash */:
+        case 53 /* Slash */:
           operatorKind = 3 /* Divide */;
           break;
-        case 60 /* Backslash */:
+        case 61 /* Backslash */:
           operatorKind = 4 /* IntegerDivide */;
           break;
-        case 62 /* BackslashBackslash */:
+        case 63 /* BackslashBackslash */:
           operatorKind = 15 /* Modulo */;
           break;
-        case 10 /* Ampersand */:
+        case 11 /* Ampersand */:
           operatorKind = 16 /* BitwiseAnd */;
           break;
-        case 17 /* Bar */:
+        case 18 /* Bar */:
           operatorKind = 17 /* BitwiseOr */;
           break;
-        case 18 /* BarBar */:
+        case 19 /* BarBar */:
           operatorKind = 18 /* BitwiseXor */;
           break;
         default:
@@ -60965,10 +61528,10 @@ var IrBuilder = class {
     let operatorKind;
     if (expression.operator.kind === 0 /* Token */) {
       switch (expression.operator.tokenKind) {
-        case 46 /* Plus */:
+        case 47 /* Plus */:
           operatorKind = 0 /* Plus */;
           break;
-        case 39 /* Minus */:
+        case 40 /* Minus */:
           operatorKind = 1 /* Minus */;
           break;
         default:
@@ -64205,6 +64768,7 @@ export {
   NamedType_alias,
   OperatorDeclaration_typeMember,
   types_exports,
+  TypeEntity2 as TypeEntity,
   TypeEntityKind,
   AliasedType,
   PackageAliasTypeDeclarationEntity,
@@ -64372,6 +64936,8 @@ export {
   ShadowReason,
   ShadowedMemberInfo,
   OverriddenAndShadowedMembers,
+  isOverridableTypeMemberEntity,
+  isOverridableTypeMember,
   LinkedMultiPlatformPackage,
   LinkedTypeWithMembers,
   TypeAssignabilityFlags,