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

Fix parsing of unfinished import statement

Browse source 
Fix #6588

Note for the test: parse error at the end of the file are actually
reported at offset 0. Use a trick to add more `^` at the beginning to
mean that.
(Offset 0 is actually offset 1 as the column starts at 1)
This commit is contained in:
Olivier Goffart 2024-10-21 11:13:40 +02:00
parent 4e50fbdb15
commit 6c81d5069e
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/compiler/parser/document.rs
View file

@ -332,13 +332,12 @@ fn parse_import_identifier_list(p: &mut impl Parser) -> bool {
p.consume();
return true;
}
SyntaxKind::Eof => return false,
SyntaxKind::Comma => {
p.consume();
}
_ => {
p.consume();
p.error("Expected comma")
p.error("Expected comma or brace");
return false;
}
}
}

6
internal/compiler/tests/syntax/fuzzing/6588.slint Normal file
View file

@ -0,0 +1,6 @@
// Copyright © SixtyFPS GmbH <info@slint.dev>
// SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-Slint-Royalty-free-2.0 OR LicenseRef-Slint-Software-3.0
//^^^error{Expected comma or brace}
import { Bmp

10
internal/compiler/tests/syntax_tests.rs
View file

@ -124,10 +124,14 @@ fn process_diagnostics(
let offset = loop {
line_counter += 1;
if line_counter >= lines_to_source {
break line_offset;
break line_offset + column;
}
line_offset = source[..line_offset].rfind('\n').unwrap_or(0);
} + column;
if let Some(o) = source[..line_offset].rfind('\n') {
line_offset = o;
} else {
break 1;
};
};
let expected_diag_level = match warning_or_error {
"warning" => i_slint_compiler::diagnostics::DiagnosticLevel::Warning,