Skip to content

Commit 991d019

Browse files
committed
Use TextRange::contains_inclusive in fixes check
1 parent fb0ab9f commit 991d019

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

crates/ide/src/diagnostics.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,7 @@ mod tests {
257257

258258
assert_eq_text!(&after, &actual);
259259
assert!(
260-
fix.fix_trigger_range.start() <= file_position.offset
261-
&& fix.fix_trigger_range.end() >= file_position.offset,
260+
fix.fix_trigger_range.contains_inclusive(file_position.offset),
262261
"diagnostic fix range {:?} does not touch cursor position {:?}",
263262
fix.fix_trigger_range,
264263
file_position.offset
@@ -288,8 +287,7 @@ mod tests {
288287

289288
assert_eq_text!(&after, &actual);
290289
assert!(
291-
fix.fix_trigger_range.start() <= file_position.offset
292-
&& fix.fix_trigger_range.end() >= file_position.offset,
290+
fix.fix_trigger_range.contains_inclusive(file_position.offset),
293291
"diagnostic fix range {:?} does not touch cursor position {:?}",
294292
fix.fix_trigger_range,
295293
file_position.offset

crates/ide/src/diagnostics/fixes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ impl DiagnosticWithFix for IncorrectCase {
111111
let offset = name_node.syntax().text_range().start();
112112
let file_position = FilePosition { file_id, offset };
113113

114-
let rename_changes = rename_with_semantics(sema, file_position, &self.suggested_text)?;
114+
let rename_changes =
115+
rename_with_semantics(sema, file_position, &self.suggested_text).ok()?;
115116

116117
let label = format!("Rename to {}", self.suggested_text);
117118
Some(Fix::new(&label, rename_changes.info, rename_changes.range))

0 commit comments

Comments
 (0)