소스 검색

CppLanguageServer: Rename Optional<> autocomplete* to try_autocomplete*

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.
Itamar 4 년 전
부모
커밋
b50eaf75eb

+ 4 - 4
Userland/DevTools/HackStudio/LanguageServers/Cpp/CppComprehensionEngine.cpp

@@ -76,17 +76,17 @@ Vector<GUI::AutocompleteProvider::Entry> CppComprehensionEngine::get_suggestions
     if (!node->parent())
         return {};
 
-    auto results = autocomplete_property(document, *node, containing_token);
+    auto results = try_autocomplete_property(document, *node, containing_token);
     if (results.has_value())
         return results.value();
 
-    results = autocomplete_name(document, *node, containing_token);
+    results = try_autocomplete_name(document, *node, containing_token);
     if (results.has_value())
         return results.value();
     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();
     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);
 }
 
-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())
         return {};

+ 2 - 2
Userland/DevTools/HackStudio/LanguageServers/Cpp/CppComprehensionEngine.h

@@ -101,8 +101,8 @@ private:
     Optional<GUI::AutocompleteProvider::ProjectLocation> find_preprocessor_definition(const DocumentData&, const GUI::TextPosition&);
 
     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>> autocomplete_name(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>> try_autocomplete_name(const DocumentData&, const ASTNode&, Optional<Token> containing_token) const;
 
     HashMap<String, OwnPtr<DocumentData>> m_documents;
 };