@typescript-deploys/pr-build 5.5.0-pr-58650-7 → 5.5.0-pr-57201-2

package/lib/tsc.js

@@ -9693,25 +9693,19 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   function reScanSlashToken(reportErrors2) {
     if (token === 44 /* SlashToken */ || token === 69 /* SlashEqualsToken */) {
-      let p = tokenStart + 1;
+      const startOfRegExpBody = tokenStart + 1;
+      pos = startOfRegExpBody;
       let inEscape = false;
       let inCharacterClass = false;
       while (true) {
-        if (p >= end) {
-          tokenFlags |= 4 /* Unterminated */;
-          error(Diagnostics.Unterminated_regular_expression_literal);
-          break;
-        }
-        const ch = charCodeUnchecked(p);
-        if (isLineBreak(ch)) {
+        const ch = charCodeChecked(pos);
+        if (ch === -1 /* EOF */ || isLineBreak(ch)) {
           tokenFlags |= 4 /* Unterminated */;
-          error(Diagnostics.Unterminated_regular_expression_literal);
           break;
         }
         if (inEscape) {
           inEscape = false;
         } else if (ch === 47 /* slash */ && !inCharacterClass) {
-          p++;
           break;
         } else if (ch === 91 /* openBracket */) {
           inCharacterClass = true;
@@ -9720,59 +9714,86 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         } else if (ch === 93 /* closeBracket */) {
           inCharacterClass = false;
         }
-        p++;
+        pos++;
       }
-      const isUnterminated = !!(tokenFlags & 4 /* Unterminated */);
-      const endOfBody = p - (isUnterminated ? 0 : 1);
-      let regExpFlags = 0 /* None */;
-      while (p < end) {
-        const ch = charCodeUnchecked(p);
-        if (!isIdentifierPart(ch, languageVersion)) {
-          break;
+      const endOfRegExpBody = pos;
+      if (tokenFlags & 4 /* Unterminated */) {
+        pos = startOfRegExpBody;
+        inEscape = false;
+        let characterClassDepth = 0;
+        let inDecimalQuantifier = false;
+        let groupDepth = 0;
+        while (pos < endOfRegExpBody) {
+          const ch = charCodeUnchecked(pos);
+          if (inEscape) {
+            inEscape = false;
+          } else if (ch === 92 /* backslash */) {
+            inEscape = true;
+          } else if (ch === 91 /* openBracket */) {
+            characterClassDepth++;
+          } else if (ch === 93 /* closeBracket */ && characterClassDepth) {
+            characterClassDepth--;
+          } else if (!characterClassDepth) {
+            if (ch === 123 /* openBrace */) {
+              inDecimalQuantifier = true;
+            } else if (ch === 125 /* closeBrace */ && inDecimalQuantifier) {
+              inDecimalQuantifier = false;
+            } else if (!inDecimalQuantifier) {
+              if (ch === 40 /* openParen */) {
+                groupDepth++;
+              } else if (ch === 41 /* closeParen */ && groupDepth) {
+                groupDepth--;
+              } else if (ch === 41 /* closeParen */ || ch === 93 /* closeBracket */ || ch === 125 /* closeBrace */) {
+                break;
+              }
+            }
+          }
+          pos++;
         }
-        if (reportErrors2) {
-          const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
-          if (flag === void 0) {
-            error(Diagnostics.Unknown_regular_expression_flag, p, 1);
-          } else if (regExpFlags & flag) {
-            error(Diagnostics.Duplicate_regular_expression_flag, p, 1);
-          } else if (((regExpFlags | flag) & 96 /* UnicodeMode */) === 96 /* UnicodeMode */) {
-            error(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, p, 1);
-          } else {
-            regExpFlags |= flag;
-            checkRegularExpressionFlagAvailable(flag, p);
+        while (isWhiteSpaceLike(charCodeChecked(pos - 1)) || charCodeChecked(pos - 1) === 59 /* semicolon */) pos--;
+        error(Diagnostics.Unterminated_regular_expression_literal, tokenStart, pos - tokenStart);
+      } else {
+        pos++;
+        let regExpFlags = 0 /* None */;
+        while (true) {
+          const ch = codePointChecked(pos);
+          if (ch === -1 /* EOF */ || !isIdentifierPart(ch, languageVersion)) {
+            break;
           }
+          if (reportErrors2) {
+            const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
+            if (flag === void 0) {
+              error(Diagnostics.Unknown_regular_expression_flag, pos, 1);
+            } else if (regExpFlags & flag) {
+              error(Diagnostics.Duplicate_regular_expression_flag, pos, 1);
+            } else if (((regExpFlags | flag) & 96 /* AnyUnicodeMode */) === 96 /* AnyUnicodeMode */) {
+              error(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, pos, 1);
+            } else {
+              regExpFlags |= flag;
+              checkRegularExpressionFlagAvailable(flag, pos);
+            }
+          }
+          pos++;
+        }
+        if (reportErrors2) {
+          scanRange(startOfRegExpBody, endOfRegExpBody - startOfRegExpBody, () => {
+            scanRegularExpressionWorker(
+              regExpFlags,
+              /*annexB*/
+              true
+            );
+          });
         }
-        p++;
-      }
-      pos = p;
-      if (reportErrors2) {
-        const saveTokenStart = tokenStart;
-        const saveTokenFlags = tokenFlags;
-        const savePos = pos;
-        const saveEnd = end;
-        pos = tokenStart + 1;
-        end = endOfBody;
-        scanRegularExpressionWorker(
-          regExpFlags,
-          isUnterminated,
-          /*annexB*/
-          true
-        );
-        tokenStart = saveTokenStart;
-        tokenFlags = saveTokenFlags;
-        pos = savePos;
-        end = saveEnd;
       }
       tokenValue = text.substring(tokenStart, pos);
       token = 14 /* RegularExpressionLiteral */;
     }
     return token;
   }
-  function scanRegularExpressionWorker(regExpFlags, isUnterminated, annexB) {
+  function scanRegularExpressionWorker(regExpFlags, annexB) {
     var unicodeSetsMode = !!(regExpFlags & 64 /* UnicodeSets */);
-    var unicodeMode = !!(regExpFlags & 96 /* UnicodeMode */);
-    if (unicodeMode) {
+    var anyUnicodeMode = !!(regExpFlags & 96 /* AnyUnicodeMode */);
+    if (anyUnicodeMode) {
       annexB = false;
     }
     var mayContainStrings = false;
@@ -9891,7 +9912,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
                 if (max || charCodeChecked(pos) === 125 /* closeBrace */) {
                   error(Diagnostics.Incomplete_quantifier_Digit_expected, digitsStart, 0);
                 } else {
-                  if (unicodeMode) {
+                  if (anyUnicodeMode) {
                     error(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, start2, 1, String.fromCharCode(ch));
                   }
                   isPreviousTermQuantifiable = true;
@@ -9902,7 +9923,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
                 error(Diagnostics.Numbers_out_of_order_in_quantifier, digitsStart, pos - digitsStart);
               }
             } else if (!min2) {
-              if (unicodeMode) {
+              if (anyUnicodeMode) {
                 error(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, start2, 1, String.fromCharCode(ch));
               }
               isPreviousTermQuantifiable = true;
@@ -9942,10 +9963,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             }
           case 93 /* closeBracket */:
           case 125 /* closeBrace */:
-            if (isUnterminated && !isInGroup) {
-              return;
-            }
-            if (unicodeMode || ch === 41 /* closeParen */) {
+            if (anyUnicodeMode || ch === 41 /* closeParen */) {
               error(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, pos, 1, String.fromCharCode(ch));
             }
             pos++;
@@ -9994,7 +10012,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
               true
             );
             scanExpectedChar(62 /* greaterThan */);
-          } else if (unicodeMode) {
+          } else if (anyUnicodeMode) {
             error(Diagnostics.k_must_be_followed_by_a_capturing_group_name_enclosed_in_angle_brackets, pos - 2, 2);
           }
           break;
@@ -10027,6 +10045,9 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       Debug.assertEqual(charCodeUnchecked(pos - 1), 92 /* backslash */);
       let ch = charCodeChecked(pos);
       switch (ch) {
+        case -1 /* EOF */:
+          error(Diagnostics.Undetermined_character_escape, pos - 1, 1);
+          return "\\";
         case 99 /* c */:
           pos++;
           ch = charCodeChecked(pos);
@@ -10034,7 +10055,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             pos++;
             return String.fromCharCode(ch & 31);
           }
-          if (unicodeMode) {
+          if (anyUnicodeMode) {
             error(Diagnostics.c_must_be_followed_by_an_ASCII_letter, pos - 2, 2);
           } else if (atomEscape && annexB) {
             pos--;
@@ -10059,14 +10080,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
           pos++;
           return String.fromCharCode(ch);
         default:
-          if (pos >= end) {
-            error(Diagnostics.Undetermined_character_escape, pos - 1, 1);
-            return "\\";
-          }
           pos--;
           return scanEscapeSequence(
             /*shouldEmitInvalidEscapeError*/
-            unicodeMode,
+            anyUnicodeMode,
             /*isRegularExpression*/
             annexB ? "annex-b" : true
           );
@@ -10542,10 +10559,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
               }
             }
             scanExpectedChar(125 /* closeBrace */);
-            if (!unicodeMode) {
+            if (!anyUnicodeMode) {
               error(Diagnostics.Unicode_property_value_expressions_are_only_available_when_the_Unicode_u_flag_or_the_Unicode_Sets_v_flag_is_set, start2, pos - start2);
             }
-          } else if (unicodeMode) {
+          } else if (anyUnicodeMode) {
             error(Diagnostics._0_must_be_followed_by_a_Unicode_property_value_expression_enclosed_in_braces, pos - 2, 2, String.fromCharCode(ch));
           }
           return true;
@@ -10565,7 +10582,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       return value;
     }
     function scanSourceCharacter() {
-      const size = unicodeMode ? charSize(charCodeChecked(pos)) : 1;
+      const size = anyUnicodeMode ? charSize(charCodeChecked(pos)) : 1;
       pos += size;
       return size > 0 ? text.substring(pos - size, pos) : "";
     }
@@ -28415,10 +28432,7 @@ var Parser;
   function parseErrorAtPosition(start, length2, message, ...args) {
     const lastError = lastOrUndefined(parseDiagnostics);
     let result;
-    if (message.category === 3 /* Message */ && lastError && start === lastError.start && length2 === lastError.length) {
-      result = createDetachedDiagnostic(fileName, sourceText, start, length2, message, ...args);
-      addRelatedInfo(lastError, result);
-    } else if (!lastError || start !== lastError.start) {
+    if (!lastError || start !== lastError.start) {
       result = createDetachedDiagnostic(fileName, sourceText, start, length2, message, ...args);
       parseDiagnostics.push(result);
     }
@@ -65733,17 +65747,12 @@ function createTypeChecker(host) {
     }
   }
   function applyToReturnTypes(source, target, callback) {
+    const sourceTypePredicate = getTypePredicateOfSignature(source);
     const targetTypePredicate = getTypePredicateOfSignature(target);
-    if (targetTypePredicate) {
-      const sourceTypePredicate = getTypePredicateOfSignature(source);
-      if (sourceTypePredicate && typePredicateKindsMatch(sourceTypePredicate, targetTypePredicate) && sourceTypePredicate.type && targetTypePredicate.type) {
-        callback(sourceTypePredicate.type, targetTypePredicate.type);
-        return;
-      }
-    }
-    const targetReturnType = getReturnTypeOfSignature(target);
-    if (couldContainTypeVariables(targetReturnType)) {
-      callback(getReturnTypeOfSignature(source), targetReturnType);
+    if (sourceTypePredicate && targetTypePredicate && typePredicateKindsMatch(sourceTypePredicate, targetTypePredicate) && sourceTypePredicate.type && targetTypePredicate.type) {
+      callback(sourceTypePredicate.type, targetTypePredicate.type);
+    } else {
+      callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
     }
   }
   function createInferenceContext(typeParameters, signature, flags, compareTypes) {

package/lib/typescript.js

@@ -6200,7 +6200,7 @@ var RegularExpressionFlags = /* @__PURE__ */ ((RegularExpressionFlags2) => {
   RegularExpressionFlags2[RegularExpressionFlags2["Unicode"] = 32] = "Unicode";
   RegularExpressionFlags2[RegularExpressionFlags2["UnicodeSets"] = 64] = "UnicodeSets";
   RegularExpressionFlags2[RegularExpressionFlags2["Sticky"] = 128] = "Sticky";
-  RegularExpressionFlags2[RegularExpressionFlags2["UnicodeMode"] = 96] = "UnicodeMode";
+  RegularExpressionFlags2[RegularExpressionFlags2["AnyUnicodeMode"] = 96] = "AnyUnicodeMode";
   RegularExpressionFlags2[RegularExpressionFlags2["Modifiers"] = 28] = "Modifiers";
   return RegularExpressionFlags2;
 })(RegularExpressionFlags || {});
@@ -13326,25 +13326,19 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   }
   function reScanSlashToken(reportErrors2) {
     if (token === 44 /* SlashToken */ || token === 69 /* SlashEqualsToken */) {
-      let p = tokenStart + 1;
+      const startOfRegExpBody = tokenStart + 1;
+      pos = startOfRegExpBody;
       let inEscape = false;
       let inCharacterClass = false;
       while (true) {
-        if (p >= end) {
-          tokenFlags |= 4 /* Unterminated */;
-          error2(Diagnostics.Unterminated_regular_expression_literal);
-          break;
-        }
-        const ch = charCodeUnchecked(p);
-        if (isLineBreak(ch)) {
+        const ch = charCodeChecked(pos);
+        if (ch === -1 /* EOF */ || isLineBreak(ch)) {
           tokenFlags |= 4 /* Unterminated */;
-          error2(Diagnostics.Unterminated_regular_expression_literal);
           break;
         }
         if (inEscape) {
           inEscape = false;
         } else if (ch === 47 /* slash */ && !inCharacterClass) {
-          p++;
           break;
         } else if (ch === 91 /* openBracket */) {
           inCharacterClass = true;
@@ -13353,59 +13347,86 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         } else if (ch === 93 /* closeBracket */) {
           inCharacterClass = false;
         }
-        p++;
+        pos++;
       }
-      const isUnterminated = !!(tokenFlags & 4 /* Unterminated */);
-      const endOfBody = p - (isUnterminated ? 0 : 1);
-      let regExpFlags = 0 /* None */;
-      while (p < end) {
-        const ch = charCodeUnchecked(p);
-        if (!isIdentifierPart(ch, languageVersion)) {
-          break;
+      const endOfRegExpBody = pos;
+      if (tokenFlags & 4 /* Unterminated */) {
+        pos = startOfRegExpBody;
+        inEscape = false;
+        let characterClassDepth = 0;
+        let inDecimalQuantifier = false;
+        let groupDepth = 0;
+        while (pos < endOfRegExpBody) {
+          const ch = charCodeUnchecked(pos);
+          if (inEscape) {
+            inEscape = false;
+          } else if (ch === 92 /* backslash */) {
+            inEscape = true;
+          } else if (ch === 91 /* openBracket */) {
+            characterClassDepth++;
+          } else if (ch === 93 /* closeBracket */ && characterClassDepth) {
+            characterClassDepth--;
+          } else if (!characterClassDepth) {
+            if (ch === 123 /* openBrace */) {
+              inDecimalQuantifier = true;
+            } else if (ch === 125 /* closeBrace */ && inDecimalQuantifier) {
+              inDecimalQuantifier = false;
+            } else if (!inDecimalQuantifier) {
+              if (ch === 40 /* openParen */) {
+                groupDepth++;
+              } else if (ch === 41 /* closeParen */ && groupDepth) {
+                groupDepth--;
+              } else if (ch === 41 /* closeParen */ || ch === 93 /* closeBracket */ || ch === 125 /* closeBrace */) {
+                break;
+              }
+            }
+          }
+          pos++;
         }
-        if (reportErrors2) {
-          const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
-          if (flag === void 0) {
-            error2(Diagnostics.Unknown_regular_expression_flag, p, 1);
-          } else if (regExpFlags & flag) {
-            error2(Diagnostics.Duplicate_regular_expression_flag, p, 1);
-          } else if (((regExpFlags | flag) & 96 /* UnicodeMode */) === 96 /* UnicodeMode */) {
-            error2(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, p, 1);
-          } else {
-            regExpFlags |= flag;
-            checkRegularExpressionFlagAvailable(flag, p);
+        while (isWhiteSpaceLike(charCodeChecked(pos - 1)) || charCodeChecked(pos - 1) === 59 /* semicolon */) pos--;
+        error2(Diagnostics.Unterminated_regular_expression_literal, tokenStart, pos - tokenStart);
+      } else {
+        pos++;
+        let regExpFlags = 0 /* None */;
+        while (true) {
+          const ch = codePointChecked(pos);
+          if (ch === -1 /* EOF */ || !isIdentifierPart(ch, languageVersion)) {
+            break;
           }
+          if (reportErrors2) {
+            const flag = characterToRegularExpressionFlag(String.fromCharCode(ch));
+            if (flag === void 0) {
+              error2(Diagnostics.Unknown_regular_expression_flag, pos, 1);
+            } else if (regExpFlags & flag) {
+              error2(Diagnostics.Duplicate_regular_expression_flag, pos, 1);
+            } else if (((regExpFlags | flag) & 96 /* AnyUnicodeMode */) === 96 /* AnyUnicodeMode */) {
+              error2(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, pos, 1);
+            } else {
+              regExpFlags |= flag;
+              checkRegularExpressionFlagAvailable(flag, pos);
+            }
+          }
+          pos++;
+        }
+        if (reportErrors2) {
+          scanRange(startOfRegExpBody, endOfRegExpBody - startOfRegExpBody, () => {
+            scanRegularExpressionWorker(
+              regExpFlags,
+              /*annexB*/
+              true
+            );
+          });
         }
-        p++;
-      }
-      pos = p;
-      if (reportErrors2) {
-        const saveTokenStart = tokenStart;
-        const saveTokenFlags = tokenFlags;
-        const savePos = pos;
-        const saveEnd = end;
-        pos = tokenStart + 1;
-        end = endOfBody;
-        scanRegularExpressionWorker(
-          regExpFlags,
-          isUnterminated,
-          /*annexB*/
-          true
-        );
-        tokenStart = saveTokenStart;
-        tokenFlags = saveTokenFlags;
-        pos = savePos;
-        end = saveEnd;
       }
       tokenValue = text.substring(tokenStart, pos);
       token = 14 /* RegularExpressionLiteral */;
     }
     return token;
   }
-  function scanRegularExpressionWorker(regExpFlags, isUnterminated, annexB) {
+  function scanRegularExpressionWorker(regExpFlags, annexB) {
     var unicodeSetsMode = !!(regExpFlags & 64 /* UnicodeSets */);
-    var unicodeMode = !!(regExpFlags & 96 /* UnicodeMode */);
-    if (unicodeMode) {
+    var anyUnicodeMode = !!(regExpFlags & 96 /* AnyUnicodeMode */);
+    if (anyUnicodeMode) {
       annexB = false;
     }
     var mayContainStrings = false;
@@ -13524,7 +13545,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
                 if (max || charCodeChecked(pos) === 125 /* closeBrace */) {
                   error2(Diagnostics.Incomplete_quantifier_Digit_expected, digitsStart, 0);
                 } else {
-                  if (unicodeMode) {
+                  if (anyUnicodeMode) {
                     error2(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, start2, 1, String.fromCharCode(ch));
                   }
                   isPreviousTermQuantifiable = true;
@@ -13535,7 +13556,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
                 error2(Diagnostics.Numbers_out_of_order_in_quantifier, digitsStart, pos - digitsStart);
               }
             } else if (!min2) {
-              if (unicodeMode) {
+              if (anyUnicodeMode) {
                 error2(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, start2, 1, String.fromCharCode(ch));
               }
               isPreviousTermQuantifiable = true;
@@ -13575,10 +13596,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             }
           case 93 /* closeBracket */:
           case 125 /* closeBrace */:
-            if (isUnterminated && !isInGroup) {
-              return;
-            }
-            if (unicodeMode || ch === 41 /* closeParen */) {
+            if (anyUnicodeMode || ch === 41 /* closeParen */) {
               error2(Diagnostics.Unexpected_0_Did_you_mean_to_escape_it_with_backslash, pos, 1, String.fromCharCode(ch));
             }
             pos++;
@@ -13627,7 +13645,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
               true
             );
             scanExpectedChar(62 /* greaterThan */);
-          } else if (unicodeMode) {
+          } else if (anyUnicodeMode) {
             error2(Diagnostics.k_must_be_followed_by_a_capturing_group_name_enclosed_in_angle_brackets, pos - 2, 2);
           }
           break;
@@ -13660,6 +13678,9 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       Debug.assertEqual(charCodeUnchecked(pos - 1), 92 /* backslash */);
       let ch = charCodeChecked(pos);
       switch (ch) {
+        case -1 /* EOF */:
+          error2(Diagnostics.Undetermined_character_escape, pos - 1, 1);
+          return "\\";
         case 99 /* c */:
           pos++;
           ch = charCodeChecked(pos);
@@ -13667,7 +13688,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             pos++;
             return String.fromCharCode(ch & 31);
           }
-          if (unicodeMode) {
+          if (anyUnicodeMode) {
             error2(Diagnostics.c_must_be_followed_by_an_ASCII_letter, pos - 2, 2);
           } else if (atomEscape && annexB) {
             pos--;
@@ -13692,14 +13713,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
           pos++;
           return String.fromCharCode(ch);
         default:
-          if (pos >= end) {
-            error2(Diagnostics.Undetermined_character_escape, pos - 1, 1);
-            return "\\";
-          }
           pos--;
           return scanEscapeSequence(
             /*shouldEmitInvalidEscapeError*/
-            unicodeMode,
+            anyUnicodeMode,
             /*isRegularExpression*/
             annexB ? "annex-b" : true
           );
@@ -14175,10 +14192,10 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
               }
             }
             scanExpectedChar(125 /* closeBrace */);
-            if (!unicodeMode) {
+            if (!anyUnicodeMode) {
               error2(Diagnostics.Unicode_property_value_expressions_are_only_available_when_the_Unicode_u_flag_or_the_Unicode_Sets_v_flag_is_set, start2, pos - start2);
             }
-          } else if (unicodeMode) {
+          } else if (anyUnicodeMode) {
             error2(Diagnostics._0_must_be_followed_by_a_Unicode_property_value_expression_enclosed_in_braces, pos - 2, 2, String.fromCharCode(ch));
           }
           return true;
@@ -14198,7 +14215,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       return value;
     }
     function scanSourceCharacter() {
-      const size = unicodeMode ? charSize(charCodeChecked(pos)) : 1;
+      const size = anyUnicodeMode ? charSize(charCodeChecked(pos)) : 1;
       pos += size;
       return size > 0 ? text.substring(pos - size, pos) : "";
     }
@@ -32861,10 +32878,7 @@ var Parser;
   function parseErrorAtPosition(start, length2, message, ...args) {
     const lastError = lastOrUndefined(parseDiagnostics);
     let result;
-    if (message.category === 3 /* Message */ && lastError && start === lastError.start && length2 === lastError.length) {
-      result = createDetachedDiagnostic(fileName, sourceText, start, length2, message, ...args);
-      addRelatedInfo(lastError, result);
-    } else if (!lastError || start !== lastError.start) {
+    if (!lastError || start !== lastError.start) {
       result = createDetachedDiagnostic(fileName, sourceText, start, length2, message, ...args);
       parseDiagnostics.push(result);
     }
@@ -70528,17 +70542,12 @@ function createTypeChecker(host) {
     }
   }
   function applyToReturnTypes(source, target, callback) {
+    const sourceTypePredicate = getTypePredicateOfSignature(source);
     const targetTypePredicate = getTypePredicateOfSignature(target);
-    if (targetTypePredicate) {
-      const sourceTypePredicate = getTypePredicateOfSignature(source);
-      if (sourceTypePredicate && typePredicateKindsMatch(sourceTypePredicate, targetTypePredicate) && sourceTypePredicate.type && targetTypePredicate.type) {
-        callback(sourceTypePredicate.type, targetTypePredicate.type);
-        return;
-      }
-    }
-    const targetReturnType = getReturnTypeOfSignature(target);
-    if (couldContainTypeVariables(targetReturnType)) {
-      callback(getReturnTypeOfSignature(source), targetReturnType);
+    if (sourceTypePredicate && targetTypePredicate && typePredicateKindsMatch(sourceTypePredicate, targetTypePredicate) && sourceTypePredicate.type && targetTypePredicate.type) {
+      callback(sourceTypePredicate.type, targetTypePredicate.type);
+    } else {
+      callback(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
     }
   }
   function createInferenceContext(typeParameters, signature, flags, compareTypes) {
@@ -167606,7 +167615,7 @@ function entryToDocumentSpan(entry) {
   }
 }
 function getPrefixAndSuffixText(entry, originalNode, checker, quotePreference) {
-  if (entry.kind !== 0 /* Span */ && isIdentifier(originalNode)) {
+  if (entry.kind !== 0 /* Span */ && (isIdentifier(originalNode) || isStringLiteralLike(originalNode))) {
     const { node, kind } = entry;
     const parent2 = node.parent;
     const name = originalNode.text;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.5.0-pr-58650-7",
+  "version": "5.5.0-pr-57201-2",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [