asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GDScript LSP: Implement goto declaration

Browse source
This commit is contained in:
geequlim 2020-01-04 20:02:26 +08:00
parent 118aaa55f9
commit eb5861f9f1
2 changed files with 70 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
modules/gdscript/language_server/gdscript_text_document.cpp
View file

@ -49,6 +49,7 @@ void GDScriptTextDocument::_bind_methods() {
ClassDB::bind_method(D_METHOD("colorPresentation"), &GDScriptTextDocument::colorPresentation); ClassDB::bind_method(D_METHOD("colorPresentation"), &GDScriptTextDocument::colorPresentation);
ClassDB::bind_method(D_METHOD("hover"), &GDScriptTextDocument::hover); ClassDB::bind_method(D_METHOD("hover"), &GDScriptTextDocument::hover);
ClassDB::bind_method(D_METHOD("definition"), &GDScriptTextDocument::definition); ClassDB::bind_method(D_METHOD("definition"), &GDScriptTextDocument::definition);
ClassDB::bind_method(D_METHOD("declaration"), &GDScriptTextDocument::declaration);
ClassDB::bind_method(D_METHOD("show_native_symbol_in_editor"), &GDScriptTextDocument::show_native_symbol_in_editor); ClassDB::bind_method(D_METHOD("show_native_symbol_in_editor"), &GDScriptTextDocument::show_native_symbol_in_editor);
} }
@ -340,67 +341,49 @@ Variant GDScriptTextDocument::hover(const Dictionary &p_params) {
} }
Array GDScriptTextDocument::definition(const Dictionary &p_params) { Array GDScriptTextDocument::definition(const Dictionary &p_params) {
Array arr;
lsp::TextDocumentPositionParams params; lsp::TextDocumentPositionParams params;
params.load(p_params); params.load(p_params);
List<const lsp::DocumentSymbol *> symbols;
Array arr = this->find_symbols(params, symbols);
return arr;
}
const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(params); Variant GDScriptTextDocument::declaration(const Dictionary &p_params) {
if (symbol) { lsp::TextDocumentPositionParams params;
lsp::Location location; params.load(p_params);
location.uri = symbol->uri; List<const lsp::DocumentSymbol *> symbols;
location.range = symbol->range; Array arr = this->find_symbols(params, symbols);
if (arr.empty() && !symbols.empty() && !symbols.front()->get()->native_class.empty()) { // Find a native symbol
const String &path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(symbol->uri); const lsp::DocumentSymbol *symbol = symbols.front()->get();
if (file_checker->file_exists(path)) { if (GDScriptLanguageProtocol::get_singleton()->is_goto_native_symbols_enabled()) {
arr.push_back(location.to_json()); String id;
} else if (!symbol->native_class.empty()) { switch (symbol->kind) {
if (GDScriptLanguageProtocol::get_singleton()->is_goto_native_symbols_enabled()) { case lsp::SymbolKind::Class:
String id; id = "class_name:" + symbol->name;
switch (symbol->kind) { break;
case lsp::SymbolKind::Class: case lsp::SymbolKind::Constant:
id = "class_name:" + symbol->name; id = "class_constant:" + symbol->native_class + ":" + symbol->name;
break; break;
case lsp::SymbolKind::Constant: case lsp::SymbolKind::Property:
id = "class_constant:" + symbol->native_class + ":" + symbol->name; case lsp::SymbolKind::Variable:
break; id = "class_property:" + symbol->native_class + ":" + symbol->name;
case lsp::SymbolKind::Property: break;
case lsp::SymbolKind::Variable: case lsp::SymbolKind::Enum:
id = "class_property:" + symbol->native_class + ":" + symbol->name; id = "class_enum:" + symbol->native_class + ":" + symbol->name;
break; break;
case lsp::SymbolKind::Enum: case lsp::SymbolKind::Method:
id = "class_enum:" + symbol->native_class + ":" + symbol->name; case lsp::SymbolKind::Function:
break; id = "class_method:" + symbol->native_class + ":" + symbol->name;
case lsp::SymbolKind::Method: break;
case lsp::SymbolKind::Function: default:
id = "class_method:" + symbol->native_class + ":" + symbol->name; id = "class_global:" + symbol->native_class + ":" + symbol->name;
break; break;
default:
id = "class_global:" + symbol->native_class + ":" + symbol->name;
break;
}
call_deferred("show_native_symbol_in_editor", id);
} else {
notify_client_show_symbol(symbol);
}
}
} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
List<const lsp::DocumentSymbol *> list;
GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_related_symbols(params, list);
for (List<const lsp::DocumentSymbol *>::Element *E = list.front(); E; E = E->next()) {
if (const lsp::DocumentSymbol *s = E->get()) {
if (!s->uri.empty()) {
lsp::Location location;
location.uri = s->uri;
location.range = s->range;
arr.push_back(location.to_json());
}
} }
call_deferred("show_native_symbol_in_editor", id);
} else {
notify_client_show_symbol(symbol);
} }
} }
return arr; return arr;
} }
@ -421,3 +404,33 @@ void GDScriptTextDocument::show_native_symbol_in_editor(const String &p_symbol_i
ScriptEditor::get_singleton()->call_deferred("_help_class_goto", p_symbol_id); ScriptEditor::get_singleton()->call_deferred("_help_class_goto", p_symbol_id);
OS::get_singleton()->move_window_to_foreground(); OS::get_singleton()->move_window_to_foreground();
} }
Array GDScriptTextDocument::find_symbols(const lsp::TextDocumentPositionParams &p_location, List<const lsp::DocumentSymbol *> &r_list) {
Array arr;
const lsp::DocumentSymbol *symbol = GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_symbol(p_location);
if (symbol) {
lsp::Location location;
location.uri = symbol->uri;
location.range = symbol->range;
const String &path = GDScriptLanguageProtocol::get_singleton()->get_workspace()->get_file_path(symbol->uri);
if (file_checker->file_exists(path)) {
arr.push_back(location.to_json());
}
r_list.push_back(symbol);
} else if (GDScriptLanguageProtocol::get_singleton()->is_smart_resolve_enabled()) {
List<const lsp::DocumentSymbol *> list;
GDScriptLanguageProtocol::get_singleton()->get_workspace()->resolve_related_symbols(p_location, list);
for (List<const lsp::DocumentSymbol *>::Element *E = list.front(); E; E = E->next()) {
if (const lsp::DocumentSymbol *s = E->get()) {
if (!s->uri.empty()) {
lsp::Location location;
location.uri = s->uri;
location.range = s->range;
arr.push_back(location.to_json());
r_list.push_back(s);
}
}
}
}
return arr;
}

2
modules/gdscript/language_server/gdscript_text_document.h
View file

@ -51,6 +51,7 @@ protected:
Array native_member_completions; Array native_member_completions;
private: private:
Array find_symbols(const lsp::TextDocumentPositionParams &p_location, List<const lsp::DocumentSymbol *> &r_list);
lsp::TextDocumentItem load_document_item(const Variant &p_param); lsp::TextDocumentItem load_document_item(const Variant &p_param);
void notify_client_show_symbol(const lsp::DocumentSymbol *symbol); void notify_client_show_symbol(const lsp::DocumentSymbol *symbol);
@ -65,6 +66,7 @@ public:
Array colorPresentation(const Dictionary &p_params); Array colorPresentation(const Dictionary &p_params);
Variant hover(const Dictionary &p_params); Variant hover(const Dictionary &p_params);
Array definition(const Dictionary &p_params); Array definition(const Dictionary &p_params);
Variant declaration(const Dictionary &p_params);
void initialize(); void initialize();