| Index: pkg/analysis_server/test/services/correction/assist_test.dart
|
| diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
|
| index e0e087e1733e668bc3af70c58ab415faa24a1de8..b1b4c389e4cecc8e1d31e3dbc2bf9d1b6ece1623 100644
|
| --- a/pkg/analysis_server/test/services/correction/assist_test.dart
|
| +++ b/pkg/analysis_server/test/services/correction/assist_test.dart
|
| @@ -15,6 +15,9 @@ import 'package:analyzer/dart/ast/standard_resolution_map.dart';
|
| import 'package:analyzer/dart/element/element.dart';
|
| import 'package:analyzer/file_system/file_system.dart';
|
| import 'package:analyzer/source/package_map_resolver.dart';
|
| +import 'package:analyzer/src/dart/analysis/ast_provider_context.dart';
|
| +import 'package:analyzer/src/dart/analysis/ast_provider_driver.dart';
|
| +import 'package:analyzer/src/dart/element/ast_provider.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
| import 'package:plugin/manager.dart';
|
| @@ -4645,12 +4648,24 @@ main() {
|
| Future<List<Assist>> _computeAssists() async {
|
| CompilationUnitElement testUnitElement =
|
| resolutionMap.elementDeclaredByCompilationUnit(testUnit);
|
| - DartAssistContext assistContext = new _DartAssistContextForValues(
|
| - testUnitElement.source,
|
| - offset,
|
| - length,
|
| - testUnitElement.context,
|
| - testUnit);
|
| + DartAssistContext assistContext;
|
| + if (enableNewAnalysisDriver) {
|
| + assistContext = new _DartAssistContextForValues(
|
| + testUnitElement.source,
|
| + offset,
|
| + length,
|
| + testUnitElement.context,
|
| + new AstProviderForDriver(driver),
|
| + testUnit);
|
| + } else {
|
| + assistContext = new _DartAssistContextForValues(
|
| + testUnitElement.source,
|
| + offset,
|
| + length,
|
| + testUnitElement.context,
|
| + new AstProviderForContext(testUnitElement.context),
|
| + testUnit);
|
| + }
|
| AssistProcessor processor = new AssistProcessor(assistContext);
|
| return await processor.compute();
|
| }
|
| @@ -4723,8 +4738,11 @@ class _DartAssistContextForValues implements DartAssistContext {
|
| final AnalysisContext analysisContext;
|
|
|
| @override
|
| + final AstProvider astProvider;
|
| +
|
| + @override
|
| final CompilationUnit unit;
|
|
|
| _DartAssistContextForValues(this.source, this.selectionOffset,
|
| - this.selectionLength, this.analysisContext, this.unit);
|
| + this.selectionLength, this.analysisContext, this.astProvider, this.unit);
|
| }
|
|
|