From 2cf0fac5cc19d7b1688673a133388f96f7ae2437 Mon Sep 17 00:00:00 2001
From: Pokey Rule <755842+pokey@users.noreply.github.com>
Date: Fri, 15 Jul 2022 22:42:37 +0100
Subject: [PATCH] Update Java patterns for new tree-sitter grammar (#871)

---
 src/languages/java.ts                         |  2 +-
 .../recorded/languages/java/clearComment.yml  | 26 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/test/suite/fixtures/recorded/languages/java/clearComment.yml

diff --git a/src/languages/java.ts b/src/languages/java.ts
index 9abe0bf303..c56a90393b 100644
--- a/src/languages/java.ts
+++ b/src/languages/java.ts
@@ -57,7 +57,7 @@ const nodeMatchers: Partial<
   className: "class_declaration[name]",
   ifStatement: "if_statement",
   string: "string_literal",
-  comment: "comment",
+  comment: ["line_comment", "block_comment", "comment"],
   anonymousFunction: "lambda_expression",
   list: "array_initializer",
   functionCall: [
diff --git a/src/test/suite/fixtures/recorded/languages/java/clearComment.yml b/src/test/suite/fixtures/recorded/languages/java/clearComment.yml
new file mode 100644
index 0000000000..fd7e101ada
--- /dev/null
+++ b/src/test/suite/fixtures/recorded/languages/java/clearComment.yml
@@ -0,0 +1,26 @@
+languageId: java
+command:
+  spokenForm: clear comment
+  version: 2
+  targets:
+    - type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: comment}
+  usePrePhraseSnapshot: true
+  action: {name: clearAndSetSelection}
+initialState:
+  documentContents: /* Hello world */
+  selections:
+    - anchor: {line: 0, character: 9}
+      active: {line: 0, character: 9}
+  marks: {}
+finalState:
+  documentContents: ""
+  selections:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+  thatMark:
+    - anchor: {line: 0, character: 0}
+      active: {line: 0, character: 0}
+fullTargets: [{type: primitive, mark: {type: cursor}, modifiers: [{type: containingScope, scopeType: {type: comment}}]}]