Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

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

Issue 1088973008: fix NSM in suggestions with importUri (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: merge Created 5 years, 8 months 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 | « no previous file | pkg/analysis_server/test/abstract_context.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/services/completion/dart_completion_cache.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/dart_completion_cache.dart b/pkg/analysis_server/lib/src/services/completion/dart_completion_cache.dart
index eebe6a5d3d4ac073fc3e825900fe279c036bdb26..67a7245acb0eaf92b58e302d82c33882232c77a0 100644
--- a/pkg/analysis_server/lib/src/services/completion/dart_completion_cache.dart
+++ b/pkg/analysis_server/lib/src/services/completion/dart_completion_cache.dart
@@ -184,11 +184,13 @@ class DartCompletionCache extends CompletionCache {
if (!constructor.isPrivate) {
CompletionSuggestion suggestion = createSuggestion(constructor,
relevance: relevance, importForSource: importForSource);
- String name = suggestion.completion;
- name = name.length > 0 ? '$className.$name' : className;
- suggestion.completion = name;
- suggestion.selectionOffset = suggestion.completion.length;
- importedConstructorSuggestions.add(suggestion);
+ if (suggestion != null) {
+ String name = suggestion.completion;
+ name = name.length > 0 ? '$className.$name' : className;
+ suggestion.completion = name;
+ suggestion.selectionOffset = suggestion.completion.length;
+ importedConstructorSuggestions.add(suggestion);
+ }
}
}
}
@@ -326,22 +328,24 @@ class DartCompletionCache extends CompletionCache {
CompletionSuggestion suggestion = createSuggestion(element,
relevance: relevance, importForSource: importForSource);
- if (element is ExecutableElement) {
- DartType returnType = element.returnType;
- if (returnType != null && returnType.isVoid) {
- importedVoidReturnSuggestions.add(suggestion);
+ if (suggestion != null) {
+ if (element is ExecutableElement) {
+ DartType returnType = element.returnType;
+ if (returnType != null && returnType.isVoid) {
+ importedVoidReturnSuggestions.add(suggestion);
+ } else {
+ otherImportedSuggestions.add(suggestion);
+ }
+ } else if (element is FunctionTypeAliasElement) {
+ importedTypeSuggestions.add(suggestion);
+ } else if (element is ClassElement) {
+ importedTypeSuggestions.add(suggestion);
+ _addConstructorSuggestions(element, relevance, importForSource);
} else {
otherImportedSuggestions.add(suggestion);
}
- } else if (element is FunctionTypeAliasElement) {
- importedTypeSuggestions.add(suggestion);
- } else if (element is ClassElement) {
- importedTypeSuggestions.add(suggestion);
- _addConstructorSuggestions(element, relevance, importForSource);
- } else {
- otherImportedSuggestions.add(suggestion);
+ _importedCompletions.add(suggestion.completion);
}
- _importedCompletions.add(suggestion.completion);
}
/**
« no previous file with comments | « no previous file | pkg/analysis_server/test/abstract_context.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698