Skip to content

Commit

Permalink
Now handling case where span has same lo and hi.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtwco committed Jan 17, 2018
1 parent 2161c3f commit a1b72f7
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/libsyntax/codemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -637,7 +637,7 @@ impl CodeMap {
/// Finds the width of a character, either before or after the provided span.
fn find_width_of_character_at_span(&self, sp: Span, forwards: bool) -> u32 {
// Disregard malformed spans and assume a one-byte wide character.
if sp.lo() > sp.hi() {
if sp.lo() >= sp.hi() {
return 1;
}

Expand Down Expand Up @@ -671,11 +671,16 @@ impl CodeMap {
} else {
return 1;
};
debug!("DTW start {:?} end {:?}", start_index, end_index);
debug!("DTW snippet {:?}", snippet);

let mut target = if forwards { end_index + 1 } else { end_index - 1 };
debug!("DTW initial target {:?}", target);
while !snippet.is_char_boundary(target - start_index) {
target = if forwards { target + 1 } else { target - 1 };
debug!("DTW update target {:?}", target);
}
debug!("DTW final target {:?}", target);

if forwards {
(target - end_index) as u32
Expand Down

0 comments on commit a1b72f7

Please sign in to comment.