| Index: pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart
|
| diff --git a/pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart b/pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart
|
| index 5d288e3c1a3ac358be03400eed158521cc4cd278..146e6c065c976cbc51cd81f5a9401ba5ee8a83c8 100644
|
| --- a/pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart
|
| +++ b/pkg/analysis_server/lib/plugin/edit/assist/assist_dart.dart
|
| @@ -8,6 +8,8 @@ import 'dart:async';
|
|
|
| import 'package:analysis_server/plugin/edit/assist/assist_core.dart';
|
| import 'package:analyzer/dart/ast/ast.dart';
|
| +import 'package:analyzer/src/dart/analysis/ast_provider_context.dart';
|
| +import 'package:analyzer/src/dart/element/ast_provider.dart';
|
| import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/source.dart';
|
|
|
| @@ -23,6 +25,11 @@ abstract class DartAssistContext {
|
| AnalysisContext get analysisContext;
|
|
|
| /**
|
| + * The provider for parsed or resolved ASTs.
|
| + */
|
| + AstProvider get astProvider;
|
| +
|
| + /**
|
| * The length of the selection.
|
| */
|
| int get selectionLength;
|
| @@ -65,7 +72,8 @@ abstract class DartAssistContributor implements AssistContributor {
|
| if (unit == null) {
|
| return Assist.EMPTY_LIST;
|
| }
|
| - DartAssistContext dartContext = new _DartAssistContextImpl(context, unit);
|
| + DartAssistContext dartContext = new _DartAssistContextImpl(
|
| + new AstProviderForContext(analysisContext), context, unit);
|
| return internalComputeAssists(dartContext);
|
| }
|
|
|
| @@ -81,6 +89,11 @@ abstract class DartAssistContributor implements AssistContributor {
|
| * Clients may not extend, implement or mix-in this class.
|
| */
|
| class _DartAssistContextImpl implements DartAssistContext {
|
| + /**
|
| + * The provider for parsed or resolved ASTs.
|
| + */
|
| + final AstProvider astProvider;
|
| +
|
| final AssistContext _context;
|
|
|
| /**
|
| @@ -88,7 +101,7 @@ class _DartAssistContextImpl implements DartAssistContext {
|
| */
|
| final CompilationUnit unit;
|
|
|
| - _DartAssistContextImpl(this._context, this.unit);
|
| + _DartAssistContextImpl(this.astProvider, this._context, this.unit);
|
|
|
| /**
|
| * The [AnalysisContext] to get assists in.
|
|
|