extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-03-13 15:08:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge: conflicts resolved

Browse Source
This commit is contained in:
blindfs 2025-03-11 21:46:51 +08:00
parent 72ffef2f4c
commit 7311decf30
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-lsp/src/semantic_tokens.rs
View File

@ -80,17 +80,7 @@ impl LanguageServer {
if sp < last_span { if sp < last_span {
continue; continue;
} }
<<<<<<< HEAD
let mut delta_start = range.start.character; let mut delta_start = range.start.character;
=======
// in case the start position is at the end of last line
let real_start_char = if range.end.line != range.start.line {
0
} else {
range.start.character
};
let mut delta_start = real_start_char;
>>>>>>> 5fa8f68d0 (test: lsp exportable completion)
if range.end.line == last_token_line { if range.end.line == last_token_line {
delta_start -= last_token_char; delta_start -= last_token_char;
} }