aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Woznicki <danwoz@nettoolkit.com>2022-02-28 14:22:20 -0800
committerStephan Seitz <stephan.seitz@fau.de>2022-03-01 21:12:14 +0100
commite23f5d48be767299cd14912090d2957657cf25bd (patch)
tree2de7157cda1257a9405915b8e450db264f204207
parentAdded fix for Java interfaces not being indented properly (diff)
downloadnvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar.gz
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar.bz2
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar.lz
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar.xz
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.tar.zst
nvim-treesitter-e23f5d48be767299cd14912090d2957657cf25bd.zip
Modified Java indent rules to stop ignoring block comments because javadoc blocks were defaulting to indent 0
-rw-r--r--queries/java/indents.scm2
-rw-r--r--tests/indent/java/javadoc.java5
-rw-r--r--tests/indent/java_spec.lua1
3 files changed, 7 insertions, 1 deletions
diff --git a/queries/java/indents.scm b/queries/java/indents.scm
index d1ba54833..cff699667 100644
--- a/queries/java/indents.scm
+++ b/queries/java/indents.scm
@@ -25,4 +25,4 @@
")"
] @indent_end
-[(block_comment) (line_comment)] @ignore
+(line_comment) @ignore
diff --git a/tests/indent/java/javadoc.java b/tests/indent/java/javadoc.java
new file mode 100644
index 000000000..94ac9b7e3
--- /dev/null
+++ b/tests/indent/java/javadoc.java
@@ -0,0 +1,5 @@
+public class Foo {
+ /**
+ */
+ void foo() {}
+}
diff --git a/tests/indent/java_spec.lua b/tests/indent/java_spec.lua
index ff14f6b2b..7b2651b2a 100644
--- a/tests/indent/java_spec.lua
+++ b/tests/indent/java_spec.lua
@@ -22,5 +22,6 @@ describe("indent Java:", function()
run:new_line("class_with_annotation.java", { on_line = 2, text = "void foo() {}", indent = 2 })
run:new_line("enum_with_annotation.java", { on_line = 2, text = "THING;", indent = 2 })
run:new_line("interface.java", { on_line = 1, text = "void foo();", indent = 2 })
+ run:new_line("javadoc.java", { on_line = 2, text = "* Sample javadoc line", indent = 2 })
end)
end)