Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose proposals for 3rd-party extensions #1344

Merged
merged 1 commit into from
Feb 17, 2020
Merged

Expose proposals for 3rd-party extensions #1344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions ....core/src/org/eclipse/jdt/ls/core/internal/contentassist/CompletionProposalRequestor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public final class CompletionProposalRequestor extends CompletionRequestor {
private CompletionContext context;
private boolean isComplete = true;
private PreferenceManager preferenceManager;
private CompletionProposalReplacementProvider proposalProvider;

static class ProposalComparator implements Comparator<CompletionProposal> {

Expand Down Expand Up @@ -199,12 +200,10 @@ public List<CompletionItem> getCompletionItems() {
CompletionResponses.store(response);

//Let's compute replacement texts for the most relevant results only
CompletionProposalReplacementProvider proposalProvider = new CompletionProposalReplacementProvider(unit, getContext(), response.getOffset(), preferenceManager.getClientPreferences());
for (int i = 0; i < limit; i++) {
CompletionProposal proposal = proposals.get(i);
try {
CompletionItem item = toCompletionItem(proposal, i);
proposalProvider.updateReplacement(proposal, item, '\0');
completionItems.add(item);
} catch (Exception e) {
JavaLanguageServerPlugin.logException(e.getMessage(), e);
Expand Down Expand Up @@ -266,6 +265,7 @@ public CompletionItem toCompletionItem(CompletionProposal proposal, int index) {
JavaLanguageServerPlugin.log(e);
}
}
proposalProvider.updateReplacement(proposal, $, '\0');
return $;
}

Expand All @@ -275,6 +275,7 @@ public void acceptContext(CompletionContext context) {
this.context = context;
response.setContext(context);
this.descriptionProvider = new CompletionProposalDescriptionProvider(context);
this.proposalProvider = new CompletionProposalReplacementProvider(unit, context, response.getOffset(), preferenceManager.getClientPreferences());
}


Expand Down Expand Up @@ -381,6 +382,10 @@ public CompletionContext getContext() {
return context;
}

public List<CompletionProposal> getProposals() {
return proposals;
}

/**
* copied from
* org.eclipse.jdt.ui.text.java.CompletionProposalCollector.isFiltered(CompletionProposal)
Expand Down Expand Up @@ -452,4 +457,4 @@ protected final char[] getDeclaringType(CompletionProposal proposal) {
}
}

}
}