| Index: editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/text/dart/CompletionProposalCollector.java
|
| ===================================================================
|
| --- editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/text/dart/CompletionProposalCollector.java (revision 7347)
|
| +++ editor/tools/plugins/com.google.dart.tools.ui/src/com/google/dart/tools/ui/text/dart/CompletionProposalCollector.java (working copy)
|
| @@ -353,8 +353,8 @@
|
| protected int computeRelevance(CompletionProposal proposal) {
|
| final int baseRelevance = proposal.getRelevance() * 16;
|
| switch (proposal.getKind()) {
|
| -// case CompletionProposal.PACKAGE_REF:
|
| -// return baseRelevance + 0;
|
| + case CompletionProposal.LIBRARY_PREFIX:
|
| + return baseRelevance + 0;
|
| case CompletionProposal.LABEL_REF:
|
| return baseRelevance + 1;
|
| case CompletionProposal.KEYWORD:
|
| @@ -406,8 +406,8 @@
|
| switch (proposal.getKind()) {
|
| case CompletionProposal.KEYWORD:
|
| return createKeywordProposal(proposal);
|
| -// case CompletionProposal.PACKAGE_REF:
|
| -// return createPackageProposal(proposal);
|
| + case CompletionProposal.LIBRARY_PREFIX:
|
| + return createLibraryPrefixProposal(proposal);
|
| case CompletionProposal.TYPE_REF:
|
| return createTypeProposal(proposal);
|
| // case CompletionProposal.JAVADOC_TYPE_REF:
|
| @@ -522,8 +522,8 @@
|
| // return "java.lang.Object".toCharArray(); //$NON-NLS-1$
|
| // }
|
| return Signature.toCharArray(declaration);
|
| -// case CompletionProposal.PACKAGE_REF:
|
| -// return proposal.getDeclarationSignature();
|
| + case CompletionProposal.LIBRARY_PREFIX:
|
| + return proposal.getDeclarationSignature();
|
| // case CompletionProposal.JAVADOC_TYPE_REF:
|
| case CompletionProposal.TYPE_REF:
|
| return Signature.toCharArray(proposal.getSignature());
|
| @@ -842,17 +842,17 @@
|
| return proposal;
|
| }
|
|
|
| -// private IDartCompletionProposal createPackageProposal(CompletionProposal proposal) {
|
| -// String completion = String.valueOf(proposal.getCompletion());
|
| -// int start = proposal.getReplaceStart();
|
| -// int length = getLength(proposal);
|
| -// StyledString label = new StyledString(fLabelProvider.createSimpleLabel(proposal));//TODO(messick)
|
| -// Image image = getImage(fLabelProvider.createPackageImageDescriptor(proposal));
|
| -// int relevance = computeRelevance(proposal);
|
| -//
|
| -// return new DartCompletionProposal(completion, start, length, image, label, relevance);
|
| -// }
|
| + private IDartCompletionProposal createLibraryPrefixProposal(CompletionProposal proposal) {
|
| + String completion = String.valueOf(proposal.getCompletion());
|
| + int start = proposal.getReplaceStart();
|
| + int length = getLength(proposal);
|
| + StyledString label = new StyledString(fLabelProvider.createSimpleLabel(proposal));//TODO(messick)
|
| + Image image = getImage(fLabelProvider.createLibraryImageDescriptor(proposal));
|
| + int relevance = computeRelevance(proposal);
|
|
|
| + return new DartCompletionProposal(completion, start, length, image, label, relevance);
|
| + }
|
| +
|
| private IDartCompletionProposal createTypeProposal(CompletionProposal typeProposal) {
|
| LazyDartCompletionProposal proposal = new LazyDartTypeCompletionProposal(typeProposal,
|
| getInvocationContext());
|
|
|