Remove ExperimentStatus.testingSdkLanguageVersion

Change-Id: Ia8993c3ca29c79ede835db46fe5e1d660a3621d2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/213104
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov
2021-09-10 19:22:57 +00:00
committed by commit-bot@chromium.org
parent b2eb0c5eb2
commit 79950b989f
5 changed files with 6 additions and 26 deletions
@@ -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');
@@ -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;
@@ -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;
@@ -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;
@@ -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<String> 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);