diff --git a/pkg/analyzer/lib/src/dart/analysis/experiments.dart b/pkg/analyzer/lib/src/dart/analysis/experiments.dart index f03c6aafa78..8bff97a1512 100644 --- a/pkg/analyzer/lib/src/dart/analysis/experiments.dart +++ b/pkg/analyzer/lib/src/dart/analysis/experiments.dart @@ -40,9 +40,6 @@ class ExperimentStatus with _CurrentState implements FeatureSet { /// The current language version. static final Version currentVersion = Version.parse(_currentVersion); - /// The language version to use in tests. - static final Version testingSdkLanguageVersion = Version.parse('2.10.0'); - /// The latest known language version. static final Version latestSdkLanguageVersion = Version.parse('2.13.0'); diff --git a/pkg/analyzer/lib/src/generated/testing/element_factory.dart b/pkg/analyzer/lib/src/generated/testing/element_factory.dart index b53f44ca889..a33890a513e 100644 --- a/pkg/analyzer/lib/src/generated/testing/element_factory.dart +++ b/pkg/analyzer/lib/src/generated/testing/element_factory.dart @@ -8,7 +8,6 @@ import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; -import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/dart/analysis/session.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/type.dart'; @@ -203,8 +202,8 @@ class ElementFactory { return spec; } - static LibraryElementImpl library(AnalysisContext context, String libraryName, - {bool isNonNullableByDefault = true}) { + static LibraryElementImpl library( + AnalysisContext context, String libraryName) { String fileName = "/$libraryName.dart"; CompilationUnitElementImpl unit = compilationUnit(fileName); LibraryElementImpl library = LibraryElementImpl( @@ -213,10 +212,7 @@ class ElementFactory { libraryName, 0, libraryName.length, - FeatureSet.fromEnableFlags2( - sdkLanguageVersion: ExperimentStatus.testingSdkLanguageVersion, - flags: isNonNullableByDefault ? [EnableString.non_nullable] : [], - ), + FeatureSet.latestLanguageVersion(), ); library.definingCompilationUnit = unit; return library; diff --git a/pkg/analyzer/test/generated/element_resolver_test.dart b/pkg/analyzer/test/generated/element_resolver_test.dart index 1d3df593700..e45489d168c 100644 --- a/pkg/analyzer/test/generated/element_resolver_test.dart +++ b/pkg/analyzer/test/generated/element_resolver_test.dart @@ -716,8 +716,7 @@ class ElementResolverTest with ResourceProviderMixin, ElementsTypesMixin { Source source = FileSource(getFile("/test.dart")); CompilationUnitElementImpl unit = CompilationUnitElementImpl(); unit.librarySource = unit.source = source; - _definingLibrary = - ElementFactory.library(context, "test", isNonNullableByDefault: false); + _definingLibrary = ElementFactory.library(context, "test"); _definingLibrary.definingCompilationUnit = unit; _definingLibrary.typeProvider = context.typeProviderLegacy; diff --git a/pkg/analyzer/test/generated/elements_types_mixin.dart b/pkg/analyzer/test/generated/elements_types_mixin.dart index c201074e419..8c01ffe446f 100644 --- a/pkg/analyzer/test/generated/elements_types_mixin.dart +++ b/pkg/analyzer/test/generated/elements_types_mixin.dart @@ -7,7 +7,6 @@ import 'package:analyzer/dart/element/element.dart'; import 'package:analyzer/dart/element/nullability_suffix.dart'; import 'package:analyzer/dart/element/type.dart'; import 'package:analyzer/dart/element/type_provider.dart'; -import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/dart/analysis/session.dart'; import 'package:analyzer/src/dart/element/element.dart'; import 'package:analyzer/src/dart/element/type.dart'; @@ -374,12 +373,7 @@ mixin ElementsTypesMixin { uriStr, -1, 0, - FeatureSet.fromEnableFlags2( - sdkLanguageVersion: ExperimentStatus.testingSdkLanguageVersion, - flags: typeSystem.isNonNullableByDefault - ? [EnableString.non_nullable] - : [], - ), + FeatureSet.latestLanguageVersion(), ); library.typeSystem = typeSystem; library.typeProvider = typeSystem.typeProvider; diff --git a/pkg/analyzer/test/src/dart/analysis/base.dart b/pkg/analyzer/test/src/dart/analysis/base.dart index 1bb79b1056f..536922f77e1 100644 --- a/pkg/analyzer/test/src/dart/analysis/base.dart +++ b/pkg/analyzer/test/src/dart/analysis/base.dart @@ -8,7 +8,6 @@ import 'package:analyzer/file_system/file_system.dart'; import 'package:analyzer/src/context/packages.dart'; import 'package:analyzer/src/dart/analysis/byte_store.dart'; import 'package:analyzer/src/dart/analysis/driver.dart'; -import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/dart/analysis/performance_logger.dart'; import 'package:analyzer/src/dart/analysis/status.dart'; import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl; @@ -40,8 +39,6 @@ class BaseAnalysisDriverTest with ResourceProviderMixin { late final String testFile; late final String testCode; - List enabledExperiments = []; - void addTestFile(String content, {bool priority = false}) { testCode = content; newFile(testFile, content: content); @@ -98,10 +95,7 @@ class BaseAnalysisDriverTest with ResourceProviderMixin { AnalysisOptionsImpl createAnalysisOptions() => AnalysisOptionsImpl() ..useFastaParser = true - ..contextFeatures = FeatureSet.fromEnableFlags2( - sdkLanguageVersion: ExperimentStatus.testingSdkLanguageVersion, - flags: enabledExperiments, - ); + ..contextFeatures = FeatureSet.latestLanguageVersion(); int findOffset(String search) { int offset = testCode.indexOf(search);