From ccb2f1a2e0ba664e3839d303a9f6e4d987734887 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 20 Jun 2024 10:58:56 +0200 Subject: [PATCH] cleanup --- .../java/beans/DependsOnCompletionProcessor.java | 15 --------------- .../java/beans/DependsOnCompletionProposal.java | 3 --- .../java/beans/QualifierCompletionProcessor.java | 4 ---- .../java/beans/QualifierCompletionProposal.java | 3 --- 4 files changed, 25 deletions(-) diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java index 1fcfe6ed7..de954fb25 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProcessor.java @@ -70,9 +70,6 @@ public class DependsOnCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(offset, offset, "\"" + bean.getName() + "\""); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly DependsOnCompletionProposal proposal = new DependsOnCompletionProposal(edits, bean.getName(), bean.getName(), null); completions.add(proposal); @@ -137,9 +134,6 @@ public class DependsOnCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(startOffset, endOffset, proposalPrefix + bean.getName() + proposalPostfix); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly DependsOnCompletionProposal proposal = new DependsOnCompletionProposal(edits, bean.getName(), bean.getName(), null); completions.add(proposal); @@ -168,9 +162,6 @@ public class DependsOnCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(startOffset, endOffset, bean.getName()); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly DependsOnCompletionProposal proposal = new DependsOnCompletionProposal(edits, bean.getName(), bean.getName(), null); completions.add(proposal); @@ -190,9 +181,6 @@ public class DependsOnCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(offset, offset, "\"" + bean.getName() + "\""); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly DependsOnCompletionProposal proposal = new DependsOnCompletionProposal(edits, bean.getName(), bean.getName(), null); completions.add(proposal); @@ -217,9 +205,6 @@ public class DependsOnCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(offset, offset, "\"" + bean.getName() + "\","); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly DependsOnCompletionProposal proposal = new DependsOnCompletionProposal(edits, bean.getName(), bean.getName(), null); completions.add(proposal); diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProposal.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProposal.java index a2e1f4382..7d5cf8a39 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProposal.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/DependsOnCompletionProposal.java @@ -30,9 +30,6 @@ public class DependsOnCompletionProposal implements ICompletionProposal { public DependsOnCompletionProposal(DocumentEdits edits, String label, String detail, Renderable documentation) { this.edits = edits; this.label = label; - // PT 161489998 - Detail for proposal must not be null. For some clients like Eclipse, - // a null detail results in an NPE at JDT level when inserting the proposal in the editor, and results - // in odd behaviour like insertion of an extra new line. this.detail = detail == null ? EMPTY_DETAIL : detail; this.documentation = documentation; } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProcessor.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProcessor.java index cfdea87ea..936880fc5 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProcessor.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProcessor.java @@ -165,11 +165,7 @@ public class QualifierCompletionProcessor implements CompletionProvider { DocumentEdits edits = new DocumentEdits(doc, false); edits.replace(startOffset, endOffset, createReplacementText.apply(candidate)); - // PT-160455522: create a proposal with `PlainText` format type, because for vscode (but not Eclipse), if you send it as a snippet - // and it is "place holder" as such `"${debug}"`, vscode may treat it as a snippet place holder, and insert an empty string - // if it cannot resolve it. If sending this as plain text, then insertion happens correctly QualifierCompletionProposal proposal = new QualifierCompletionProposal(edits, candidate, candidate, null, score--); - completions.add(proposal); } } diff --git a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProposal.java b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProposal.java index 4ca1e990a..1a7dd3a59 100644 --- a/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProposal.java +++ b/headless-services/spring-boot-language-server/src/main/java/org/springframework/ide/vscode/boot/java/beans/QualifierCompletionProposal.java @@ -31,9 +31,6 @@ public class QualifierCompletionProposal extends ScoreableProposal { public QualifierCompletionProposal(DocumentEdits edits, String label, String detail, Renderable documentation, double score) { this.edits = edits; this.label = label; - // PT 161489998 - Detail for proposal must not be null. For some clients like Eclipse, - // a null detail results in an NPE at JDT level when inserting the proposal in the editor, and results - // in odd behaviour like insertion of an extra new line. this.detail = detail == null ? EMPTY_DETAIL : detail; this.documentation = documentation; this.score = score;