Version 2.18.0-35.0.dev

Merge commit 'fec466e3fe726060d411bc0dc2ed5ae5977a2ab1' into 'dev'

Author: Dart CI

DEPS

@@ -39,7 +39,7 @@ vars = {
 
   # Checked-in SDK version. The checked-in SDK is a Dart SDK distribution in a
   # cipd package used to run Dart scripts in the build and test infrastructure.
-  "sdk_tag": "version:2.16.2",
+  "sdk_tag": "version:2.17.0-266.1.beta",
 
   # co19 is a cipd package. Use update.sh in tests/co19[_2] to update these
   # hashes. It requires access to the dart-build-access group, which EngProd

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

@@ -9,7 +9,15 @@ import 'dart:collection' show ListMixin;
 import 'dart:typed_data' show Uint16List, Uint32List;
 
 import 'token.dart'
-    show BeginToken, Keyword, KeywordToken, SyntheticToken, Token, TokenType;
+    show
+        BeginToken,
+        CommentToken,
+        Keyword,
+        KeywordToken,
+        LanguageVersionToken,
+        SyntheticToken,
+        Token,
+        TokenType;
 
 import 'token.dart' as analyzer show StringToken;
 
@@ -34,8 +42,7 @@ import 'error_token.dart'
 
 import 'keyword_state.dart' show KeywordState;
 
-import 'token_impl.dart'
-    show CommentToken, DartDocToken, LanguageVersionToken, StringToken;
+import 'token_impl.dart' show DartDocToken, StringTokenImpl;
 
 import 'token_constants.dart';
 
@@ -570,11 +577,9 @@ abstract class AbstractScanner implements Scanner {
       {
         AbstractScanner option1 = createRecoveryOptionScanner();
         option1.insertSyntheticClosers(originalStack, groupingStack);
-        option1Recoveries =
-            option1.recoveryOptionTokenizer(option1.appendEndGroupInternal(
-                /* foundMatchingBrace = */ true,
-                type,
-                openKind));
+        option1Recoveries = option1.recoveryOptionTokenizer(
+            option1.appendEndGroupInternal(
+                /* foundMatchingBrace = */ true, type, openKind));
         option1Recoveries += option1.groupingStack.slowLength();
       }
 
@@ -583,11 +588,9 @@ abstract class AbstractScanner implements Scanner {
       {
         AbstractScanner option2 = createRecoveryOptionScanner();
         option2.groupingStack = originalStack;
-        option2Recoveries =
-            option2.recoveryOptionTokenizer(option2.appendEndGroupInternal(
-                /* foundMatchingBrace = */ false,
-                type,
-                openKind));
+        option2Recoveries = option2.recoveryOptionTokenizer(
+            option2.appendEndGroupInternal(
+                /* foundMatchingBrace = */ false, type, openKind));
         // We add 1 to make this option pay for ignoring this token.
         option2Recoveries += option2.groupingStack.slowLength() + 1;
       }
@@ -1914,7 +1917,7 @@ abstract class AbstractScanner implements Scanner {
         codeUnits.add(next);
         next = advance();
       }
-      appendToken(new StringToken.fromString(
+      appendToken(new StringTokenImpl.fromString(
           TokenType.IDENTIFIER, new String.fromCharCodes(codeUnits), charOffset,
           precedingComments: comments));
       return next;

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

@@ -6,7 +6,7 @@ library _fe_analyzer_shared.scanner.recover;
 
 import 'token.dart' show Token, TokenType;
 
-import 'token_impl.dart' show StringToken;
+import 'token_impl.dart' show StringTokenImpl;
 
 import 'error_token.dart' show ErrorToken;
 
@@ -49,7 +49,7 @@ Token scannerRecovery(List<int> bytes, Token tokens, List<int> lineStarts) {
 }
 
 Token synthesizeToken(int charOffset, String value, TokenType type) {
-  return new StringToken.fromString(type, value, charOffset);
+  return new StringTokenImpl.fromString(type, value, charOffset);
 }
 
 Token skipToEof(Token token) {

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

@@ -22,8 +22,7 @@ export 'abstract_scanner.dart'
 
 export 'token_impl.dart'
     show
-        LanguageVersionToken,
-        StringToken,
+        StringTokenImpl,
         isBinaryOperator,
         isMinusOperator,
         isTernaryOperator,
@@ -32,7 +31,7 @@ export 'token_impl.dart'
 
 export 'error_token.dart' show ErrorToken, buildUnexpectedCharacterToken;
 
-export 'token_impl.dart' show LanguageVersionToken;
+export 'token.dart' show LanguageVersionToken;
 
 export 'token_constants.dart' show EOF_TOKEN;
 

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

@@ -4,15 +4,25 @@
 
 library dart2js.scanner.string_scanner;
 
-import 'token.dart' show Token, SyntheticStringToken, TokenType;
+import 'token.dart'
+    show
+        CommentToken,
+        LanguageVersionToken,
+        SyntheticStringToken,
+        Token,
+        TokenType;
 
 import 'token.dart' as analyzer show StringToken;
 
 import 'abstract_scanner.dart'
     show AbstractScanner, LanguageVersionChanged, ScannerConfiguration;
 
 import 'token_impl.dart'
-    show CommentToken, DartDocToken, LanguageVersionToken, StringToken;
+    show
+        CommentTokenImpl,
+        DartDocToken,
+        LanguageVersionTokenImpl,
+        StringTokenImpl;
 
 import 'error_token.dart' show ErrorToken;
 
@@ -69,7 +79,7 @@ class StringScanner extends AbstractScanner {
   analyzer.StringToken createSubstringToken(
       TokenType type, int start, bool asciiOnly,
       [int extraOffset = 0]) {
-    return new StringToken.fromSubstring(
+    return new StringTokenImpl.fromSubstring(
         type, string, start, scanOffset + extraOffset, tokenStart,
         canonicalize: true, precedingComments: comments);
   }
@@ -85,7 +95,7 @@ class StringScanner extends AbstractScanner {
   @override
   CommentToken createCommentToken(TokenType type, int start, bool asciiOnly,
       [int extraOffset = 0]) {
-    return new CommentToken.fromSubstring(
+    return new CommentTokenImpl.fromSubstring(
         type, string, start, scanOffset + extraOffset, tokenStart,
         canonicalize: true);
   }
@@ -101,7 +111,7 @@ class StringScanner extends AbstractScanner {
   @override
   LanguageVersionToken createLanguageVersionToken(
       int start, int major, int minor) {
-    return new LanguageVersionToken.fromSubstring(
+    return new LanguageVersionTokenImpl.fromSubstring(
         string, start, scanOffset, tokenStart, major, minor,
         canonicalize: true);
   }

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

@@ -4,8 +4,14 @@
 
 library _fe_analyzer_shared.scanner.token;
 
-import 'token.dart' as analyzer;
-import 'token.dart' show TokenType;
+import 'token.dart'
+    show
+        DocumentationCommentToken,
+        SimpleToken,
+        TokenType,
+        CommentToken,
+        StringToken,
+        LanguageVersionToken;
 
 import 'token_constants.dart' show IDENTIFIER_TOKEN;
 
@@ -16,7 +22,7 @@ import 'string_canonicalizer.dart';
  * number literals, comments, and error tokens, using the corresponding
  * precedence info.
  */
-class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
+class StringTokenImpl extends SimpleToken implements StringToken {
   /**
    * The length threshold above which substring tokens are computed lazily.
    *
@@ -33,8 +39,8 @@ class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
    * Creates a non-lazy string token. If [canonicalize] is true, the string
    * is canonicalized before the token is created.
    */
-  StringToken.fromString(TokenType type, String value, int charOffset,
-      {bool canonicalize: false, analyzer.CommentToken? precedingComments})
+  StringTokenImpl.fromString(TokenType type, String value, int charOffset,
+      {bool canonicalize: false, CommentToken? precedingComments})
       : valueOrLazySubstring = canonicalizedString(
             value, /* start = */ 0, value.length, canonicalize),
         super(type, charOffset, precedingComments);
@@ -43,9 +49,9 @@ class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
    * Creates a lazy string token. If [canonicalize] is true, the string
    * is canonicalized before the token is created.
    */
-  StringToken.fromSubstring(
+  StringTokenImpl.fromSubstring(
       TokenType type, String data, int start, int end, int charOffset,
-      {bool canonicalize: false, analyzer.CommentToken? precedingComments})
+      {bool canonicalize: false, CommentToken? precedingComments})
       : super(type, charOffset, precedingComments) {
     int length = end - start;
     if (length <= LAZY_THRESHOLD) {
@@ -61,9 +67,9 @@ class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
    * Creates a lazy string token. If [asciiOnly] is false, the byte array
    * is passed through a UTF-8 decoder.
    */
-  StringToken.fromUtf8Bytes(TokenType type, List<int> data, int start, int end,
-      bool asciiOnly, int charOffset,
-      {analyzer.CommentToken? precedingComments})
+  StringTokenImpl.fromUtf8Bytes(TokenType type, List<int> data, int start,
+      int end, bool asciiOnly, int charOffset,
+      {CommentToken? precedingComments})
       : super(type, charOffset, precedingComments) {
     int length = end - start;
     if (length <= LAZY_THRESHOLD) {
@@ -73,10 +79,6 @@ class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
     }
   }
 
-  StringToken._(TokenType type, this.valueOrLazySubstring, int charOffset,
-      [analyzer.CommentToken? precedingComments])
-      : super(type, charOffset, precedingComments);
-
   @override
   String get lexeme {
     if (valueOrLazySubstring is String) {
@@ -119,28 +121,15 @@ class StringToken extends analyzer.SimpleToken implements analyzer.StringToken {
   String value() => lexeme;
 }
 
-/**
- * A String-valued token that does not exist in the original source.
- */
-class SyntheticStringToken extends StringToken
-    implements analyzer.SyntheticStringToken {
-  SyntheticStringToken(TokenType type, String value, int offset,
-      [analyzer.CommentToken? precedingComments])
-      : super._(type, value, offset, precedingComments);
-
-  @override
-  int get length => 0;
-}
-
-class CommentToken extends StringToken implements analyzer.CommentToken {
+class CommentTokenImpl extends StringTokenImpl implements CommentToken {
   @override
-  analyzer.SimpleToken? parent;
+  SimpleToken? parent;
 
   /**
    * Creates a lazy comment token. If [canonicalize] is true, the string
    * is canonicalized before the token is created.
    */
-  CommentToken.fromSubstring(
+  CommentTokenImpl.fromSubstring(
       TokenType type, String data, int start, int end, int charOffset,
       {bool canonicalize: false})
       : super.fromSubstring(type, data, start, end, charOffset,
@@ -149,44 +138,44 @@ class CommentToken extends StringToken implements analyzer.CommentToken {
   /**
    * Creates a non-lazy comment token.
    */
-  CommentToken.fromString(TokenType type, String lexeme, int charOffset)
+  CommentTokenImpl.fromString(TokenType type, String lexeme, int charOffset)
       : super.fromString(type, lexeme, charOffset);
 
   /**
    * Creates a lazy string token. If [asciiOnly] is false, the byte array
    * is passed through a UTF-8 decoder.
    */
-  CommentToken.fromUtf8Bytes(TokenType type, List<int> data, int start, int end,
-      bool asciiOnly, int charOffset)
+  CommentTokenImpl.fromUtf8Bytes(TokenType type, List<int> data, int start,
+      int end, bool asciiOnly, int charOffset)
       : super.fromUtf8Bytes(type, data, start, end, asciiOnly, charOffset);
 }
 
-class LanguageVersionToken extends CommentToken
-    implements analyzer.LanguageVersionToken {
+class LanguageVersionTokenImpl extends CommentTokenImpl
+    implements LanguageVersionToken {
   @override
   int major;
 
   @override
   int minor;
 
-  LanguageVersionToken.from(String text, int offset, this.major, this.minor)
+  LanguageVersionTokenImpl.from(String text, int offset, this.major, this.minor)
       : super.fromString(TokenType.SINGLE_LINE_COMMENT, text, offset);
 
-  LanguageVersionToken.fromSubstring(
+  LanguageVersionTokenImpl.fromSubstring(
       String string, int start, int end, int tokenStart, this.major, this.minor,
       {bool canonicalize: false})
       : super.fromSubstring(
             TokenType.SINGLE_LINE_COMMENT, string, start, end, tokenStart,
             canonicalize: canonicalize);
 
-  LanguageVersionToken.fromUtf8Bytes(List<int> bytes, int start, int end,
+  LanguageVersionTokenImpl.fromUtf8Bytes(List<int> bytes, int start, int end,
       int tokenStart, this.major, this.minor)
       : super.fromUtf8Bytes(
             TokenType.SINGLE_LINE_COMMENT, bytes, start, end, true, tokenStart);
 }
 
-class DartDocToken extends CommentToken
-    implements analyzer.DocumentationCommentToken {
+class DartDocToken extends CommentTokenImpl
+    implements DocumentationCommentToken {
   /**
    * Creates a lazy comment token. If [canonicalize] is true, the string
    * is canonicalized before the token is created.

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

@@ -6,17 +6,21 @@ library _fe_analyzer_shared.scanner.utf8_bytes_scanner;
 
 import 'dart:convert' show unicodeBomCharacterRune, utf8;
 
-import 'token.dart' show SyntheticStringToken, TokenType;
+import 'token.dart' show LanguageVersionToken, SyntheticStringToken, TokenType;
 
-import 'token.dart' as analyzer show StringToken;
+import 'token.dart' as analyzer;
 
 import 'scanner.dart' show unicodeReplacementCharacter;
 
 import 'abstract_scanner.dart'
     show AbstractScanner, LanguageVersionChanged, ScannerConfiguration;
 
 import 'token_impl.dart'
-    show CommentToken, DartDocToken, LanguageVersionToken, StringToken;
+    show
+        CommentTokenImpl,
+        DartDocToken,
+        LanguageVersionTokenImpl,
+        StringTokenImpl;
 
 /**
  * Scanner that reads from a UTF-8 encoded list of bytes and creates tokens
@@ -227,23 +231,25 @@ class Utf8BytesScanner extends AbstractScanner {
   analyzer.StringToken createSubstringToken(
       TokenType type, int start, bool asciiOnly,
       [int extraOffset = 0]) {
-    return new StringToken.fromUtf8Bytes(
+    return new StringTokenImpl.fromUtf8Bytes(
         type, bytes, start, byteOffset + extraOffset, asciiOnly, tokenStart,
         precedingComments: comments);
   }
 
   @override
   analyzer.StringToken createSyntheticSubstringToken(
       TokenType type, int start, bool asciiOnly, String syntheticChars) {
-    String source = StringToken.decodeUtf8(bytes, start, byteOffset, asciiOnly);
+    String source =
+        StringTokenImpl.decodeUtf8(bytes, start, byteOffset, asciiOnly);
     return new SyntheticStringToken(
         type, source + syntheticChars, tokenStart, source.length);
   }
 
   @override
-  CommentToken createCommentToken(TokenType type, int start, bool asciiOnly,
+  analyzer.CommentToken createCommentToken(
+      TokenType type, int start, bool asciiOnly,
       [int extraOffset = 0]) {
-    return new CommentToken.fromUtf8Bytes(
+    return new CommentTokenImpl.fromUtf8Bytes(
         type, bytes, start, byteOffset + extraOffset, asciiOnly, tokenStart);
   }
 
@@ -257,7 +263,7 @@ class Utf8BytesScanner extends AbstractScanner {
   @override
   LanguageVersionToken createLanguageVersionToken(
       int start, int major, int minor) {
-    return new LanguageVersionToken.fromUtf8Bytes(
+    return new LanguageVersionTokenImpl.fromUtf8Bytes(
         bytes, start, byteOffset, tokenStart, major, minor);
   }