RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 14:42:44 +00:00
Code Issues Activity Actions

LanguageServers/Cpp: Complete Preprocessor definitions

Browse source 
Preprocessor definitions now appear in the AutoComplete suggestions box
as well as in the Locator.
This commit is contained in:
Itamar 2021-03-13 09:50:33 +02:00 • committed by Andreas Kling
parent 5b22f6f45a
commit 7bf6eca9d8
6 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/DevTools/HackStudio/LanguageServers/Cpp/ParserAutoComplete.cpp
View file

@ -163,6 +163,13 @@ Vector<GUI::AutocompleteProvider::Entry> ParserAutoComplete::autocomplete_name(c
suggestions.append({ name.to_string(), partial_text.length(), GUI::AutocompleteProvider::CompletionKind::Identifier });
}
}
for (auto& preprocessor_name : document.parser().definitions().keys()) {
if (preprocessor_name.starts_with(partial_text)) {
suggestions.append({ preprocessor_name.to_string(), partial_text.length(), GUI::AutocompleteProvider::CompletionKind::PreprocessorDefinition });
}
}
return suggestions;
}
@ -275,9 +282,11 @@ NonnullRefPtrVector<Declaration> ParserAutoComplete::get_declarations_in_outer_s
continue;
declarations.append(get_declarations_in_outer_scope_including_headers(*included_document));
}
for (auto& decl : document.parser().root_node()->declarations()) {
declarations.append(decl);
}
return declarations;
}
@ -374,6 +383,11 @@ void ParserAutoComplete::update_declared_symbols(const DocumentData& document)
for (auto& decl : document.parser().root_node()->declarations()) {
declarations.append({ decl.name(), { document.filename(), decl.start().line, decl.start().column }, type_of_declaration(decl) });
}
for (auto& definition : document.preprocessor().definitions()) {
declarations.append({ definition.key, { document.filename(), definition.value.line, definition.value.column }, GUI::AutocompleteProvider::DeclarationType::PreprocessorDefinition });
}
set_declarations_of_document(document.filename(), move(declarations));
}
@ -403,7 +417,6 @@ OwnPtr<ParserAutoComplete::DocumentData> ParserAutoComplete::create_document_dat
all_definitions.set(move(item.key), move(item.value));
for (auto include : document_data->preprocessor().included_paths()) {
auto included_document = get_or_create_document_data(document_path_from_include_path(include));
if (!included_document)
continue;