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

Unified Diff: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java

Issue 845553005: Change code completion relevance from CompletionRelevance.LOW/DEFAULT/HIGH to int (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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
Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java
diff --git a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java
index a5ac7da3093bf2876c7a132fa023d7b124252fd6..3e94d8ba2536e36c2c43c3cba9e9bad1e036a4c5 100644
--- a/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java
+++ b/editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/internal/text/dart/DartServerProposal.java
@@ -20,7 +20,6 @@ import com.google.dart.engine.utilities.instrumentation.InstrumentationBuilder;
import com.google.dart.server.AnalysisServer;
import com.google.dart.server.GetHoverConsumer;
import com.google.dart.server.generated.types.CompletionSuggestion;
-import com.google.dart.server.generated.types.CompletionSuggestionKind;
import com.google.dart.server.generated.types.Element;
import com.google.dart.server.generated.types.HoverInformation;
import com.google.dart.server.generated.types.Location;
@@ -39,8 +38,6 @@ import com.google.dart.tools.ui.internal.viewsupport.DartElementImageProvider;
import com.google.dart.tools.ui.internal.viewsupport.ImageDescriptorRegistry;
import com.google.dart.tools.ui.text.dart.IDartCompletionProposal;
-import static com.google.dart.server.generated.types.CompletionRelevance.HIGH;
-import static com.google.dart.server.generated.types.CompletionRelevance.LOW;
import static com.google.dart.server.generated.types.CompletionSuggestionKind.IMPORT;
import static com.google.dart.server.generated.types.CompletionSuggestionKind.KEYWORD;
import static com.google.dart.server.generated.types.ElementKind.FIELD;
@@ -551,29 +548,29 @@ public class DartServerProposal implements ICompletionProposal, ICompletionPropo
}
private int computeRelevance() {
- String relevance = suggestion.getRelevance();
- if (HIGH.equals(relevance)) {
- return 0;
- } else if (LOW.equals(relevance)) {
- return 100;
- } else { // DEFAULT
+ int relevance = suggestion.getRelevance();
+ if (relevance != 1000) {
danrubel 2015/01/08 22:38:03 This code will be removed as we move this logic to
+ return relevance;
+ }
+ // TODO (danrubel) move this code to the server
+ { // DEFAULT
Element element = suggestion.getElement();
if (element != null) {
String kind = element.getKind();
if (LOCAL_VARIABLE.equals(kind) || PARAMETER.equals(kind)) {
- return 20;
+ return 1059;
} else if (FIELD.equals(kind)) {
- return 21;
+ return 1058;
} else if (METHOD.equals(kind) || GETTER.equals(kind) || SETTER.equals(kind)
|| FUNCTION.equals(kind)) {
- return 22;
+ return 1057;
} else if (TOP_LEVEL_VARIABLE.equals(kind)) {
- return 23;
+ return 1056;
} else if (KEYWORD.equals(kind)) {
- return 24;
+ return 1055;
}
}
- return 50;
+ return 1000;
}
}
@@ -636,22 +633,6 @@ public class DartServerProposal implements ICompletionProposal, ICompletionPropo
}
return css;
}
-
- /**
- * @return A string representing the parameters or {@code null} if no parameters for completion
- */
- private String getParamString() {
- Element element = suggestion.getElement();
- if (element != null && !CompletionSuggestionKind.IDENTIFIER.equals(suggestion.getKind())) {
- String kind = element.getKind();
- if (!GETTER.equals(kind) && !SETTER.equals(kind)) {
- if (element != null) {
- return element.getParameters();
- }
- }
- }
- return null;
- }
}
/**

Powered by Google App Engine
This is Rietveld 408576698