diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-27 13:32:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-27 13:32:41 +0200 |
| commit | 1777d8008e5d6c4d4192f9bcede12e70e12daf55 (patch) | |
| tree | 79649f33889b70dd9b7a35b9979bb3cc9731eb00 /modules/gdscript/language_server/gdscript_extend_parser.cpp | |
| parent | 41013e4f9a391f9c2597edbc1385b848dd9eacdf (diff) | |
| parent | 41ef9cf789633f8ec6b023cb45fd5ddbddf77446 (diff) | |
| download | redot-engine-1777d8008e5d6c4d4192f9bcede12e70e12daf55.tar.gz | |
Merge pull request #50913 from Razoric480/lsp-SymbolKind-fix
Fix LSP reporting wrong types
Diffstat (limited to 'modules/gdscript/language_server/gdscript_extend_parser.cpp')
| -rw-r--r-- | modules/gdscript/language_server/gdscript_extend_parser.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gdscript/language_server/gdscript_extend_parser.cpp b/modules/gdscript/language_server/gdscript_extend_parser.cpp index b3469ec47c..d106b3b541 100644 --- a/modules/gdscript/language_server/gdscript_extend_parser.cpp +++ b/modules/gdscript/language_server/gdscript_extend_parser.cpp @@ -150,9 +150,9 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p } r_symbol.kind = lsp::SymbolKind::Class; r_symbol.deprecated = false; - r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_class->start_line); - r_symbol.range.start.character = LINE_NUMBER_TO_INDEX(p_class->start_column); - r_symbol.range.end.line = LINE_NUMBER_TO_INDEX(p_class->end_line); + r_symbol.range.start.line = p_class->start_line; + r_symbol.range.start.character = p_class->start_column; + r_symbol.range.end.line = lines.size(); r_symbol.selectionRange.start.line = r_symbol.range.start.line; r_symbol.detail = "class " + r_symbol.name; bool is_root_class = &r_symbol == &class_symbol; @@ -165,7 +165,7 @@ void ExtendGDScriptParser::parse_class_symbol(const GDScriptParser::ClassNode *p case ClassNode::Member::VARIABLE: { lsp::DocumentSymbol symbol; symbol.name = m.variable->identifier->name; - symbol.kind = lsp::SymbolKind::Variable; + symbol.kind = m.variable->property == VariableNode::PropertyStyle::PROP_NONE ? lsp::SymbolKind::Variable : lsp::SymbolKind::Property; symbol.deprecated = false; symbol.range.start.line = LINE_NUMBER_TO_INDEX(m.variable->start_line); symbol.range.start.character = LINE_NUMBER_TO_INDEX(m.variable->start_column); @@ -317,7 +317,7 @@ void ExtendGDScriptParser::parse_function_symbol(const GDScriptParser::FunctionN const String uri = get_uri(); r_symbol.name = p_func->identifier->name; - r_symbol.kind = lsp::SymbolKind::Function; + r_symbol.kind = p_func->is_static ? lsp::SymbolKind::Function : lsp::SymbolKind::Method; r_symbol.detail = "func " + String(p_func->identifier->name) + "("; r_symbol.deprecated = false; r_symbol.range.start.line = LINE_NUMBER_TO_INDEX(p_func->start_line); |