Version 3.6.0-181.0.dev

Merge f391b0d into dev

pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart

@@ -142,10 +142,11 @@ abstract class AbstractScanner implements Scanner {
 
   final bool inRecoveryOption;
   int recoveryCount = 0;
+  final bool allowLazyStrings;
 
   AbstractScanner(ScannerConfiguration? config, this.includeComments,
       this.languageVersionChanged,
-      {int? numberOfBytesHint})
+      {int? numberOfBytesHint, this.allowLazyStrings = true})
       : lineStarts = new LineStarts(numberOfBytesHint),
         inRecoveryOption = false {
     this.tail = this.tokens;
@@ -159,7 +160,8 @@ abstract class AbstractScanner implements Scanner {
       : lineStarts = [],
         includeComments = false,
         languageVersionChanged = null,
-        inRecoveryOption = true {
+        inRecoveryOption = true,
+        allowLazyStrings = true {
     this.tail = this.tokens;
     this.errorTail = this.tokens;
     this._enableExtensionMethods = copyFrom._enableExtensionMethods;
@@ -265,7 +267,8 @@ abstract class AbstractScanner implements Scanner {
    */
   void appendSubstringToken(TokenType type, int start, bool asciiOnly,
       [int extraOffset = 0]) {
-    appendToken(createSubstringToken(type, start, asciiOnly, extraOffset));
+    appendToken(createSubstringToken(
+        type, start, asciiOnly, extraOffset, allowLazyStrings));
   }
 
   /**
@@ -277,9 +280,8 @@ abstract class AbstractScanner implements Scanner {
    * Note that [extraOffset] can only be used if the covered character(s) are
    * known to be ASCII.
    */
-  analyzer.StringToken createSubstringToken(
-      TokenType type, int start, bool asciiOnly,
-      [int extraOffset = 0]);
+  analyzer.StringToken createSubstringToken(TokenType type, int start,
+      bool asciiOnly, int extraOffset, bool allowLazy);
 
   /**
    * Appends a substring from the scan offset [start] to the current

pkg/_fe_analyzer_shared/lib/src/scanner/scanner.dart

@@ -71,14 +71,16 @@ class ScannerResult {
 ScannerResult scan(Uint8List bytes,
     {ScannerConfiguration? configuration,
     bool includeComments = false,
-    LanguageVersionChanged? languageVersionChanged}) {
+    LanguageVersionChanged? languageVersionChanged,
+    bool allowLazyStrings = true}) {
   if (bytes.last != 0) {
     throw new ArgumentError("[bytes]: the last byte must be 0.");
   }
   Scanner scanner = new Utf8BytesScanner(bytes,
       configuration: configuration,
       includeComments: includeComments,
-      languageVersionChanged: languageVersionChanged);
+      languageVersionChanged: languageVersionChanged,
+      allowLazyStrings: allowLazyStrings);
   return _tokenizeAndRecover(scanner, bytes: bytes);
 }
 

pkg/_fe_analyzer_shared/lib/src/scanner/string_scanner.dart

@@ -86,12 +86,13 @@ class StringScanner extends AbstractScanner {
   void handleUnicode(int startScanOffset) {}
 
   @override
-  analyzer.StringToken createSubstringToken(
-      TokenType type, int start, bool asciiOnly,
-      [int extraOffset = 0]) {
+  analyzer.StringToken createSubstringToken(TokenType type, int start,
+      bool asciiOnly, int extraOffset, bool allowLazy) {
     return new StringTokenImpl.fromSubstring(
         type, string, start, scanOffset + extraOffset, tokenStart,
-        canonicalize: true, precedingComments: comments);
+        canonicalize: true,
+        precedingComments: comments,
+        allowLazyFoo: allowLazy);
   }
 
   @override

pkg/_fe_analyzer_shared/lib/src/scanner/token_impl.dart

@@ -52,10 +52,12 @@ class StringTokenImpl extends SimpleToken implements StringToken {
    */
   StringTokenImpl.fromSubstring(
       TokenType type, String data, int start, int end, int charOffset,
-      {bool canonicalize = false, CommentToken? precedingComments})
+      {bool canonicalize = false,
+      CommentToken? precedingComments,
+      bool allowLazyFoo = true})
       : super(type, charOffset, precedingComments) {
     int length = end - start;
-    if (length <= LAZY_THRESHOLD) {
+    if (!allowLazyFoo || length <= LAZY_THRESHOLD) {
       valueOrLazySubstring = canonicalize
           ? canonicalizeSubString(data, start, end)
           : data.substring(start, end);
@@ -71,10 +73,10 @@ class StringTokenImpl extends SimpleToken implements StringToken {
    */
   StringTokenImpl.fromUtf8Bytes(TokenType type, Uint8List data, int start,
       int end, bool asciiOnly, int charOffset,
-      {CommentToken? precedingComments})
+      {CommentToken? precedingComments, bool allowLazyFoo = true})
       : super(type, charOffset, precedingComments) {
     int length = end - start;
-    if (length <= LAZY_THRESHOLD) {
+    if (!allowLazyFoo || length <= LAZY_THRESHOLD) {
       valueOrLazySubstring =
           canonicalizeUtf8SubString(data, start, end, asciiOnly);
     } else {

pkg/_fe_analyzer_shared/lib/src/scanner/utf8_bytes_scanner.dart

@@ -97,9 +97,11 @@ class Utf8BytesScanner extends AbstractScanner {
   Utf8BytesScanner(this.bytes,
       {ScannerConfiguration? configuration,
       bool includeComments = false,
-      LanguageVersionChanged? languageVersionChanged})
+      LanguageVersionChanged? languageVersionChanged,
+      bool allowLazyStrings = true})
       : super(configuration, includeComments, languageVersionChanged,
-            numberOfBytesHint: bytes.length) {
+            numberOfBytesHint: bytes.length,
+            allowLazyStrings: allowLazyStrings) {
     assert(bytes.last == 0);
     // Skip a leading BOM.
     if (containsBomAt(/* offset = */ 0)) {
@@ -241,12 +243,11 @@ class Utf8BytesScanner extends AbstractScanner {
   }
 
   @override
-  analyzer.StringToken createSubstringToken(
-      TokenType type, int start, bool asciiOnly,
-      [int extraOffset = 0]) {
+  analyzer.StringToken createSubstringToken(TokenType type, int start,
+      bool asciiOnly, int extraOffset, bool allowLazy) {
     return new StringTokenImpl.fromUtf8Bytes(
         type, bytes, start, byteOffset + extraOffset, asciiOnly, tokenStart,
-        precedingComments: comments);
+        precedingComments: comments, allowLazyFoo: allowLazy);
   }
 
   @override

pkg/front_end/lib/src/source/source_loader.dart

@@ -969,7 +969,8 @@ severity: $severity
   Set<SourceCompilationUnit> _unavailableDartLibraries = {};
 
   Future<Token> tokenize(SourceCompilationUnit compilationUnit,
-      {bool suppressLexicalErrors = false}) async {
+      {bool suppressLexicalErrors = false,
+      bool allowLazyStrings = true}) async {
     target.benchmarker
         // Coverage-ignore(suite): Not run.
         ?.beginSubdivide(BenchmarkSubdivides.tokenize);
@@ -1060,7 +1061,7 @@ severity: $severity
           enableExtensionMethods:
               compilationUnit.libraryFeatures.extensionMethods.isEnabled,
           enableNonNullable: true);
-    });
+    }, allowLazyStrings: allowLazyStrings);
     Token token = result.tokens;
     if (!suppressLexicalErrors) {
       List<int> source = getSource(bytes);
@@ -1274,7 +1275,8 @@ severity: $severity
     // second time, and the first time was in [buildOutline] above. So this
     // time we suppress lexical errors.
     SourceCompilationUnit compilationUnit = library.compilationUnit;
-    Token tokens = await tokenize(compilationUnit, suppressLexicalErrors: true);
+    Token tokens = await tokenize(compilationUnit,
+        suppressLexicalErrors: true, allowLazyStrings: false);
 
     if (target.benchmarker != null) {
       // When benchmarking we do extra parsing on it's own to get a timing of
@@ -1310,8 +1312,8 @@ severity: $severity
         allowPatterns: library.libraryFeatures.patterns.isEnabled);
     parser.parseUnit(tokens);
     for (SourceCompilationUnit compilationUnit in library.parts) {
-      Token tokens =
-          await tokenize(compilationUnit, suppressLexicalErrors: true);
+      Token tokens = await tokenize(compilationUnit,
+          suppressLexicalErrors: true, allowLazyStrings: false);
       DietListener listener =
           createDietListener(library, compilationUnit.offsetMap);
       DietParser parser = new DietParser(listener,
@@ -1328,7 +1330,7 @@ severity: $severity
       FunctionNode parameters,
       VariableDeclaration? extensionThis) async {
     Token token = await tokenize(libraryBuilder.compilationUnit,
-        suppressLexicalErrors: false);
+        suppressLexicalErrors: false, allowLazyStrings: false);
     DietListener dietListener = createDietListener(
         libraryBuilder,
         // Expression compilation doesn't build an outline, and thus doesn't

pkg/front_end/lib/src/util/textual_outline.dart

@@ -450,7 +450,7 @@ String? textualOutline(
       ..originalPosition = originalPosition.value++);
     // Coverage-ignore-block(suite): Not run.
     infoForTesting?.languageVersionTokens.add(languageVersionToken);
-  });
+  }, allowLazyStrings: false);
   Token firstToken = scanner.tokenize();
   TextualOutlineListener listener = new TextualOutlineListener();
   ClassMemberParser classMemberParser =

pkg/front_end/test/comments_on_certain_arguments_tool.dart

@@ -401,9 +401,11 @@ class TestSourceLoader extends SourceLoader {
 
   @override
   Future<Token> tokenize(SourceCompilationUnit sourceCompilationUnit,
-      {bool suppressLexicalErrors = false}) async {
+      {bool suppressLexicalErrors = false,
+      bool allowLazyStrings = true}) async {
     Token result = await super.tokenize(sourceCompilationUnit,
-        suppressLexicalErrors: suppressLexicalErrors);
+        suppressLexicalErrors: suppressLexicalErrors,
+        allowLazyStrings: allowLazyStrings);
     cache[sourceCompilationUnit.fileUri] = result;
     return result;
   }