pkg/analysis_server/lib/src/services/completion/dart/local_reference_contributor.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/local_reference_contributor.dart

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

Patch Set: Address review comments 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/services/completion/dart/local_constructor_contributor.dart ('k') | pkg/analysis_server/lib/src/services/completion/dart/optype.dart » ('j') | pkg/analyzer/lib/dart/ast/resolution_map.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 01298f865156ee5ce6a744c93b2412730ddbbb20..2d3bdd1fcfce69223dcbc2c192770ea70fad638d 100644

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

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

@@ -17,6 +17,7 @@ import 'package:analysis_server/src/services/completion/dart/optype.dart';

import 'package:analysis_server/src/services/correction/strings.dart';

import 'package:analysis_server/src/utilities/documentation.dart';

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

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

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

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

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

@@ -520,8 +521,10 @@ class _LocalVisitor extends LocalDeclarationVisitor {

{bool isAbstract: false,

bool isDeprecated: false,

int relevance: DART_RELEVANCE_DEFAULT}) {

- relevance = optype.returnValueSuggestionsFilter(

- enumDeclaration.element?.type, relevance);

+ ClassElement classElement =

+ resolutionMap.elementDeclaredByEnumDeclaration(enumDeclaration);

+ relevance =

+ optype.returnValueSuggestionsFilter(classElement?.type, relevance);

if (relevance != null) {

_addLocalSuggestion_enumConstant(constantDeclaration, enumDeclaration,

isAbstract: isAbstract,