RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 21:37:34 +00:00
Code Issues Activity Actions

CppLanguageServer: Rename Optional<> autocomplete* to try_autocomplete*

Browse source 
autocomplete_property => try_autocomplete_property
autocomplete_name => try_autocomplete_name

This makes it more clear that these variants may fail because e.g
the node is not a property / not a name.
This commit is contained in:
Itamar 2021-05-21 16:02:05 +03:00 • committed by Andreas Kling
parent 0522a4360b
commit b50eaf75eb
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/DevTools/HackStudio/LanguageServers/Cpp/CppComprehensionEngine.cpp
View file

@ -76,17 +76,17 @@ Vector<GUI::AutocompleteProvider::Entry> CppComprehensionEngine::get_suggestions
if (!node->parent()) if (!node->parent())
return {}; return {};
auto results = autocomplete_property(document, *node, containing_token); auto results = try_autocomplete_property(document, *node, containing_token);
if (results.has_value()) if (results.has_value())
return results.value(); return results.value();
results = autocomplete_name(document, *node, containing_token); results = try_autocomplete_name(document, *node, containing_token);
if (results.has_value()) if (results.has_value())
return results.value(); return results.value();
return {}; return {};
} }
Optional<Vector<GUI::AutocompleteProvider::Entry>> CppComprehensionEngine::autocomplete_name(const DocumentData& document, const ASTNode& node, Optional<Token> containing_token) const Optional<Vector<GUI::AutocompleteProvider::Entry>> CppComprehensionEngine::try_autocomplete_name(const DocumentData& document, const ASTNode& node, Optional<Token> containing_token) const
{ {
auto partial_text = String::empty(); auto partial_text = String::empty();
if (containing_token.has_value() && containing_token.value().type() != Token::Type::ColonColon) { if (containing_token.has_value() && containing_token.value().type() != Token::Type::ColonColon) {
@ -95,7 +95,7 @@ Optional<Vector<GUI::AutocompleteProvider::Entry>> CppComprehensionEngine::autoc
return autocomplete_name(document, node, partial_text); return autocomplete_name(document, node, partial_text);
} }
Optional<Vector<GUI::AutocompleteProvider::Entry>> CppComprehensionEngine::autocomplete_property(const DocumentData& document, const ASTNode& node, Optional<Token> containing_token) const Optional<Vector<GUI::AutocompleteProvider::Entry>> CppComprehensionEngine::try_autocomplete_property(const DocumentData& document, const ASTNode& node, Optional<Token> containing_token) const
{ {
if (!containing_token.has_value()) if (!containing_token.has_value())
return {}; return {};

4
Userland/DevTools/HackStudio/LanguageServers/Cpp/CppComprehensionEngine.h
View file

@ -101,8 +101,8 @@ private:
Optional<GUI::AutocompleteProvider::ProjectLocation> find_preprocessor_definition(const DocumentData&, const GUI::TextPosition&); Optional<GUI::AutocompleteProvider::ProjectLocation> find_preprocessor_definition(const DocumentData&, const GUI::TextPosition&);
OwnPtr<DocumentData> create_document_data(String&& text, const String& filename); OwnPtr<DocumentData> create_document_data(String&& text, const String& filename);
Optional<Vector<GUI::AutocompleteProvider::Entry>> autocomplete_property(const DocumentData&, const ASTNode&, Optional<Token> containing_token) const; Optional<Vector<GUI::AutocompleteProvider::Entry>> try_autocomplete_property(const DocumentData&, const ASTNode&, Optional<Token> containing_token) const;
Optional<Vector<GUI::AutocompleteProvider::Entry>> autocomplete_name(const DocumentData&, const ASTNode&, Optional<Token> containing_token) const; Optional<Vector<GUI::AutocompleteProvider::Entry>> try_autocomplete_name(const DocumentData&, const ASTNode&, Optional<Token> containing_token) const;
HashMap<String, OwnPtr<DocumentData>> m_documents; HashMap<String, OwnPtr<DocumentData>> m_documents;
}; };