Context-aware Java snippets

Closes #782 Signed-off-by: David Thompson <davthomp@redhat.com>
redhat-developer · Jan 31, 2023 · 5a1b1cf · 5a1b1cf
1 parent 05e23f9
commit 5a1b1cf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/...xt/com.redhat.quarkus.ls/src/main/resources/com/redhat/quarkus/snippets/quarkus-java.json b/...xt/com.redhat.quarkus.ls/src/main/resources/com/redhat/quarkus/snippets/quarkus-java.json
@@ -26,7 +26,8 @@
 		],
 		"description": "Quarkus test resource class",
 		"context": {
-			"type": "io.quarkus.test.junit.QuarkusTest"
+			"type": "io.quarkus.test.junit.QuarkusTest",
+			"contentType": "class"
 		}
 	},
 	"Quarkus - new native test resource class": {
@@ -44,7 +45,8 @@
 		],
 		"description": "Quarkus native test resource class",
 		"context": {
-			"type": "io.quarkus.test.junit.SubstrateTest"
+			"type": "io.quarkus.test.junit.SubstrateTest",
+			"contentType": "class"
 		}
 	},
 	"Quarkus - new integration test resource class": {
@@ -62,7 +64,8 @@
 		],
 		"description": "Quarkus integration test resource class",
 		"context": {
-			"type": "io.quarkus.test.junit.QuarkusIntegrationTest"
+			"type": "io.quarkus.test.junit.QuarkusIntegrationTest",
+			"contentType": "class"
 		}
 	}
 }
diff --git a/...t.quarkus.ls/src/test/java/com/redhat/quarkus/ls/JavaTextDocumentSnippetRegistryTest.java b/...t.quarkus.ls/src/test/java/com/redhat/quarkus/ls/JavaTextDocumentSnippetRegistryTest.java
@@ -19,6 +19,8 @@
 import org.junit.Test;
 
 import org.eclipse.lsp4mp.ls.java.JavaTextDocumentSnippetRegistry;
+import org.eclipse.lsp4mp.commons.JavaCursorContextKind;
+import org.eclipse.lsp4mp.commons.JavaCursorContextResult;
 import org.eclipse.lsp4mp.commons.ProjectLabelInfoEntry;
 import org.eclipse.lsp4mp.ls.commons.snippets.ISnippetContext;
 import org.eclipse.lsp4mp.ls.commons.snippets.Snippet;
@@ -60,6 +62,12 @@ public void javaSnippets() {
 				Arrays.asList("io.quarkus.test.junit.QuarkusTest"));
 		boolean match2 = ((SnippetContextForJava) context).isMatch(new JavaSnippetCompletionContext(projectInfo2, null));
 		Assert.assertTrue("Project has io.quarkus.test.junit.QuarkusTest type", match2);
+
+		boolean match3 = ((SnippetContextForJava) context).isMatch(new JavaSnippetCompletionContext(projectInfo2, new JavaCursorContextResult(JavaCursorContextKind.BEFORE_CLASS, "aaaa")));
+		Assert.assertFalse("Cursor is not in an empty file", match3);
+
+		boolean match4 = ((SnippetContextForJava) context).isMatch(new JavaSnippetCompletionContext(projectInfo2, new JavaCursorContextResult(JavaCursorContextKind.IN_EMPTY_FILE, "aaaa")));
+		Assert.assertTrue("Cursor is in an empty file", match4);
 	}
 
 	private static Optional<Snippet> findByPrefix(String prefix, SnippetRegistry registry) {