Skip to content

Commit b7aaa56

Browse files
fix: include original line number in checkstyle output
1 parent c0e616b commit b7aaa56

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/emitter/checkstyle.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,11 @@ where
5252
if let DiffLine::Expected(message) = line {
5353
write!(
5454
writer,
55-
r#"<error line="{}" severity="warning" message="Should be `{}`" />"#,
55+
r#"<error {}="{}" {}="{}" severity="warning" message="Should be `{}`" />"#,
56+
"line",
5657
mismatch.line_number,
58+
"original_line",
59+
mismatch.line_number_orig,
5760
XmlEscaped(&message)
5861
)?;
5962
}

tests/writemode/target/checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<checkstyle version="4.3"><file name="tests/writemode/source/fn-single-line.rs"><error line="2" severity="warning" message="Should be `fn foo_expr() { 1 }`" /><error line="2" severity="warning" message="Should be `fn foo_stmt() { foo(); }`" /><error line="2" severity="warning" message="Should be `fn foo_decl_local() { let z = 5; }`" /><error line="2" severity="warning" message="Should be `fn foo_decl_item(x: &amp;mut i32) { x = 3; }`" /><error line="2" severity="warning" message="Should be `fn empty() {}`" /><error line="2" severity="warning" message="Should be `fn foo_return() -&gt; String { &quot;yay&quot; }`" /><error line="2" severity="warning" message="Should be `fn foo_where() -&gt; T`" /><error line="2" severity="warning" message="Should be `where`" /><error line="2" severity="warning" message="Should be ` T: Sync,`" /><error line="2" severity="warning" message="Should be `{`" /><error line="52" severity="warning" message="Should be `fn lots_of_space() { 1 }`" /><error line="59" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="59" severity="warning" message="Should be `trait CoolerTypes {`" /><error line="59" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="59" severity="warning" message="Should be `fn Foo&lt;T&gt;()`" /><error line="59" severity="warning" message="Should be `where`" /><error line="59" severity="warning" message="Should be ` T: Bar,`" /><error line="59" severity="warning" message="Should be `{`" /></file></checkstyle>
2+
<checkstyle version="4.3"><file name="tests/writemode/source/fn-single-line.rs"><error line="2" original_line="2" severity="warning" message="Should be `fn foo_expr() { 1 }`" /><error line="2" original_line="2" severity="warning" message="Should be `fn foo_stmt() { foo(); }`" /><error line="2" original_line="2" severity="warning" message="Should be `fn foo_decl_local() { let z = 5; }`" /><error line="2" original_line="2" severity="warning" message="Should be `fn foo_decl_item(x: &amp;mut i32) { x = 3; }`" /><error line="2" original_line="2" severity="warning" message="Should be `fn empty() {}`" /><error line="2" original_line="2" severity="warning" message="Should be `fn foo_return() -&gt; String { &quot;yay&quot; }`" /><error line="2" original_line="2" severity="warning" message="Should be `fn foo_where() -&gt; T`" /><error line="2" original_line="2" severity="warning" message="Should be `where`" /><error line="2" original_line="2" severity="warning" message="Should be ` T: Sync,`" /><error line="2" original_line="2" severity="warning" message="Should be `{`" /><error line="52" original_line="61" severity="warning" message="Should be `fn lots_of_space() { 1 }`" /><error line="59" original_line="70" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="59" original_line="70" severity="warning" message="Should be `trait CoolerTypes {`" /><error line="59" original_line="70" severity="warning" message="Should be ` fn dummy(&amp;self) {}`" /><error line="59" original_line="70" severity="warning" message="Should be `fn Foo&lt;T&gt;()`" /><error line="59" original_line="70" severity="warning" message="Should be `where`" /><error line="59" original_line="70" severity="warning" message="Should be ` T: Bar,`" /><error line="59" original_line="70" severity="warning" message="Should be `{`" /></file></checkstyle>

0 commit comments

Comments
 (0)