Skip to content

Updated LSP new from template command input validation rules #496

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Updated LSP new from template command input validation rules #496

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
12 changes: 7 additions & 5 deletions patches/7893-draft.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
index 891bfa328d..ed80b903a5 100644
index 891bfa328d..91172fda4b 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/LspTemplateUI.java
@@ -27,6 +27,7 @@ import java.net.MalformedURLException;
Expand Down Expand Up @@ -103,7 +103,7 @@ index 891bfa328d..ed80b903a5 100644
});
}

@@ -229,9 +253,21 @@ final class LspTemplateUI {
@@ -229,9 +253,23 @@ final class LspTemplateUI {
FileObject template = desc.getTemplate();
Object handler = template.getAttribute(FileBuilder.ATTR_TEMPLATE_HANDLER);
if (handler == null) {
Expand All @@ -114,8 +114,10 @@ index 891bfa328d..ed80b903a5 100644
+
+ @Override
+ public CompletionStage<String> apply(String name) {
+ if (!SourceVersion.isName(name)) {
+ client.showMessage(new MessageParams(MessageType.Error, Bundle.ERR_InvalidObjectName(name)));
+ if (!name.equals("package-info") && !name.equals("module-info")
+ && (SourceVersion.isKeyword(name) || !SourceVersion.isIdentifier(name)))
+ {
+ client.showMessage(new MessageParams(MessageType.Error,Bundle.ERR_InvalidObjectName(name)));
+ return client.showInputBox(new ShowInputBoxParams(Bundle.CTL_TemplateUI_SelectName(), desc.getProposedName())).thenCompose(this);
+ }
+ return CompletableFuture.completedFuture(name);
Expand All @@ -128,7 +130,7 @@ index 891bfa328d..ed80b903a5 100644
}
return CompletableFuture.completedFuture(builder);
}
@@ -242,7 +278,7 @@ final class LspTemplateUI {
@@ -242,7 +280,7 @@ final class LspTemplateUI {
suggestion = Utilities.toFile(new URI(folders.get(0).getUri())).getParent();
} catch (URISyntaxException ex) {
}
Expand Down