Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-27 11:44:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

LSP: Fix spec violations that break the VSCode outline

Browse source
This commit is contained in:
HolonProduction 2024-11-15 19:32:00 +01:00
parent 98ddec4b8b
commit 2f620db1d8
3 changed files with 43 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/gdscript/language_server/gdscript_extend_parser.cpp
View file

@ -57,6 +57,12 @@ lsp::Position GodotPosition::to_lsp(const Vector<String> &p_lines) const {
return res; return res;
} }
res.line = line - 1; res.line = line - 1;
// Special case: `column = 0` -> Starts at beginning of line.
if (column <= 0) {
return res;
}
// Note: character outside of `pos_line.length()-1` is valid. // Note: character outside of `pos_line.length()-1` is valid.
res.character = column - 1; res.character = column - 1;
@ -238,9 +244,12 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p
r_symbol.kind = lsp::SymbolKind::Class; r_symbol.kind = lsp::SymbolKind::Class;
r_symbol.deprecated = false; r_symbol.deprecated = false;
r_symbol.range = range_of_node(p_class); r_symbol.range = range_of_node(p_class);
r_symbol.range.start.line = MAX(r_symbol.range.start.line, 0);
if (p_class->identifier) { if (p_class->identifier) {
r_symbol.selectionRange = range_of_node(p_class->identifier); r_symbol.selectionRange = range_of_node(p_class->identifier);
} else {
// No meaningful `selectionRange`, but we must ensure that it is inside of `range`.
r_symbol.selectionRange.start = r_symbol.range.start;
r_symbol.selectionRange.end = r_symbol.range.start;
} }
r_symbol.detail = "class " + r_symbol.name; r_symbol.detail = "class " + r_symbol.name;
{ {

2
modules/gdscript/tests/scripts/lsp/first_line_comment.gd Normal file
View file

@ -0,0 +1,2 @@
# Some comment
extends Node

31
modules/gdscript/tests/test_lsp.h
View file

@ -375,6 +375,18 @@ func f():
gd.to_lsp(lines); gd.to_lsp(lines);
} }
SUBCASE("special case: zero column for root class") {
GodotPosition gd(1, 0);
lsp::Position expected = lsp_pos(0, 0);
lsp::Position actual = gd.to_lsp(lines);
CHECK_EQ(actual, expected);
}
SUBCASE("special case: zero line and column for root class") {
GodotPosition gd(0, 0);
lsp::Position expected = lsp_pos(0, 0);
lsp::Position actual = gd.to_lsp(lines);
CHECK_EQ(actual, expected);
}
SUBCASE("special case: negative line for root class") { SUBCASE("special case: negative line for root class") {
GodotPosition gd(-1, 0); GodotPosition gd(-1, 0);
lsp::Position expected = lsp_pos(0, 0); lsp::Position expected = lsp_pos(0, 0);
@ -468,6 +480,25 @@ func f():
test_resolve_symbols(uri, all_test_data, all_test_data); test_resolve_symbols(uri, all_test_data, all_test_data);
} }
memdelete(proto);
finish_language();
}
TEST_CASE("[workspace][document_symbol]") {
GDScriptLanguageProtocol *proto = initialize(root);
REQUIRE(proto);
SUBCASE("selectionRange of root class must be inside range") {
String path = "res://lsp/first_line_comment.gd";
assert_no_errors_in(path);
GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_local_script(path);
ExtendGDScriptParser *parser = GDScriptLanguageProtocol::get_singleton()->get_workspace()->parse_results[path];
REQUIRE(parser);
lsp::DocumentSymbol cls = parser->get_symbols();
REQUIRE(((cls.range.start.line == cls.selectionRange.start.line && cls.range.start.character <= cls.selectionRange.start.character) || (cls.range.start.line < cls.selectionRange.start.line)));
REQUIRE(((cls.range.end.line == cls.selectionRange.end.line && cls.range.end.character >= cls.selectionRange.end.character) || (cls.range.end.line > cls.selectionRange.end.line)));
}
memdelete(proto); memdelete(proto);
finish_language(); finish_language();
} }