| 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 0dfe7d0a10524c6380893ff8d9456b67ce3c5ced..b21d50151bd19ecade7d4a52e27a4a5c97ba1732 100644
|
| --- a/pkg/analysis_server/test/services/correction/assist_test.dart
|
| +++ b/pkg/analysis_server/test/services/correction/assist_test.dart
|
| @@ -14,8 +14,8 @@ 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/analysis/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';
|
| @@ -4697,23 +4697,8 @@ main() {
|
| CompilationUnitElement testUnitElement =
|
| resolutionMap.elementDeclaredByCompilationUnit(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);
|
| - }
|
| + assistContext = new _DartAssistContextForValues(testUnitElement.source,
|
| + offset, length, driver, new AstProviderForDriver(driver), testUnit);
|
| AssistProcessor processor = new AssistProcessor(assistContext);
|
| return await processor.compute();
|
| }
|
| @@ -4777,7 +4762,7 @@ class _DartAssistContextForValues implements DartAssistContext {
|
| final int selectionLength;
|
|
|
| @override
|
| - final AnalysisContext analysisContext;
|
| + final AnalysisDriver analysisDriver;
|
|
|
| @override
|
| final AstProvider astProvider;
|
| @@ -4786,5 +4771,5 @@ class _DartAssistContextForValues implements DartAssistContext {
|
| final CompilationUnit unit;
|
|
|
| _DartAssistContextForValues(this.source, this.selectionOffset,
|
| - this.selectionLength, this.analysisContext, this.astProvider, this.unit);
|
| + this.selectionLength, this.analysisDriver, this.astProvider, this.unit);
|
| }
|
|
|