[parser/scanner] Remove ScannerConfig `enableExtensionMethods`
Extension methods can no longer be disabled. This CL removes the option
from the scanner config and the parser related specific recovery.
It also removes any specific (triggered) test of the functionality.
A follow-up CL will do the same for NNBD.
Change-Id: Ia385008e5ed1333fb37697b8fe424b8759bce198
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403581
Reviewed-by: Johnni Winther <johnniwinther@google.com>
Commit-Queue: Jens Johansen <jensj@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index 3e7f0025..dbc8460f 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -3787,20 +3787,7 @@
if (semicolon.isA(TokenType.SEMICOLON)) {
token = semicolon;
} else {
- // Recovery
- if (kind == DeclarationKind.TopLevel &&
- beforeType.next!.isIdentifier &&
- beforeType.next!.lexeme == 'extension') {
- // Looks like an extension method
- // TODO(danrubel): Remove when extension methods are enabled by default
- // because then 'extension' will be interpreted as a built-in
- // and this code will never be executed
- reportExperimentNotEnabled(ExperimentalFlag.extensionMethods,
- beforeType.next!, beforeType.next!);
- token = rewriter.insertSyntheticToken(token, TokenType.SEMICOLON);
- } else {
- token = ensureSemicolon(token);
- }
+ token = ensureSemicolon(token);
}
switch (kind) {
case DeclarationKind.TopLevel:
diff --git a/pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart b/pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart
index 066ee56..4b3481b 100644
--- a/pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/scanner/abstract_scanner.dart
@@ -73,9 +73,6 @@
/// based upon the specified language version.
final LanguageVersionChanged? languageVersionChanged;
- /// Experimental flag for enabling scanning of the `extension` token.
- bool _enableExtensionMethods = false;
-
/// Experimental flag for enabling scanning of NNBD tokens
/// such as 'required' and 'late'.
bool _enableNonNullable = false;
@@ -165,7 +162,6 @@
allowLazyStrings = true {
this.tail = this.tokens;
this.errorTail = this.tokens;
- this._enableExtensionMethods = copyFrom._enableExtensionMethods;
this._enableNonNullable = copyFrom._enableNonNullable;
this._enableTripleShift = copyFrom._enableTripleShift;
this.tokenStart = copyFrom.tokenStart;
@@ -175,7 +171,6 @@
@override
set configuration(ScannerConfiguration? config) {
if (config != null) {
- _enableExtensionMethods = config.enableExtensionMethods;
_enableNonNullable = config.enableNonNullable;
_enableTripleShift = config.enableTripleShift;
_forAugmentationLibrary = config.forAugmentationLibrary;
@@ -1745,9 +1740,6 @@
if (keyword == null) {
return tokenizeIdentifier(next, start, allowDollar);
}
- if (!_enableExtensionMethods && keyword == Keyword.EXTENSION) {
- return tokenizeIdentifier(next, start, allowDollar);
- }
if (!_enableNonNullable &&
(keyword == Keyword.LATE || keyword == Keyword.REQUIRED)) {
return tokenizeIdentifier(next, start, allowDollar);
@@ -2172,9 +2164,6 @@
static const ScannerConfiguration nonNullable =
const ScannerConfiguration(enableNonNullable: true);
- /// Experimental flag for enabling scanning of the `extension` keyword.
- final bool enableExtensionMethods;
-
/// Experimental flag for enabling scanning of NNBD tokens
/// such as 'required' and 'late'
final bool enableNonNullable;
@@ -2188,7 +2177,6 @@
final bool forAugmentationLibrary;
const ScannerConfiguration({
- this.enableExtensionMethods = false,
this.enableNonNullable = false,
this.enableTripleShift = false,
this.forAugmentationLibrary = false,
diff --git a/pkg/_fe_analyzer_shared/test/macros/code_optimizer_test.dart b/pkg/_fe_analyzer_shared/test/macros/code_optimizer_test.dart
index 37d2cb1..0be2a03 100644
--- a/pkg/_fe_analyzer_shared/test/macros/code_optimizer_test.dart
+++ b/pkg/_fe_analyzer_shared/test/macros/code_optimizer_test.dart
@@ -740,7 +740,6 @@
code,
libraryDeclarationNames: libraryDeclarationNames,
scannerConfiguration: ScannerConfiguration(
- enableExtensionMethods: true,
enableNonNullable: true,
forAugmentationLibrary: true,
),
diff --git a/pkg/_fe_analyzer_shared/test/scanner_benchmark.dart b/pkg/_fe_analyzer_shared/test/scanner_benchmark.dart
index 6c39cb6..d2694a8 100644
--- a/pkg/_fe_analyzer_shared/test/scanner_benchmark.dart
+++ b/pkg/_fe_analyzer_shared/test/scanner_benchmark.dart
@@ -53,7 +53,6 @@
hasErrors = scanString(
content,
configuration: new ScannerConfiguration(
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
),
@@ -66,7 +65,6 @@
hasErrors = scan(
contentBytes,
configuration: new ScannerConfiguration(
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
),
@@ -80,7 +78,6 @@
hasErrors = scan(
tmp,
configuration: new ScannerConfiguration(
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
),
diff --git a/pkg/analyzer/lib/src/dart/scanner/scanner.dart b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
index 428f82b..99d3b17 100644
--- a/pkg/analyzer/lib/src/dart/scanner/scanner.dart
+++ b/pkg/analyzer/lib/src/dart/scanner/scanner.dart
@@ -199,8 +199,6 @@
featureSet == null
? fasta.ScannerConfiguration()
: fasta.ScannerConfiguration(
- enableExtensionMethods:
- featureSet.isEnabled(Feature.extension_methods),
enableTripleShift: featureSet.isEnabled(Feature.triple_shift),
enableNonNullable: featureSet.isEnabled(Feature.non_nullable),
forAugmentationLibrary: featureSet.isEnabled(Feature.macros),
diff --git a/pkg/analyzer/test/generated/extension_methods_parser_test.dart b/pkg/analyzer/test/generated/extension_methods_parser_test.dart
index be852fc..73576cb 100644
--- a/pkg/analyzer/test/generated/extension_methods_parser_test.dart
+++ b/pkg/analyzer/test/generated/extension_methods_parser_test.dart
@@ -7,7 +7,6 @@
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
-import '../util/feature_sets.dart';
import 'parser_test_base.dart';
main() {
@@ -219,17 +218,6 @@
expect(extension.members, hasLength(0));
}
- void test_simple_not_enabled() {
- parseCompilationUnit(
- 'extension E on C { }',
- errors: [
- expectedError(ParserErrorCode.EXPERIMENT_NOT_ENABLED, 0, 9),
- expectedError(ParserErrorCode.MISSING_FUNCTION_PARAMETERS, 15, 1)
- ],
- featureSet: FeatureSets.language_2_3,
- );
- }
-
void test_simple_with() {
var unit = parseCompilationUnit('extension E with C { }', errors: [
expectedError(ParserErrorCode.EXPECTED_INSTEAD, 12, 4),
diff --git a/pkg/analyzer/test/util/feature_sets.dart b/pkg/analyzer/test/util/feature_sets.dart
index 7b548a9..5e6d624 100644
--- a/pkg/analyzer/test/util/feature_sets.dart
+++ b/pkg/analyzer/test/util/feature_sets.dart
@@ -8,11 +8,6 @@
import 'package:pub_semver/pub_semver.dart';
class FeatureSets {
- static final FeatureSet language_2_3 = FeatureSet.fromEnableFlags2(
- sdkLanguageVersion: Version.parse('2.3.0'),
- flags: [],
- );
-
static final FeatureSet language_2_9 = FeatureSet.fromEnableFlags2(
sdkLanguageVersion: Version.parse('2.9.0'),
flags: [],
diff --git a/pkg/front_end/lib/src/base/incremental_compiler.dart b/pkg/front_end/lib/src/base/incremental_compiler.dart
index ca404aa..fea1ed6 100644
--- a/pkg/front_end/lib/src/base/incremental_compiler.dart
+++ b/pkg/front_end/lib/src/base/incremental_compiler.dart
@@ -1232,7 +1232,6 @@
return null;
}
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
- enableExtensionMethods: true /* can't be disabled */,
enableNonNullable: true /* can't be disabled */,
enableTripleShift:
/* should this be on the library? */
diff --git a/pkg/front_end/lib/src/kernel/macro/macro.dart b/pkg/front_end/lib/src/kernel/macro/macro.dart
index 9005780..4cb3207 100644
--- a/pkg/front_end/lib/src/kernel/macro/macro.dart
+++ b/pkg/front_end/lib/src/kernel/macro/macro.dart
@@ -1355,7 +1355,6 @@
ScannerResult scannerResult = scan(sourceUtf8,
configuration: new ScannerConfiguration(
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
forAugmentationLibrary: true));
diff --git a/pkg/front_end/lib/src/source/source_loader.dart b/pkg/front_end/lib/src/source/source_loader.dart
index ff61299..d73c8e9 100644
--- a/pkg/front_end/lib/src/source/source_loader.dart
+++ b/pkg/front_end/lib/src/source/source_loader.dart
@@ -1051,11 +1051,6 @@
ExperimentalFlag.tripleShift,
compilationUnit.importUri,
compilationUnit.packageLanguageVersion.version),
- enableExtensionMethods:
- target.isExperimentEnabledInLibraryByVersion(
- ExperimentalFlag.extensionMethods,
- compilationUnit.importUri,
- compilationUnit.packageLanguageVersion.version),
enableNonNullable: target.isExperimentEnabledInLibraryByVersion(
ExperimentalFlag.nonNullable,
compilationUnit.importUri,
@@ -1072,8 +1067,6 @@
scanner.configuration = new ScannerConfiguration(
enableTripleShift:
compilationUnit.libraryFeatures.tripleShift.isEnabled,
- enableExtensionMethods:
- compilationUnit.libraryFeatures.extensionMethods.isEnabled,
enableNonNullable: true);
}, allowLazyStrings: allowLazyStrings);
Token token = result.tokens;
diff --git a/pkg/front_end/lib/src/util/import_export_etc_helper.dart b/pkg/front_end/lib/src/util/import_export_etc_helper.dart
index 8dafa92..a429c46 100644
--- a/pkg/front_end/lib/src/util/import_export_etc_helper.dart
+++ b/pkg/front_end/lib/src/util/import_export_etc_helper.dart
@@ -13,7 +13,6 @@
new ImportExportPartLibraryHelperVisitor();
getAST(
rawBytes,
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
includeBody: false,
diff --git a/pkg/front_end/lib/src/util/outline_extractor.dart b/pkg/front_end/lib/src/util/outline_extractor.dart
index f6237ce..c1cdd78 100644
--- a/pkg/front_end/lib/src/util/outline_extractor.dart
+++ b/pkg/front_end/lib/src/util/outline_extractor.dart
@@ -135,9 +135,7 @@
// TODO: Support updating the configuration; also default it to match
// the package version.
final ScannerConfiguration configuration = new ScannerConfiguration(
- enableExtensionMethods: true,
- enableNonNullable: true,
- enableTripleShift: true);
+ enableNonNullable: true, enableTripleShift: true);
textualOutlineStopwatch.start();
final String? outlined =
textualOutline(bytes, configuration, enablePatterns: true);
@@ -147,7 +145,6 @@
getAstStopwatch.start();
List<Token> languageVersionsSeen = [];
final ParserAstNode ast = getAST(bytes2,
- enableExtensionMethods: configuration.enableExtensionMethods,
enableNonNullable: configuration.enableNonNullable,
enableTripleShift: configuration.enableTripleShift,
languageVersionsSeen: languageVersionsSeen);
diff --git a/pkg/front_end/lib/src/util/parser_ast.dart b/pkg/front_end/lib/src/util/parser_ast.dart
index 9c7d497..77aeeee 100644
--- a/pkg/front_end/lib/src/util/parser_ast.dart
+++ b/pkg/front_end/lib/src/util/parser_ast.dart
@@ -28,7 +28,6 @@
Uint8List rawBytes, {
bool includeBody = true,
bool includeComments = false,
- bool enableExtensionMethods = false,
bool enableNonNullable = false,
bool enableTripleShift = false,
bool allowPatterns = false,
@@ -36,7 +35,6 @@
List<int>? lineStarts,
}) {
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
- enableExtensionMethods: enableExtensionMethods,
enableNonNullable: enableNonNullable,
enableTripleShift: enableTripleShift);
diff --git a/pkg/front_end/test/crashing_test_case_minimizer_impl.dart b/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
index 56f69b5..d90f233 100644
--- a/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
+++ b/pkg/front_end/test/crashing_test_case_minimizer_impl.dart
@@ -561,7 +561,6 @@
CompilationUnitEnd ast = getAST(originalBytes,
includeBody: false,
includeComments: false,
- enableExtensionMethods: true,
enableNonNullable: _isUriNnbd(uri!));
// Find all imports/exports of this file (if any).
// If finding any:
@@ -602,7 +601,6 @@
ast = getAST(withoutInlineable,
includeBody: false,
includeComments: false,
- enableExtensionMethods: true,
enableNonNullable: _isUriNnbd(uri));
for (ImportEnd import in ast.getImports()) {
offsetOfLast = max(offsetOfLast, import.semicolon!.offset + 1);
@@ -704,10 +702,7 @@
Uint8List oldData, Uri newUri, Uri oldUri, bool nnbd,
{bool convertExportToImport = false}) {
CompilationUnitEnd ast = getAST(oldData,
- includeBody: false,
- includeComments: false,
- enableExtensionMethods: true,
- enableNonNullable: nnbd);
+ includeBody: false, includeComments: false, enableNonNullable: nnbd);
List<_Replacement> replacements = [];
for (ImportEnd import in ast.getImports()) {
_rewriteImportsExportsToUriInternal(
@@ -1300,7 +1295,6 @@
CompilationUnitEnd ast = getAST(data,
includeBody: true,
includeComments: false,
- enableExtensionMethods: true,
enableNonNullable: _isUriNnbd(uri));
_CompilationHelperClass helper = new _CompilationHelperClass(data);
@@ -1867,8 +1861,6 @@
ScannerConfiguration _getScannerConfiguration(Version languageVersion) {
return new ScannerConfiguration(
- enableExtensionMethods:
- languageVersion >= ExperimentalFlag.extensionMethods.enabledVersion,
enableNonNullable:
languageVersion >= ExperimentalFlag.nonNullable.enabledVersion,
enableTripleShift:
@@ -2171,14 +2163,10 @@
}
ScannerConfiguration _scannerConfiguration = new ScannerConfiguration(
- enableTripleShift: true,
- enableExtensionMethods: true,
- enableNonNullable: true);
+ enableTripleShift: true, enableNonNullable: true);
ScannerConfiguration _scannerConfigurationNonNNBD = new ScannerConfiguration(
- enableTripleShift: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ enableTripleShift: true, enableNonNullable: false);
List<int>? _dataCache;
String? _dataCacheString;
diff --git a/pkg/front_end/test/lint_suite.dart b/pkg/front_end/test/lint_suite.dart
index db9c050..08f3375 100644
--- a/pkg/front_end/test/lint_suite.dart
+++ b/pkg/front_end/test/lint_suite.dart
@@ -30,8 +30,7 @@
displayName: "lint suite",
configurationPath: "../testing.json");
-Future<Context> createContext(
- Chain suite, Map<String, String> environment) {
+Future<Context> createContext(Chain suite, Map<String, String> environment) {
const Set<String> knownEnvironmentKeys = {"onlyInGit"};
checkEnvironment(environment, knownEnvironmentKeys);
@@ -137,9 +136,7 @@
Utf8BytesScanner scanner = new Utf8BytesScanner(
bytes,
configuration: const ScannerConfiguration(
- enableExtensionMethods: true,
- enableNonNullable: true,
- enableTripleShift: true),
+ enableNonNullable: true, enableTripleShift: true),
includeComments: true,
languageVersionChanged: (scanner, languageVersion) {
// Nothing - but don't overwrite the previous settings.
diff --git a/pkg/front_end/test/parser/parser_ast_test.dart b/pkg/front_end/test/parser/parser_ast_test.dart
index cb8c013..65f506f 100644
--- a/pkg/front_end/test/parser/parser_ast_test.dart
+++ b/pkg/front_end/test/parser/parser_ast_test.dart
@@ -39,7 +39,6 @@
data,
includeBody: true,
includeComments: true,
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
);
@@ -82,10 +81,7 @@
base.resolve("parser_ast_test_data/top_level_stuff.txt"));
Uint8List data = file.readAsBytesSync();
CompilationUnitEnd ast = getAST(data,
- includeBody: true,
- includeComments: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ includeBody: true, includeComments: true, enableNonNullable: false);
expect(2, ast.getImports().length);
expect(2, ast.getExports().length);
@@ -139,10 +135,7 @@
base.resolve("parser_ast_test_data/top_level_stuff_helper.txt"));
data = file.readAsBytesSync();
ast = getAST(data,
- includeBody: true,
- includeComments: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ includeBody: true, includeComments: true, enableNonNullable: false);
foundChunks = splitIntoChunks(ast, data);
expect(1, foundChunks.length);
expect("part of 'top_level_stuff.txt';", foundChunks[0]);
@@ -151,10 +144,7 @@
new File.fromUri(base.resolve("parser_ast_test_data/script_handle.txt"));
data = file.readAsBytesSync();
ast = getAST(data,
- includeBody: true,
- includeComments: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ includeBody: true, includeComments: true, enableNonNullable: false);
foundChunks = splitIntoChunks(ast, data);
expect(1, foundChunks.length);
expect("#!/usr/bin/env dart -c", foundChunks[0]);
@@ -164,10 +154,7 @@
File file = new File.fromUri(base.resolve("parser_ast_test_data/class.txt"));
Uint8List data = file.readAsBytesSync();
CompilationUnitEnd ast = getAST(data,
- includeBody: true,
- includeComments: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ includeBody: true, includeComments: true, enableNonNullable: false);
List<TopLevelDeclarationEnd> classes = ast.getClasses();
expect(2, classes.length);
@@ -248,10 +235,7 @@
File file = new File.fromUri(base.resolve("parser_ast_test_data/mixin.txt"));
Uint8List data = file.readAsBytesSync();
CompilationUnitEnd ast = getAST(data,
- includeBody: true,
- includeComments: true,
- enableExtensionMethods: true,
- enableNonNullable: false);
+ includeBody: true, includeComments: true, enableNonNullable: false);
List<TopLevelDeclarationEnd> mixins = ast.getMixinDeclarations();
expect(mixins.length, 1);
diff --git a/pkg/front_end/test/parser_suite.dart b/pkg/front_end/test/parser_suite.dart
index 0d74e13..1cb1f0f 100644
--- a/pkg/front_end/test/parser_suite.dart
+++ b/pkg/front_end/test/parser_suite.dart
@@ -73,27 +73,23 @@
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
enableTripleShift: true,
- enableExtensionMethods: true,
enableNonNullable: true,
forAugmentationLibrary: false);
ScannerConfiguration scannerConfigurationNonNNBD = new ScannerConfiguration(
enableTripleShift: true,
- enableExtensionMethods: true,
enableNonNullable: false,
forAugmentationLibrary: false);
ScannerConfiguration scannerConfigurationNonTripleShift =
new ScannerConfiguration(
enableTripleShift: false,
- enableExtensionMethods: true,
enableNonNullable: true,
forAugmentationLibrary: false);
ScannerConfiguration scannerConfigurationAugmentation =
new ScannerConfiguration(
enableTripleShift: true,
- enableExtensionMethods: true,
enableNonNullable: true,
forAugmentationLibrary: true);
diff --git a/pkg/front_end/test/parser_test_parser_creator.dart b/pkg/front_end/test/parser_test_parser_creator.dart
index ed8b6ff..22ac64d 100644
--- a/pkg/front_end/test/parser_test_parser_creator.dart
+++ b/pkg/front_end/test/parser_test_parser_creator.dart
@@ -307,7 +307,8 @@
troubleParameterTokens[currentFormalParameterToken] = nameToken;
}
currentFormalParameterToken = null;
- if (kind == FormalParameterKind.optionalNamed) {
+ if (kind == FormalParameterKind.optionalNamed ||
+ kind == FormalParameterKind.requiredNamed) {
parametersNamed.add(nameToken.lexeme);
} else {
parameters.add(nameToken.lexeme);
diff --git a/pkg/front_end/test/scanner_test.dart b/pkg/front_end/test/scanner_test.dart
index 4d020c5..cea2784 100644
--- a/pkg/front_end/test/scanner_test.dart
+++ b/pkg/front_end/test/scanner_test.dart
@@ -528,13 +528,7 @@
}
void test_keyword_extension() {
- _assertKeywordToken("extension",
- configuration: ScannerConfiguration(enableExtensionMethods: true));
- }
-
- void test_keyword_extension_old() {
- _assertNotKeywordToken("extension",
- configuration: ScannerConfiguration(enableExtensionMethods: false));
+ _assertKeywordToken("extension", configuration: ScannerConfiguration());
}
void test_keyword_factory() {
diff --git a/pkg/front_end/test/testing/folder_options.dart b/pkg/front_end/test/testing/folder_options.dart
index 490dad1..6167343 100644
--- a/pkg/front_end/test/testing/folder_options.dart
+++ b/pkg/front_end/test/testing/folder_options.dart
@@ -145,8 +145,6 @@
}
addForcedExperimentalFlag(
- "enableExtensionMethods", ExperimentalFlag.extensionMethods);
- addForcedExperimentalFlag(
"enableNonNullable", ExperimentalFlag.nonNullable);
return experimentalFlags;
}
diff --git a/pkg/front_end/test/testing/suite.dart b/pkg/front_end/test/testing/suite.dart
index 891f3f0..bf85974 100644
--- a/pkg/front_end/test/testing/suite.dart
+++ b/pkg/front_end/test/testing/suite.dart
@@ -1625,7 +1625,6 @@
CompilationUnitEnd ast = getAST(bytes,
includeBody: false,
includeComments: true,
- enableExtensionMethods: true,
enableNonNullable: true,
allowPatterns: allowPatterns);
ast.accept(this);
diff --git a/pkg/front_end/test/textual_outline_suite.dart b/pkg/front_end/test/textual_outline_suite.dart
index e0e2ad3..73a65fa 100644
--- a/pkg/front_end/test/textual_outline_suite.dart
+++ b/pkg/front_end/test/textual_outline_suite.dart
@@ -116,9 +116,6 @@
String? result = textualOutline(
bytes,
new ScannerConfiguration(
- enableExtensionMethods: isExperimentEnabled(
- ExperimentalFlag.extensionMethods,
- explicitExperimentalFlags: experimentalFlags),
enableNonNullable: isExperimentEnabled(ExperimentalFlag.nonNullable,
explicitExperimentalFlags: experimentalFlags),
enableTripleShift: isExperimentEnabled(ExperimentalFlag.tripleShift,
diff --git a/pkg/front_end/test/textual_outline_test.dart b/pkg/front_end/test/textual_outline_test.dart
index 2dea71f..ed8f716 100644
--- a/pkg/front_end/test/textual_outline_test.dart
+++ b/pkg/front_end/test/textual_outline_test.dart
@@ -9,8 +9,7 @@
import "package:front_end/src/util/textual_outline.dart"
show TextualOutlineInfoForTesting, textualOutline;
-const ScannerConfiguration scannerConfiguration =
- const ScannerConfiguration(enableExtensionMethods: true);
+const ScannerConfiguration scannerConfiguration = const ScannerConfiguration();
void main() {
TextualOutlineInfoForTesting infoForTesting;
diff --git a/pkg/front_end/test/token_test.dart b/pkg/front_end/test/token_test.dart
index 5feb16e..ba39cd5 100644
--- a/pkg/front_end/test/token_test.dart
+++ b/pkg/front_end/test/token_test.dart
@@ -143,7 +143,7 @@
Keyword.CLASS,
Keyword.ENUM,
Keyword.EXPORT,
- //Keyword.EXTENSION, <-- when "extension methods" is enabled by default
+ Keyword.EXTENSION,
Keyword.IMPORT,
Keyword.LIBRARY,
Keyword.MIXIN,
diff --git a/pkg/front_end/test/utils/kernel_chain.dart b/pkg/front_end/test/utils/kernel_chain.dart
index fabfeb6..49acbb4 100644
--- a/pkg/front_end/test/utils/kernel_chain.dart
+++ b/pkg/front_end/test/utils/kernel_chain.dart
@@ -335,9 +335,7 @@
Utf8BytesScanner scanner = new Utf8BytesScanner(
rawBytes,
configuration: const ScannerConfiguration(
- enableExtensionMethods: true,
- enableNonNullable: true,
- enableTripleShift: true),
+ enableNonNullable: true, enableTripleShift: true),
includeComments: true,
languageVersionChanged: (scanner, languageVersion) {
// Nothing - but don't overwrite the previous settings.
diff --git a/pkg/front_end/test/web_parser_git_test_helper.dart b/pkg/front_end/test/web_parser_git_test_helper.dart
index 14871b8..3b5e4f6 100644
--- a/pkg/front_end/test/web_parser_git_test_helper.dart
+++ b/pkg/front_end/test/web_parser_git_test_helper.dart
@@ -17,9 +17,7 @@
""";
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
- enableExtensionMethods: true,
- enableNonNullable: true,
- enableTripleShift: true);
+ enableNonNullable: true, enableTripleShift: true);
StringScanner scanner = new StringScanner(
source,
diff --git a/pkg/front_end/tool/coverage_merger.dart b/pkg/front_end/tool/coverage_merger.dart
index a549676..5012acf 100644
--- a/pkg/front_end/tool/coverage_merger.dart
+++ b/pkg/front_end/tool/coverage_merger.dart
@@ -267,7 +267,6 @@
CompilationUnitEnd ast = getAST(
rawBytes,
includeComments: true,
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
allowPatterns: true,
diff --git a/pkg/front_end/tool/dart_doctest_impl.dart b/pkg/front_end/tool/dart_doctest_impl.dart
index 7b59758..b4dc667 100644
--- a/pkg/front_end/tool/dart_doctest_impl.dart
+++ b/pkg/front_end/tool/dart_doctest_impl.dart
@@ -531,9 +531,7 @@
Token scanRawBytes(Uint8List rawBytes, {List<int>? lineStarts}) {
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
- enableExtensionMethods: true,
- enableNonNullable: true,
- enableTripleShift: true);
+ enableNonNullable: true, enableTripleShift: true);
Utf8BytesScanner scanner = new Utf8BytesScanner(
rawBytes,
diff --git a/pkg/front_end/tool/duplicate_code_finder_experiment.dart b/pkg/front_end/tool/duplicate_code_finder_experiment.dart
index 4019868..b28d915 100644
--- a/pkg/front_end/tool/duplicate_code_finder_experiment.dart
+++ b/pkg/front_end/tool/duplicate_code_finder_experiment.dart
@@ -330,7 +330,6 @@
Token _scan(String data) {
ScannerConfiguration scannerConfiguration = new ScannerConfiguration(
enableTripleShift: true,
- enableExtensionMethods: true,
enableNonNullable: true,
forAugmentationLibrary: false);
diff --git a/pkg/front_end/tool/fuzz/minimizer.dart b/pkg/front_end/tool/fuzz/minimizer.dart
index 42f33de..da0b65d 100644
--- a/pkg/front_end/tool/fuzz/minimizer.dart
+++ b/pkg/front_end/tool/fuzz/minimizer.dart
@@ -33,7 +33,6 @@
CompilationUnitEnd ast = getAST(
rawBytes,
includeComments: true,
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
allowPatterns: true,
diff --git a/pkg/front_end/tool/parser_direct_ast/viewer.dart b/pkg/front_end/tool/parser_direct_ast/viewer.dart
index a11f79f..cac6d096 100644
--- a/pkg/front_end/tool/parser_direct_ast/viewer.dart
+++ b/pkg/front_end/tool/parser_direct_ast/viewer.dart
@@ -19,7 +19,6 @@
Uint8List bytes = new File.fromUri(uri).readAsBytesSync();
ParserAstNode ast = getAST(
bytes,
- enableExtensionMethods: true,
enableNonNullable: true,
enableTripleShift: true,
allowPatterns: true,
