mirror of
https://github.com/dart-lang/sdk
synced 2024-09-18 20:51:19 +00:00
Clean up WithNullSafetyMixin in analysis_server.
Also fixes a bug in DartCompletionRequestImpl. Change-Id: I5110226da6e238dae8e632972b969b0e1b17c94b Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/174222 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
This commit is contained in:
parent
fe3dd43995
commit
b29e1d93c2
|
@ -317,8 +317,7 @@ class DartCompletionRequestImpl implements DartCompletionRequest {
|
|||
}
|
||||
|
||||
@override
|
||||
FeatureSet get featureSet =>
|
||||
result.session.analysisContext.analysisOptions.contextFeatures;
|
||||
FeatureSet get featureSet => result.libraryElement.featureSet;
|
||||
|
||||
@override
|
||||
bool get includeIdentifiers {
|
||||
|
|
|
@ -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/element/element.dart';
|
||||
|
@ -270,23 +269,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
|
||||
|
|
|
@ -462,7 +462,10 @@ class AddMissingRequiredArgumentWithNullSafetyTest extends FixProcessorTest
|
|||
FixKind get kind => DartFixKind.ADD_MISSING_REQUIRED_ARGUMENT;
|
||||
|
||||
@override
|
||||
bool get withPackageMeta => true;
|
||||
void setUp() {
|
||||
super.setUp();
|
||||
writeTestPackageConfig(meta: true);
|
||||
}
|
||||
|
||||
Future<void> test_constructor_single_closure_nnbd() async {
|
||||
addSource('/home/test/lib/a.dart', r'''
|
||||
|
|
Loading…
Reference in a new issue