Skip to content

Commit 0d753f1

Browse files
author
Matija Obid
committed
Tests
1 parent 4190f58 commit 0d753f1

File tree

58 files changed

+1850
-270
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1850
-270
lines changed

combobulate-java.el

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,7 @@ If node is not method, return DEFAULT-NAME"
156156

157157
(:activation-nodes
158158
;; Class first level statements:
159-
((:nodes ("class_declaration"
160-
"field_declaration"
161-
"method_declaration"
162-
"constant_declaration"
163-
"annotation")
159+
((:nodes ((rule "class_body"))
164160
:has-parent ("class_body"
165161
"interface_body"
166162
"modifiers")))
@@ -172,16 +168,16 @@ If node is not method, return DEFAULT-NAME"
172168
:selector (:choose node
173169
:match-query
174170
(:query (class_declaration (class_body (method_declaration @match))) :engine combobulate)))
175-
171+
176172
( :activation-nodes ((:nodes ("block") :position at))
177173
:selector (:choose node
178174
:match-query
179175
(:query (block (_ @match)) :engine combobulate)))
180-
176+
181177
( :activation-nodes ((:nodes ("marker_annotation" "annotation") :position at))
182178
:selector (:choose node
183179
:match-siblings (:match-rules ("marker_annotation" "annotation"))))
184-
180+
185181
( :activation-nodes ((:nodes ((irule "block"))
186182
:position at))
187183
:selector (:choose node
@@ -193,11 +189,11 @@ If node is not method, return DEFAULT-NAME"
193189
:match-query
194190
(:query (if_statement consequence: (_ @match)) :engine combobulate)))
195191

196-
192+
197193

198194
( :activation-nodes ((:nodes ("lambda_expression"
199195
"method_declaration")
200-
:position in))
196+
:position in))
201197
:selector (:choose node
202198
:match-query
203199
(:query (_ body: (_ @match)) :engine combobulate)))
@@ -221,7 +217,6 @@ If node is not method, return DEFAULT-NAME"
221217

222218
(defun combobulate-java-setup (_)
223219
"Do nothing."
224-
;; (setq-local combobulate-navigate-down-into-lists nil)
225220
nil)
226221

227222
(provide 'combobulate-java)
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- combobulate-test-point-overlays: ((1 outline 237) (2 outline 251) (3 outline 259) (4 outline 283) (5 outline 296)); eval: (combobulate-test-fixture-mode t); -*-
2+
package example;
3+
4+
public class Arguments {
5+
public static void test(Long a, String[] arr, Map<Integer, String> b, Set<Long> x, String... args) {
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- combobulate-test-point-overlays: ((1 outline 237) (2 outline 251) (3 outline 259) (4 outline 283) (5 outline 296)); eval: (combobulate-test-fixture-mode t); -*-
2+
package example;
3+
4+
public class Arguments {
5+
public static void test(String[] arr, Map<Integer, String> b, Long a, Set<Long> x, String... args) {
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- combobulate-test-point-overlays: ((1 outline 237) (2 outline 251) (3 outline 259) (4 outline 283) (5 outline 296)); eval: (combobulate-test-fixture-mode t); -*-
2+
package example;
3+
4+
public class Arguments {
5+
public static void test(String[] arr, Long a, Set<Long> x, Map<Integer, String> b, String... args) {
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- combobulate-test-point-overlays: ((1 outline 237) (2 outline 251) (3 outline 259) (4 outline 283) (5 outline 296)); eval: (combobulate-test-fixture-mode t); -*-
2+
package example;
3+
4+
public class Arguments {
5+
public static void test(String[] arr, Long a, Map<Integer, String> b, String... args, Set<Long> x) {
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// -*- combobulate-test-point-overlays: ((1 outline 237) (2 outline 251) (3 outline 259) (4 outline 283) (5 outline 296)); eval: (combobulate-test-fixture-mode t); -*-
2+
package example;
3+
4+
public class Arguments {
5+
public static void test(String[] arr, Long a, Map<Integer, String> b, Set<Long> x, String... args) {
6+
}
7+
}

tests/fixture-deltas/combobulate-drag-down/example.java[@1~after].java

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/fixture-deltas/combobulate-drag-down/example.java[@2~after].java

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/fixture-deltas/combobulate-drag-down/example.java[@3~after].java

Lines changed: 0 additions & 11 deletions
This file was deleted.

tests/fixture-deltas/combobulate-drag-down/example.java[@4~after].java

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)