Skip to content

Fix overlapping edits in postfix completions #3861

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

Open
tartarughina wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix overlapping edits in postfix completions #3861

Show file tree
Hide file tree
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
21 changes: 9 additions & 12 deletions ...core/src/org/eclipse/jdt/ls/core/internal/corext/template/java/PostfixTemplateEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.eclipse.lsp4j.CompletionItemLabelDetails;
import org.eclipse.lsp4j.Range;
import org.eclipse.lsp4j.TextEdit;
import org.eclipse.lsp4j.jsonrpc.messages.Either;

public class PostfixTemplateEngine {
private static String Switch_Name = "switch"; //$NON-NLS-1$
Expand Down Expand Up @@ -112,10 +113,10 @@ public List<CompletionItem> complete(IDocument document, int offset, ICompilatio
context.setActiveTemplateName(template.getName());
content = evaluateGenericTemplate(context, template);
}
setTextEdit(item, content, completionItemDefaults);
setTextEdit(item, content, range);

if (!getClientPreferences().isResolveAdditionalTextEditsSupport()) {
setAdditionalTextEdit(item, compilationUnit, context, range, template);
setAdditionalTextEdit(item, compilationUnit, context, template);
}

if (isCompletionItemLabelDetailsSupport()) {
Expand Down Expand Up @@ -151,27 +152,23 @@ public List<CompletionItem> complete(IDocument document, int offset, ICompilatio
return res;
}

private void setTextEdit(final CompletionItem item, String content, CompletionItemDefaults completionItemDefaults) {
if (getClientPreferences().isCompletionListItemDefaultsSupport() && completionItemDefaults.getEditRange() != null) {
item.setTextEditText(content);
} else {
item.setInsertText(content);
}
private void setTextEdit(final CompletionItem item, String content, Range range) {
item.setTextEdit(Either.forLeft(new TextEdit(range, content)));
}

public static void setAdditionalTextEdit(final CompletionItem item, ICompilationUnit compilationUnit,
JavaPostfixContext context, Range range, Template template) {
JavaPostfixContext context, Template template) {
List<TextEdit> additionalEdits = new ArrayList<>();
// use additional test edit to remove the code that needs to be replaced
additionalEdits.add(new TextEdit(range, ""));
List<org.eclipse.text.edits.TextEdit> jdtTextEdits = context.getAdditionalTextEdits(template.getName());
if (jdtTextEdits != null && !jdtTextEdits.isEmpty()) {
for (org.eclipse.text.edits.TextEdit edit : jdtTextEdits) {
TextEditConverter converter = new TextEditConverter(compilationUnit, edit);
additionalEdits.addAll(converter.convert());
}
}
item.setAdditionalTextEdits(additionalEdits);
if (!additionalEdits.isEmpty()) {
item.setAdditionalTextEdits(additionalEdits);
}
}

private boolean isCompletionItemLabelDetailsSupport() {
Expand Down
2 changes: 1 addition & 1 deletion ...e.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/handlers/CompletionResolveHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public CompletionItem resolve(CompletionItem param, IProgressMonitor monitor) {
}

if (manager.getClientPreferences().isResolveAdditionalTextEditsSupport()) {
PostfixTemplateEngine.setAdditionalTextEdit(param, unit, postfixContext, range, template);
PostfixTemplateEngine.setAdditionalTextEdit(param, unit, postfixContext, template);
}
}

Expand Down
Loading