language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lsp: Offer to populate empty documents (#4767)

Browse source
This commit is contained in:
Tobias Hunger 2024-12-11 19:33:24 +01:00 • committed by GitHub
parent 34bbeed11a
commit b7e1fb9d18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 434 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

35
internal/compiler/lexer.rs
View file

@ -44,7 +44,7 @@ pub fn lex_whitespace(text: &str, _: &mut LexState) -> usize {
let mut len = 0;
let chars = text.chars();
for c in chars {
if !c.is_whitespace() {
if !c.is_whitespace() && !['\u{0002}', '\u{0003}'].contains(&c) {
break;
}
len += c.len_utf8();
@ -413,6 +413,13 @@ fn test_locate_rust_macro() {
///
/// All the other bytes which are not newlines are replaced by space. This allow offsets in the resulting
/// string to preserve line and column number.
///
/// The last byte before the Slint area will be \u{2} (ASCII Start-of-Text), the first byte after
/// the slint code will be \u{3} (ASCII End-of-Text), so that programs can find the area of slint code
/// within the program.
///
/// Note that the slint compiler considers Start-of-Text and End-of-Text as whitespace and will treat them
/// accodingly.
pub fn extract_rust_macro(rust_source: String) -> Option<String> {
let core::ops::Range { start, end } = locate_slint_macro(&rust_source).next()?;
let mut bytes = rust_source.into_bytes();
@ -421,9 +428,17 @@ pub fn extract_rust_macro(rust_source: String) -> Option<String> {
*c = b' '
}
}
for c in &mut bytes[end..] {
if *c != b'\n' {
*c = b' '
if start > 0 {
bytes[start - 1] = 2;
}
if end < bytes.len() {
bytes[end] = 3;
for c in &mut bytes[end + 1..] {
if *c != b'\n' {
*c = b' '
}
}
}
Some(String::from_utf8(bytes).expect("We just added spaces"))
@ -437,23 +452,23 @@ fn test_extract_rust_macro() {
"abc\n€\nslint ! {x \" \\\" }🦀\" { () {}\n {} }xx =}- ;}\n xxx \n yyy {}\n".into(),
),
Some(
" \n \n x \" \\\" }🦀\" { () {}\n {} }xx = \n \n \n".into(),
" \n \n \u{2}x \" \\\" }🦀\" { () {}\n {} }xx =\u{3} \n \n \n".into(),
)
);
assert_eq!(
extract_rust_macro("xx\nabcd::slint!{abc{}efg".into()),
Some(" \n abc{}efg".into())
Some(" \n \u{2}abc{}efg".into())
);
assert_eq!(
extract_rust_macro("slint!\nnot.\nslint!{\nunterminated\nxxx".into()),
Some(" \n \n \nunterminated\nxxx".into())
Some(" \n \n \u{2}\nunterminated\nxxx".into())
);
assert_eq!(extract_rust_macro("foo\n/* slint! { hello }\n".into()), None);
assert_eq!(extract_rust_macro("foo\n/* slint::slint! { hello }\n".into()), None);
assert_eq!(
extract_rust_macro("foo\n// slint! { hello }\nslint!{world}\na".into()),
Some(" \n \n world \n ".into())
Some(" \n \n \u{2}world\u{3}\n ".into())
);
assert_eq!(extract_rust_macro("foo\n\" slint! { hello }\"\n".into()), None);
assert_eq!(
@ -461,11 +476,11 @@ fn test_extract_rust_macro() {
"abc\n€\nslint ! (x /* \\\" )🦀*/ { () {}\n {} }xx =)- ;}\n xxx \n yyy {}\n".into(),
),
Some(
" \n \n x /* \\\" )🦀*/ { () {}\n {} }xx = \n \n \n".into(),
" \n \n \u{2}x /* \\\" )🦀*/ { () {}\n {} }xx =\u{3} \n \n \n".into(),
)
);
assert_eq!(
extract_rust_macro("abc slint![x slint!() [{[]}] s] abc".into()),
Some(" x slint!() [{[]}] s ".into()),
Some(" \u{0002}x slint!() [{[]}] s\u{0003} ".into()),
);
}