gered/llm-ls
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix: clamp col pos to prevent an out of bound slicing range (#13)

Browse source
This commit is contained in:
Luc Georges 2023-09-11 18:31:00 +02:00 committed by GitHub
parent 15c4ef3088
commit 1550467f86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/llm-ls/src/main.rs
View file

@ -15,9 +15,6 @@ use tracing::{error, info};
use tracing_appender::rolling; use tracing_appender::rolling;
use tracing_subscriber::EnvFilter; use tracing_subscriber::EnvFilter;
// TODO:
// * handle slice panic
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
struct RequestParams { struct RequestParams {
max_new_tokens: u32, max_new_tokens: u32,
@ -153,12 +150,13 @@ fn build_prompt(
let mut before_iter = text.lines_at(pos.line as usize + 1).reversed(); let mut before_iter = text.lines_at(pos.line as usize + 1).reversed();
let mut after_iter = text.lines_at(pos.line as usize); let mut after_iter = text.lines_at(pos.line as usize);
let mut before_line = before_iter.next(); let mut before_line = before_iter.next();
let col = pos.character as usize;
if let Some(line) = before_line { if let Some(line) = before_line {
let col = (pos.character as usize).clamp(0, line.len_chars());
before_line = Some(line.slice(0..col)); before_line = Some(line.slice(0..col));
} }
let mut after_line = after_iter.next(); let mut after_line = after_iter.next();
if let Some(line) = after_line { if let Some(line) = after_line {
let col = (pos.character as usize).clamp(0, line.len_chars());
after_line = Some(line.slice(col..)); after_line = Some(line.slice(col..));
} }
let mut before = vec![]; let mut before = vec![];
@ -205,7 +203,8 @@ fn build_prompt(
let mut first = true; let mut first = true;
for mut line in text.lines_at(pos.line as usize + 1).reversed() { for mut line in text.lines_at(pos.line as usize + 1).reversed() {
if first { if first {
line = line.slice(0..pos.character as usize); let col = (pos.character as usize).clamp(0, line.len_chars());
line = line.slice(0..col);
first = false; first = false;
} }
let line = line.to_string(); let line = line.to_string();