languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-15 23:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up WithNullSafetyMixin in analyzer/ and analyzer_plugin/.

Browse source 
Bug: https://github.com/dart-lang/sdk/issues/43837
Change-Id: I2282d0230e5ea0abdd2a08de2a16cfaa602c3cc8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174223
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
Konstantin Shcheglov 2020-11-28 04:56:46 +00:00 committed by commit-bot@chromium.org
parent b29e1d93c2
commit 6e311941bb
5 changed files with 8 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/analyzer/test/src/dart/constant/evaluation_test.dart
View file

@ -1083,8 +1083,6 @@ class ConstantVisitorWithNullSafetyWithTripleShiftTest
writeTestPackageAnalysisOptionsFile(
AnalysisOptionsFileConfig(
experiments: [
// TODO(scheglov) https://github.com/dart-lang/sdk/issues/43837
EnableString.non_nullable,
EnableString.triple_shift,
],
),

19
pkg/analyzer/test/src/dart/resolution/context_collection_resolution.dart
View file

@ -4,14 +4,12 @@
import 'package:analyzer/dart/analysis/analysis_context.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/src/dart/analysis/byte_store.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:analyzer/src/generated/engine.dart' show AnalysisOptionsImpl;
import 'package:analyzer/src/test_utilities/mock_packages.dart';
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
@ -361,23 +359,8 @@ class PubspecYamlFileConfig {
mixin WithNullSafetyMixin on PubPackageResolutionTest {
@override
String get testPackageLanguageVersion =>
Feature.non_nullable.isEnabledByDefault ? '2.12' : '2.11';
String get testPackageLanguageVersion => '2.12';
@override
bool get typeToStringWithNullability => true;
/// TODO(scheglov) https://github.com/dart-lang/sdk/issues/43837
/// Remove when Null Safety is enabled by default.
@nonVirtual
@override
void setUp() {
super.setUp();
writeTestPackageAnalysisOptionsFile(
AnalysisOptionsFileConfig(
experiments: [EnableString.non_nullable],
),
);
}
}

21
pkg/analyzer/test/src/diagnostics/invalid_language_override_greater_test.dart
View file

@ -38,12 +38,12 @@ class A {}
test_greaterThanPackage() async {
_configureTestPackageLanguageVersion('2.5');
await assertNoErrorsInCode(r'''
// @dart = 2.10
// @dart = 2.12
int? a;
''');
_assertUnitLanguageVersion(
package: Version.parse('2.5.0'),
override: Version.parse('2.10.0'),
override: Version.parse('2.12.0'),
);
}
@ -70,18 +70,9 @@ class A {}
}
void _configureTestPackageLanguageVersion(String versionStr) {
newFile('$testPackageRootPath/.dart_tool/package_config.json', content: '''
{
"configVersion": 2,
"packages": [
{
"name": "test",
"rootUri": "../",
"packageUri": "lib/",
"languageVersion": "$versionStr"
}
]
}
''');
writeTestPackageConfig(
PackageConfigFileBuilder(),
languageVersion: versionStr,
);
}
}

2
pkg/analyzer/test/src/diagnostics/sdk_version_gt_gt_gt_operator_test.dart
View file

@ -28,8 +28,6 @@ class SdkVersionGtGtGtOperatorTest extends SdkConstraintVerifierTest {
writeTestPackageAnalysisOptionsFile(
AnalysisOptionsFileConfig(
experiments: [
// TODO(scheglov) https://github.com/dart-lang/sdk/issues/43837
EnableString.non_nullable,
EnableString.triple_shift,
],
),

21
pkg/analyzer_plugin/test/support/abstract_context.dart
View file

@ -4,7 +4,6 @@
import 'package:analyzer/dart/analysis/analysis_context.dart';
import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/dart/analysis/features.dart';
import 'package:analyzer/dart/analysis/results.dart';
import 'package:analyzer/dart/analysis/session.dart';
import 'package:analyzer/dart/ast/ast.dart';
@ -14,7 +13,6 @@ import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
import 'package:analyzer/src/dart/analysis/byte_store.dart';
import 'package:analyzer/src/dart/analysis/driver.dart';
import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
import 'package:analyzer/src/dart/analysis/experiments.dart';
import 'package:analyzer/src/generated/engine.dart' show AnalysisEngine;
import 'package:analyzer/src/generated/source_io.dart';
import 'package:analyzer/src/generated/testing/element_search.dart';
@ -22,7 +20,6 @@ import 'package:analyzer/src/test_utilities/mock_packages.dart';
import 'package:analyzer/src/test_utilities/mock_sdk.dart';
import 'package:analyzer/src/test_utilities/package_config_file_builder.dart';
import 'package:analyzer/src/test_utilities/resource_provider_mixin.dart';
import 'package:meta/meta.dart';
/// Finds an [Element] with the given [name].
Element findChildElement(Element root, String name, [ElementKind kind]) {
@ -174,23 +171,7 @@ class AbstractContextTest with ResourceProviderMixin {
mixin WithNullSafetyMixin on AbstractContextTest {
@override
String get testPackageLanguageVersion =>
Feature.non_nullable.isEnabledByDefault ? '2.12' : '2.11';
bool get withPackageMeta => false;
/// TODO(scheglov) https://github.com/dart-lang/sdk/issues/43837
/// Remove when Null Safety is enabled by default.
@nonVirtual
@override
void setUp() {
super.setUp();
writeTestPackageConfig(
languageVersion: testPackageLanguageVersion,
meta: withPackageMeta,
);
createAnalysisOptionsFile(experiments: [EnableString.non_nullable]);
}
String get testPackageLanguageVersion => '2.12';
}
/// Wraps the given [_ElementVisitorFunction] into an instance of