pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart - Issue 2551023005: Prepare for decoupling analyzer ASTs from element model.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

Issue 2551023005: Prepare for decoupling analyzer ASTs from element model. (Closed)

Patch Set: Created 4 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « pkg/analysis_server/lib/src/operation/operation_analysis.dart ('k') | pkg/analysis_server/lib/src/services/completion/dart/inherited_reference_contributor.dart » ('j') | pkg/analyzer/lib/dart/ast/resolution_accessors.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

index 26a9af5c403832e3a88932ff2ccc955f2848742a..7b4318b3cbc470f546dcd8410aa6f69cf2c7a103 100644

--- a/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

+++ b/pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

@@ -19,6 +19,7 @@ import 'package:analysis_server/src/services/completion/dart/contribution_sorter

import 'package:analysis_server/src/services/completion/dart/optype.dart';

import 'package:analysis_server/src/services/search/search_engine.dart';

import 'package:analyzer/dart/ast/ast.dart';

+import 'package:analyzer/dart/ast/resolution_accessors.dart';

import 'package:analyzer/dart/ast/standard_ast_factory.dart';

import 'package:analyzer/dart/ast/token.dart';

import 'package:analyzer/dart/element/element.dart';

@@ -179,7 +180,7 @@ class DartCompletionRequestImpl implements DartCompletionRequest {

@override

LibraryElement get coreLib {

if (result != null) {

- AnalysisContext context = result.unit.element.context;

+ AnalysisContext context = elementForCompilationUnit(result.unit).context;

_coreLib = context.typeProvider.objectType.element.library;

} else {

Source coreUri = sourceFactory.forUri('dart:core');

@@ -325,7 +326,7 @@ class DartCompletionRequestImpl implements DartCompletionRequest {

return _resolvedUnits;

}

if (result != null) {

- _resolvedUnits = result.unit.element.library.units;

+ _resolvedUnits = elementForCompilationUnit(result.unit).library.units;

return _resolvedUnits;

}

LibraryElement libElem = libraryElement;

@@ -396,7 +397,7 @@ class DartCompletionRequestImpl implements DartCompletionRequest {

if (request.context == null) {

unit = request.result.unit;

// TODO(scheglov) support for parts

- libSource = unit.element.source;

+ libSource = elementForCompilationUnit(unit).source;

} else {

Source source = request.source;

AnalysisContext context = request.context;