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

Jump to bottom

Add postfix completion for sysouf, sysoutv, format, par, and not #2691

Merged
merged 1 commit into from
Jun 12, 2023
Merged

Add postfix completion for sysouf, sysoutv, format, par, and not #2691

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
25 changes: 25 additions & 0 deletions ...dt.ls.core/src/org/eclipse/jdt/ls/core/internal/corext/template/java/PostfixTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,22 @@ public enum PostfixTemplate {
FOR(PostfixPreferences.FOR_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.FOR_CONTENT, PostfixPreferences.FOR_DESCRIPTION),
FORI(PostfixPreferences.FORI_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.FORI_CONTENT, PostfixPreferences.FORI_DESCRIPTION),
FORR(PostfixPreferences.FORR_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.FORR_CONTENT, PostfixPreferences.FORR_DESCRIPTION),
FORMAT(PostfixPreferences.FORMAT_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.FORMAT_CONTENT,
PostfixPreferences.FORMAT_DESCRIPTION),
NNULL(PostfixPreferences.NNULL_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.NNULL_CONTENT, PostfixPreferences.NNULL_DESCRIPTION),
NULL(PostfixPreferences.NULL_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.NULL_CONTENT, PostfixPreferences.NULL_DESCRIPTION),
NOT(PostfixPreferences.NOT_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.NOT_CONTENT,
PostfixPreferences.NOT_DESCRIPTION),
SYSOUT(PostfixPreferences.SYSOUT_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.SYSOUT_CONTENT, PostfixPreferences.SYSOUT_DESCRIPTION),
SYSOUF(PostfixPreferences.SYSOUF_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.SYSOUF_CONTENT,
PostfixPreferences.SYSOUF_DESCRIPTION),
SYSOUTV(PostfixPreferences.SYSOUTV_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.SYSOUTV_CONTENT,
PostfixPreferences.SYSOUTV_DESCRIPTION),
SYSERR(PostfixPreferences.SYSERR_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.SYSERR_CONTENT, PostfixPreferences.SYSERR_DESCRIPTION),
THROW(PostfixPreferences.THROW_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.THROW_CONTENT, PostfixPreferences.THROW_DESCRIPTION),
VAR(PostfixPreferences.VAR_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.VAR_CONTENT, PostfixPreferences.VAR_DESCRIPTION),
PAR(PostfixPreferences.PAR_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.PAR_CONTENT,
PostfixPreferences.PAR_DESCRIPTION),
WHILE(PostfixPreferences.WHILE_ID, JavaPostfixContextType.ID_ALL, PostfixPreferences.WHILE_CONTENT, PostfixPreferences.WHILE_DESCRIPTION);
//@formatter:off

Expand Down Expand Up @@ -60,13 +70,18 @@ class PostfixPreferences {
public static final String FOR_ID = "org.eclipse.jdt.postfixcompletion.for";
public static final String FORI_ID = "org.eclipse.jdt.postfixcompletion.fori";
public static final String FORR_ID = "org.eclipse.jdt.postfixcompletion.forr";
public static final String FORMAT_ID = "org.eclipse.jdt.postfixcompletion.format";
public static final String IF_ID = "org.eclipse.jdt.ls.postfixcompletion.if";
public static final String NNULL_ID = "org.eclipse.jdt.postfixcompletion.nnull";
public static final String NULL_ID = "org.eclipse.jdt.postfixcompletion.null";
public static final String NOT_ID = "org.eclipse.jdt.postfixcompletion.not";
public static final String SYSOUT_ID = "org.eclipse.jdt.postfixcompletion.sysout";
public static final String SYSOUTV_ID = "org.eclipse.jdt.postfixcompletion.sysoutv";
public static final String SYSOUF_ID = "org.eclipse.jdt.postfixcompletion.sysouf";
public static final String SYSERR_ID = "org.eclipse.jdt.postfixcompletion.syserr";
public static final String THROW_ID = "org.eclipse.jdt.postfixcompletion.throw";
public static final String VAR_ID = "org.eclipse.jdt.postfixcompletion.var";
public static final String PAR_ID = "org.eclipse.jdt.postfixcompletion.par";
public static final String WHILE_ID = "org.eclipse.jdt.postfixcompletion.while";

// Default Contents
Expand All @@ -83,6 +98,7 @@ class PostfixPreferences {
public static final String FORR_CONTENT = "for (int $${1:${index}} = ${i:inner_expression(array)}.length - 1; $${1:${index}} >= 0; $${1:${index}}--) {\n" +
"\t$${0}\n" +
"}";
public static final String FORMAT_CONTENT = "String.format(${i:inner_expression(java.lang.String)}${}, $${0});";
public static final String IF_CONTENT = "if (${i:inner_expression(boolean)}) {\n" +
"\t$${0}\n" +
"}";
Expand All @@ -92,10 +108,14 @@ class PostfixPreferences {
public static final String NULL_CONTENT = "if (${i:inner_expression(java.lang.Object,array)} == null) {\n" +
"\t$${0}\n" +
"}";
public static final String NOT_CONTENT = "!${i:inner_expression(boolean)}${}";
rgrunber marked this conversation as resolved.
Show resolved Hide resolved
public static final String SYSOUT_CONTENT = "System.out.println(${i:inner_expression(java.lang.Object)}${});$${0}";
public static final String SYSOUTV_CONTENT = "System.out.println(\"${i:inner_expression(java.lang.Object)}${} = \" + ${i:inner_expression(java.lang.Object)}${});$${0}";
public static final String SYSOUF_CONTENT = "System.out.printf(\"\", ${i:inner_expression(java.lang.Object)}${});$${0}";
public static final String SYSERR_CONTENT = "System.err.println(${i:inner_expression(java.lang.Object)}${});$${0}";
public static final String THROW_CONTENT = "throw ${true:inner_expression(java.lang.Throwable)};";
public static final String VAR_CONTENT = "${field:newType(inner_expression)} $${1:${var:newName(inner_expression)}} = ${inner_expression};$${0}";
public static final String PAR_CONTENT = "(${i:inner_expression}${})";
public static final String WHILE_CONTENT = "while (${i:inner_expression(boolean)}) {\n" +
"\t$${0}\n" +
"}";
Expand All @@ -106,12 +126,17 @@ class PostfixPreferences {
public static final String FOR_DESCRIPTION = "Creates a for statement";
public static final String FORI_DESCRIPTION = "Creates a for statement which iterates over an array";
public static final String FORR_DESCRIPTION = "Creates a for statement which iterates over an array in reverse order";
public static final String FORMAT_DESCRIPTION = "Sends the affected object to the String.format(..) method";
public static final String IF_DESCRIPTION = "Creates a if statement";
public static final String NNULL_DESCRIPTION = "Creates an if statement and checks if the expression does not resolve to null";
public static final String NULL_DESCRIPTION = "Creates an if statement which checks if expression resolves to null";
public static final String NOT_DESCRIPTION = "Negates the expression";
public static final String SYSOUT_DESCRIPTION = "Sends the affected object to a System.out.println(..) call";
public static final String SYSOUTV_DESCRIPTION = "Sends the affected object to a System.out.println(..) call";
public static final String SYSOUF_DESCRIPTION = "Sends the affected object to a System.out.printf(..) call";
public static final String SYSERR_DESCRIPTION = "Sends the affected object to a System.err.println(..) call";
public static final String THROW_DESCRIPTION = "Throws the given Exception";
public static final String VAR_DESCRIPTION = "Creates a new variable";
public static final String PAR_DESCRIPTION = "Places the expression in parentheses";
public static final String WHILE_DESCRIPTION = "Creates a while loop";
}
130 changes: 130 additions & 0 deletions ...pse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/handlers/PostfixCompletionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,32 @@ public void test_null() throws JavaModelException {
assertEquals(new Range(new Position(3, 2), new Position(3, 8)), range);
}

@Test
public void test_not() throws JavaModelException {
//@formatter:off
ICompilationUnit unit = getWorkingCopy(
"src/org/sample/Test.java",
"package org.sample;\n" +
"public class Test {\n" +
" public void testMethod(boolean a) {\n" +
" a.not" +
" }\n" +
"}"
);
//@formatter:on
CompletionList list = requestCompletions(unit, "a.not");

assertNotNull(list);

List<CompletionItem> items = new ArrayList<>(list.getItems());
CompletionItem item = items.get(0);
assertEquals("not", item.getLabel());
assertEquals(item.getInsertText(), "!a");
assertEquals(item.getInsertTextFormat(), InsertTextFormat.Snippet);
Range range = item.getAdditionalTextEdits().get(0).getRange();
assertEquals(new Range(new Position(3, 2), new Position(3, 7)), range);
}

@Test
public void test_sysout() throws JavaModelException {
//@formatter:off
Expand Down Expand Up @@ -406,6 +432,60 @@ public void test_sysout_object() throws JavaModelException {
assertEquals(new Range(new Position(4, 2), new Position(4, 12)), range);
}

@Test
public void test_sysoutv_object() throws JavaModelException {
//@formatter:off
ICompilationUnit unit = getWorkingCopy(
"src/org/sample/Test.java",
"package org.sample;\n" +
"public class Test {\n" +
" public void testMethod(String a) {\n" +
" Boolean foo = true;\n" +
" foo.sysoutv" +
" }\n" +
"}"
);
//@formatter:on
CompletionList list = requestCompletions(unit, "foo.sysoutv");

assertNotNull(list);

List<CompletionItem> items = new ArrayList<>(list.getItems());
CompletionItem item = items.get(0);
assertEquals("sysoutv", item.getLabel());
assertEquals(item.getInsertText(), "System.out.println(\"foo = \" + foo);${0}");
assertEquals(item.getInsertTextFormat(), InsertTextFormat.Snippet);
Range range = item.getAdditionalTextEdits().get(0).getRange();
assertEquals(new Range(new Position(4, 2), new Position(4, 13)), range);
}

@Test
public void test_sysouf_object() throws JavaModelException {
//@formatter:off
ICompilationUnit unit = getWorkingCopy(
"src/org/sample/Test.java",
"package org.sample;\n" +
"public class Test {\n" +
" public void testMethod(String a) {\n" +
" Boolean foo = true;\n" +
" foo.sysouf" +
" }\n" +
"}"
);
//@formatter:on
CompletionList list = requestCompletions(unit, "foo.sysouf");

assertNotNull(list);

List<CompletionItem> items = new ArrayList<>(list.getItems());
CompletionItem item = items.get(0);
assertEquals("sysouf", item.getLabel());
assertEquals(item.getInsertText(), "System.out.printf(\"\", foo);${0}");
assertEquals(item.getInsertTextFormat(), InsertTextFormat.Snippet);
Range range = item.getAdditionalTextEdits().get(0).getRange();
assertEquals(new Range(new Position(4, 2), new Position(4, 12)), range);
}

@Test
public void test_syserr_object() throws JavaModelException {
//@formatter:off
Expand Down Expand Up @@ -433,6 +513,30 @@ public void test_syserr_object() throws JavaModelException {
assertEquals(new Range(new Position(4, 2), new Position(4, 12)), range);
}

@Test
public void test_format() throws JavaModelException {
//@formatter:off
ICompilationUnit unit = getWorkingCopy(
"src/org/sample/Test.java",
"package org.sample;\n" +
"public class Test {\n" +
" public void testMethod(String a) {\n" +
" a.format" +
" }\n" +
"}"
);
//@formatter:on
CompletionList list = requestCompletions(unit, "a.format");

assertNotNull(list);

CompletionItem item = list.getItems().stream().filter(i -> i.getKind() == CompletionItemKind.Snippet).findFirst().orElse(null);
assertEquals("format", item.getLabel());
assertEquals(item.getTextEditText(), "String.format(a, ${0});");
Range range = item.getAdditionalTextEdits().get(0).getRange();
assertEquals(new Range(new Position(3, 2), new Position(3, 10)), range);
}

@Test
public void test_throw() throws JavaModelException {
//@formatter:off
Expand Down Expand Up @@ -515,6 +619,32 @@ public void test_var2() throws JavaModelException {
assertTrue(additionalTextEdits.stream().anyMatch(e -> e.getNewText().contains("import java.util.List;")));
}

@Test
public void test_par() throws JavaModelException {
//@formatter:off
ICompilationUnit unit = getWorkingCopy(
"src/org/sample/Test.java",
"package org.sample;\n" +
"public class Test {\n" +
" public void testMethod(String a) {\n" +
" a.par" +
" }\n" +
"}"
);
//@formatter:on
CompletionList list = requestCompletions(unit, "a.par");

assertNotNull(list);

List<CompletionItem> items = new ArrayList<>(list.getItems());
CompletionItem item = items.get(0);
assertEquals("par", item.getLabel());
assertEquals(item.getInsertText(), "(a)");
assertEquals(item.getInsertTextFormat(), InsertTextFormat.Snippet);
Range range = item.getAdditionalTextEdits().get(0).getRange();
assertEquals(new Range(new Position(3, 2), new Position(3, 7)), range);
}

@Test
public void test_while() throws JavaModelException {
//@formatter:off
Expand Down