mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 11:26:18 -04:00
53277a65ad
- Integrate the AST into the LSP, this makes parsing and tokenizing the files much easier - Consolidate most of the symbol info tracking in `goalc` to a single map. Fixed some issues where the old map would never evict symbols when re-compiling files. There is still some more to cleanup, but this now can be used as an incrementally updated source-of-truth for the LSP - re-compile files when they are saved. Ideally this would be done everytime they are changed but that: - may be too aggressive - goalc doesn't compile incrementally yet so it likely would be a worse UX Features added, see https://github.com/open-goal/opengoal-vscode/issues/256 - Hover ![image](https://github.com/open-goal/jak-project/assets/13153231/58dadb5d-582c-4c1f-9ffe-eaa4c85a0255) ![image](https://github.com/open-goal/jak-project/assets/13153231/b383adde-57fc-462c-a256-b2de5c30ca9a) - LSP Status fixed - Type Hierarchy ![image](https://github.com/open-goal/jak-project/assets/13153231/8e681377-1d4e-4336-ad70-1695a4607340) - Document Color ![image](https://github.com/open-goal/jak-project/assets/13153231/4e48ccd8-0ed1-4459-a133-5277561e4201) - Document Symbols ![Screenshot 2024-03-27 004105](https://github.com/open-goal/jak-project/assets/13153231/8e655034-43c4-4261-b6e0-85de00cbfc7f) - Completions ![Screenshot 2024-03-30 004504](https://github.com/open-goal/jak-project/assets/13153231/d123a187-af90-466b-9eb7-561b2ee97cd1) --------- Co-authored-by: Hat Kid <6624576+Hat-Kid@users.noreply.github.com>
59 lines
2.5 KiB
C++
59 lines
2.5 KiB
C++
#include "completion.h"
|
|
|
|
namespace lsp_handlers {
|
|
|
|
std::unordered_map<symbol_info::Kind, LSPSpec::CompletionItemKind> completion_item_kind_map = {
|
|
{symbol_info::Kind::CONSTANT, LSPSpec::CompletionItemKind::Constant},
|
|
{symbol_info::Kind::FUNCTION, LSPSpec::CompletionItemKind::Function},
|
|
{symbol_info::Kind::FWD_DECLARED_SYM, LSPSpec::CompletionItemKind::Reference},
|
|
{symbol_info::Kind::GLOBAL_VAR, LSPSpec::CompletionItemKind::Variable},
|
|
{symbol_info::Kind::INVALID, LSPSpec::CompletionItemKind::Text},
|
|
{symbol_info::Kind::LANGUAGE_BUILTIN, LSPSpec::CompletionItemKind::Function},
|
|
{symbol_info::Kind::MACRO, LSPSpec::CompletionItemKind::Operator},
|
|
{symbol_info::Kind::METHOD, LSPSpec::CompletionItemKind::Method},
|
|
{symbol_info::Kind::TYPE, LSPSpec::CompletionItemKind::Class},
|
|
};
|
|
|
|
std::optional<json> get_completions(Workspace& workspace, int /*id*/, json params) {
|
|
auto converted_params = params.get<LSPSpec::CompletionParams>();
|
|
const auto file_type = workspace.determine_filetype_from_uri(converted_params.textDocument.m_uri);
|
|
|
|
if (file_type != Workspace::FileType::OpenGOAL) {
|
|
return nullptr;
|
|
}
|
|
auto maybe_tracked_file = workspace.get_tracked_og_file(converted_params.textDocument.m_uri);
|
|
if (!maybe_tracked_file) {
|
|
return nullptr;
|
|
}
|
|
std::vector<LSPSpec::CompletionItem> items;
|
|
const auto& tracked_file = maybe_tracked_file.value().get();
|
|
// The cursor position in the context of completions is always 1 character ahead of the text, we
|
|
// move it back 1 spot so we can actually detect what the user has typed so far
|
|
LSPSpec::Position new_position = converted_params.position;
|
|
if (new_position.m_character > 0) {
|
|
new_position.m_character--;
|
|
}
|
|
const auto symbol = tracked_file.get_symbol_at_position(new_position);
|
|
if (!symbol) {
|
|
lg::debug("get_completions - no symbol to work from");
|
|
} else {
|
|
const auto matching_symbols =
|
|
workspace.get_symbols_starting_with(tracked_file.m_game_version, symbol.value());
|
|
lg::debug("get_completions - found {} symbols", matching_symbols.size());
|
|
|
|
for (const auto& symbol : matching_symbols) {
|
|
LSPSpec::CompletionItem item;
|
|
item.label = symbol->m_name;
|
|
item.kind = completion_item_kind_map.at(symbol->m_kind);
|
|
// TODO - flesh out this more fully when auto-complete with non-globals works as well
|
|
items.push_back(item);
|
|
}
|
|
}
|
|
LSPSpec::CompletionList list_result;
|
|
list_result.isIncomplete = false; // we want further typing to re-evaluate the list
|
|
list_result.items = items;
|
|
return list_result;
|
|
}
|
|
|
|
} // namespace lsp_handlers
|