-
Notifications
You must be signed in to change notification settings - Fork 883
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
change config name to generated_marker_line_search_limit
change config name to generated_marker_line_search_limit update docs fix formatting use config variable add 0 limit docs adding zero limit search
- Loading branch information
Showing
12 changed files
with
69 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,10 @@ | ||
use crate::Config; | ||
|
||
/// Returns `true` if the given span is a part of generated files. | ||
pub(super) fn is_generated_file(original_snippet: &str, header_size: usize) -> bool { | ||
pub(super) fn is_generated_file(original_snippet: &str, config: &Config) -> bool { | ||
original_snippet | ||
.lines() | ||
.take(header_size) // looking for marker only in the beginning of the file | ||
// looking for marker only in the beginning of the file | ||
.take(config.generated_marker_line_search_limit()) | ||
.any(|line| line.contains("@generated")) | ||
} |
2 changes: 1 addition & 1 deletion
2
.../false_with_generated_file_header_size.rs → ...ith_generated_marker_line_search_limit.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../false_with_generated_file_header_size.rs → ...files/false_with_marker_out_scope_size.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9 changes: 9 additions & 0 deletions
9
tests/source/configs/format_generated_files/false_with_zero_search_limit.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
// rustfmt-format_generated_files: false | ||
// rustfmt-generated_marker_line_search_limit: 0 | ||
|
||
// @generated | ||
fn main() { | ||
println!("hello, world") | ||
; | ||
} | ||
// @generated |
10 changes: 10 additions & 0 deletions
10
tests/source/configs/format_generated_files/true_with_marker_in_scope_size.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-format_generated_files: true | ||
// rustfmt-generated_marker_line_search_limit: 20 | ||
|
||
fn main() | ||
{ | ||
println!("hello, world") | ||
; | ||
} | ||
|
||
// @generated |
10 changes: 10 additions & 0 deletions
10
tests/target/configs/format_generated_files/false_with_generated_marker_line_search_limit.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// rustfmt-format_generated_files: false | ||
// rustfmt-generated_marker_line_search_limit: 15 | ||
|
||
fn main() | ||
{ | ||
println!("hello, world") | ||
; | ||
} | ||
|
||
// @generated |
8 changes: 8 additions & 0 deletions
8
tests/target/configs/format_generated_files/false_with_marker_out_scope_size.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
// rustfmt-format_generated_files: false | ||
// rustfmt-generated_marker_line_search_limit: 1 | ||
|
||
fn main() { | ||
println!("hello, world"); | ||
} | ||
|
||
// @generated |
8 changes: 8 additions & 0 deletions
8
tests/target/configs/format_generated_files/false_with_zero_search_limit.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
// rustfmt-format_generated_files: false | ||
// rustfmt-generated_marker_line_search_limit: 0 | ||
|
||
// @generated | ||
fn main() { | ||
println!("hello, world"); | ||
} | ||
// @generated |
8 changes: 8 additions & 0 deletions
8
tests/target/configs/format_generated_files/true_with_marker_in_scope_size.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
// rustfmt-format_generated_files: true | ||
// rustfmt-generated_marker_line_search_limit: 20 | ||
|
||
fn main() { | ||
println!("hello, world"); | ||
} | ||
|
||
// @generated |