RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:47:45 +00:00
Code Issues Activity Actions

LanguageServers: Remove ClientConnection dependency

Browse source 
We now no longer need to provide a ClientConnection object to construct
AutoCompleteEngine.
This commit is contained in:
Itamar 2021-05-14 10:20:17 +03:00 • committed by Andreas Kling
parent 687efe6dd6
commit c49cf23a86
12 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/DevTools/HackStudio/LanguageServers/Cpp/ClientConnection.h
View file

@ -19,8 +19,10 @@ public:
ClientConnection(NonnullRefPtr<Core::LocalSocket> socket, int client_id)
: LanguageServers::ClientConnection(move(socket), client_id)
{
m_autocomplete_engine = make<ParserAutoComplete>(*this, m_filedb);
m_autocomplete_engine->set_declarations_of_document_callback = &ClientConnection::set_declarations_of_document_callback;
m_autocomplete_engine = make<ParserAutoComplete>(m_filedb);
m_autocomplete_engine->set_declarations_of_document_callback = [this](const String& filename, Vector<GUI::AutocompleteProvider::Declaration>&& declarations) {
async_declarations_in_document(filename, move(declarations));
};
}
virtual ~ClientConnection() override = default;
@ -30,9 +32,9 @@ private:
{
dbgln_if(CPP_LANGUAGE_SERVER_DEBUG, "SetAutoCompleteMode: {}", mode);
if (mode == "Parser")
m_autocomplete_engine = make<ParserAutoComplete>(*this, m_filedb);
m_autocomplete_engine = make<ParserAutoComplete>(m_filedb);
else
m_autocomplete_engine = make<LexerAutoComplete>(*this, m_filedb);
m_autocomplete_engine = make<LexerAutoComplete>(m_filedb);
}
};
}

4
Userland/DevTools/HackStudio/LanguageServers/Cpp/LexerAutoComplete.cpp
View file

@ -11,8 +11,8 @@
namespace LanguageServers::Cpp {
LexerAutoComplete::LexerAutoComplete(ClientConnection& connection, const FileDB& filedb)
: AutoCompleteEngine(connection, filedb)
LexerAutoComplete::LexerAutoComplete(const FileDB& filedb)
: AutoCompleteEngine(filedb)
{
}

2
Userland/DevTools/HackStudio/LanguageServers/Cpp/LexerAutoComplete.h
View file

@ -19,7 +19,7 @@ using namespace ::Cpp;
class LexerAutoComplete : public AutoCompleteEngine {
public:
LexerAutoComplete(ClientConnection&, const FileDB& filedb);
LexerAutoComplete(const FileDB& filedb);
virtual Vector<GUI::AutocompleteProvider::Entry> get_suggestions(const String& file, const GUI::TextPosition& autocomplete_position) override;

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

@ -17,8 +17,8 @@
namespace LanguageServers::Cpp {
ParserAutoComplete::ParserAutoComplete(ClientConnection& connection, const FileDB& filedb)
: AutoCompleteEngine(connection, filedb, true)
ParserAutoComplete::ParserAutoComplete(const FileDB& filedb)
: AutoCompleteEngine(filedb, true)
{
}

2
Userland/DevTools/HackStudio/LanguageServers/Cpp/ParserAutoComplete.h
View file

@ -23,7 +23,7 @@ using namespace ::Cpp;
class ParserAutoComplete : public AutoCompleteEngine {
public:
ParserAutoComplete(ClientConnection&, const FileDB& filedb);
ParserAutoComplete(const FileDB& filedb);
virtual Vector<GUI::AutocompleteProvider::Entry> get_suggestions(const String& file, const GUI::TextPosition& autocomplete_position) override;
virtual void on_edit(const String& file) override;