@artel/artc 0.6.26023 → 0.6.26025

package/build/{chunk-RQOGIK5O.js → chunk-OTHSFQXT.js}

@@ -77,10 +77,10 @@ var PackageDialect = /* @__PURE__ */ ((PackageDialect26) => {
 })(PackageDialect || {});
 
 // source/common/PackageLocale.ts
-var PackageLocale = /* @__PURE__ */ ((PackageLocale55) => {
-  PackageLocale55[PackageLocale55["En"] = 0] = "En";
-  PackageLocale55[PackageLocale55["Ru"] = 1] = "Ru";
-  return PackageLocale55;
+var PackageLocale = /* @__PURE__ */ ((PackageLocale56) => {
+  PackageLocale56[PackageLocale56["En"] = 0] = "En";
+  PackageLocale56[PackageLocale56["Ru"] = 1] = "Ru";
+  return PackageLocale56;
 })(PackageLocale || {});
 var locales = [
   { locale: 0 /* En */, code: "en", names: ["english", "\u0430\u043D\u0433\u043B\u0438\u0439\u0441\u043A\u0438\u0439"] },
@@ -764,7 +764,7 @@ var UniqueWithComparatorQuery = class extends Query {
 };
 
 // source/common/Constants.ts
-var ArtelVersion = true ? "0.6.26023" : "";
+var ArtelVersion = true ? "0.6.26025" : "";
 var ArtelSourceFileExtensions = [".\u0430\u0440\u0442", ".\u0430\u0440\u0442\u0435\u043B\u044C", ".art", ".artel", ".\u0430\u0440\u0442\u043C", ".\u0430\u0440\u0442\u0435\u043B\u044C\u043C", ".artm", ".artelm"];
 var ArtelSourceFileExtensionSet = new Set(ArtelSourceFileExtensions);
 var ArtelSourceAndConfigurationFileExtensionSet = new Set(ArtelSourceFileExtensionSet).add(".json");
@@ -2118,9 +2118,6 @@ var Scanner = class _Scanner {
       }
       this.currentPosition++;
     }
-    while (this.currentPosition < this.endPosition && this.text.charAt(this.currentPosition) === "`") {
-      this.currentPosition++;
-    }
     return true;
   }
   static isWhitespaceOrTab(char) {
@@ -2163,16 +2160,16 @@ var Scanner = class _Scanner {
       return false;
     }
     index++;
-    while (index < length) {
-      if (!_Scanner.isIdentifierPart(textWithoutQuotes.charCodeAt(index))) {
-        return false;
-      }
+    while (index < length && _Scanner.isIdentifierPart(textWithoutQuotes.charCodeAt(index))) {
       index++;
     }
-    if (index === length && textWithoutQuotes.charCodeAt(index - 1) === 45 /* Minus */) {
+    if (textWithoutQuotes.charCodeAt(index - 1) === 45 /* Minus */) {
       return false;
     }
-    return true;
+    while (index < length && textWithoutQuotes.charAt(index) === "`") {
+      index++;
+    }
+    return index === length;
   }
   static isIdentifier(text) {
     const length = text.length;
@@ -2206,12 +2203,12 @@ var Scanner = class _Scanner {
       while (index < length && _Scanner.isIdentifierPart(text.charCodeAt(index))) {
         index++;
       }
-      if (index <= length && text.charCodeAt(index - 1) === 45 /* Minus */) {
+      if (text.charCodeAt(index - 1) === 45 /* Minus */) {
         return false;
       }
-    }
-    while (index < length && text.charAt(index) === "`") {
-      index++;
+      while (index < length && text.charAt(index) === "`") {
+        index++;
+      }
     }
     return index === length;
   }
@@ -2593,37 +2590,15 @@ function isLowercaseChar(char) {
 }
 
 // source/common/Name.ts
-var NameFlags = /* @__PURE__ */ ((NameFlags2) => {
-  NameFlags2[NameFlags2["None"] = 0] = "None";
-  NameFlags2[NameFlags2["QuotedName"] = 2] = "QuotedName";
-  NameFlags2[NameFlags2["RequiresQuotes"] = 4] = "RequiresQuotes";
-  NameFlags2[NameFlags2["ConflictResolvingParameterName"] = 8] = "ConflictResolvingParameterName";
-  NameFlags2[NameFlags2["BackingVariableName"] = 16] = "BackingVariableName";
-  NameFlags2[NameFlags2["PreferKebabCase"] = 32] = "PreferKebabCase";
-  return NameFlags2;
+var NameFlags = /* @__PURE__ */ ((NameFlags3) => {
+  NameFlags3[NameFlags3["None"] = 0] = "None";
+  NameFlags3[NameFlags3["QuotedName"] = 2] = "QuotedName";
+  NameFlags3[NameFlags3["RequiresQuotes"] = 4] = "RequiresQuotes";
+  NameFlags3[NameFlags3["SpecialName"] = 8] = "SpecialName";
+  NameFlags3[NameFlags3["PreferKebabCase"] = 16] = "PreferKebabCase";
+  return NameFlags3;
 })(NameFlags || {});
 var Name = class _Name {
-  static {
-    this.objectParameterNameKey = "-object";
-  }
-  /**
-   * Ключ, используемый для сравнения имён на эквивалентность с учётом флагов. Получается из
-   * `keyWithoutBackQuotes` путём добавления символов '\`' `meaningfulBackQuoteCount` число раз.
-   */
-  get key() {
-    return this.keyWithoutBackQuotes + "`".repeat(this.meaningfulBackQuoteCount);
-  }
-  /**
-   * Количество значащих символов '`', соответствующих флагам.
-   */
-  get meaningfulBackQuoteCount() {
-    if ((this.flags & 8 /* ConflictResolvingParameterName */) !== 0) {
-      return 1;
-    } else if ((this.flags & 16 /* BackingVariableName */) !== 0) {
-      return 2;
-    }
-    return 0;
-  }
   /**
    * Исходное имя, при необходимости взятое в одиночные кавычки и содержащее обратные кавычки согласно флагам.
    */
@@ -2634,52 +2609,45 @@ var Name = class _Name {
    * @param unescapedOriginalWithoutQuotes Исходное имя без апострофов, одиночных кавычек и экранирования.
    * @param flags Флаги имени (`NameFlags`). `NameFlags.None` по умолчанию.
    */
-  constructor(unescapedOriginalWithoutQuotes, flags = 0 /* None */, specialKey) {
+  constructor(unescapedOriginalWithoutQuotes, flags = 0 /* None */) {
     this.unescapedOriginalWithoutQuotes = unescapedOriginalWithoutQuotes;
-    if (specialKey !== void 0) {
-      this.keyWithoutBackQuotes = specialKey;
+    if ((flags & 8 /* SpecialName */) !== 0) {
+      this.key = unescapedOriginalWithoutQuotes;
     } else {
       const isPlainIdentifier = Scanner.isPlainIdentifier(unescapedOriginalWithoutQuotes);
       if (isPlainIdentifier && (flags & 2 /* QuotedName */) === 0) {
-        this.keyWithoutBackQuotes = kebabCaseToCamelCase(unescapedOriginalWithoutQuotes);
+        this.key = kebabCaseToCamelCase(unescapedOriginalWithoutQuotes);
       } else {
         if ((flags & 4 /* RequiresQuotes */) === 0 && (!isPlainIdentifier || kebabCaseToCamelCase(unescapedOriginalWithoutQuotes) !== unescapedOriginalWithoutQuotes)) {
           flags |= 4 /* RequiresQuotes */;
         }
-        if ((flags & 4 /* RequiresQuotes */) === 0) {
-          this.keyWithoutBackQuotes = unescapedOriginalWithoutQuotes;
-        } else {
-          this.keyWithoutBackQuotes = `'${unescapedOriginalWithoutQuotes}'`;
+        this.key = unescapedOriginalWithoutQuotes;
+        if (this.key.startsWith("-")) {
+          this.key = "'" + this.key;
         }
       }
     }
     this.flags = flags;
   }
-  toConflictResolvingParameterName() {
-    return new _Name(this.unescapedOriginalWithoutQuotes, this.flags | 8 /* ConflictResolvingParameterName */);
-  }
   toBackingVariableName() {
-    return new _Name(this.unescapedOriginalWithoutQuotes, this.flags | 16 /* BackingVariableName */);
+    return new _Name(this.unescapedOriginalWithoutQuotes + "`", this.flags);
   }
-  considerEqual(other, considerBackQuotes = true) {
-    let result;
-    if (considerBackQuotes) {
-      result = this.key === other.key;
-    } else {
-      result = this.keyWithoutBackQuotes === other.keyWithoutBackQuotes;
-    }
-    return result;
+  considerEqual(other) {
+    return this.key === other.key;
   }
   toString() {
     return this.unescapedOriginal;
   }
-  getPreferredUnescapedOriginal(flags) {
-    return _Name.toUnescapedOriginal(this.unescapedOriginalWithoutQuotes, flags);
+  getPreferredUnescapedOriginal(requiresQuotes = false) {
+    return _Name.toUnescapedOriginal(
+      this.unescapedOriginalWithoutQuotes,
+      requiresQuotes ? this.flags | 4 /* RequiresQuotes */ : this.flags
+    );
   }
   getDisplayText() {
     return this.unescapedOriginal;
   }
-  static parse(original, initialFlags = 0 /* None */, specialKey) {
+  static parse(original, initialFlags = 0 /* None */) {
     let flags = initialFlags;
     let firstCharIndex = 0;
     let lastCharIndex = original.length - 1;
@@ -2687,16 +2655,6 @@ var Name = class _Name {
       flags |= 2 /* QuotedName */;
       firstCharIndex++;
     }
-    let backQuoteCount = 0;
-    while (firstCharIndex <= lastCharIndex && original.charAt(lastCharIndex) === "`") {
-      backQuoteCount++;
-      lastCharIndex--;
-    }
-    if (backQuoteCount === 1) {
-      flags |= 8 /* ConflictResolvingParameterName */;
-    } else if (backQuoteCount === 2) {
-      flags |= 16 /* BackingVariableName */;
-    }
     if (firstCharIndex <= lastCharIndex && original.charAt(lastCharIndex) === "'") {
       lastCharIndex--;
     }
@@ -2704,20 +2662,15 @@ var Name = class _Name {
     if ((flags & 2 /* QuotedName */) !== 0) {
       unescapedOriginalWithoutQuotes = unescapeText(unescapedOriginalWithoutQuotes);
     }
-    return new _Name(unescapedOriginalWithoutQuotes, flags, specialKey);
+    return new _Name(unescapedOriginalWithoutQuotes, flags);
   }
   static toUnescapedOriginal(unescapedOriginalWithoutQuotes, flags) {
     let result = unescapedOriginalWithoutQuotes;
     if ((flags & 4 /* RequiresQuotes */) !== 0) {
       result = `'${result}'`;
-    } else if ((flags & 32 /* PreferKebabCase */) !== 0) {
+    } else if ((flags & 16 /* PreferKebabCase */) !== 0) {
       result = camelCaseToKebabCasePreservingKeyEquality(result);
     }
-    if ((flags & 8 /* ConflictResolvingParameterName */) !== 0) {
-      result += "`";
-    } else if ((flags & 16 /* BackingVariableName */) !== 0) {
-      result += "``";
-    }
     return result;
   }
 };
@@ -4052,8 +4005,8 @@ var EntityNaming_named = class {
   toString() {
     return this.value.unescapedOriginal;
   }
-  considerEqual(other, considerBackQuotes) {
-    return other.kind === "named" && this.value.considerEqual(other.value, considerBackQuotes);
+  considerEqual(other) {
+    return other.kind === "named" && this.value.considerEqual(other.value);
   }
 };
 var EntityNaming_anonymous = class {
@@ -4063,7 +4016,7 @@ var EntityNaming_anonymous = class {
   toString() {
     return "anonymous";
   }
-  considerEqual(other, _considerBackQuotes) {
+  considerEqual(other) {
     return other.kind === "anonymous";
   }
 };
@@ -4106,32 +4059,32 @@ var specialNameKeys = {
   objectParameter: "-\u043E\u0431\u044A\u0435\u043A\u0442",
   constructor: "-\u0441\u043E\u0437\u0434\u0430\u043D\u0438\u0435",
   destructor: "-\u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0435\u043D\u0438\u0435",
-  plusOperator: "+",
-  unaryPlusOperator: "+\u0443",
-  binaryPlusOperator: "+\u0431",
-  minusOperator: "-",
-  unaryMinusOperator: "-\u0443",
-  binaryMinusOperator: "-\u0431",
+  plusOperator: "-\u043F\u043B\u044E\u0441",
+  unaryPlusOperator: "-\u043F\u043B\u044E\u0441-\u043E\u0434\u043D\u043E\u043C\u0435\u0441\u0442\u043D\u044B\u0439",
+  binaryPlusOperator: "-\u043F\u043B\u044E\u0441-\u0434\u0432\u0443\u0445\u043C\u0435\u0441\u0442\u043D\u044B\u0439",
+  minusOperator: "-\u043C\u0438\u043D\u0443\u0441",
+  unaryMinusOperator: "-\u043C\u0438\u043D\u0443\u0441-\u043E\u0434\u043D\u043E\u043C\u0435\u0441\u0442\u043D\u044B\u0439",
+  binaryMinusOperator: "-\u043C\u0438\u043D\u0443\u0441-\u0434\u0432\u0443\u0445\u043C\u0435\u0441\u0442\u043D\u044B\u0439",
   notOperator: "-\u043D\u0435",
-  multiplyOperator: "*",
-  divideOperator: "/",
-  moduloOperator: "%",
-  lessThanOperator: "<",
-  greaterThanOperator: ">",
-  lessThanOrEqualOperator: "<=",
-  greaterThanOrEqualOperator: ">=",
+  multiplyOperator: "-\u0443\u043C\u043D\u043E\u0436\u0435\u043D\u0438\u0435",
+  divideOperator: "-\u0434\u0435\u043B\u0435\u043D\u0438\u0435",
+  moduloOperator: "-\u043E\u0441\u0442\u0430\u0442\u043E\u043A",
+  lessThanOperator: "-\u043C\u0435\u043D\u044C\u0448\u0435",
+  greaterThanOperator: "-\u0431\u043E\u043B\u044C\u0448\u0435",
+  lessThanOrEqualOperator: "-\u043C\u0435\u043D\u044C\u0448\u0435-\u0438\u043B\u0438-\u0440\u0430\u0432\u043D\u043E",
+  greaterThanOrEqualOperator: "-\u0431\u043E\u043B\u044C\u0448\u0435-\u0438\u043B\u0438-\u0440\u0430\u0432\u043D\u043E",
   orOperator: "-\u0438\u043B\u0438",
   andOperator: "-\u0438",
   xorOperator: "-\u0438\u0441\u043A\u043B",
-  bitwiseAndOperator: "&",
-  bitwiseOrOperator: "|",
-  bitwiseXorOperator: "||",
-  leftShiftOperator: "<<",
-  signedRightShiftOperator: ">>",
-  unsignedRightShiftOperator: ">>>"
+  bitwiseAndOperator: "-\u043F\u043E\u0431\u0438\u0442\u043E\u0432\u043E\u0435-\u0438",
+  bitwiseOrOperator: "-\u043F\u043E\u0431\u0438\u0442\u043E\u0432\u043E\u0435-\u0438\u043B\u0438",
+  bitwiseXorOperator: "-\u043F\u043E\u0431\u0438\u0442\u043E\u0432\u043E\u0435-\u0438\u0441\u043A\u043B",
+  leftShiftOperator: "-\u0441\u0434\u0432\u0438\u0433-\u0432\u043B\u0435\u0432\u043E",
+  signedRightShiftOperator: "-\u0441\u0434\u0432\u0438\u0433-\u0432\u043F\u0440\u0430\u0432\u043E",
+  unsignedRightShiftOperator: "-\u0441\u0434\u0432\u0438\u0433-\u0432\u043F\u0440\u0430\u0432\u043E-\u043D\u0443\u043B\u044F\u043C\u0438"
 };
 var specialNames = Object.fromEntries(
-  Object.entries(specialNameKeys).map((e) => [e[0], new Name(e[1], 0 /* None */, e[1])])
+  Object.entries(specialNameKeys).map((e) => [e[0], new Name(e[1], 8 /* SpecialName */)])
 );
 var specialNameBySyntacticalOperatorKind = {
   [0 /* Plus */]: specialNames.plusOperator,
@@ -8138,10 +8091,10 @@ var TextTemplateLiteral = class extends BaseExpressionNode {
   }
 };
 var LocalizableTextTemplateLiteral = class extends BaseExpressionNode {
-  constructor(head, spanList, code, rangeWithTrivia) {
+  constructor(head, spanList, key, rangeWithTrivia) {
     super(rangeWithTrivia);
     this.kind = 77 /* LocalizableTextTemplateLiteral */;
-    this.children = [head, spanList, code];
+    this.children = [head, spanList, key];
     this.setParentForChildren();
   }
   get parent() {
@@ -8154,7 +8107,7 @@ var LocalizableTextTemplateLiteral = class extends BaseExpressionNode {
   get spanList() {
     return this.children[1];
   }
-  get code() {
+  get key() {
     return this.children[2];
   }
   get thisAsNode() {
@@ -8237,10 +8190,10 @@ var TextLiteral = class extends BaseExpressionNode {
   }
 };
 var LocalizableTextLiteral = class extends BaseExpressionNode {
-  constructor(text, code, rangeWithTrivia) {
+  constructor(text, key, rangeWithTrivia) {
     super(rangeWithTrivia);
     this.kind = 82 /* LocalizableTextLiteral */;
-    this.children = [text, code];
+    this.children = [text, key];
     this.setParentForChildren();
   }
   get parent() {
@@ -8250,7 +8203,7 @@ var LocalizableTextLiteral = class extends BaseExpressionNode {
   get text() {
     return this.children[0];
   }
-  get code() {
+  get key() {
     return this.children[1];
   }
   get thisAsNode() {
@@ -9642,10 +9595,10 @@ var TextTranslationFunctionDeclaration = class extends BaseNode {
   }
 };
 var TranslationTextLiteral = class extends BaseNode {
-  constructor(text, code, rangeWithTrivia) {
+  constructor(text, key, rangeWithTrivia) {
     super(rangeWithTrivia);
     this.kind = 140 /* TranslationTextLiteral */;
-    this.children = [text, code];
+    this.children = [text, key];
     this.setParentForChildren();
   }
   get parent() {
@@ -9655,7 +9608,7 @@ var TranslationTextLiteral = class extends BaseNode {
   get text() {
     return this.children[0];
   }
-  get code() {
+  get key() {
     return this.children[1];
   }
   get thisAsNode() {
@@ -9663,10 +9616,10 @@ var TranslationTextLiteral = class extends BaseNode {
   }
 };
 var TranslationTextTemplate = class extends BaseNode {
-  constructor(head, spanList, code, rangeWithTrivia) {
+  constructor(head, spanList, key, rangeWithTrivia) {
     super(rangeWithTrivia);
     this.kind = 141 /* TranslationTextTemplate */;
-    this.children = [head, spanList, code];
+    this.children = [head, spanList, key];
     this.setParentForChildren();
   }
   get parent() {
@@ -9679,7 +9632,7 @@ var TranslationTextTemplate = class extends BaseNode {
   get spanList() {
     return this.children[1];
   }
-  get code() {
+  get key() {
     return this.children[2];
   }
   get thisAsNode() {
@@ -10122,13 +10075,11 @@ var TokenFlags = /* @__PURE__ */ ((TokenFlags2) => {
   TokenFlags2[TokenFlags2["RequiresQuotes"] = 8] = "RequiresQuotes";
   TokenFlags2[TokenFlags2["EscapedKeyword"] = 16] = "EscapedKeyword";
   TokenFlags2[TokenFlags2["HasBackQuotes"] = 32] = "HasBackQuotes";
-  TokenFlags2[TokenFlags2["ConflictResolvingParameterName"] = 64] = "ConflictResolvingParameterName";
-  TokenFlags2[TokenFlags2["BackingVariableName"] = 128] = "BackingVariableName";
-  TokenFlags2[TokenFlags2["SingleCharText"] = 256] = "SingleCharText";
-  TokenFlags2[TokenFlags2["StartsWithTilde"] = 512] = "StartsWithTilde";
-  TokenFlags2[TokenFlags2["EndsWithTilde"] = 1024] = "EndsWithTilde";
-  TokenFlags2[TokenFlags2["ObjectParameterName"] = 2048] = "ObjectParameterName";
-  TokenFlags2[TokenFlags2["LocalizableText"] = 1536] = "LocalizableText";
+  TokenFlags2[TokenFlags2["SingleCharText"] = 64] = "SingleCharText";
+  TokenFlags2[TokenFlags2["StartsWithTilde"] = 128] = "StartsWithTilde";
+  TokenFlags2[TokenFlags2["EndsWithTilde"] = 256] = "EndsWithTilde";
+  TokenFlags2[TokenFlags2["ObjectParameterName"] = 512] = "ObjectParameterName";
+  TokenFlags2[TokenFlags2["LocalizableText"] = 384] = "LocalizableText";
   return TokenFlags2;
 })(TokenFlags || {});
 
@@ -12123,7 +12074,7 @@ var SyntaxToCode = class _SyntaxToCode {
     } else {
       let value = token.value;
       if (token.tokenKind === 9 /* Identifier */) {
-        if ((token.flags & 2048 /* ObjectParameterName */) !== 0) {
+        if ((token.flags & 512 /* ObjectParameterName */) !== 0) {
           value = LocalizationHelperA.localizeKeywordAndTakeFirst(7 /* Object */, this.keywordsLocale);
         } else if (value.startsWith("'") && value.endsWith("'")) {
           value = `'${this.escapeLiteralIdentifier(value.substring(1, value.length - 1))}'`;
@@ -12528,15 +12479,11 @@ var DiagnosticCode = /* @__PURE__ */ ((DiagnosticCode2) => {
   DiagnosticCode2[DiagnosticCode2["ModifierListExpected"] = 1120] = "ModifierListExpected";
   DiagnosticCode2[DiagnosticCode2["RunKeywordCreationKeywordOrModifierListExpected"] = 1121] = "RunKeywordCreationKeywordOrModifierListExpected";
   DiagnosticCode2[DiagnosticCode2["HidingLevelExpected"] = 1122] = "HidingLevelExpected";
-  DiagnosticCode2[DiagnosticCode2["ParameterNameCanContainOnlyOneBackQuote"] = 1123] = "ParameterNameCanContainOnlyOneBackQuote";
-  DiagnosticCode2[DiagnosticCode2["FieldNameCanContainOnlyTwoBackQuote"] = 1124] = "FieldNameCanContainOnlyTwoBackQuote";
-  DiagnosticCode2[DiagnosticCode2["BackQuotesCanOnlyBeUsedInParameterAndFieldNames"] = 1125] = "BackQuotesCanOnlyBeUsedInParameterAndFieldNames";
-  DiagnosticCode2[DiagnosticCode2["NameThatMatchesKeywordMustBeEnclosedInSingleQuotes"] = 1126] = "NameThatMatchesKeywordMustBeEnclosedInSingleQuotes";
-  DiagnosticCode2[DiagnosticCode2["TagNameExpected"] = 1127] = "TagNameExpected";
-  DiagnosticCode2[DiagnosticCode2["TypeMemberTranslationExpected"] = 1128] = "TypeMemberTranslationExpected";
-  DiagnosticCode2[DiagnosticCode2["TranslationExpected"] = 1129] = "TranslationExpected";
-  DiagnosticCode2[DiagnosticCode2["TranslatedTextTemplateOrTranslationFunctionBlockExpected"] = 1130] = "TranslatedTextTemplateOrTranslationFunctionBlockExpected";
-  DiagnosticCode2[DiagnosticCode2["TranslatedTextCannotBeginOrEndWithTilde"] = 1131] = "TranslatedTextCannotBeginOrEndWithTilde";
+  DiagnosticCode2[DiagnosticCode2["TagNameExpected"] = 1123] = "TagNameExpected";
+  DiagnosticCode2[DiagnosticCode2["TypeMemberTranslationExpected"] = 1124] = "TypeMemberTranslationExpected";
+  DiagnosticCode2[DiagnosticCode2["TranslationExpected"] = 1125] = "TranslationExpected";
+  DiagnosticCode2[DiagnosticCode2["TranslatedTextTemplateOrTranslationFunctionBlockExpected"] = 1126] = "TranslatedTextTemplateOrTranslationFunctionBlockExpected";
+  DiagnosticCode2[DiagnosticCode2["TranslatedTextCannotBeginOrEndWithTilde"] = 1127] = "TranslatedTextCannotBeginOrEndWithTilde";
   DiagnosticCode2[DiagnosticCode2["TypeCannotBeUsedAsValue"] = 2e3] = "TypeCannotBeUsedAsValue";
   DiagnosticCode2[DiagnosticCode2["PackageNameCannotBeUsedAsValue"] = 2001] = "PackageNameCannotBeUsedAsValue";
   DiagnosticCode2[DiagnosticCode2["PackageAliasCannotBeUsedAsValue"] = 2002] = "PackageAliasCannotBeUsedAsValue";
@@ -12865,15 +12812,11 @@ var englishErrorMessages = {
   [1120 /* ModifierListExpected */]: "Modifier list expected.",
   [1121 /* RunKeywordCreationKeywordOrModifierListExpected */]: "The 'run' keyword, 'creation' keyword or modifier list expected.",
   [1122 /* HidingLevelExpected */]: "Hiding level expected.",
-  [1123 /* ParameterNameCanContainOnlyOneBackQuote */]: "Parameter name can contain only one back quote.",
-  [1124 /* FieldNameCanContainOnlyTwoBackQuote */]: "Field name can contain only two back quote.",
-  [1125 /* BackQuotesCanOnlyBeUsedInParameterAndFieldNames */]: "Back quotes can only be used in parameter and field names.",
-  [1126 /* NameThatMatchesKeywordMustBeEnclosedInSingleQuotes */]: "Name that matches keyword must be enclosed in single quotes.",
-  [1127 /* TagNameExpected */]: "Tag name expected.",
-  [1128 /* TypeMemberTranslationExpected */]: "Type member translation expected.",
-  [1129 /* TranslationExpected */]: "Translation expected.",
-  [1130 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */]: "Translated text template or translation function block expected.",
-  [1131 /* TranslatedTextCannotBeginOrEndWithTilde */]: "Translated text cannot begin or end with '~' (tilde).",
+  [1123 /* TagNameExpected */]: "Tag name expected.",
+  [1124 /* TypeMemberTranslationExpected */]: "Type member translation expected.",
+  [1125 /* TranslationExpected */]: "Translation expected.",
+  [1126 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */]: "Translated text template or translation function block expected.",
+  [1127 /* TranslatedTextCannotBeginOrEndWithTilde */]: "Translated text cannot begin or end with '~' (tilde).",
   [2e3 /* TypeCannotBeUsedAsValue */]: "Type name cannot be used as value.",
   [2001 /* PackageNameCannotBeUsedAsValue */]: "Package name cannot be used as value.",
   [2002 /* PackageAliasCannotBeUsedAsValue */]: "Package alias cannot be used as value.",
@@ -13155,14 +13098,10 @@ var russianErrorMessages = {
   [1119 /* InvalidTextTemplate */]: "\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.",
   [1120 /* 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.",
   [1121 /* 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.",
-  [1123 /* ParameterNameCanContainOnlyOneBackQuote */]: "\u0418\u043C\u044F \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430 \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u0434\u0438\u043D \u0430\u043F\u043E\u0441\u0442\u0440\u043E\u0444.",
-  [1124 /* FieldNameCanContainOnlyTwoBackQuote */]: "\u0418\u043C\u044F \u043F\u043E\u043B\u044F \u043C\u043E\u0436\u0435\u0442 \u0441\u043E\u0434\u0435\u0440\u0436\u0430\u0442\u044C \u0442\u043E\u043B\u044C\u043A\u043E \u0434\u0432\u0430 \u0430\u043F\u043E\u0441\u0442\u0440\u043E\u0444\u0430.",
-  [1125 /* BackQuotesCanOnlyBeUsedInParameterAndFieldNames */]: "\u0410\u043F\u043E\u0441\u0442\u0440\u043E\u0444\u044B \u043C\u043E\u0433\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C\u0441\u044F \u0442\u043E\u043B\u044C\u043A\u043E \u0432 \u0438\u043C\u0435\u043D\u0430\u0445 \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043E\u0432 \u0438 \u043F\u043E\u043B\u0435\u0439.",
-  [1126 /* NameThatMatchesKeywordMustBeEnclosedInSingleQuotes */]: "\u0418\u043C\u044F, \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u044E\u0449\u0435\u0435 \u0441 \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C \u0441\u043B\u043E\u0432\u043E\u043C, \u0434\u043E\u043B\u0436\u043D\u043E \u0431\u044B\u0442\u044C \u0432\u0437\u044F\u0442\u043E \u0432 \u043E\u0434\u0438\u043D\u0430\u0440\u043D\u044B\u0435 \u043A\u0430\u0432\u044B\u0447\u043A\u0438.",
-  [1128 /* TypeMemberTranslationExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u0447\u043B\u0435\u043D\u0430 \u0442\u0438\u043F\u0430.",
-  [1129 /* TranslationExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u043E\u0434.",
-  [1130 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0451\u043D\u043D\u044B\u0439 \u0448\u0430\u0431\u043B\u043E\u043D \u0442\u0435\u043A\u0441\u0442\u0430 \u0438\u043B\u0438 \u0431\u043B\u043E\u043A \u0444\u0443\u043D\u043A\u0446\u0438\u0438 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430.",
-  [1131 /* TranslatedTextCannotBeginOrEndWithTilde */]: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0451\u043D\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043D\u0430\u0447\u0438\u043D\u0430\u0442\u044C\u0441\u044F \u0438\u043B\u0438 \u0437\u0430\u043A\u0430\u043D\u0447\u0438\u0432\u0430\u0442\u044C\u0441\u044F \u0437\u043D\u0430\u043A\u043E\u043C '~' (\u0442\u0438\u043B\u044C\u0434\u0430).",
+  [1124 /* TypeMemberTranslationExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u043E\u0434 \u0447\u043B\u0435\u043D\u0430 \u0442\u0438\u043F\u0430.",
+  [1125 /* TranslationExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u043E\u0434.",
+  [1126 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0451\u043D\u043D\u044B\u0439 \u0448\u0430\u0431\u043B\u043E\u043D \u0442\u0435\u043A\u0441\u0442\u0430 \u0438\u043B\u0438 \u0431\u043B\u043E\u043A \u0444\u0443\u043D\u043A\u0446\u0438\u0438 \u043F\u0435\u0440\u0435\u0432\u043E\u0434\u0430.",
+  [1127 /* TranslatedTextCannotBeginOrEndWithTilde */]: "\u041F\u0435\u0440\u0435\u0432\u0435\u0434\u0451\u043D\u043D\u044B\u0439 \u0442\u0435\u043A\u0441\u0442 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043D\u0430\u0447\u0438\u043D\u0430\u0442\u044C\u0441\u044F \u0438\u043B\u0438 \u0437\u0430\u043A\u0430\u043D\u0447\u0438\u0432\u0430\u0442\u044C\u0441\u044F \u0437\u043D\u0430\u043A\u043E\u043C '~' (\u0442\u0438\u043B\u044C\u0434\u0430).",
   [2e3 /* TypeCannotBeUsedAsValue */]: "\u0418\u043C\u044F \u0442\u0438\u043F\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u043E \u043A\u0430\u043A \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435.",
   [2001 /* PackageNameCannotBeUsedAsValue */]: "\u0418\u043C\u044F \u043F\u0430\u043A\u0435\u0442\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u043E \u043A\u0430\u043A \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435.",
   [2002 /* PackageAliasCannotBeUsedAsValue */]: "\u041F\u0441\u0435\u0432\u0434\u043E\u043D\u0438\u043C \u043F\u0430\u043A\u0435\u0442\u0430 \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D \u043A\u0430\u043A \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435.",
@@ -13266,7 +13205,7 @@ var russianErrorMessages = {
   [2099 /* OperatorFunction0MustHaveNoMoreThanOneParameter */]: "\u0424\u0443\u043D\u043A\u0446\u0438\u044F \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u0438 '{0}' \u0434\u043E\u043B\u0436\u043D\u0430 \u0438\u043C\u0435\u0442\u044C \u043D\u0435 \u0431\u043E\u043B\u0435\u0435 \u043E\u0434\u043D\u043E\u0433\u043E \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u0430.",
   [2100 /* CorrespondingBasicTypeMemberNotFound */]: "\u041D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0441\u043E\u043E\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u0431\u0430\u0437\u043E\u0432\u044B\u0439 \u0447\u043B\u0435\u043D \u0442\u0438\u043F\u0430.",
   [2101 /* AsyncFunctionCanOnlyBeCalledFromFunctionMarkedWithAsyncModifier */]: "\u0410\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u0430\u044F \u0444\u0443\u043D\u043A\u0446\u0438\u044F \u043C\u043E\u0436\u0435\u0442 \u0431\u044B\u0442\u044C \u0432\u044B\u0437\u0432\u0430\u043D\u0430 \u0442\u043E\u043B\u044C\u043A\u043E \u0438\u0437 \u0444\u0443\u043D\u043A\u0446\u0438\u0438, \u043F\u043E\u043C\u0435\u0447\u0435\u043D\u043D\u043E\u0439 \u043C\u043E\u0434\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u043E\u043C '\u0430\u0441\u0438\u043D\u0445\u0440\u043E\u043D\u043D\u043E'.",
-  [1127 /* TagNameExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0442\u0435\u0433\u0430.",
+  [1123 /* TagNameExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0442\u0435\u0433\u0430.",
   [2102 /* TagNotFound */]: "\u0422\u0435\u0433 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D.",
   [2103 /* TypeOrFunctionNameExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0442\u0438\u043F\u0430 \u0438\u043B\u0438 \u0444\u0443\u043D\u043A\u0446\u0438\u0438.",
   [2104 /* PackageNameOrAliasExpected */]: "\u041E\u0436\u0438\u0434\u0430\u043B\u043E\u0441\u044C \u0438\u043C\u044F \u0438\u043B\u0438 \u043F\u0441\u0435\u0432\u0434\u043E\u043D\u0438\u043C \u043F\u0430\u043A\u0435\u0442\u0430.",
@@ -13875,14 +13814,9 @@ var TextParser = class {
     }
     return void 0;
   }
-  parseIdentifier(declarationKind = 0 /* None */, diagnosticCode = 1100 /* IdentifierExpected */) {
+  parseIdentifier(diagnosticCode = 1100 /* IdentifierExpected */) {
     if (this.isToken(9 /* Identifier */)) {
-      const range = this.getCurrentTokenOrKeyword().rangeWithoutTrivia;
       const identifier2 = this.parseDetectedToken();
-      const validated = this.validateIdentifier(identifier2, range);
-      if (validated && declarationKind !== 0 /* None */) {
-        this.validateDeclarationOrTranslationName(identifier2, range, declarationKind);
-      }
       return identifier2;
     }
     return this.parseMissingIdentifier(diagnosticCode);
@@ -13896,12 +13830,9 @@ var TextParser = class {
     this.hasPrecedingLineBreak = false;
     return result;
   }
-  parseQualifiedName(diagnosticKindForFirstMissingIdentifier) {
+  parseQualifiedName(diagnosticCodeForFirstMissingIdentifier) {
     const qualifiedNameStart = this.tokenOrKeywordStartPosition();
-    const parts = [this.parseIdentifier(
-      0 /* None */,
-      diagnosticKindForFirstMissingIdentifier
-    )];
+    const parts = [this.parseIdentifier(diagnosticCodeForFirstMissingIdentifier)];
     let dotToken = this.parseOptionalToken(34 /* Dot */);
     while (dotToken !== void 0) {
       parts.push(dotToken);
@@ -13913,12 +13844,12 @@ var TextParser = class {
   isStartOfParameterName() {
     return this.isToken(9 /* Identifier */) || this.isKeyword(7 /* Object */);
   }
-  parseParameterName(declarationKind) {
+  parseParameterName() {
     let result = this.parseOptionalKeyword(7 /* Object */);
     if (result !== void 0) {
       Debug.assert(result.tokens.length === 1, "\u0421\u043B\u0443\u0436\u0435\u0431\u043D\u043E\u0435 \u0441\u043B\u043E\u0432\u043E '\u043E\u0431\u044A\u0435\u043A\u0442' \u0434\u043E\u043B\u0436\u043D\u043E \u0441\u043E\u0441\u0442\u043E\u044F\u0442\u044C \u0438\u0437 \u043E\u0434\u043D\u043E\u0433\u043E \u0438\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u043A\u0430\u0442\u043E\u0440\u0430.");
       const identifier2 = result.tokens[0];
-      const flags = identifier2.flags | 2048 /* ObjectParameterName */;
+      const flags = identifier2.flags | 512 /* ObjectParameterName */;
       result = new Token2(
         9 /* Identifier */,
         identifier2.value,
@@ -13929,7 +13860,7 @@ var TextParser = class {
         identifier2.rangeWithTrivia
       );
     } else {
-      result = this.parseIdentifier(declarationKind);
+      result = this.parseIdentifier();
     }
     return result;
   }
@@ -14263,17 +14194,16 @@ var TextParser = class {
       flags |= 4 /* QuotedName */;
       firstCharIndex++;
     }
-    let backQuoteCount = 0;
-    while (firstCharIndex <= lastCharIndex && value.charAt(lastCharIndex) === "`") {
-      backQuoteCount++;
+    if (firstCharIndex <= lastCharIndex && value.charAt(lastCharIndex) === "'") {
       lastCharIndex--;
     }
-    if (firstCharIndex <= lastCharIndex && value.charAt(lastCharIndex) === "'") {
+    while (firstCharIndex <= lastCharIndex && value.charAt(lastCharIndex) === "`") {
+      flags |= 32 /* HasBackQuotes */;
       lastCharIndex--;
     }
     let operatorKind;
     const valueWithoutQuotes = value.substring(firstCharIndex, lastCharIndex + 1);
-    if ((flags & 4 /* QuotedName */) !== 0 || backQuoteCount > 0) {
+    if ((flags & 4 /* QuotedName */) !== 0) {
       const unescapedValue = unescapeText(valueWithoutQuotes);
       const keywordPart = this.keywords.get(unescapedValue)?.find((x) => x.kind === 1 /* EndKeywordPart */);
       if (keywordPart !== void 0) {
@@ -14283,14 +14213,6 @@ var TextParser = class {
         operatorKind = operatorKindByTokenText[unescapedValue];
       }
     }
-    if (backQuoteCount > 0) {
-      flags |= 32 /* HasBackQuotes */;
-      if (backQuoteCount === 1) {
-        flags |= 64 /* ConflictResolvingParameterName */;
-      } else if (backQuoteCount === 2) {
-        flags |= 128 /* BackingVariableName */;
-      }
-    }
     if (valueWithoutQuotes !== value && !Scanner.isPlainIdentifier(valueWithoutQuotes)) {
       flags |= 8 /* RequiresQuotes */;
     }
@@ -14308,21 +14230,21 @@ var TextParser = class {
     let flags = 0 /* None */;
     switch (scannerToken.kind) {
       case 9 /* CharLiteral */:
-        flags |= 256 /* SingleCharText */;
+        flags |= 64 /* SingleCharText */;
         break;
       case 14 /* LocalizableTextLiteral */:
         if (scannerToken.value.startsWith("~")) {
-          flags |= 512 /* StartsWithTilde */;
+          flags |= 128 /* StartsWithTilde */;
         }
         if (scannerToken.value.endsWith("~")) {
-          flags |= 1024 /* EndsWithTilde */;
+          flags |= 256 /* EndsWithTilde */;
         }
         break;
       case 15 /* LocalizableTextTemplateHead */:
-        flags = 512 /* StartsWithTilde */;
+        flags = 128 /* StartsWithTilde */;
         break;
       case 16 /* LocalizableTextTemplateTail */:
-        flags = 1024 /* EndsWithTilde */;
+        flags = 256 /* EndsWithTilde */;
         break;
     }
     return new Token2(
@@ -14432,32 +14354,6 @@ var TextParser = class {
     );
     return newToken;
   }
-  validateIdentifier(identifier2, range) {
-    if ((identifier2.flags & 16 /* EscapedKeyword */) !== 0 && (identifier2.flags & 4 /* QuotedName */) === 0) {
-      this.tryReportDiagnosticAtRange(range, 1126 /* NameThatMatchesKeywordMustBeEnclosedInSingleQuotes */);
-      return false;
-    }
-    return true;
-  }
-  validateDeclarationOrTranslationName(identifier2, range, kind) {
-    if ((identifier2.flags & 32 /* HasBackQuotes */) !== 0) {
-      if (kind === 1 /* ParameterDeclaration */) {
-        if ((identifier2.flags & 64 /* ConflictResolvingParameterName */) === 0) {
-          this.tryReportDiagnosticAtRange(range, 1123 /* ParameterNameCanContainOnlyOneBackQuote */);
-        }
-      } else if (kind === 2 /* FieldDeclaration */ || kind === 3 /* FieldTranslation */) {
-        if ((identifier2.flags & 128 /* BackingVariableName */) === 0) {
-          this.tryReportDiagnosticAtRange(
-            range,
-            1124 /* FieldNameCanContainOnlyTwoBackQuote */,
-            1 /* Warning */
-          );
-        }
-      } else {
-        this.tryReportDiagnosticAtRange(range, 1125 /* BackQuotesCanOnlyBeUsedInParameterAndFieldNames */);
-      }
-    }
-  }
   getCurrentTokenOrKeywordName() {
     const tokenOrKeyword = this.currentTokenOrKeyword_;
     if (tokenOrKeyword.kind === 0 /* Token */) {
@@ -14702,10 +14598,7 @@ var PackageImportDirectiveParser = class extends BlockElementListParser {
   }
   parsePackageName() {
     const packageNameStart = this.parser.tokenOrKeywordStartPosition();
-    const parts = [this.parser.parseIdentifier(
-      0 /* None */,
-      1102 /* PackageNameExpected */
-    )];
+    const parts = [this.parser.parseIdentifier(1102 /* PackageNameExpected */)];
     while (this.parser.isToken(34 /* Dot */)) {
       parts.push(this.parser.parseExpectedToken(34 /* Dot */));
       parts.push(this.parser.parseIdentifier());
@@ -14856,7 +14749,7 @@ var StatementParser = class _StatementParser {
   }
   parseErrorVariableDeclaration() {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -14888,10 +14781,7 @@ var StatementParser = class _StatementParser {
   }
   parseForStatementVariableDeclaration() {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
-    const name = this.parser.parseIdentifier(
-      4 /* Other */,
-      1105 /* ForStatementVariableDeclarationExpected */
-    );
+    const name = this.parser.parseIdentifier(1105 /* ForStatementVariableDeclarationExpected */);
     return new ForStatementVariableDeclaration(name, this.parser.rangeFrom(declarationStart));
   }
   canParseOptionalExpression(isFollowedByStatementBlock) {
@@ -14989,7 +14879,7 @@ var StatementParser = class _StatementParser {
     } else {
       letOrVarKeyword = this.parser.parseExpectedKeyword(1 /* Let */);
     }
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -15076,7 +14966,7 @@ var StatementParser = class _StatementParser {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
     const asyncKeyword = this.parser.parseOptionalKeyword(44 /* Async */);
     const functionKeyword = this.parser.parseExpectedKeyword(16 /* Function */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -15762,13 +15652,13 @@ var ExpressionParser = class _ExpressionParser {
     const literalStart = this.parser.tokenOrKeywordStartPosition();
     const text = this.parser.parseExpectedToken(5 /* TextLiteral */);
     let result;
-    if ((text.flags & 1536 /* LocalizableText */) !== 0) {
-      let code;
+    if ((text.flags & 384 /* LocalizableText */) !== 0) {
+      let key;
       const currentToken = this.parser.getCurrentTokenOrKeyword();
-      if ((text.flags & 1024 /* EndsWithTilde */) !== 0 && text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 2 /* IntegerLiteral */ && currentToken.leadingTrivia.length === 0) {
-        code = this.parser.parseExpectedToken(2 /* IntegerLiteral */);
+      if ((text.flags & 256 /* EndsWithTilde */) !== 0 && text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 5 /* TextLiteral */ && currentToken.leadingTrivia.length === 0) {
+        key = this.parser.parseExpectedToken(5 /* TextLiteral */);
       }
-      result = new LocalizableTextLiteral(text, code, this.parser.rangeFrom(literalStart));
+      result = new LocalizableTextLiteral(text, key, this.parser.rangeFrom(literalStart));
     } else {
       result = new TextLiteral(text, this.parser.rangeFrom(literalStart));
     }
@@ -15781,13 +15671,13 @@ var ExpressionParser = class _ExpressionParser {
     const spans = spanList.spans;
     const tail = spans.length > 0 ? spans[spans.length - 1] : void 0;
     let result;
-    if ((head.flags & 1536 /* LocalizableText */) !== 0 || tail !== void 0 && (tail.text.flags & 1536 /* LocalizableText */) !== 0) {
-      let code;
+    if ((head.flags & 384 /* LocalizableText */) !== 0 || tail !== void 0 && (tail.text.flags & 384 /* LocalizableText */) !== 0) {
+      let key;
       const currentToken = this.parser.getCurrentTokenOrKeyword();
-      if (tail !== void 0 && (tail.text.flags & 1024 /* EndsWithTilde */) !== 0 && tail.text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 2 /* IntegerLiteral */ && currentToken.leadingTrivia.length === 0) {
-        code = this.parser.parseExpectedToken(2 /* IntegerLiteral */);
+      if (tail !== void 0 && (tail.text.flags & 256 /* EndsWithTilde */) !== 0 && tail.text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 5 /* TextLiteral */ && currentToken.leadingTrivia.length === 0) {
+        key = this.parser.parseExpectedToken(5 /* TextLiteral */);
       }
-      result = new LocalizableTextTemplateLiteral(head, spanList, code, this.parser.rangeFrom(literalStart));
+      result = new LocalizableTextTemplateLiteral(head, spanList, key, this.parser.rangeFrom(literalStart));
     } else {
       result = new TextTemplateLiteral(head, spanList, this.parser.rangeFrom(literalStart));
     }
@@ -15879,7 +15769,7 @@ var PackageMemberDeclarationParser = class {
     );
   }
   parsePackageVariableDeclaration(declarationStart, tagList, modifierList) {
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -15901,7 +15791,7 @@ var PackageMemberDeclarationParser = class {
   }
   parsePackageVariableGetterDeclaration(declarationStart, tagList, modifierList) {
     const getKeyword = this.parser.parseExpectedKeyword(62 /* Get */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     const typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     const block = this.parser.parseOptionalFunctionBlock();
     return new PackageVariableGetterDeclaration(
@@ -15916,7 +15806,7 @@ var PackageMemberDeclarationParser = class {
   }
   parsePackageVariableSetterDeclaration(declarationStart, tagList, modifierList) {
     const setKeyword = this.parser.parseExpectedKeyword(63 /* Set */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     const block = this.parser.parseOptionalFunctionBlock();
     return new PackageVariableSetterDeclaration(
       tagList,
@@ -15929,7 +15819,7 @@ var PackageMemberDeclarationParser = class {
   }
   parsePackageFunctionDeclaration(declarationStart, tagList, modifierList) {
     const functionKeyword = this.parser.parseExpectedKeyword(16 /* Function */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16001,7 +15891,7 @@ var PackageMemberDeclarationParser = class {
   }
   parseAliasTypeDeclaration(declarationStart, tagList, modifierList) {
     const typeKeyword = this.parser.parseExpectedKeyword(20 /* Type */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16026,7 +15916,7 @@ var PackageMemberDeclarationParser = class {
   }
   parseClassDeclaration(declarationStart, tagList, modifierList) {
     const classKeyword = this.parser.parseExpectedKeyword(3 /* Class */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16049,7 +15939,7 @@ var PackageMemberDeclarationParser = class {
   }
   parseStructureDeclaration(declarationStart, tagList, modifierList) {
     const structureKeyword = this.parser.parseExpectedKeyword(4 /* Structure */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16072,7 +15962,7 @@ var PackageMemberDeclarationParser = class {
   }
   parseAspectOrReducedTypeDeclaration(declarationStart, tagList, modifierList) {
     const aspectKeyword = this.parser.parseExpectedKeyword(5 /* Aspect */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16112,7 +16002,7 @@ var PackageMemberDeclarationParser = class {
   }
   parseVariantDeclaration(declarationStart, tagList, modifierList) {
     const variantKeyword = this.parser.parseExpectedKeyword(8 /* Variant */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16300,7 +16190,7 @@ var TypeMemberDeclarationParser = class extends BlockElementListParser {
     return parsingFunction(declarationStart, tagList, modifierList);
   }
   parseVariantValueDeclaration(declarationStart, tagList, modifierList) {
-    const identifier2 = this.parser.parseIdentifier(4 /* Other */);
+    const identifier2 = this.parser.parseIdentifier();
     let value;
     const equalsToken = this.parser.parseOptionalToken(64 /* Equals */);
     if (equalsToken !== void 0) {
@@ -16317,7 +16207,7 @@ var TypeMemberDeclarationParser = class extends BlockElementListParser {
   }
   parseMethodDeclaration(declarationStart, tagList, modifierList) {
     const functionKeyword = this.parser.parseExpectedKeyword(16 /* Function */);
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeParameterClause;
     if (this.parser.typeParameterClauseParser.isStartOfTypeParameterClause()) {
       typeParameterClause = this.parser.typeParameterClauseParser.parseTypeParameterClause();
@@ -16367,7 +16257,7 @@ var TypeMemberDeclarationParser = class extends BlockElementListParser {
     );
   }
   parseFieldDeclaration(declarationStart, tagList, modifierList) {
-    const name = this.parser.parseIdentifier(2 /* FieldDeclaration */);
+    const name = this.parser.parseIdentifier();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -16426,7 +16316,7 @@ var TypeMemberDeclarationParser = class extends BlockElementListParser {
     );
   }
   parseFieldGetterDeclaration(declarationStart, tagList, modifierList, getKeyword) {
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     const typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
     const block = this.parser.parseOptionalFunctionBlock();
     return new FieldGetterDeclaration(
@@ -16474,7 +16364,7 @@ var TypeMemberDeclarationParser = class extends BlockElementListParser {
     );
   }
   parseFieldSetterDeclaration(declarationStart, tagList, modifierList, setKeyword) {
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     const block = this.parser.parseOptionalFunctionBlock();
     return new FieldSetterDeclaration(
       tagList,
@@ -16547,7 +16437,7 @@ var TagListParser = class {
   parseTag() {
     const tagStart = this.parser.tokenOrKeywordStartPosition();
     const hashSignToken = this.parser.parseExpectedToken(42 /* HashSign */);
-    const name = this.parser.parseQualifiedName(1127 /* TagNameExpected */);
+    const name = this.parser.parseQualifiedName(1123 /* TagNameExpected */);
     let typeArgumentClause;
     if (this.parser.typeArgumentParser.isStartOfTypeArgumentClause()) {
       typeArgumentClause = this.parser.typeArgumentParser.parseTypeArgumentClause();
@@ -16895,11 +16785,11 @@ var ArgumentListParser = class extends ListParser {
     let name;
     let equalsToken;
     const isNamedArgumentDeclaration = this.parser.lookAhead(() => {
-      const name2 = this.parser.parseParameterName(0 /* None */);
+      const name2 = this.parser.parseParameterName();
       return !name2.isMissing && this.parser.isToken(64 /* Equals */);
     });
     if (isNamedArgumentDeclaration) {
-      name = this.parser.parseParameterName(0 /* None */);
+      name = this.parser.parseParameterName();
       equalsToken = this.parser.parseExpectedToken(64 /* Equals */);
     }
     const expression = this.parser.expressionParser.parseExpression(false);
@@ -17004,7 +16894,7 @@ var TypeParameterClauseParser = class extends ListParser {
   }
   parseTypeParameterDeclaration() {
     const declarationStart = this.parser.tokenOrKeywordStartPosition();
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeConstraint;
     const colonToken = this.parser.parseOptionalToken(31 /* Colon */);
     if (colonToken !== void 0) {
@@ -17123,7 +17013,7 @@ var ParameterDeclarationParser = class {
   parseParameterDeclaration() {
     const parameterStart = this.parser.tokenOrKeywordStartPosition();
     const tagList = this.parser.tagListParser.parseTagList();
-    const name = this.parser.parseParameterName(1 /* ParameterDeclaration */);
+    const name = this.parser.parseParameterName();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -17207,7 +17097,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
     return this.parseTopLevelTranslation();
   }
   skipUnknownElement() {
-    this.parser.tryReportDiagnosticAtCurrentRange(1129 /* TranslationExpected */);
+    this.parser.tryReportDiagnosticAtCurrentRange(1125 /* TranslationExpected */);
     this.parser.skipTokenOrKeyword();
   }
   isStartOfTopLevelTranslation() {
@@ -17261,9 +17151,9 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   }
   parsePackageVariableTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
-    const sourceName = this.parser.parseIdentifier(4 /* Other */);
+    const sourceName = this.parser.parseIdentifier();
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(4 /* Other */);
+    const translatedName = this.parser.parseIdentifier();
     return new PackageVariableTranslationDeclaration(
       sourceName,
       minusGreaterThanToken,
@@ -17274,11 +17164,11 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   parsePackageFunctionTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const functionKeyword = this.parser.parseExpectedKeyword(16 /* Function */);
-    const sourceName = this.parser.parseIdentifier(4 /* Other */);
+    const sourceName = this.parser.parseIdentifier();
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
     const sourceParameterClause = this.parseParameterClause();
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(4 /* Other */);
+    const translatedName = this.parser.parseIdentifier();
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
     return new PackageFunctionTranslationDeclaration(
@@ -17296,11 +17186,11 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   parseMethodTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const functionKeyword = this.parser.parseExpectedKeyword(16 /* Function */);
-    const sourceName = this.parser.parseIdentifier(4 /* Other */);
+    const sourceName = this.parser.parseIdentifier();
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
     const sourceParameterClause = this.parseParameterClause();
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(4 /* Other */);
+    const translatedName = this.parser.parseIdentifier();
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
     return new MethodTranslation(
@@ -17317,9 +17207,9 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   }
   parseFieldOrVariantTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
-    const sourceName = this.parser.parseIdentifier(3 /* FieldTranslation */);
+    const sourceName = this.parser.parseIdentifier();
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(3 /* FieldTranslation */);
+    const translatedName = this.parser.parseIdentifier();
     return new FieldOrVariantTranslation(
       sourceName,
       minusGreaterThanToken,
@@ -17402,7 +17292,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   parseTypeOrFunctionTypeTranslation() {
     const translationStart = this.parser.tokenOrKeywordStartPosition();
     const typeKeyword = this.parser.parseExpectedKeyword(20 /* Type */);
-    const sourceName = this.parser.parseIdentifier(4 /* Other */);
+    const sourceName = this.parser.parseIdentifier();
     const sourceTypeParameterClause = this.parseOptionalTypeParameterClause();
     if (this.parser.isToken(51 /* OpenParenthesis */)) {
       return this.parseFunctionTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause);
@@ -17412,7 +17302,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   }
   parseTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause) {
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(4 /* Other */);
+    const translatedName = this.parser.parseIdentifier();
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     let memberList;
     let closeBraceToken;
@@ -17439,7 +17329,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   parseFunctionTypeTranslation(translationStart, typeKeyword, sourceName, sourceTypeParameterClause) {
     const sourceParameterClause = this.parseParameterClause();
     const minusGreaterThanToken = this.parser.parseExpectedToken(49 /* MinusGreaterThan */);
-    const translatedName = this.parser.parseIdentifier(4 /* Other */);
+    const translatedName = this.parser.parseIdentifier();
     const translatedTypeParameterClause = this.parseOptionalTypeParameterClause();
     const translatedParameterClause = this.parseParameterClause();
     return new FunctionTypeTranslationDeclaration(
@@ -17469,10 +17359,10 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
       switch (tokenOrKeyword.tokenKind) {
         case 5 /* TextLiteral */: {
           const targetText = this.parser.expressionParser.parseTextLiteral();
-          if ((targetText.text.flags & 1536 /* LocalizableText */) !== 0) {
+          if ((targetText.text.flags & 384 /* LocalizableText */) !== 0) {
             this.parser.tryReportDiagnosticAtRange(
               targetText.rangeWithoutTrivia,
-              1131 /* TranslatedTextCannotBeginOrEndWithTilde */
+              1127 /* TranslatedTextCannotBeginOrEndWithTilde */
             );
           }
           result = new TextTranslationDeclaration(
@@ -17487,10 +17377,10 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
           const textTemplate = this.parser.expressionParser.parseTextTemplateLiteral();
           const spans = textTemplate.spanList.spans;
           const tail = spans.length > 0 ? spans[spans.length - 1] : void 0;
-          if ((textTemplate.head.flags & 1536 /* LocalizableText */) !== 0 || tail !== void 0 && (tail.text.flags & 1536 /* LocalizableText */) !== 0) {
+          if ((textTemplate.head.flags & 384 /* LocalizableText */) !== 0 || tail !== void 0 && (tail.text.flags & 384 /* LocalizableText */) !== 0) {
             this.parser.tryReportDiagnosticAtRange(
               textTemplate.rangeWithoutTrivia,
-              1131 /* TranslatedTextCannotBeginOrEndWithTilde */
+              1127 /* TranslatedTextCannotBeginOrEndWithTilde */
             );
           }
           result = new TextTranslationDeclaration(
@@ -17517,7 +17407,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
       const missingTextLiteralToken = this.parser.createMissingToken(5 /* TextLiteral */);
       const targetText = new TextLiteral(missingTextLiteralToken, missingTextLiteralToken.rangeWithTrivia);
       this.parser.tryReportDiagnosticAtCurrentRange(
-        1130 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */
+        1126 /* TranslatedTextTemplateOrTranslationFunctionBlockExpected */
       );
       result = new TextTranslationDeclaration(
         sourceText,
@@ -17531,12 +17421,12 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   parseTranslationTextLiteral() {
     const literalStart = this.parser.tokenOrKeywordStartPosition();
     const text = this.parser.parseExpectedToken(5 /* TextLiteral */);
-    let code;
+    let key;
     const currentToken = this.parser.getCurrentTokenOrKeyword();
-    if ((text.flags & 1024 /* EndsWithTilde */) !== 0 && text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 2 /* IntegerLiteral */ && currentToken.leadingTrivia.length === 0) {
-      code = this.parser.parseExpectedToken(2 /* IntegerLiteral */);
+    if ((text.flags & 256 /* EndsWithTilde */) !== 0 && text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 5 /* TextLiteral */ && currentToken.leadingTrivia.length === 0) {
+      key = this.parser.parseExpectedToken(5 /* TextLiteral */);
     }
-    return new TranslationTextLiteral(text, code, this.parser.rangeFrom(literalStart));
+    return new TranslationTextLiteral(text, key, this.parser.rangeFrom(literalStart));
   }
   parseTranslationTextTemplate() {
     const literalStart = this.parser.tokenOrKeywordStartPosition();
@@ -17554,8 +17444,8 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
         spans.push(span);
       } while (span.text.tokenKind === 7 /* TextTemplatePart */);
       const currentToken = this.parser.getCurrentTokenOrKeyword();
-      if ((span.text.flags & 1024 /* EndsWithTilde */) !== 0 && span.text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 2 /* IntegerLiteral */ && currentToken.leadingTrivia.length === 0) {
-        code = this.parser.parseExpectedToken(2 /* IntegerLiteral */);
+      if ((span.text.flags & 256 /* EndsWithTilde */) !== 0 && span.text.trailingTrivia.length === 0 && currentToken.kind === 0 /* Token */ && currentToken.tokenKind === 5 /* TextLiteral */ && currentToken.leadingTrivia.length === 0) {
+        code = this.parser.parseExpectedToken(5 /* TextLiteral */);
       }
     }
     const spanList = new TranslationTextTemplateSpanList(spans, this.parser.rangeFrom(spanListStart));
@@ -17563,7 +17453,7 @@ var TranslationsDeclarationParser = class extends BlockElementListParser {
   }
   parseTranslationTextTemplateParameter() {
     const parameterStart = this.parser.tokenOrKeywordStartPosition();
-    const name = this.parser.parseIdentifier(4 /* Other */);
+    const name = this.parser.parseIdentifier();
     let typeAnnotation;
     if (this.parser.typeAnnotationParser.isStartOfTypeAnnotation()) {
       typeAnnotation = this.parser.typeAnnotationParser.parseTypeAnnotation();
@@ -17583,7 +17473,7 @@ var TypeMemberTranslationListParser = class extends BlockElementListParser {
     return this.parentParser.parseTypeMemberTranslation();
   }
   skipUnknownElement() {
-    this.parser.tryReportDiagnosticAtCurrentRange(1128 /* TypeMemberTranslationExpected */);
+    this.parser.tryReportDiagnosticAtCurrentRange(1124 /* TypeMemberTranslationExpected */);
     this.parser.skipTokenOrKeyword();
   }
 };
@@ -17599,7 +17489,7 @@ var TranslationParameterListParser = class extends ListParser {
     return this.parser.isStartOfParameterName();
   }
   parseExpectedElement() {
-    return this.parser.parseParameterName(4 /* Other */);
+    return this.parser.parseParameterName();
   }
   parseMissingElement() {
     this.parser.tryReportDiagnosticAtCurrentRange(1100 /* IdentifierExpected */);
@@ -17621,7 +17511,7 @@ var TranslationTypeParameterListParser = class extends ListParser {
     return this.parser.isToken(9 /* Identifier */);
   }
   parseExpectedElement() {
-    return this.parser.parseIdentifier(4 /* Other */);
+    return this.parser.parseIdentifier();
   }
   parseMissingElement() {
     this.parser.tryReportDiagnosticAtCurrentRange(1100 /* IdentifierExpected */);
@@ -20980,7 +20870,7 @@ var TagBase = class {
   get argumentByNameKey() {
     return this.argumentByNameKey_.getOrInsertWith(() => Query.toMap(
       this.argumentByParameter,
-      (tuple) => tuple[0].getOriginalEntity().getName().keyWithoutBackQuotes,
+      (tuple) => tuple[0].getOriginalEntity().getName().key,
       (tuple) => tuple[1]
     ));
   }
@@ -22752,17 +22642,17 @@ var PackageName2 = class _PackageName {
     this.segments = segments;
   }
   get key() {
-    return this.segments.map((s) => s.keyWithoutBackQuotes).join(".");
+    return this.segments.map((s) => s.key).join(".");
   }
   static parse(name) {
     const segments = name.split(".").map((s) => Name.parse(s));
     return new _PackageName(createNonEmptyArray(segments));
   }
   considerEqual(name) {
-    return this.segments.length === name.segments.length && this.segments.every((s, i) => s.considerEqual(name.segments[i], false));
+    return this.segments.length === name.segments.length && this.segments.every((s, i) => s.considerEqual(name.segments[i]));
   }
   toString(original = true) {
-    return this.segments.map((s) => original ? s.unescapedOriginal : s.keyWithoutBackQuotes).join(".");
+    return this.segments.map((s) => original ? s.unescapedOriginal : s.key).join(".");
   }
 };
 var RequiredPackageConfig;
@@ -26192,9 +26082,6 @@ var TextTemplateEmitOptions = class _TextTemplateEmitOptions {
       this.flags = flagsOrFirstFlag ?? 0 /* None */;
     }
   }
-  static default() {
-    return new _TextTemplateEmitOptions(1 /* CreateTextTemplateInstance */);
-  }
   get createTextTemplateInstance() {
     return (this.flags & 1 /* CreateTextTemplateInstance */) !== 0;
   }
@@ -27572,20 +27459,30 @@ var TextLiteral2 = class _TextLiteral {
     this.value = value;
     this.sourceLocation = sourceLocation;
     this.kind = 46 /* TextLiteral */;
+    this.options = new TextTemplateEmitOptions(false);
+  }
+  withOptions(options) {
+    this.options = options;
+    return this;
   }
   clone() {
-    return new _TextLiteral(this.value, this.sourceLocation);
+    return new _TextLiteral(this.value, this.sourceLocation).withOptions(this.options.clone());
   }
 };
 var LocalizableTextLiteral2 = class _LocalizableTextLiteral {
-  constructor(value, code, sourceLocation) {
+  constructor(value, key, sourceLocation) {
     this.value = value;
-    this.code = code;
+    this.key = key;
     this.sourceLocation = sourceLocation;
     this.kind = 47 /* LocalizableTextLiteral */;
+    this.options = new TextTemplateEmitOptions(false);
+  }
+  withOptions(options) {
+    this.options = options;
+    return this;
   }
   clone() {
-    return new _LocalizableTextLiteral(this.value, this.code, this.sourceLocation);
+    return new _LocalizableTextLiteral(this.value, this.key, this.sourceLocation);
   }
 };
 var TextWithEntityName = class _TextWithEntityName {
@@ -27604,7 +27501,7 @@ var TextTemplateLiteral2 = class _TextTemplateLiteral {
     this.expressions = expressions;
     this.sourceLocation = sourceLocation;
     this.kind = 48 /* TextTemplateLiteral */;
-    this.options = TextTemplateEmitOptions.default();
+    this.options = new TextTemplateEmitOptions(true);
   }
   withOptions(options) {
     this.options = options;
@@ -27619,13 +27516,13 @@ var TextTemplateLiteral2 = class _TextTemplateLiteral {
   }
 };
 var LocalizableTextTemplateLiteral2 = class _LocalizableTextTemplateLiteral {
-  constructor(textFragments, expressions, code, sourceLocation) {
+  constructor(textFragments, expressions, key, sourceLocation) {
     this.textFragments = textFragments;
     this.expressions = expressions;
-    this.code = code;
+    this.key = key;
     this.sourceLocation = sourceLocation;
     this.kind = 49 /* LocalizableTextTemplateLiteral */;
-    this.options = TextTemplateEmitOptions.default();
+    this.options = new TextTemplateEmitOptions(true);
   }
   withOptions(options) {
     this.options = options;
@@ -27635,7 +27532,7 @@ var LocalizableTextTemplateLiteral2 = class _LocalizableTextTemplateLiteral {
     return new _LocalizableTextTemplateLiteral(
       this.textFragments,
       this.expressions.map((e) => e.clone()),
-      this.code,
+      this.key,
       this.sourceLocation
     ).withOptions(this.options.clone());
   }
@@ -28396,6 +28293,11 @@ var StandardTypes = class {
   get textTemplate() {
     return this.textTemplate_ ??= this.entityMap.getType(this.analyzer.originalStandardTypes.textTemplate);
   }
+  get localizableTextTemplate() {
+    return this.localizableTextTemplate_ ??= this.entityMap.getType(
+      this.analyzer.originalStandardTypes.localizableTextTemplate
+    );
+  }
   get reference() {
     return this.reference_ ??= this.entityMap.getType(this.analyzer.originalStandardTypes.reference);
   }
@@ -28486,7 +28388,7 @@ var EntityFinder = class _EntityFinder {
     if (key.parameterNames !== void 0) {
       methodEntities = methodEntities.filter((m) => {
         const parameters = m.getParameters();
-        return parameters.length === key.parameterNames?.length && Query.zip(parameters, key.parameterNames, (p, n) => p.getName().considerEqual(new Name(n), false)).all((v) => v);
+        return parameters.length === key.parameterNames?.length && Query.zip(parameters, key.parameterNames, (p, n) => p.getName().considerEqual(new Name(n))).all((v) => v);
       });
     }
     if (methodEntities.length === 0) {
@@ -28506,7 +28408,7 @@ var EntityFinder = class _EntityFinder {
     if (key.parameterNames !== void 0) {
       constructorEntities = constructorEntities.filter((m) => {
         const parameters = m.getParameters();
-        return parameters.length === key.parameterNames?.length && Query.zip(parameters, key.parameterNames, (p, n) => p.getName().considerEqual(new Name(n), false)).all((v) => v);
+        return parameters.length === key.parameterNames?.length && Query.zip(parameters, key.parameterNames, (p, n) => p.getName().considerEqual(new Name(n))).all((v) => v);
       });
     }
     if (constructorEntities.length === 0) {
@@ -29353,15 +29255,7 @@ var EntityMap = class _EntityMap {
       }
     }
     if (result === void 0) {
-      const key = name.keyWithoutBackQuotes;
-      if (key.length >= 2 && key.charAt(0) === "'" && key.charAt(key.length - 1) === "'") {
-        result = key.substring(1, key.length - 1);
-      } else {
-        result = key;
-      }
-      if ((name.flags & 16 /* BackingVariableName */) !== 0) {
-        result += "_";
-      }
+      result = name.key;
     }
     return result;
   }
@@ -29964,8 +29858,8 @@ function ternaryExpression(condition, firstExpression, secondExpression, sourceL
 function textLiteral(value, sourceLocation) {
   return new TextLiteral2(value, sourceLocation);
 }
-function localizableTextLiteral(value, code, sourceLocation) {
-  return new LocalizableTextLiteral2(value, code, sourceLocation);
+function localizableTextLiteral(value, key, sourceLocation) {
+  return new LocalizableTextLiteral2(value, key, sourceLocation);
 }
 function textWithEntityName(entity, sourceLocation) {
   return new TextWithEntityName(entity, sourceLocation);
@@ -29973,8 +29867,8 @@ function textWithEntityName(entity, sourceLocation) {
 function textTemplateLiteral(textFragments, expressions, sourceLocation) {
   return new TextTemplateLiteral2(textFragments, expressions, sourceLocation);
 }
-function localizableTextTemplateLiteral(textFragments, expressions, code, sourceLocation) {
-  return new LocalizableTextTemplateLiteral2(textFragments, expressions, code, sourceLocation);
+function localizableTextTemplateLiteral(textFragments, expressions, key, sourceLocation) {
+  return new LocalizableTextTemplateLiteral2(textFragments, expressions, key, sourceLocation);
 }
 function thisExpression(type, sourceLocation) {
   return new ThisExpression(type, sourceLocation);
@@ -33085,23 +32979,31 @@ var AspectsLowering = class {
     return fieldSetterDeclaration(setterEntity, body, parameterEntity2);
   }
   getNotAbstractAspectMembersToAddToDerivedType(entity) {
-    const overriddenMembers = Query.from(entity.members).map((m) => this.getAllOverriddenAspectMembers(m)).filter((m) => m !== void 0).flatMap((m) => m).uniqueToSet();
-    const result = /* @__PURE__ */ new Set();
-    for (const aspect of enumerateOwnAspectsRecursively(entity)) {
-      if (!aspect.containingPackage.details.isSource) {
+    const overriddenMembers = Query.from(entity.members).map((m) => this.getAllOverriddenAspectMembers(m)).chain(Query.from(this.uniqueBaseTypesRecursively(entity)).flatMap((e) => e.members.map((m) => this.getAllOverriddenAspectMembers(m)))).filter((m) => m !== void 0).flatMap((m) => m).uniqueToSet();
+    const result = new Array();
+    for (const baseType of this.uniqueBaseTypesRecursively(entity)) {
+      if (!this.ctx.ectx.isAspectTypeEntity(baseType) || !baseType.containingPackage.details.isSource) {
         continue;
       }
-      for (const member of aspect.members) {
+      for (const member of baseType.members) {
         if (!overriddenMembers.has(member) && !member.details.isAbstract && !member.details.isStatic) {
-          result.add(member);
+          result.push(member);
         }
       }
     }
-    return Array.from(result);
-    function* enumerateOwnAspectsRecursively(entity2) {
-      yield* __yieldStar(entity2.baseAspectTypes);
-      for (const baseAspectType of entity2.baseAspectTypes) {
-        yield* __yieldStar(enumerateOwnAspectsRecursively(baseAspectType));
+    return result;
+  }
+  *uniqueBaseTypesRecursively(entity, enumerated = /* @__PURE__ */ new Set()) {
+    if (entity.baseObjectType !== void 0 && !enumerated.has(entity.baseObjectType)) {
+      yield entity.baseObjectType;
+      enumerated.add(entity.baseObjectType);
+      yield* __yieldStar(this.uniqueBaseTypesRecursively(entity.baseObjectType));
+    }
+    for (const baseAspectType of entity.baseAspectTypes) {
+      if (!enumerated.has(baseAspectType)) {
+        yield baseAspectType;
+        enumerated.add(baseAspectType);
+        yield* __yieldStar(this.uniqueBaseTypesRecursively(baseAspectType));
       }
     }
   }
@@ -34467,6 +34369,12 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
         }
         return preserveStatement();
       },
+      transformTextLiteral: (node) => {
+        if (node.options.createTextTemplateInstance) {
+          return replaceExpression(this.createTextTemplateConstructorCall([node.value], [], node.sourceLocation));
+        }
+        return preserveExpression();
+      },
       transformTextTemplateLiteral: (node) => {
         if (node.options.createTextTemplateInstance) {
           return replaceExpression(this.lowerTextTemplateLiteral(node));
@@ -34474,10 +34382,40 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
         return preserveExpression();
       },
       transformLocalizableTextLiteral: (node) => {
-        return replaceExpression(this.lowerLocalizableTextLiteral(node));
+        let expression = this.createLocalizableTextTemplateConstructorCall(
+          [node.value],
+          [],
+          node.key,
+          node.sourceLocation
+        );
+        if (!node.options.createTextTemplateInstance) {
+          expression = instanceMethodCallExpression(
+            expression,
+            this.ctx.localizableTextTemplateTranslateMethod,
+            [],
+            false,
+            node.sourceLocation
+          );
+        }
+        return replaceExpression(expression);
       },
       transformLocalizableTextTemplateLiteral: (node) => {
-        return replaceExpression(this.lowerLocalizableTextTemplateLiteral(node));
+        let expression = this.createLocalizableTextTemplateConstructorCall(
+          node.textFragments,
+          node.expressions,
+          node.key,
+          node.sourceLocation
+        );
+        if (!node.options.createTextTemplateInstance) {
+          expression = instanceMethodCallExpression(
+            expression,
+            this.ctx.localizableTextTemplateTranslateMethod,
+            [],
+            false,
+            node.sourceLocation
+          );
+        }
+        return replaceExpression(expression);
       },
       transformMethodDeclaration: (node) => {
         const nameKeySymbolDeclaration = this.ifTypeMemberHasComputedNameThenSymbolDeclaration(node.entity, true);
@@ -34730,16 +34668,16 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
     const result = this.createLocalizableTextTemplateConstructorAndTranslateCall(
       [node.value],
       [],
-      node.code,
+      node.key,
       node.sourceLocation
     );
     return result;
   }
   lowerLocalizableTextTemplateLiteral(node) {
-    const result = this.createLocalizableTextTemplateConstructorAndTranslateCall(
+    const result = this.createLocalizableTextTemplateConstructorCall(
       node.textFragments,
       node.expressions,
-      node.code,
+      node.key,
       node.sourceLocation
     );
     return result;
@@ -34755,20 +34693,25 @@ var UsagesLowering = class _UsagesLowering extends ExecutableCodeLowering {
     );
     return constructorCall;
   }
-  createLocalizableTextTemplateConstructorAndTranslateCall(textFragments, expressions, code, sourceLocation) {
+  createLocalizableTextTemplateConstructorCall(textFragments, expressions, key, sourceLocation) {
     const textFragmentsArray = arrayLiteral(this.ctx.ectx, textFragments.map((s) => textLiteral(s)));
     const expressionArray = arrayLiteral(this.ctx.ectx, expressions);
-    let codeArg;
-    if (code !== void 0) {
-      codeArg = numericLiteral(code);
-    } else {
-      codeArg = textLiteral(textFragments.join("_"));
-    }
+    const keyArg = key !== void 0 ? textLiteral(key) : nullLiteral();
     const packageArg = staticFieldGetAccess(this.ctx.packageThisPackageField);
     const constructorCall = constructorCallExpression(
       this.ctx.ectx,
       this.ctx.localizableTextTemplateConstructor,
-      [textFragmentsArray, expressionArray, codeArg, packageArg]
+      [textFragmentsArray, expressionArray, keyArg, packageArg],
+      sourceLocation
+    );
+    return constructorCall;
+  }
+  createLocalizableTextTemplateConstructorAndTranslateCall(textFragments, expressions, key, sourceLocation) {
+    const constructorCall = this.createLocalizableTextTemplateConstructorCall(
+      textFragments,
+      expressions,
+      key,
+      sourceLocation
     );
     const toTextMethodCall = instanceMethodCallExpression(
       constructorCall,
@@ -35618,7 +35561,7 @@ var TextTranslationsLowering = class {
         );
         const statements = [dictionaryVariableDeclarationStatement];
         for (const translation of pkg2.ir.translations) {
-          const key = typeof translation.key === "number" ? numericLiteral(translation.key) : textLiteral(translation.key);
+          const key = textLiteral(translation.key);
           let textOrTranslationFunction;
           if (translation.translatedTextOrFunctionBlock.kind === 4 /* BlockStatement */) {
             textOrTranslationFunction = this.createTranslationFunctionLiteral(
@@ -36827,7 +36770,7 @@ var IrBuilderA = class {
         result = this.buildTokenExpression(expression);
         break;
       case 81 /* TextLiteral */:
-        if ((expression.text.flags & 256 /* SingleCharText */) !== 0) {
+        if ((expression.text.flags & 64 /* SingleCharText */) !== 0) {
           result = this.buildCharLiteral(expression);
         } else {
           result = this.buildTextLiteral(expression);
@@ -36865,7 +36808,25 @@ var IrBuilderA = class {
   }
   applyImplicitConversionIfRequired(expression, expressionIr) {
     if (this.expressionCanBeImplicitlyConverted(expression)) {
-      if (expression.kind === 76 /* TextTemplateLiteral */ && this.analyzer.type.ofExpression(expression).equals(this.analyzer.originalStandardTypes.text)) {
+      if (expression.kind === 81 /* TextLiteral */ && expressionIr.kind === 46 /* TextLiteral */) {
+        let targetType2 = this.analyzer.getTargetTypeOfExpression(expression);
+        if (targetType2 !== void 0) {
+          targetType2 = this.analyzer.excludeNullFromType(targetType2.unalias());
+        }
+        if (targetType2 !== void 0 && targetType2.equals(this.analyzer.originalStandardTypes.textTemplate)) {
+          expressionIr.options = expressionIr.options.setCreateTextTemplateInstance(true);
+          return expressionIr;
+        }
+      } else if (expression.kind === 82 /* LocalizableTextLiteral */ && expressionIr.kind === 47 /* LocalizableTextLiteral */) {
+        let targetType2 = this.analyzer.getTargetTypeOfExpression(expression);
+        if (targetType2 !== void 0) {
+          targetType2 = this.analyzer.excludeNullFromType(targetType2.unalias());
+        }
+        if (targetType2 !== void 0 && targetType2.equals(this.analyzer.originalStandardTypes.localizableTextTemplate)) {
+          expressionIr.options = expressionIr.options.setCreateTextTemplateInstance(true);
+          return expressionIr;
+        }
+      } else if ((expression.kind === 76 /* TextTemplateLiteral */ || expression.kind === 77 /* LocalizableTextTemplateLiteral */) && this.analyzer.type.ofExpression(expression).equals(this.analyzer.originalStandardTypes.text)) {
         return this.convertTextTemplateToText(expressionIr);
       }
       let targetType = this.analyzer.getTargetTypeOfExpression(expression);
@@ -36874,7 +36835,7 @@ var IrBuilderA = class {
       }
       if (targetType !== void 0) {
         const expressionType = this.analyzer.type.ofExpression(expression);
-        if (expressionType.equals(this.analyzer.originalStandardTypes.textTemplate)) {
+        if (expressionType.equals(this.analyzer.originalStandardTypes.textTemplate) || expressionType.equals(this.analyzer.originalStandardTypes.localizableTextTemplate)) {
           const isConvertedToText = targetType.equals(this.analyzer.originalStandardTypes.text) || targetType.kind === "union" && targetType.unaliasedFlattenedTypes.some((t) => t.equals(this.analyzer.originalStandardTypes.text));
           if (isConvertedToText) {
             return this.convertTextTemplateToText(expressionIr);
@@ -37474,12 +37435,9 @@ var IrBuilderA = class {
     );
   }
   buildLocalizableTextLiteral(expression) {
-    const code = expression.code !== void 0 ? parseIntegerLiteral(expression.code.value) : void 0;
-    return localizableTextLiteral(
-      unescapeText(withoutQuotes(expression.text.value)),
-      code,
-      this.getSourceLocation(expression)
-    );
+    const value = unescapeText(withoutQuotes(expression.text.value));
+    const key = expression.key !== void 0 ? unescapeText(withoutQuotes(expression.key.value)) : void 0;
+    return localizableTextLiteral(value, key, this.getSourceLocation(expression));
   }
   buildTextTemplateLiteral(expression) {
     const textFragments = [unescapeText(withoutTemplateQuotes(expression.head.value))];
@@ -37497,8 +37455,8 @@ var IrBuilderA = class {
       textFragments.push(unescapeText(withoutTemplateQuotes(span.text.value)));
       expressions.push(this.buildExpression(span.expression));
     }
-    const code = expression.code !== void 0 ? parseIntegerLiteral(expression.code.value) : void 0;
-    return localizableTextTemplateLiteral(textFragments, expressions, code, this.getSourceLocation(expression));
+    const key = expression.key !== void 0 ? unescapeText(withoutQuotes(expression.key.value)) : void 0;
+    return localizableTextTemplateLiteral(textFragments, expressions, key, this.getSourceLocation(expression));
   }
   buildTokenExpression(expression) {
     switch (expression.token.tokenKind) {
@@ -41131,6 +41089,13 @@ var StandardTypes2 = class {
     }
     return this.textTemplate_;
   }
+  get localizableTextTemplate() {
+    if (this.localizableTextTemplate_ === void 0) {
+      const entity = this.wellKnownDeclarations.localizableTextTemplate;
+      this.localizableTextTemplate_ = this.analyzer.typeFactory.getStructuredType(entity, Substitutions.empty());
+    }
+    return this.localizableTextTemplate_;
+  }
   get char() {
     if (this.char_ === void 0) {
       const entity = this.wellKnownDeclarations.char;
@@ -41481,8 +41446,8 @@ var TypeFactory = class {
   getStructuredType(entity, substitutions) {
     return new StructuredType(this.analyzer, entity, substitutions);
   }
-  getParameterType(entity, excludeNone) {
-    return new ParameterType(this.analyzer, entity, excludeNone);
+  getParameterType(entity, excludeNull) {
+    return new ParameterType(this.analyzer, entity, excludeNull);
   }
   getVariantType(entity, substitutions) {
     return new VariantType(this.analyzer, entity, substitutions);
@@ -43708,7 +43673,7 @@ var TranslatedEntityNameConflictsValidator = class {
       const translatedMembers = originalMembers.map((m) => translatedMemberByOriginal.get(m)).filter((m) => m !== void 0);
       const firstSourceTranslatedMember = translatedMembers.find((m) => m.getTranslation()?.definition.kind === "source");
       if (firstSourceTranslatedMember !== void 0) {
-        const translatedMemberWithDifferentName = translatedMembers.find((m) => !m.getName().considerEqual(firstSourceTranslatedMember.getName(), true));
+        const translatedMemberWithDifferentName = translatedMembers.find((m) => !m.getName().considerEqual(firstSourceTranslatedMember.getName()));
         if (translatedMemberWithDifferentName !== void 0) {
           const nodeForDiagnostic = this.getTranslatedNameNode(
             this.getTranslationDefinitionNode(firstSourceTranslatedMember.getTranslation())
@@ -43737,7 +43702,7 @@ var TranslatedEntityNameConflictsValidator = class {
       if (firstSourceTranslatedMember !== void 0) {
         const originalMembers = translatedMembers.map((m) => m.getOriginalEntity());
         const originalName = firstSourceTranslatedMember.getOriginalEntity().getName();
-        const originalMemberWithDifferentName = originalMembers.find((m) => !m.getName().considerEqual(originalName, true));
+        const originalMemberWithDifferentName = originalMembers.find((m) => !m.getName().considerEqual(originalName));
         if (originalMemberWithDifferentName !== void 0) {
           const nodeForDiagnostic = this.getTranslatedNameNode(
             this.getTranslationDefinitionNode(firstSourceTranslatedMember.getTranslation())
@@ -43787,7 +43752,7 @@ var TranslatedEntityNameConflictsValidator = class {
     if (typeParameters.length > 0) {
       const nameKeys = /* @__PURE__ */ new Set();
       for (const typeParameter of typeParameters) {
-        const key = typeParameter.getName().keyWithoutBackQuotes;
+        const key = typeParameter.getName().key;
         if (nameKeys.has(key)) {
           const translationDefinition = typeParameter.getTranslation()?.definition;
           if (translationDefinition?.kind === "source" && translationDefinition.translatedNameIdentifier !== void 0) {
@@ -43808,7 +43773,7 @@ var TranslatedEntityNameConflictsValidator = class {
     if (parameters.length > 0) {
       const nameKeys = /* @__PURE__ */ new Set();
       for (const parameter of parameters) {
-        const key = parameter.getName().keyWithoutBackQuotes;
+        const key = parameter.getName().key;
         if (nameKeys.has(key)) {
           const translationDefinition = parameter.getTranslation()?.definition;
           if (translationDefinition?.kind === "source" && translationDefinition.translatedNameIdentifier !== void 0) {
@@ -44947,7 +44912,7 @@ var ResolvedTranslationPackage = class _ResolvedTranslationPackage {
     return Query.zip(
       typeParameterEntities,
       translationTypeParameters,
-      (e, n) => e.getName().considerEqual(this.analyzer.createNameFromIdentifier(n), false)
+      (e, n) => e.getName().considerEqual(this.analyzer.createNameFromIdentifier(n))
     ).all((v) => v);
   }
   areParameterEntitiesEqualToTranslationParameters(parameterEntities, translationParameterList) {
@@ -44958,7 +44923,7 @@ var ResolvedTranslationPackage = class _ResolvedTranslationPackage {
     return Query.zip(
       parameterEntities,
       translationParameters,
-      (e, n) => e.getName().considerEqual(this.analyzer.createNameFromIdentifier(n), false)
+      (e, n) => e.getName().considerEqual(this.analyzer.createNameFromIdentifier(n))
     ).all((v) => v);
   }
   createNotTranslatedEntitiesDiagnostic(entities, totalCount, node, argumentFactory) {
@@ -47261,11 +47226,7 @@ var TsParameterEntity = class {
     this.subkind = "parameter";
     this.type = new Cached();
     if (isObjectParameter_) {
-      const objectKeywordText = LocalizationHelperA.localizeKeywordAndTakeFirst(
-        7 /* Object */,
-        0 /* En */
-      );
-      this.name = new Name(objectKeywordText, 0 /* None */, specialNameKeys.objectParameter);
+      this.name = new Name(specialNameKeys.objectParameter, 8 /* SpecialName */);
     } else {
       this.name = this.tsctx.createName(this.symbol.name, "variable");
     }
@@ -52557,25 +52518,19 @@ var SourceAnonymousStructuredTypeDeclarationData = class extends SourceStructure
 
 // source/analysis/a/TextIdentity.ts
 var TextIdentity = class {
-  static keyFromTextFragments(fragments) {
-    return fragments.join("_");
-  }
-  static keyFromTextToken(token) {
-    return unescapeText(withoutQuotes(token.value));
-  }
   static keyFromLocalizableTextLiteral(node) {
     let result;
-    if (node.code !== void 0) {
-      result = parseIntegerLiteral(node.code.value);
+    if (node.key !== void 0) {
+      result = unescapeText(withoutQuotes(node.key.value));
     } else {
-      result = this.keyFromTextToken(node.text);
+      result = unescapeText(withoutQuotes(node.text.value));
     }
     return result;
   }
   static keyFromLocalizableTextTemplateLiteral(node) {
     let result;
-    if (node.code !== void 0) {
-      result = parseIntegerLiteral(node.code.value);
+    if (node.key !== void 0) {
+      result = unescapeText(withoutQuotes(node.key.value));
     } else {
       const fragments = [unescapeText(withoutTemplateQuotes(node.head.value))];
       node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
@@ -52585,12 +52540,12 @@ var TextIdentity = class {
   }
   static keyFromTextTranslationSource(node) {
     let result;
-    if (node.code !== void 0) {
-      result = parseIntegerLiteral(node.code.value);
+    if (node.key !== void 0) {
+      result = unescapeText(withoutQuotes(node.key.value));
     } else {
       switch (node.kind) {
         case 140 /* TranslationTextLiteral */: {
-          result = this.keyFromTextToken(node.text);
+          result = unescapeText(withoutQuotes(node.text.value));
           break;
         }
         case 141 /* TranslationTextTemplate */: {
@@ -52619,7 +52574,7 @@ var TextTranslationDeclarationEntity = class {
       case 140 /* TranslationTextLiteral */: {
         this.text = unescapeText(withoutQuotes(node.text.value));
         this.textFragments = [this.text];
-        lastToken = node.code ?? node.text;
+        lastToken = node.key ?? node.text;
         break;
       }
       case 141 /* TranslationTextTemplate */: {
@@ -52627,8 +52582,8 @@ var TextTranslationDeclarationEntity = class {
         node.spanList.spans.forEach((x) => fragments.push(unescapeText(withoutTemplateQuotes(x.text.value))));
         this.textFragments = fragments;
         this.text = this.textFragments.join("_");
-        if (node.code !== void 0) {
-          lastToken = node.code;
+        if (node.key !== void 0) {
+          lastToken = node.key;
         } else {
           const spans = node.spanList.spans;
           if (spans.length > 0) {
@@ -54110,7 +54065,7 @@ var ParameterDeclarationEntity = class {
     return 0 /* ArtelA */;
   }
   isObjectParameter() {
-    let result = (this.node.name.flags & 2048 /* ObjectParameterName */) !== 0;
+    let result = (this.node.name.flags & 512 /* ObjectParameterName */) !== 0;
     if (result) {
       const firstParameter = this.node.parent.parameters.first();
       result = this.node === firstParameter;
@@ -54221,7 +54176,7 @@ var IndexParameterDeclarationEntity = class {
     return 0 /* ArtelA */;
   }
   isObjectParameter() {
-    let result = (this.getterOrSetterParameterDeclaration.name.flags & 2048 /* ObjectParameterName */) !== 0;
+    let result = (this.getterOrSetterParameterDeclaration.name.flags & 512 /* ObjectParameterName */) !== 0;
     if (result) {
       const firstParameter = this.getterOrSetterParameterDeclaration.parent.parameters.first();
       result = this.getterOrSetterParameterDeclaration === firstParameter;
@@ -54326,7 +54281,7 @@ var FunctionLiteralParameterDeclarationEntity = class {
     return this;
   }
   isObjectParameter() {
-    return this.parameterIndex === 0 && (this.node.name.flags & 2048 /* ObjectParameterName */) !== 0;
+    return this.parameterIndex === 0 && (this.node.name.flags & 512 /* ObjectParameterName */) !== 0;
   }
   getContainingFunctionLiteralEntity() {
     return this.analyzer.entity.ofFunctionLiteralInternal(this.functionLiteral);
@@ -55562,7 +55517,7 @@ var TsPackageMembersCreator = class {
     if (sourcePackageToMergeWith !== void 0) {
       switch (sourcePackageToMergeWith.dialect) {
         case 0 /* ArtelA */:
-          this.namedDeclarationsByName = Query.from(sourcePackageToMergeWith.sourceFiles).flatMap((d) => d.getSyntaxNode().declarationList.flatten()).filter(isNamedPackageMemberDeclaration).groupByToMap((d) => tsctx.analyzer.dialectA.createNameFromIdentifier(d.name).keyWithoutBackQuotes);
+          this.namedDeclarationsByName = Query.from(sourcePackageToMergeWith.sourceFiles).flatMap((d) => d.getSyntaxNode().declarationList.flatten()).filter(isNamedPackageMemberDeclaration).groupByToMap((d) => tsctx.analyzer.dialectA.createNameFromIdentifier(d.name).key);
           break;
         case 1 /* ArtelM */:
           break;
@@ -56155,7 +56110,7 @@ var TsInteropContext = class {
   createName(original, ownerKind) {
     let flags = 2 /* QuotedName */;
     if (ownerKind === "variable" || ownerKind === "method") {
-      flags |= 32 /* PreferKebabCase */;
+      flags |= 16 /* PreferKebabCase */;
     }
     return new Name(original, flags);
   }
@@ -57190,6 +57145,14 @@ var LocalizedWellKnownDeclarations = class {
     }
     return this.textTemplate_;
   }
+  get localizableTextTemplate() {
+    if (this.localizableTextTemplate_ === void 0) {
+      this.localizableTextTemplate_ = this.getLocalizedStructuredType(
+        this.analyzer.originalWellKnownDeclarations.localizableTextTemplate
+      );
+    }
+    return this.localizableTextTemplate_;
+  }
   get char() {
     if (this.char_ === void 0) {
       this.char_ = this.getLocalizedStructuredType(this.analyzer.originalWellKnownDeclarations.char);
@@ -60638,7 +60601,7 @@ var SourceFileAnalyzer = class {
   checkObjectParameterIsTheFirstParameter(parameters) {
     for (let i = 1; i < parameters.length; i++) {
       const parameterDeclaration2 = parameters[i];
-      if ((parameterDeclaration2.name.flags & 2048 /* ObjectParameterName */) !== 0) {
+      if ((parameterDeclaration2.name.flags & 512 /* ObjectParameterName */) !== 0) {
         this.createAndAddDiagnostic(2227 /* ObjectParameterMustBeTheFirstParameter */, parameterDeclaration2.name);
         break;
       }
@@ -63349,6 +63312,7 @@ var WellKnownDeclarationsLoader = class {
       integer: this.findPackageType(systemPackage, new Name("\u0426\u0435\u043B\u043E\u0435"), 0, 1 /* Structured */),
       text: this.findPackageType(systemPackage, new Name("\u0422\u0435\u043A\u0441\u0442"), 0, 1 /* Structured */),
       textTemplate: this.findPackageType(systemPackage, new Name("\u0428\u0430\u0431\u043B\u043E\u043D\u0422\u0435\u043A\u0441\u0442\u0430"), 0, 1 /* Structured */),
+      localizableTextTemplate: this.findPackageType(systemPackage, new Name("\u0428\u0430\u0431\u043B\u043E\u043D\u0422\u0435\u043A\u0441\u0442\u0430\u041F\u0435\u0440\u0435\u0432\u043E\u0434\u0438\u043C\u044B\u0439"), 0, 1 /* Structured */),
       char: this.findPackageType(systemPackage, new Name("\u0421\u0438\u043C\u0432\u043E\u043B"), 0, 1 /* Structured */),
       yesNo: this.findPackageType(systemPackage, new Name("\u0414\u0430\u041D\u0435\u0442"), 0, 1 /* Structured */),
       nullEntity: this.findPackageType(systemPackage, new Name("\u041F\u0443\u0441\u0442\u043E"), 0, 1 /* Structured */),
@@ -63427,7 +63391,7 @@ var SignatureComparer = class {
     if (entity1.kind !== entity2.kind) {
       return false;
     }
-    if ((options & 1 /* CompareNames */) !== 0 && entity1.kind === 1 /* Function */ && !entity1.getNaming().considerEqual(entity2.getNaming(), false)) {
+    if ((options & 1 /* CompareNames */) !== 0 && entity1.kind === 1 /* Function */ && !entity1.getNaming().considerEqual(entity2.getNaming())) {
       return false;
     }
     const parameters1 = entity1.getParameters();
@@ -64161,6 +64125,9 @@ var TypeAssignabilityCheck = class {
     if (source.equals(this.analyzer.originalStandardTypes.textTemplate) && target.equals(this.analyzer.originalStandardTypes.text)) {
       return 16 /* ImplicitConversion */;
     }
+    if (source.equals(this.analyzer.originalStandardTypes.localizableTextTemplate) && target.equals(this.analyzer.originalStandardTypes.text)) {
+      return 16 /* ImplicitConversion */;
+    }
     if (source.kind === "variant") {
       let result = this.getAssignabilityFlags(source.getUnderlyingType(), target);
       if (result !== 1 /* NotAssignable */) {
@@ -64287,8 +64254,8 @@ var TypeAssignabilityCheck = class {
   /**
    * @example
    * ```artel
-   * перем а = операция(п: Текст): Объект { }
-   * перем б = операция(п: Объект): Текст { }
+   * перем а = функция(п: Текст): Объект { }
+   * перем б = функция(п: Объект): Текст { }
    *
    * а = б // Корректно
    * б = а // Ошибка
@@ -65087,7 +65054,7 @@ var ArgumentToParameterMatcher = class {
           hasErrors ||= true;
         }
       } else {
-        const parameterIndex = parameters.findIndex((p) => p.getName()?.considerEqual(argumentName, false) === true);
+        const parameterIndex = parameters.findIndex((p) => p.getName()?.considerEqual(argumentName) === true);
         if (parameterIndex >= 0 && parameterIndex < parameters.length && parameterIndex === argumentIndex) {
           const parameter = parameters[parameterIndex];
           argumentToParameterMapping.set(argument2, parameter);
@@ -65104,7 +65071,7 @@ var ArgumentToParameterMatcher = class {
         this.reportArgumentDiagnostic(argument2, 2020 /* PositionalArgumentsCannotFollowNamedArguments */);
         hasErrors ||= true;
       } else {
-        const parameter = parameters.find((p) => p.getName()?.considerEqual(argumentName, false) === true);
+        const parameter = parameters.find((p) => p.getName()?.considerEqual(argumentName) === true);
         if (parameter !== void 0) {
           if (matchedParameters.has(parameter)) {
             this.reportArgumentDiagnostic(argument2, 2021 /* ArgumentForParameterAlreadyAssigned */);
@@ -72822,20 +72789,11 @@ var Analyzer3 = class extends Analyzer {
   createNameFromIdentifier(node) {
     let result = this.nameByIdentifierText.get(node.value);
     if (result === void 0) {
-      let nameFlags = 0 /* None */;
-      if ((node.flags & 4 /* QuotedName */) !== 0) {
-        nameFlags |= 2 /* QuotedName */;
-      }
-      if ((node.flags & 64 /* ConflictResolvingParameterName */) !== 0) {
-        nameFlags |= 8 /* ConflictResolvingParameterName */;
-      } else if ((node.flags & 128 /* BackingVariableName */) !== 0) {
-        nameFlags |= 16 /* BackingVariableName */;
-      }
-      let specialKey;
-      if ((node.flags & 2048 /* ObjectParameterName */) !== 0) {
-        specialKey = specialNameKeys.objectParameter;
+      if ((node.flags & 512 /* ObjectParameterName */) !== 0) {
+        result = Name.parse(specialNameKeys.objectParameter, 8 /* SpecialName */);
+      } else {
+        result = Name.parse(node.value, 0 /* None */);
       }
-      result = Name.parse(node.value, nameFlags, specialKey);
       this.nameByIdentifierText.set(node.value, result);
     }
     return result;
@@ -73833,11 +73791,13 @@ var Type14 = class {
       case 71 /* ConditionalExpression */:
         return this.ofConditionalExpression(node, analysisOptions);
       case 81 /* TextLiteral */:
+        return this.ofTextLiteral(node, analysisOptions);
       case 82 /* LocalizableTextLiteral */:
-        return this.ofTextLiteral(node);
+        return this.ofLocalizableTextLiteral(node, analysisOptions);
       case 76 /* TextTemplateLiteral */:
-      case 77 /* LocalizableTextTemplateLiteral */:
         return this.ofTextTemplateLiteral(node, analysisOptions);
+      case 77 /* LocalizableTextTemplateLiteral */:
+        return this.ofLocalizableTextTemplateLiteral(node, analysisOptions);
       case 86 /* IdentifierExpression */:
         return this.ofIdentifierExpression(node, analysisOptions);
       case 80 /* TokenExpression */:
@@ -74176,13 +74136,50 @@ var Type14 = class {
     }
     return this.analyzer.typeFactory.getUnionType([firstExpressionType, secondExpressionType], true);
   }
-  ofTextLiteral(node) {
+  ofTextLiteral(node, analysisOptions) {
     const standardTypes = this.analyzer.getLocalizedStandardTypes(node.locale);
-    if (node.kind === 81 /* TextLiteral */ && (node.text.flags & 256 /* SingleCharText */) !== 0) {
+    let targetType = this.analyzer.getTargetTypeOfExpression(node, analysisOptions);
+    if (targetType !== void 0) {
+      targetType = targetType.unalias();
+    }
+    let nodeIsTemplateNotText;
+    if (targetType === void 0) {
+      nodeIsTemplateNotText = false;
+    } else if (targetType.equals(standardTypes.textTemplate)) {
+      nodeIsTemplateNotText = true;
+    } else if (targetType.kind === "union") {
+      nodeIsTemplateNotText = targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.textTemplate)) && !targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.text));
+    } else {
+      nodeIsTemplateNotText = false;
+    }
+    if (nodeIsTemplateNotText) {
+      return standardTypes.textTemplate;
+    } else if (node.kind === 81 /* TextLiteral */ && (node.text.flags & 64 /* SingleCharText */) !== 0) {
       return standardTypes.char;
     }
     return standardTypes.text;
   }
+  ofLocalizableTextLiteral(node, analysisOptions) {
+    const standardTypes = this.analyzer.getLocalizedStandardTypes(node.locale);
+    let targetType = this.analyzer.getTargetTypeOfExpression(node, analysisOptions);
+    if (targetType !== void 0) {
+      targetType = targetType.unalias();
+    }
+    let nodeIsTemplateNotText;
+    if (targetType === void 0) {
+      nodeIsTemplateNotText = false;
+    } else if (targetType.equals(standardTypes.localizableTextTemplate)) {
+      nodeIsTemplateNotText = true;
+    } else if (targetType.kind === "union") {
+      nodeIsTemplateNotText = targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.localizableTextTemplate)) && !targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.text));
+    } else {
+      nodeIsTemplateNotText = false;
+    }
+    if (nodeIsTemplateNotText) {
+      return standardTypes.localizableTextTemplate;
+    }
+    return standardTypes.text;
+  }
   /**
    * По умолчанию литерал шаблона текста имеет тип Текст.
    *
@@ -74209,6 +74206,32 @@ var Type14 = class {
     }
     return nodeIsTemplateNotText ? standardTypes.textTemplate : standardTypes.text;
   }
+  /**
+   * По умолчанию литерал шаблона текста имеет тип Текст.
+   *
+   * Литерал переводимого шаблона текста имеет тип ШаблонТекстаПереводимый в следующих случаях:
+   * - если он присваивается в переменную, имеющую тип ШаблонТекстаПереводимый;
+   * - если он присваивается в переменную, имеющую союзный тип, содержащий тип ШаблонТекстаПереводимый
+   *   и не содержащий тип Текст.
+   */
+  ofLocalizableTextTemplateLiteral(node, analysisOptions) {
+    const standardTypes = this.analyzer.getLocalizedStandardTypes(node.locale);
+    let targetType = this.analyzer.getTargetTypeOfExpression(node, analysisOptions);
+    if (targetType !== void 0) {
+      targetType = targetType.unalias();
+    }
+    let nodeIsTemplateNotText;
+    if (targetType === void 0) {
+      nodeIsTemplateNotText = false;
+    } else if (targetType.equals(standardTypes.localizableTextTemplate)) {
+      nodeIsTemplateNotText = true;
+    } else if (targetType.kind === "union") {
+      nodeIsTemplateNotText = targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.localizableTextTemplate)) && !targetType.unaliasedFlattenedTypes.some((t) => t.equals(standardTypes.text));
+    } else {
+      nodeIsTemplateNotText = false;
+    }
+    return nodeIsTemplateNotText ? standardTypes.localizableTextTemplate : standardTypes.text;
+  }
   ofIdentifierExpression(node, analysisOptions) {
     const meaning = this.analyzer.resolveIdentifierExpression(node, analysisOptions);
     switch (meaning.kind) {
@@ -75475,7 +75498,7 @@ var Entity9 = class {
   areIndexedElementAccessorDeclarationsEqual(node1, node2) {
     let areEqual = node1.parameterClause.parameterList.parameters.count() === node2.parameterClause.parameterList.parameters.count();
     if (areEqual) {
-      areEqual = node1.parameterClause.parameterList.parameters.zip(node2.parameterClause.parameterList.parameters, (p1, p2) => this.analyzer.createNameFromIdentifier(p1.name).considerEqual(this.analyzer.createNameFromIdentifier(p2.name), false) && p1.typeAnnotation !== void 0 && p2.typeAnnotation !== void 0 && this.analyzer.type.ofTypeSpecifier(p1.typeAnnotation.typeSpecifier).equals(this.analyzer.type.ofTypeSpecifier(p2.typeAnnotation.typeSpecifier))).all((v) => v);
+      areEqual = node1.parameterClause.parameterList.parameters.zip(node2.parameterClause.parameterList.parameters, (p1, p2) => this.analyzer.createNameFromIdentifier(p1.name).considerEqual(this.analyzer.createNameFromIdentifier(p2.name)) && p1.typeAnnotation !== void 0 && p2.typeAnnotation !== void 0 && this.analyzer.type.ofTypeSpecifier(p1.typeAnnotation.typeSpecifier).equals(this.analyzer.type.ofTypeSpecifier(p2.typeAnnotation.typeSpecifier))).all((v) => v);
     }
     return areEqual;
   }