Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Correct keyword regex used by style_keyword_*. #213

Merged
merged 1 commit into from
Dec 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/rules/style_keyword_0or1space.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Rule for StyleKeyword0Or1Space {
- exactly 1space, then identifier or symbol
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_0space.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl Rule for StyleKeyword0Space {
- nothing, immediately followed by a symbol
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_1or2space.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Rule for StyleKeyword1Or2Space {
- exactly 2space
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_1space.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl Rule for StyleKeyword1Space {
- exactly 1space, then nothing
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_construct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl Rule for StyleKeywordConstruct {
- exactly 1space, then comment
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_datatype.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Rule for StyleKeywordDatatype {
- exactly 1space, then identifier
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_end.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ impl Rule for StyleKeywordEnd {
- exactly 1space, then nothing
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_maybelabel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl Rule for StyleKeywordMaybelabel {
- exactly 1space, then comment
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down
2 changes: 1 addition & 1 deletion src/rules/style_keyword_newline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ impl Rule for StyleKeywordNewline {
- exactly 1space then a comment
*/
if self.re_split.is_none() {
self.re_split = Some(Regex::new(r"(?P<kw>[a-z_01]+)(?P<succ>(?s:.)*)").unwrap());
self.re_split = Some(Regex::new(r"(?P<kw>[\\$'BXZa-z_01]+)(?P<succ>(?s:.)*)").unwrap());
}
if self.re_kw.is_none() {
let keywords =
Expand Down