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

HackStudio: Use new format functions.

Browse source
This commit is contained in:
asynts 2020-10-08 13:41:36 +02:00 • committed by Andreas Kling
parent 3b601cd4bd
commit 7c4fb2b804
23 changed files with 112 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

6
DevTools/HackStudio/LanguageServers/Shell/AutoComplete.cpp
View file

@ -43,16 +43,16 @@ Vector<AutoCompleteResponse> AutoComplete::get_suggestions(const String& code, s
return {};
#ifdef DEBUG_AUTOCOMPLETE
dbg() << "Complete '" << code << "': ";
dbgln("Complete '{}'", code);
ast->dump(1);
dbg() << "At offset " << offset;
dbgln("At offset {}", offset);
#endif
auto result = ast->complete_for_editor(m_shell, offset);
Vector<AutoCompleteResponse> completions;
for (auto& entry : result) {
#ifdef DEBUG_AUTOCOMPLETE
dbg() << "Suggestion: '" << entry.text_string << "' starting at " << entry.input_offset;
dbgln("Suggestion: '{}' starting at {}", entry.text_string, entry.input_offset);
#endif
completions.append({ entry.text_string, entry.input_offset });
}

30
DevTools/HackStudio/LanguageServers/Shell/ClientConnection.cpp
View file

@ -57,7 +57,7 @@ OwnPtr<Messages::LanguageServer::GreetResponse> ClientConnection::handle(const M
{
m_project_root = LexicalPath(message.project_root());
#ifdef DEBUG_SH_LANGUAGE_SERVER
dbg() << "project_root: " << m_project_root.string();
dbgln("project_root: {}", m_project_root);
#endif
return make<Messages::LanguageServer::GreetResponse>(client_id());
}
@ -81,16 +81,16 @@ static DefaultDocumentClient s_default_document_client;
void ClientConnection::handle(const Messages::LanguageServer::FileOpened& message)
{
LexicalPath file_path(String::format("%s/%s", m_project_root.string().characters(), message.file_name().characters()));
LexicalPath file_path(String::formatted("{}/{}", m_project_root, message.file_name()));
#ifdef DEBUG_SH_LANGUAGE_SERVER
dbg() << "FileOpened: " << file_path.string();
dbgln("FileOpened: {}", file_path);
#endif
auto file = Core::File::construct(file_path.string());
if (!file->open(Core::IODevice::ReadOnly)) {
errno = file->error();
perror("open");
dbg() << "Failed to open project file: " << file_path.string();
dbgln("Failed to open project file: {}", file_path);
return;
}
auto content = file->read_all();
@ -106,31 +106,31 @@ void ClientConnection::handle(const Messages::LanguageServer::FileOpened& messag
void ClientConnection::handle(const Messages::LanguageServer::FileEditInsertText& message)
{
#ifdef DEBUG_SH_LANGUAGE_SERVER
dbg() << "InsertText for file: " << message.file_name();
dbg() << "Text: " << message.text();
dbg() << "[" << message.start_line() << ":" << message.start_column() << "]";
dbgln("InsertText for file: {}", message.file_name());
dbgln("Text: {}", message.text());
dbgln("[{}:{}]", message.start_line(), message.start_column());
#endif
auto document = document_for(message.file_name());
if (!document) {
dbg() << "file " << message.file_name() << " has not been opened";
dbgln("file {} has not been opened", message.file_name());
return;
}
GUI::TextPosition start_position { (size_t)message.start_line(), (size_t)message.start_column() };
document->insert_at(start_position, message.text(), &s_default_document_client);
#ifdef DEBUG_FILE_CONTENT
dbg() << document->text();
dbgln("{}", document->text());
#endif
}
void ClientConnection::handle(const Messages::LanguageServer::FileEditRemoveText& message)
{
#ifdef DEBUG_SH_LANGUAGE_SERVER
dbg() << "RemoveText for file: " << message.file_name();
dbg() << "[" << message.start_line() << ":" << message.start_column() << " - " << message.end_line() << ":" << message.end_column() << "]";
dbgln("RemoveText for file: {}", message.file_name());
dbgln("[{}:{} - {}:{}]", message.start_line(), message.start_column(), message.end_line(), message.end_column());
#endif
auto document = document_for(message.file_name());
if (!document) {
dbg() << "file " << message.file_name() << " has not been opened";
dbgln("file {} has not been opened", message.file_name());
return;
}
GUI::TextPosition start_position { (size_t)message.start_line(), (size_t)message.start_column() };
@ -150,12 +150,12 @@ void ClientConnection::handle(const Messages::LanguageServer::FileEditRemoveText
void ClientConnection::handle(const Messages::LanguageServer::AutoCompleteSuggestions& message)
{
#ifdef DEBUG_SH_LANGUAGE_SERVER
dbg() << "AutoCompleteSuggestions for: " << message.file_name() << " " << message.cursor_line() << ":" << message.cursor_column();
dbgln("AutoCompleteSuggestions for: {} {}:{}", message.file_name(), message.cursor_line(), message.cursor_column());
#endif
auto document = document_for(message.file_name());
if (!document) {
dbg() << "file " << message.file_name() << " has not been opened";
dbgln("file {} has not been opened", message.file_name());
return;
}
@ -185,7 +185,7 @@ void ClientConnection::handle(const Messages::LanguageServer::SetFileContent& me
{
auto document = document_for(message.file_name());
if (!document) {
dbg() << "file " << message.file_name() << " has not been opened";
dbgln("file {} has not been opened", message.file_name());
return;
}
auto content = message.content();