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

AK+Everywhere: Rename String to DeprecatedString

Browse source 
We have a new, improved string type coming up in AK (OOM aware, no null
state), and while it's going to use UTF-8, the name UTF8String is a
mouthful - so let's free up the String name by renaming the existing
class.
Making the old one have an annoying name will hopefully also help with
quick adoption :^)
This commit is contained in:
Linus Groh 2022-12-04 18:02:33 +00:00 • committed by Andreas Kling
parent f74251606d
commit 6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/DevTools/HackStudio/LanguageServers/ConnectionFromClient.cpp
View file

@ -27,7 +27,7 @@ void ConnectionFromClient::die()
exit(0);
}
void ConnectionFromClient::greet(String const& project_root)
void ConnectionFromClient::greet(DeprecatedString const& project_root)
{
m_filedb.set_project_root(project_root);
if (unveil(project_root.characters(), "r") < 0) {
@ -40,7 +40,7 @@ void ConnectionFromClient::greet(String const& project_root)
}
}
void ConnectionFromClient::file_opened(String const& filename, IPC::File const& file)
void ConnectionFromClient::file_opened(DeprecatedString const& filename, IPC::File const& file)
{
if (m_filedb.is_open(filename)) {
return;
@ -49,7 +49,7 @@ void ConnectionFromClient::file_opened(String const& filename, IPC::File const&
m_autocomplete_engine->file_opened(filename);
}
void ConnectionFromClient::file_edit_insert_text(String const& filename, String const& text, i32 start_line, i32 start_column)
void ConnectionFromClient::file_edit_insert_text(DeprecatedString const& filename, DeprecatedString const& text, i32 start_line, i32 start_column)
{
dbgln_if(LANGUAGE_SERVER_DEBUG, "InsertText for file: {}", filename);
dbgln_if(LANGUAGE_SERVER_DEBUG, "Text: {}", text);
@ -58,7 +58,7 @@ void ConnectionFromClient::file_edit_insert_text(String const& filename, String
m_autocomplete_engine->on_edit(filename);
}
void ConnectionFromClient::file_edit_remove_text(String const& filename, i32 start_line, i32 start_column, i32 end_line, i32 end_column)
void ConnectionFromClient::file_edit_remove_text(DeprecatedString const& filename, i32 start_line, i32 start_column, i32 end_line, i32 end_column)
{
dbgln_if(LANGUAGE_SERVER_DEBUG, "RemoveText for file: {}", filename);
dbgln_if(LANGUAGE_SERVER_DEBUG, "[{}:{} - {}:{}]", start_line, start_column, end_line, end_column);
@ -81,7 +81,7 @@ void ConnectionFromClient::auto_complete_suggestions(CodeComprehension::ProjectL
async_auto_complete_suggestions(move(suggestions));
}
void ConnectionFromClient::set_file_content(String const& filename, String const& content)
void ConnectionFromClient::set_file_content(DeprecatedString const& filename, DeprecatedString const& content)
{
dbgln_if(LANGUAGE_SERVER_DEBUG, "SetFileContent: {}", filename);
auto document = m_filedb.get_document(filename);
@ -140,7 +140,7 @@ void ConnectionFromClient::get_parameters_hint(CodeComprehension::ProjectLocatio
async_parameters_hint_result(params->params, params->current_index);
}
void ConnectionFromClient::get_tokens_info(String const& filename)
void ConnectionFromClient::get_tokens_info(DeprecatedString const& filename)
{
dbgln_if(LANGUAGE_SERVER_DEBUG, "GetTokenInfo: {}", filename);
auto document = m_filedb.get_document(filename);

12
Userland/DevTools/HackStudio/LanguageServers/ConnectionFromClient.h
View file

@ -27,15 +27,15 @@ public:
virtual void die() override;
protected:
virtual void greet(String const&) override;
virtual void file_opened(String const&, IPC::File const&) override;
virtual void file_edit_insert_text(String const&, String const&, i32, i32) override;
virtual void file_edit_remove_text(String const&, i32, i32, i32, i32) override;
virtual void set_file_content(String const&, String const&) override;
virtual void greet(DeprecatedString const&) override;
virtual void file_opened(DeprecatedString const&, IPC::File const&) override;
virtual void file_edit_insert_text(DeprecatedString const&, DeprecatedString const&, i32, i32) override;
virtual void file_edit_remove_text(DeprecatedString const&, i32, i32, i32, i32) override;
virtual void set_file_content(DeprecatedString const&, DeprecatedString const&) override;
virtual void auto_complete_suggestions(CodeComprehension::ProjectLocation const&) override;
virtual void find_declaration(CodeComprehension::ProjectLocation const&) override;
virtual void get_parameters_hint(CodeComprehension::ProjectLocation const&) override;
virtual void get_tokens_info(String const&) override;
virtual void get_tokens_info(DeprecatedString const&) override;
FileDB m_filedb;
OwnPtr<CodeComprehension::CodeComprehensionEngine> m_autocomplete_engine;

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

@ -19,10 +19,10 @@ private:
: LanguageServers::ConnectionFromClient(move(socket))
{
m_autocomplete_engine = adopt_own(*new CodeComprehension::Cpp::CppComprehensionEngine(m_filedb));
m_autocomplete_engine->set_declarations_of_document_callback = [this](String const& filename, Vector<CodeComprehension::Declaration>&& declarations) {
m_autocomplete_engine->set_declarations_of_document_callback = [this](DeprecatedString const& filename, Vector<CodeComprehension::Declaration>&& declarations) {
async_declarations_in_document(filename, move(declarations));
};
m_autocomplete_engine->set_todo_entries_of_document_callback = [this](String const& filename, Vector<CodeComprehension::TodoEntry>&& todo_entries) {
m_autocomplete_engine->set_todo_entries_of_document_callback = [this](DeprecatedString const& filename, Vector<CodeComprehension::TodoEntry>&& todo_entries) {
async_todo_entries_in_document(filename, move(todo_entries));
};
}

24
Userland/DevTools/HackStudio/LanguageServers/FileDB.cpp
View file

@ -12,7 +12,7 @@
namespace LanguageServers {
RefPtr<const GUI::TextDocument> FileDB::get_document(String const& filename) const
RefPtr<const GUI::TextDocument> FileDB::get_document(DeprecatedString const& filename) const
{
auto absolute_path = to_absolute_path(filename);
auto document_optional = m_open_files.get(absolute_path);
@ -22,7 +22,7 @@ RefPtr<const GUI::TextDocument> FileDB::get_document(String const& filename) con
return *document_optional.value();
}
RefPtr<GUI::TextDocument> FileDB::get_document(String const& filename)
RefPtr<GUI::TextDocument> FileDB::get_document(DeprecatedString const& filename)
{
auto document = reinterpret_cast<FileDB const*>(this)->get_document(filename);
if (document.is_null())
@ -30,7 +30,7 @@ RefPtr<GUI::TextDocument> FileDB::get_document(String const& filename)
return adopt_ref(*const_cast<GUI::TextDocument*>(document.leak_ref()));
}
Optional<String> FileDB::get_or_read_from_filesystem(StringView filename) const
Optional<DeprecatedString> FileDB::get_or_read_from_filesystem(StringView filename) const
{
auto absolute_path = to_absolute_path(filename);
auto document = get_document(absolute_path);
@ -43,12 +43,12 @@ Optional<String> FileDB::get_or_read_from_filesystem(StringView filename) const
return {};
}
bool FileDB::is_open(String const& filename) const
bool FileDB::is_open(DeprecatedString const& filename) const
{
return m_open_files.contains(to_absolute_path(filename));
}
bool FileDB::add(String const& filename, int fd)
bool FileDB::add(DeprecatedString const& filename, int fd)
{
auto document = create_from_fd(fd);
if (!document)
@ -58,17 +58,17 @@ bool FileDB::add(String const& filename, int fd)
return true;
}
String FileDB::to_absolute_path(String const& filename) const
DeprecatedString FileDB::to_absolute_path(DeprecatedString const& filename) const
{
if (LexicalPath { filename }.is_absolute()) {
return filename;
}
if (m_project_root.is_null())
return filename;
return LexicalPath { String::formatted("{}/{}", m_project_root, filename) }.string();
return LexicalPath { DeprecatedString::formatted("{}/{}", m_project_root, filename) }.string();
}
RefPtr<GUI::TextDocument> FileDB::create_from_filesystem(String const& filename) const
RefPtr<GUI::TextDocument> FileDB::create_from_filesystem(DeprecatedString const& filename) const
{
auto file = Core::File::open(to_absolute_path(filename), Core::OpenMode::ReadOnly);
if (file.is_error()) {
@ -116,7 +116,7 @@ RefPtr<GUI::TextDocument> FileDB::create_from_file(Core::File& file) const
return document;
}
void FileDB::on_file_edit_insert_text(String const& filename, String const& inserted_text, size_t start_line, size_t start_column)
void FileDB::on_file_edit_insert_text(DeprecatedString const& filename, DeprecatedString const& inserted_text, size_t start_line, size_t start_column)
{
VERIFY(is_open(filename));
auto document = get_document(filename);
@ -127,7 +127,7 @@ void FileDB::on_file_edit_insert_text(String const& filename, String const& inse
dbgln_if(FILE_CONTENT_DEBUG, "{}", document->text());
}
void FileDB::on_file_edit_remove_text(String const& filename, size_t start_line, size_t start_column, size_t end_line, size_t end_column)
void FileDB::on_file_edit_remove_text(DeprecatedString const& filename, size_t start_line, size_t start_column, size_t end_line, size_t end_column)
{
// TODO: If file is not open - need to get its contents
// Otherwise- somehow verify that respawned language server is synced with all file contents
@ -144,7 +144,7 @@ void FileDB::on_file_edit_remove_text(String const& filename, size_t start_line,
dbgln_if(FILE_CONTENT_DEBUG, "{}", document->text());
}
RefPtr<GUI::TextDocument> FileDB::create_with_content(String const& content)
RefPtr<GUI::TextDocument> FileDB::create_with_content(DeprecatedString const& content)
{
StringView content_view(content);
auto document = GUI::TextDocument::create(&s_default_document_client);
@ -152,7 +152,7 @@ RefPtr<GUI::TextDocument> FileDB::create_with_content(String const& content)
return document;
}
bool FileDB::add(String const& filename, String const& content)
bool FileDB::add(DeprecatedString const& filename, DeprecatedString const& content)
{
auto document = create_with_content(content);
if (!document) {

28
Userland/DevTools/HackStudio/LanguageServers/FileDB.h
View file

@ -6,9 +6,9 @@
#pragma once
#include <AK/DeprecatedString.h>
#include <AK/HashMap.h>
#include <AK/NonnullRefPtr.h>
#include <AK/String.h>
#include <LibCodeComprehension/FileDB.h>
#include <LibGUI/TextDocument.h>
@ -17,28 +17,28 @@ namespace LanguageServers {
class FileDB final : public CodeComprehension::FileDB {
public:
FileDB() = default;
virtual Optional<String> get_or_read_from_filesystem(StringView filename) const override;
virtual Optional<DeprecatedString> get_or_read_from_filesystem(StringView filename) const override;
RefPtr<const GUI::TextDocument> get_document(String const& filename) const;
RefPtr<GUI::TextDocument> get_document(String const& filename);
RefPtr<const GUI::TextDocument> get_document(DeprecatedString const& filename) const;
RefPtr<GUI::TextDocument> get_document(DeprecatedString const& filename);
bool add(String const& filename, int fd);
bool add(String const& filename, String const& content);
bool add(DeprecatedString const& filename, int fd);
bool add(DeprecatedString const& filename, DeprecatedString const& content);
void on_file_edit_insert_text(String const& filename, String const& inserted_text, size_t start_line, size_t start_column);
void on_file_edit_remove_text(String const& filename, size_t start_line, size_t start_column, size_t end_line, size_t end_column);
String to_absolute_path(String const& filename) const;
bool is_open(String const& filename) const;
void on_file_edit_insert_text(DeprecatedString const& filename, DeprecatedString const& inserted_text, size_t start_line, size_t start_column);
void on_file_edit_remove_text(DeprecatedString const& filename, size_t start_line, size_t start_column, size_t end_line, size_t end_column);
DeprecatedString to_absolute_path(DeprecatedString const& filename) const;
bool is_open(DeprecatedString const& filename) const;
private:
RefPtr<GUI::TextDocument> create_from_filesystem(String const& filename) const;
RefPtr<GUI::TextDocument> create_from_filesystem(DeprecatedString const& filename) const;
RefPtr<GUI::TextDocument> create_from_fd(int fd) const;
RefPtr<GUI::TextDocument> create_from_file(Core::File&) const;
static RefPtr<GUI::TextDocument> create_with_content(String const&);
static RefPtr<GUI::TextDocument> create_with_content(DeprecatedString const&);
private:
HashMap<String, NonnullRefPtr<GUI::TextDocument>> m_open_files;
String m_project_root;
HashMap<DeprecatedString, NonnullRefPtr<GUI::TextDocument>> m_open_files;
DeprecatedString m_project_root;
};
}

6
Userland/DevTools/HackStudio/LanguageServers/LanguageClient.ipc
View file

@ -2,8 +2,8 @@ endpoint LanguageClient
{
auto_complete_suggestions(Vector<CodeComprehension::AutocompleteResultEntry> suggestions) =|
declaration_location(CodeComprehension::ProjectLocation location) =|
declarations_in_document(String filename, Vector<CodeComprehension::Declaration> declarations) =|
todo_entries_in_document(String filename, Vector<CodeComprehension::TodoEntry> todo_entries) =|
parameters_hint_result(Vector<String> params, int current_index) =|
declarations_in_document(DeprecatedString filename, Vector<CodeComprehension::Declaration> declarations) =|
todo_entries_in_document(DeprecatedString filename, Vector<CodeComprehension::TodoEntry> todo_entries) =|
parameters_hint_result(Vector<DeprecatedString> params, int current_index) =|
tokens_info_result(Vector<CodeComprehension::TokenInfo> tokens_info) =|
}

12
Userland/DevTools/HackStudio/LanguageServers/LanguageServer.ipc
View file

@ -1,15 +1,15 @@
endpoint LanguageServer
{
greet(String project_root) =|
greet(DeprecatedString project_root) =|
file_opened(String filename, IPC::File file) =|
file_edit_insert_text(String filename, String text, i32 start_line, i32 start_column) =|
file_edit_remove_text(String filename, i32 start_line, i32 start_column, i32 end_line, i32 end_column) =|
set_file_content(String filename, String content) =|
file_opened(DeprecatedString filename, IPC::File file) =|
file_edit_insert_text(DeprecatedString filename, DeprecatedString text, i32 start_line, i32 start_column) =|
file_edit_remove_text(DeprecatedString filename, i32 start_line, i32 start_column, i32 end_line, i32 end_column) =|
set_file_content(DeprecatedString filename, DeprecatedString content) =|
auto_complete_suggestions(CodeComprehension::ProjectLocation location) =|
find_declaration(CodeComprehension::ProjectLocation location) =|
get_parameters_hint(CodeComprehension::ProjectLocation location) =|
get_tokens_info(String filename) =|
get_tokens_info(DeprecatedString filename) =|
}

4
Userland/DevTools/HackStudio/LanguageServers/Shell/ConnectionFromClient.h
View file

@ -20,10 +20,10 @@ private:
: LanguageServers::ConnectionFromClient(move(socket))
{
m_autocomplete_engine = make<CodeComprehension::Shell::ShellComprehensionEngine>(m_filedb);
m_autocomplete_engine->set_declarations_of_document_callback = [this](String const& filename, Vector<CodeComprehension::Declaration>&& declarations) {
m_autocomplete_engine->set_declarations_of_document_callback = [this](DeprecatedString const& filename, Vector<CodeComprehension::Declaration>&& declarations) {
async_declarations_in_document(filename, move(declarations));
};
m_autocomplete_engine->set_todo_entries_of_document_callback = [this](String const& filename, Vector<CodeComprehension::TodoEntry>&& todo_entries) {
m_autocomplete_engine->set_todo_entries_of_document_callback = [this](DeprecatedString const& filename, Vector<CodeComprehension::TodoEntry>&& todo_entries) {
async_todo_entries_in_document(filename, move(todo_entries));
};
}