Skip to content

Commit 6175e07

Browse files
feat(outline): add Java record_declaration rule (#2945)
* feat(outline): add Java record_declaration rule The bundled Java outline rules had no rule for `record_declaration`, so a file whose only type is a `record` produced no outline elements at all, even though both the grammar and `schemas/java_rule.json` already know the kind. Add a `java-record` item rule mapping `record_declaration` to `symbolType: struct`, mirroring the existing `csharp-record` rule, and list it as a parent for the Java member rules so a record's methods, constructors and fields are attributed to the record instead of an enclosing type. Closes #2944 * feat(outline): recognize Java compact record constructors Add a java-member-compact-constructor member rule targeting the compact_constructor_declaration grammar node, alongside the existing java-member-constructor, and snapshot a record with a compact constructor.
1 parent 3ecc031 commit 6175e07

2 files changed

Lines changed: 84 additions & 3 deletions

File tree

‎crates/outline/src/default_rules/java.yml‎

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,27 @@ isExported:
7171
has:
7272
pattern: public
7373
---
74+
id: java-record
75+
language: Java
76+
role: item
77+
symbolType: struct
78+
rule:
79+
all:
80+
- kind: record_declaration
81+
- has:
82+
field: name
83+
pattern: $NAME
84+
name: $NAME
85+
isExported:
86+
has:
87+
kind: modifiers
88+
has:
89+
pattern: public
90+
---
7491
id: java-member-method
7592
language: Java
7693
role: member
77-
parentRuleIds: [java-interface, java-enum, java-class]
94+
parentRuleIds: [java-interface, java-enum, java-class, java-record]
7895
symbolType: method
7996
rule:
8097
all:
@@ -92,7 +109,7 @@ isPublic:
92109
id: java-member-constructor
93110
language: Java
94111
role: member
95-
parentRuleIds: [java-enum, java-class]
112+
parentRuleIds: [java-enum, java-class, java-record]
96113
symbolType: constructor
97114
rule:
98115
all:
@@ -107,10 +124,28 @@ isPublic:
107124
has:
108125
pattern: public
109126
---
127+
id: java-member-compact-constructor
128+
language: Java
129+
role: member
130+
parentRuleIds: [java-enum, java-class, java-record]
131+
symbolType: constructor
132+
rule:
133+
all:
134+
- kind: compact_constructor_declaration
135+
- has:
136+
field: name
137+
pattern: $NAME
138+
name: $NAME
139+
isPublic:
140+
has:
141+
kind: modifiers
142+
has:
143+
pattern: public
144+
---
110145
id: java-member-field
111146
language: Java
112147
role: member
113-
parentRuleIds: [java-interface, java-enum, java-class]
148+
parentRuleIds: [java-interface, java-enum, java-class, java-record]
114149
symbolType: field
115150
rule:
116151
all:

‎crates/outline/tests/jvm_swift_outline_rules.rs‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,52 @@ enum Protocol { HTTP_1_1 }
182182
);
183183
}
184184

185+
#[test]
186+
fn java_rules_parse_and_extract_records() {
187+
const RULES: &str = include_str!("../src/default_rules/java.yml");
188+
common::assert_outline_snapshot(
189+
SupportLang::Java,
190+
RULES,
191+
r#"
192+
public record Point(int x, int y) {
193+
public double norm() { return 0; }
194+
}
195+
196+
record Internal(int value) {}
197+
"#,
198+
r#"
199+
- Struct item exported Point
200+
- Method public norm
201+
- Struct item private Internal
202+
"#,
203+
);
204+
}
205+
206+
#[test]
207+
fn java_rules_parse_and_extract_compact_constructors() {
208+
const RULES: &str = include_str!("../src/default_rules/java.yml");
209+
common::assert_outline_snapshot(
210+
SupportLang::Java,
211+
RULES,
212+
r#"
213+
public record Point(int x, int y) {
214+
public Point {
215+
if (x < 0) { throw new IllegalArgumentException(); }
216+
}
217+
public double norm() { return 0; }
218+
}
219+
220+
record Internal(int value) {}
221+
"#,
222+
r#"
223+
- Struct item exported Point
224+
- Constructor public Point
225+
- Method public norm
226+
- Struct item private Internal
227+
"#,
228+
);
229+
}
230+
185231
#[test]
186232
fn java_rules_extract_duplicate_method_names_with_signatures() {
187233
const RULES: &str = include_str!("../src/default_rules/java.yml");

0 commit comments

Comments
 (0)