Skip to content

Commit

Permalink
Auto merge of #18243 - krobelus:clamp-position-character, r=Veykril
Browse files Browse the repository at this point in the history
Clamp Position::character to line length

LSP says about Position::character

> If the character value is greater than the line length it defaults back to the line length.

but from_proto::offset() doesn't implement this.

A client might for example request code actions for a whole line by sending
Position::character=99999.  I don't think there is ever a reason (besides laziness) why the
client can't specify the line length instead but I guess we should not crash but follow protocol.

Not sure how to update Cargo.lock (lib/README.md doesn't say how).

Fixes #18240
  • Loading branch information
bors committed Oct 18, 2024
2 parents 5b85f1c + 2af15d2 commit 03cfa8e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/rust-analyzer/lib/line-index/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "line-index"
version = "0.1.1"
version = "0.1.2"
description = "Maps flat `TextSize` offsets to/from `(line, column)` representation."
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/rust-analyzer/tree/master/lib/line-index"
Expand Down
8 changes: 8 additions & 0 deletions src/tools/rust-analyzer/lib/line-index/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,14 @@ impl LineIndex {
Some(LineCol { line: line_col.line, col })
}

/// Returns the given line's range.
pub fn line(&self, line: u32) -> Option<TextRange> {
let start = self.start_offset(line as usize)?;
let next_newline = self.newlines.get(line as usize).copied().unwrap_or(self.len);
let line_length = next_newline - start;
Some(TextRange::new(start, start + line_length))
}

/// Given a range [start, end), returns a sorted iterator of non-empty ranges [start, x1), [x1,
/// x2), ..., [xn, end) where all the xi, which are positions of newlines, are inside the range
/// [start, end).
Expand Down
23 changes: 23 additions & 0 deletions src/tools/rust-analyzer/lib/line-index/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,3 +195,26 @@ fn test_every_chars() {
}
}
}

#[test]
fn test_line() {
use text_size::TextRange;

macro_rules! validate {
($text:expr, $line:expr, $expected_start:literal .. $expected_end:literal) => {
let line_index = LineIndex::new($text);
assert_eq!(
line_index.line($line),
Some(TextRange::new(
TextSize::from($expected_start),
TextSize::from($expected_end)
))
);
};
}

validate!("", 0, 0..0);
validate!("\n", 1, 1..1);
validate!("\nabc", 1, 1..4);
validate!("\nabc\ndef", 1, 1..5);
}

0 comments on commit 03cfa8e

Please sign in to comment.