mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use u8 to represent ambiguous representants (#3345)

Browse source
This commit is contained in:
Charlie Marsh 2023-03-04 16:01:05 -05:00 • committed by GitHub
parent 40d3b40c14
commit d7767b2bad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

72
crates/ruff/src/rules/ruff/rules/ambiguous_unicode_character.rs
View file

@ -96,7 +96,7 @@ impl AlwaysAutofixableViolation for AmbiguousUnicodeCharacterComment {
} }
/// See: <https://github.com/microsoft/vscode/blob/095ddabc52b82498ee7f718a34f9dd11d59099a8/src/vs/base/common/strings.ts#L1094> /// See: <https://github.com/microsoft/vscode/blob/095ddabc52b82498ee7f718a34f9dd11d59099a8/src/vs/base/common/strings.ts#L1094>
static CONFUSABLES: Lazy<FxHashMap<u32, u32>> = Lazy::new(|| { static CONFUSABLES: Lazy<FxHashMap<u32, u8>> = Lazy::new(|| {
#[allow(clippy::unreadable_literal)] #[allow(clippy::unreadable_literal)]
FxHashMap::from_iter([ FxHashMap::from_iter([
(8232, 32), (8232, 32),
@ -1701,44 +1701,42 @@ pub fn ambiguous_unicode_character(
// Search for confusing characters. // Search for confusing characters.
if let Some(representant) = CONFUSABLES.get(&(current_char as u32)) { if let Some(representant) = CONFUSABLES.get(&(current_char as u32)) {
if !settings.allowed_confusables.contains(&current_char) { if !settings.allowed_confusables.contains(&current_char) {
if let Some(representant) = char::from_u32(*representant) { let col = if row_offset == 0 {
let col = if row_offset == 0 { start.column() + col_offset
start.column() + col_offset } else {
} else { col_offset
col_offset };
}; let location = Location::new(start.row() + row_offset, col);
let location = Location::new(start.row() + row_offset, col); let end_location = Location::new(location.row(), location.column() + 1);
let end_location = Location::new(location.row(), location.column() + 1); let mut diagnostic = Diagnostic::new::<DiagnosticKind>(
let mut diagnostic = Diagnostic::new::<DiagnosticKind>( match context {
match context { Context::String => AmbiguousUnicodeCharacterString {
Context::String => AmbiguousUnicodeCharacterString { confusable: current_char,
confusable: current_char, representant: *representant as char,
representant,
}
.into(),
Context::Docstring => AmbiguousUnicodeCharacterDocstring {
confusable: current_char,
representant,
}
.into(),
Context::Comment => AmbiguousUnicodeCharacterComment {
confusable: current_char,
representant,
}
.into(),
},
Range::new(location, end_location),
);
if settings.rules.enabled(diagnostic.kind.rule()) {
if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
diagnostic.amend(Fix::replacement(
representant.to_string(),
location,
end_location,
));
} }
diagnostics.push(diagnostic); .into(),
Context::Docstring => AmbiguousUnicodeCharacterDocstring {
confusable: current_char,
representant: *representant as char,
}
.into(),
Context::Comment => AmbiguousUnicodeCharacterComment {
confusable: current_char,
representant: *representant as char,
}
.into(),
},
Range::new(location, end_location),
);
if settings.rules.enabled(diagnostic.kind.rule()) {
if autofix.into() && settings.rules.should_fix(diagnostic.kind.rule()) {
diagnostic.amend(Fix::replacement(
(*representant as char).to_string(),
location,
end_location,
));
} }
diagnostics.push(diagnostic);
} }
} }
} }