mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inverted the match logic to skip comments, attribute macros, and whitespace before the appropriate keywords.

Browse Source
This commit is contained in:
TopGunSnake 2022-07-19 18:08:05 -05:00
parent 09da74a35d
commit 6df414faa2
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/ide-assists/src/handlers/extract_module.rs
View File

@ -382,19 +382,10 @@ fn change_visibility(&mut self, record_fields: Vec<SyntaxNode>) {
for (vis, syntax) in replacements {
let item = syntax.children_with_tokens().find(|node_or_token| {
match node_or_token.kind() {
// We're looking for the start of functions, impls, structs, traits, and other documentable/attribute
// macroable items that would have pub(crate) in front of it
SyntaxKind::FN_KW
| SyntaxKind::STRUCT_KW
| SyntaxKind::ENUM_KW
| SyntaxKind::TRAIT_KW
| SyntaxKind::TYPE_KW
| SyntaxKind::CONST_KW
| SyntaxKind::MOD_KW => true,
// If we didn't find a keyword, we want to cover the record fields in a struct
SyntaxKind::NAME => true,
// Otherwise, the token shouldn't have pub(crate) before it
_ => false,
// We're skipping comments, doc comments, and attribute macros that may precede the keyword
// that the visibility should be placed before.
SyntaxKind::COMMENT | SyntaxKind::ATTR | SyntaxKind::WHITESPACE => false,
_ => true,
}
});