zalox
/
jucipp
mirror of https://gitlab.com/cppit/jucipp
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Language protocol: added uri encoding/decoding, and added missing argument escaping to some Terminal::process calls

merge-requests/393/head
eidheim 7 years ago
parent
51a55faae8
commit
cdc69d082d
8 changed files with 98 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 42
      src/filesystem.cc
  2. 5
      src/filesystem.h
  3. 8
      src/juci.cc
  4. 2
      src/project.cc
  5. 2
      src/source.cc
  6. 70
      src/source_language_protocol.cc
  7. 6
      src/source_language_protocol.h
  8. 7
      tests/filesystem_test.cc

42
src/filesystem.cc
Unescape View File

@ -269,3 +269,45 @@ boost::filesystem::path filesystem::find_executable(const std::string &executabl
} }
return boost::filesystem::path(); return boost::filesystem::path();
} }
std::string filesystem::get_uri_from_path(const boost::filesystem::path &path) {
std::string uri{"file://"};
static auto hex_chars = "0123456789ABCDEF";
for(auto &chr : path.string()) {
static std::string encode_exceptions{"-._~!$&'()*+,;=:@?/\\"};
if(!((chr >= '0' && chr <= '9') || (chr >= 'A' && chr <= 'Z') || (chr >= 'a' && chr <= 'z') ||
std::any_of(encode_exceptions.begin(), encode_exceptions.end(), [chr](char e) { return chr == e; })))
uri += std::string("%") + hex_chars[static_cast<unsigned char>(chr) >> 4] + hex_chars[static_cast<unsigned char>(chr) & 15];
else
uri += chr;
}
return uri;
}
boost::filesystem::path filesystem::get_path_from_uri(const std::string &uri) {
std::string encoded;
if(uri.compare(0, 7, "file://") == 0)
encoded = uri.substr(7);
else
encoded = uri;
std::string unencoded;
for(size_t i = 0; i < encoded.size(); ++i) {
if(encoded[i] == '%' && i + 2 < encoded.size()) {
auto hex = encoded.substr(i + 1, 2);
auto decoded_chr = static_cast<char>(std::strtol(hex.c_str(), nullptr, 16));
unencoded += decoded_chr;
i += 2;
}
else if(encoded[i] == '+')
unencoded += ' ';
else
unencoded += encoded[i];
}
return unencoded;
}

5
src/filesystem.h
Unescape View File

@ -39,4 +39,9 @@ public:
static const std::vector<boost::filesystem::path> &get_executable_search_paths(); static const std::vector<boost::filesystem::path> &get_executable_search_paths();
static boost::filesystem::path find_executable(const std::string &executable_name); static boost::filesystem::path find_executable(const std::string &executable_name);
/// Get uri from path
static std::string get_uri_from_path(const boost::filesystem::path &path);
/// Get path from file uri
static boost::filesystem::path get_path_from_uri(const std::string &uri);
}; };

8
src/juci.cc
Unescape View File

@ -1,6 +1,7 @@
#include "juci.h" #include "juci.h"
#include "config.h" #include "config.h"
#include "directories.h" #include "directories.h"
#include "filesystem.h"
#include "menu.h" #include "menu.h"
#include "notebook.h" #include "notebook.h"
#include "terminal.h" #include "terminal.h"
@ -65,15 +66,16 @@ void Application::on_activate() {
std::string files_in_directory; std::string files_in_directory;
for(auto it = files.begin(); it != files.end();) { for(auto it = files.begin(); it != files.end();) {
if(it->first.generic_string().compare(0, directory.generic_string().size() + 1, directory.generic_string() + '/') == 0) { if(it->first.generic_string().compare(0, directory.generic_string().size() + 1, directory.generic_string() + '/') == 0) {
files_in_directory += " " + it->first.string(); files_in_directory += " " + filesystem::escape_argument(it->first.string());
it = files.erase(it); it = files.erase(it);
} }
else else
it++; it++;
} }
std::thread another_juci_app([directory, files_in_directory]() { std::thread another_juci_app([directory, files_in_directory]() {
Terminal::get().async_print("Executing: juci " + directory.string() + files_in_directory + "\n"); auto command = "juci " + filesystem::escape_argument(directory.string()) + files_in_directory;
Terminal::get().process("juci " + directory.string() + files_in_directory, "", false); Terminal::get().async_print("Executing: " + command + "\n");
Terminal::get().process(command, "", false);
}); });
another_juci_app.detach(); another_juci_app.detach();
} }

2
src/project.cc
Unescape View File

@ -749,7 +749,7 @@ void Project::LanguageProtocol::show_symbols() {
else { else {
std::vector<std::string> rows; std::vector<std::string> rows;
std::promise<void> result_processed; std::promise<void> result_processed;
client->write_request(language_protocol_view, "textDocument/documentSymbol", R"("textDocument":{"uri":"file://)" + language_protocol_view->file_path.string() + "\"}", [&result_processed, &rows, locations](const boost::property_tree::ptree &result, bool error) { client->write_request(language_protocol_view, "textDocument/documentSymbol", R"("textDocument":{"uri":")" + language_protocol_view->uri + "\"}", [&result_processed, &rows, locations](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
for(auto it = result.begin(); it != result.end(); ++it) { for(auto it = result.begin(); it != result.end(); ++it) {
try { try {

2
src/source.cc
Unescape View File

@ -674,7 +674,7 @@ void Source::View::setup_format_style(bool is_generic_view) {
} }
} }
command += " --stdin-filepath " + this->file_path.string() + " --print-width 120 --config-precedence prefer-file"; command += " --stdin-filepath " + filesystem::escape_argument(this->file_path.string()) + " --print-width 120 --config-precedence prefer-file";
if(get_buffer()->get_has_selection()) { // Cannot be used together with --cursor-offset if(get_buffer()->get_has_selection()) { // Cannot be used together with --cursor-offset
Gtk::TextIter start, end; Gtk::TextIter start, end;

70
src/source_language_protocol.cc
Unescape View File

@ -23,8 +23,7 @@ LanguageProtocol::Range::Range(const boost::property_tree::ptree &pt) : start(pt
LanguageProtocol::Location::Location(const boost::property_tree::ptree &pt, std::string file_) : range(pt.get_child("range")) { LanguageProtocol::Location::Location(const boost::property_tree::ptree &pt, std::string file_) : range(pt.get_child("range")) {
if(file_.empty()) { if(file_.empty()) {
file = pt.get<std::string>("uri"); file = filesystem::get_path_from_uri(pt.get<std::string>("uri")).string();
file.erase(0, 7);
} }
else else
file = std::move(file_); file = std::move(file_);
@ -40,8 +39,8 @@ LanguageProtocol::Diagnostic::Diagnostic(const boost::property_tree::ptree &pt)
LanguageProtocol::TextEdit::TextEdit(const boost::property_tree::ptree &pt, std::string new_text_) : range(pt.get_child("range")), new_text(new_text_.empty() ? pt.get<std::string>("newText") : std::move(new_text_)) {} LanguageProtocol::TextEdit::TextEdit(const boost::property_tree::ptree &pt, std::string new_text_) : range(pt.get_child("range")), new_text(new_text_.empty() ? pt.get<std::string>("newText") : std::move(new_text_)) {}
LanguageProtocol::Client::Client(std::string root_uri_, std::string language_id_) : root_uri(std::move(root_uri_)), language_id(std::move(language_id_)) { LanguageProtocol::Client::Client(boost::filesystem::path root_path_, std::string language_id_) : root_path(std::move(root_path_)), language_id(std::move(language_id_)) {
process = std::make_unique<TinyProcessLib::Process>(language_id + "-language-server", root_uri, [this](const char *bytes, size_t n) { process = std::make_unique<TinyProcessLib::Process>(filesystem::escape_argument(language_id + "-language-server"), root_path.string(), [this](const char *bytes, size_t n) {
server_message_stream.write(bytes, n); server_message_stream.write(bytes, n);
parse_server_message(); parse_server_message();
}, [](const char *bytes, size_t n) { }, [](const char *bytes, size_t n) {
@ -50,14 +49,14 @@ LanguageProtocol::Client::Client(std::string root_uri_, std::string language_id_
} }
std::shared_ptr<LanguageProtocol::Client> LanguageProtocol::Client::get(const boost::filesystem::path &file_path, const std::string &language_id) { std::shared_ptr<LanguageProtocol::Client> LanguageProtocol::Client::get(const boost::filesystem::path &file_path, const std::string &language_id) {
std::string root_uri; boost::filesystem::path root_path;
auto build = Project::Build::create(file_path); auto build = Project::Build::create(file_path);
if(!build->project_path.empty()) if(!build->project_path.empty())
root_uri = build->project_path.string(); root_path = build->project_path;
else else
root_uri = file_path.parent_path().string(); root_path = file_path.parent_path();
auto cache_id = root_uri + '|' + language_id; auto cache_id = root_path.string() + '|' + language_id;
static std::unordered_map<std::string, std::weak_ptr<Client>> cache; static std::unordered_map<std::string, std::weak_ptr<Client>> cache;
static std::mutex mutex; static std::mutex mutex;
@ -67,7 +66,7 @@ std::shared_ptr<LanguageProtocol::Client> LanguageProtocol::Client::get(const bo
it = cache.emplace(cache_id, std::weak_ptr<Client>()).first; it = cache.emplace(cache_id, std::weak_ptr<Client>()).first;
auto instance = it->second.lock(); auto instance = it->second.lock();
if(!instance) if(!instance)
it->second = instance = std::shared_ptr<Client>(new Client(root_uri, language_id), [](Client *client_ptr) { it->second = instance = std::shared_ptr<Client>(new Client(root_path, language_id), [](Client *client_ptr) {
std::thread delete_thread([client_ptr] { std::thread delete_thread([client_ptr] {
delete client_ptr; delete client_ptr;
}); });
@ -113,7 +112,7 @@ LanguageProtocol::Capabilities LanguageProtocol::Client::initialize(Source::Lang
return capabilities; return capabilities;
std::promise<void> result_processed; std::promise<void> result_processed;
write_request(nullptr, "initialize", "\"processId\":" + std::to_string(process->get_id()) + R"(,"rootUri":"file://)" + root_uri + R"(","capabilities":{"workspace":{"didChangeConfiguration":{"dynamicRegistration":true},"didChangeWatchedFiles":{"dynamicRegistration":true},"symbol":{"dynamicRegistration":true},"executeCommand":{"dynamicRegistration":true}},"textDocument":{"synchronization":{"dynamicRegistration":true,"willSave":true,"willSaveWaitUntil":true,"didSave":true},"completion":{"dynamicRegistration":true,"completionItem":{"snippetSupport":true}},"hover":{"dynamicRegistration":true},"signatureHelp":{"dynamicRegistration":true},"definition":{"dynamicRegistration":true},"references":{"dynamicRegistration":true},"documentHighlight":{"dynamicRegistration":true},"documentSymbol":{"dynamicRegistration":true},"codeAction":{"dynamicRegistration":true},"codeLens":{"dynamicRegistration":true},"formatting":{"dynamicRegistration":true},"rangeFormatting":{"dynamicRegistration":true},"onTypeFormatting":{"dynamicRegistration":true},"rename":{"dynamicRegistration":true},"documentLink":{"dynamicRegistration":true}}},"initializationOptions":{"omitInitBuild":true},"trace":"off")", [this, &result_processed](const boost::property_tree::ptree &result, bool error) { write_request(nullptr, "initialize", "\"processId\":" + std::to_string(process->get_id()) + R"(,"rootUri":")" + filesystem::get_uri_from_path(root_path) + R"(","capabilities":{"workspace":{"didChangeConfiguration":{"dynamicRegistration":true},"didChangeWatchedFiles":{"dynamicRegistration":true},"symbol":{"dynamicRegistration":true},"executeCommand":{"dynamicRegistration":true}},"textDocument":{"synchronization":{"dynamicRegistration":true,"willSave":true,"willSaveWaitUntil":true,"didSave":true},"completion":{"dynamicRegistration":true,"completionItem":{"snippetSupport":true}},"hover":{"dynamicRegistration":true},"signatureHelp":{"dynamicRegistration":true},"definition":{"dynamicRegistration":true},"references":{"dynamicRegistration":true},"documentHighlight":{"dynamicRegistration":true},"documentSymbol":{"dynamicRegistration":true},"codeAction":{"dynamicRegistration":true},"codeLens":{"dynamicRegistration":true},"formatting":{"dynamicRegistration":true},"rangeFormatting":{"dynamicRegistration":true},"onTypeFormatting":{"dynamicRegistration":true},"rename":{"dynamicRegistration":true},"documentLink":{"dynamicRegistration":true}}},"initializationOptions":{"omitInitBuild":true},"trace":"off")", [this, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
auto capabilities_pt = result.find("capabilities"); auto capabilities_pt = result.find("capabilities");
if(capabilities_pt != result.not_found()) { if(capabilities_pt != result.not_found()) {
@ -322,8 +321,8 @@ void LanguageProtocol::Client::write_notification(const std::string &method, con
void LanguageProtocol::Client::handle_server_request(const std::string &method, const boost::property_tree::ptree &params) { void LanguageProtocol::Client::handle_server_request(const std::string &method, const boost::property_tree::ptree &params) {
if(method == "textDocument/publishDiagnostics") { if(method == "textDocument/publishDiagnostics") {
std::vector<Diagnostic> diagnostics; std::vector<Diagnostic> diagnostics;
auto uri = params.get<std::string>("uri", ""); auto file = filesystem::get_path_from_uri(params.get<std::string>("uri", ""));
if(!uri.empty()) { if(!file.empty()) {
auto diagnostics_pt = params.get_child("diagnostics", boost::property_tree::ptree()); auto diagnostics_pt = params.get_child("diagnostics", boost::property_tree::ptree());
for(auto it = diagnostics_pt.begin(); it != diagnostics_pt.end(); ++it) { for(auto it = diagnostics_pt.begin(); it != diagnostics_pt.end(); ++it) {
try { try {
@ -334,7 +333,7 @@ void LanguageProtocol::Client::handle_server_request(const std::string &method,
} }
std::lock_guard<std::mutex> lock(views_mutex); std::lock_guard<std::mutex> lock(views_mutex);
for(auto view : views) { for(auto view : views) {
if(uri.size() >= 7 && uri.compare(7, std::string::npos, view->file_path.string()) == 0) { if(file == view->file_path) {
view->update_diagnostics(std::move(diagnostics)); view->update_diagnostics(std::move(diagnostics));
break; break;
} }
@ -344,7 +343,7 @@ void LanguageProtocol::Client::handle_server_request(const std::string &method,
} }
Source::LanguageProtocolView::LanguageProtocolView(const boost::filesystem::path &file_path, const Glib::RefPtr<Gsv::Language> &language, std::string language_id_) Source::LanguageProtocolView::LanguageProtocolView(const boost::filesystem::path &file_path, const Glib::RefPtr<Gsv::Language> &language, std::string language_id_)
: Source::BaseView(file_path, language), Source::View(file_path, language), language_id(std::move(language_id_)), client(LanguageProtocol::Client::get(file_path, language_id)), autocomplete(this, interactive_completion, last_keyval, false) { : Source::BaseView(file_path, language), Source::View(file_path, language), uri(filesystem::get_uri_from_path(file_path)), language_id(std::move(language_id_)), client(LanguageProtocol::Client::get(file_path, language_id)), autocomplete(this, interactive_completion, last_keyval, false) {
configure(); configure();
get_source_buffer()->set_language(language); get_source_buffer()->set_language(language);
get_source_buffer()->set_highlight_syntax(true); get_source_buffer()->set_highlight_syntax(true);
@ -380,7 +379,7 @@ Source::LanguageProtocolView::LanguageProtocolView(const boost::filesystem::path
escape_text(text); escape_text(text);
content_changes = R"({"text":")" + text + "\"}"; content_changes = R"({"text":")" + text + "\"}";
} }
client->write_notification("textDocument/didChange", R"("textDocument":{"uri":"file://)" + this->file_path.string() + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + content_changes + "]"); client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + content_changes + "]");
}, false); }, false);
get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start, const Gtk::TextBuffer::iterator &end) { get_buffer()->signal_erase().connect([this](const Gtk::TextBuffer::iterator &start, const Gtk::TextBuffer::iterator &end) {
@ -394,7 +393,7 @@ Source::LanguageProtocolView::LanguageProtocolView(const boost::filesystem::path
escape_text(text); escape_text(text);
content_changes = R"({"text":")" + text + "\"}"; content_changes = R"({"text":")" + text + "\"}";
} }
client->write_notification("textDocument/didChange", R"("textDocument":{"uri":"file://)" + this->file_path.string() + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + content_changes + "]"); client->write_notification("textDocument/didChange", R"("textDocument":{"uri":")" + this->uri + R"(","version":)" + std::to_string(document_version++) + "},\"contentChanges\":[" + content_changes + "]");
}, false); }, false);
} }
@ -418,7 +417,7 @@ void Source::LanguageProtocolView::initialize(bool setup) {
std::string text = get_buffer()->get_text(); std::string text = get_buffer()->get_text();
escape_text(text); escape_text(text);
client->write_notification("textDocument/didOpen", R"("textDocument":{"uri":"file://)" + file_path.string() + R"(","languageId":")" + language_id + R"(","version":)" + std::to_string(document_version++) + R"(,"text":")" + text + "\"}"); client->write_notification("textDocument/didOpen", R"("textDocument":{"uri":")" + uri + R"(","languageId":")" + language_id + R"(","version":)" + std::to_string(document_version++) + R"(,"text":")" + text + "\"}");
if(setup) { if(setup) {
setup_autocomplete(); setup_autocomplete();
@ -448,7 +447,7 @@ void Source::LanguageProtocolView::close() {
if(autocomplete.thread.joinable()) if(autocomplete.thread.joinable())
autocomplete.thread.join(); autocomplete.thread.join();
client->write_notification("textDocument/didClose", R"("textDocument":{"uri":"file://)" + file_path.string() + "\"}"); client->write_notification("textDocument/didClose", R"("textDocument":{"uri":")" + uri + "\"}");
client->close(this); client->close(this);
client = nullptr; client = nullptr;
} }
@ -460,6 +459,7 @@ Source::LanguageProtocolView::~LanguageProtocolView() {
void Source::LanguageProtocolView::rename(const boost::filesystem::path &path) { void Source::LanguageProtocolView::rename(const boost::filesystem::path &path) {
close(); close();
Source::DiffView::rename(path); Source::DiffView::rename(path);
uri = filesystem::get_uri_from_path(path);
client = LanguageProtocol::Client::get(file_path, language_id); client = LanguageProtocol::Client::get(file_path, language_id);
initialize(false); initialize(false);
} }
@ -517,11 +517,11 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
method = "textDocument/rangeFormatting"; method = "textDocument/rangeFormatting";
Gtk::TextIter start, end; Gtk::TextIter start, end;
get_buffer()->get_selection_bounds(start, end); get_buffer()->get_selection_bounds(start, end);
params = R"("textDocument":{"uri":"file://)" + file_path.string() + R"("},"range":{"start":{"line":)" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(end.get_line()) + ",\"character\":" + std::to_string(end.get_line_offset()) + "}},\"options\":{" + options + "}"; params = R"("textDocument":{"uri":")" + uri + R"("},"range":{"start":{"line":)" + std::to_string(start.get_line()) + ",\"character\":" + std::to_string(start.get_line_offset()) + R"(},"end":{"line":)" + std::to_string(end.get_line()) + ",\"character\":" + std::to_string(end.get_line_offset()) + "}},\"options\":{" + options + "}";
} }
else { else {
method = "textDocument/formatting"; method = "textDocument/formatting";
params = R"("textDocument":{"uri":"file://)" + file_path.string() + R"("},"options":{)" + options + "}"; params = R"("textDocument":{"uri":")" + uri + R"("},"options":{)" + options + "}";
} }
client->write_request(this, method, params, [&text_edits, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, method, params, [&text_edits, &result_processed](const boost::property_tree::ptree &result, bool error) {
@ -588,7 +588,7 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
else else
method = "textDocument/documentHighlight"; method = "textDocument/documentHighlight";
client->write_request(this, method, R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, &locations, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, method, R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, &locations, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
try { try {
for(auto it = result.begin(); it != result.end(); ++it) for(auto it = result.begin(); it != result.end(); ++it)
@ -724,7 +724,7 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
std::vector<Changes> changes; std::vector<Changes> changes;
std::promise<void> result_processed; std::promise<void> result_processed;
if(capabilities.rename) { if(capabilities.rename) {
client->write_request(this, "textDocument/rename", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "newName": ")" + text + "\"", [this, &changes, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/rename", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "newName": ")" + text + "\"", [this, &changes, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
boost::filesystem::path project_path; boost::filesystem::path project_path;
auto build = Project::Build::create(file_path); auto build = Project::Build::create(file_path);
@ -751,14 +751,13 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
for(auto change_it = changes_pt.begin(); change_it != changes_pt.end(); ++change_it) { for(auto change_it = changes_pt.begin(); change_it != changes_pt.end(); ++change_it) {
auto document_it = change_it->second.find("textDocument"); auto document_it = change_it->second.find("textDocument");
if(document_it != change_it->second.not_found()) { if(document_it != change_it->second.not_found()) {
auto file = document_it->second.get<std::string>("uri", ""); auto file = filesystem::get_path_from_uri(document_it->second.get<std::string>("uri", ""));
file.erase(0, 7);
if(filesystem::file_in_path(file, project_path)) { if(filesystem::file_in_path(file, project_path)) {
std::vector<LanguageProtocol::TextEdit> edits; std::vector<LanguageProtocol::TextEdit> edits;
auto edits_pt = change_it->second.get_child("edits", boost::property_tree::ptree()); auto edits_pt = change_it->second.get_child("edits", boost::property_tree::ptree());
for(auto edit_it = edits_pt.begin(); edit_it != edits_pt.end(); ++edit_it) for(auto edit_it = edits_pt.begin(); edit_it != edits_pt.end(); ++edit_it)
edits.emplace_back(edit_it->second); edits.emplace_back(edit_it->second);
changes.emplace_back(Changes{std::move(file), std::move(edits)}); changes.emplace_back(Changes{file.string(), std::move(edits)});
} }
} }
} }
@ -772,7 +771,7 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
}); });
} }
else { else {
client->write_request(this, "textDocument/documentHighlight", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, &changes, &text, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/documentHighlight", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, &changes, &text, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
try { try {
std::vector<LanguageProtocol::TextEdit> edits; std::vector<LanguageProtocol::TextEdit> edits;
@ -875,7 +874,7 @@ void Source::LanguageProtocolView::setup_navigation_and_refactoring() {
std::vector<std::pair<Offset, std::string>> methods; std::vector<std::pair<Offset, std::string>> methods;
std::promise<void> result_processed; std::promise<void> result_processed;
client->write_request(this, "textDocument/documentSymbol", R"("textDocument":{"uri":"file://)" + file_path.string() + "\"}", [&result_processed, &methods](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/documentSymbol", R"("textDocument":{"uri":")" + uri + "\"}", [&result_processed, &methods](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
for(auto it = result.begin(); it != result.end(); ++it) { for(auto it = result.begin(); it != result.end(); ++it) {
try { try {
@ -1022,7 +1021,7 @@ void Source::LanguageProtocolView::show_type_tooltips(const Gdk::Rectangle &rect
static int request_count = 0; static int request_count = 0;
request_count++; request_count++;
auto current_request = request_count; auto current_request = request_count;
client->write_request(this, "textDocument/hover", R"("textDocument": {"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + "}", [this, offset, current_request](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/hover", R"("textDocument": {"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + "}", [this, offset, current_request](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
// hover result structure vary significantly from the different language servers // hover result structure vary significantly from the different language servers
auto content = std::make_shared<std::string>(); auto content = std::make_shared<std::string>();
@ -1124,12 +1123,9 @@ void Source::LanguageProtocolView::apply_similar_symbol_tag() {
static int request_count = 0; static int request_count = 0;
request_count++; request_count++;
auto current_request = request_count; auto current_request = request_count;
client->write_request(this, method, R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, current_request](const boost::property_tree::ptree &result, bool error) { client->write_request(this, method, R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + R"(}, "context": {"includeDeclaration": true})", [this, current_request](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
std::vector<LanguageProtocol::Range> ranges; std::vector<LanguageProtocol::Range> ranges;
std::string uri;
if(!capabilities.document_highlight)
uri = "file://" + file_path.string();
for(auto it = result.begin(); it != result.end(); ++it) { for(auto it = result.begin(); it != result.end(); ++it) {
try { try {
if(capabilities.document_highlight || it->second.get<std::string>("uri") == uri) if(capabilities.document_highlight || it->second.get<std::string>("uri") == uri)
@ -1158,7 +1154,7 @@ void Source::LanguageProtocolView::apply_clickable_tag(const Gtk::TextIter &iter
auto current_request = request_count; auto current_request = request_count;
auto line = iter.get_line(); auto line = iter.get_line();
auto offset = iter.get_line_offset(); auto offset = iter.get_line_offset();
client->write_request(this, "textDocument/definition", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(line) + ", \"character\": " + std::to_string(offset) + "}", [this, current_request, line, offset](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/definition", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(line) + ", \"character\": " + std::to_string(offset) + "}", [this, current_request, line, offset](const boost::property_tree::ptree &result, bool error) {
if(!error && !result.empty()) { if(!error && !result.empty()) {
dispatcher.post([this, current_request, line, offset] { dispatcher.post([this, current_request, line, offset] {
if(current_request != request_count || !clickable_tag_applied) if(current_request != request_count || !clickable_tag_applied)
@ -1174,7 +1170,7 @@ void Source::LanguageProtocolView::apply_clickable_tag(const Gtk::TextIter &iter
Source::Offset Source::LanguageProtocolView::get_declaration(const Gtk::TextIter &iter) { Source::Offset Source::LanguageProtocolView::get_declaration(const Gtk::TextIter &iter) {
auto offset = std::make_shared<Offset>(); auto offset = std::make_shared<Offset>();
std::promise<void> result_processed; std::promise<void> result_processed;
client->write_request(this, "textDocument/definition", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + "}", [offset, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/definition", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(iter.get_line()) + ", \"character\": " + std::to_string(iter.get_line_offset()) + "}", [offset, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
for(auto it = result.begin(); it != result.end(); ++it) { for(auto it = result.begin(); it != result.end(); ++it) {
try { try {
@ -1349,7 +1345,7 @@ void Source::LanguageProtocolView::setup_autocomplete() {
if(autocomplete_show_parameters) { if(autocomplete_show_parameters) {
if(!capabilities.signature_help) if(!capabilities.signature_help)
return; return;
client->write_request(this, "textDocument/signatureHelp", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(line_number - 1) + ", \"character\": " + std::to_string(column - 1) + "}", [this, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/signatureHelp", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(line_number - 1) + ", \"character\": " + std::to_string(column - 1) + "}", [this, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
auto signatures = result.get_child("signatures", boost::property_tree::ptree()); auto signatures = result.get_child("signatures", boost::property_tree::ptree());
for(auto signature_it = signatures.begin(); signature_it != signatures.end(); ++signature_it) { for(auto signature_it = signatures.begin(); signature_it != signatures.end(); ++signature_it) {
@ -1368,7 +1364,7 @@ void Source::LanguageProtocolView::setup_autocomplete() {
}); });
} }
else { else {
client->write_request(this, "textDocument/completion", R"("textDocument":{"uri":"file://)" + file_path.string() + R"("}, "position": {"line": )" + std::to_string(line_number - 1) + ", \"character\": " + std::to_string(column - 1) + "}", [this, &result_processed](const boost::property_tree::ptree &result, bool error) { client->write_request(this, "textDocument/completion", R"("textDocument":{"uri":")" + uri + R"("}, "position": {"line": )" + std::to_string(line_number - 1) + ", \"character\": " + std::to_string(column - 1) + "}", [this, &result_processed](const boost::property_tree::ptree &result, bool error) {
if(!error) { if(!error) {
auto begin = result.begin(); // rust language server is bugged auto begin = result.begin(); // rust language server is bugged
auto end = result.end(); auto end = result.end();
@ -1502,7 +1498,7 @@ bool Source::LanguageProtocolView::has_named_parameters() {
void Source::LanguageProtocolView::update_flow_coverage() { void Source::LanguageProtocolView::update_flow_coverage() {
std::stringstream stdin_stream, stderr_stream; std::stringstream stdin_stream, stderr_stream;
auto stdout_stream = std::make_shared<std::stringstream>(); auto stdout_stream = std::make_shared<std::stringstream>();
auto exit_status = Terminal::get().process(stdin_stream, *stdout_stream, flow_coverage_executable.string() + " coverage --json " + file_path.string(), "", &stderr_stream); auto exit_status = Terminal::get().process(stdin_stream, *stdout_stream, flow_coverage_executable.string() + " coverage --json " + filesystem::escape_argument(file_path.string()), "", &stderr_stream);
dispatcher.post([this, exit_status, stdout_stream] { dispatcher.post([this, exit_status, stdout_stream] {
if(!flow_coverage_cleared_diagnostic_tooltips) { if(!flow_coverage_cleared_diagnostic_tooltips) {

6
src/source_language_protocol.h
Unescape View File

@ -79,8 +79,8 @@ namespace LanguageProtocol {
}; };
class Client { class Client {
Client(std::string root_uri, std::string language_id); Client(boost::filesystem::path root_path, std::string language_id);
std::string root_uri; boost::filesystem::path root_path;
std::string language_id; std::string language_id;
Capabilities capabilities; Capabilities capabilities;
@ -135,6 +135,8 @@ namespace Source {
Gtk::TextIter get_iter_at_line_pos(int line, int pos) override; Gtk::TextIter get_iter_at_line_pos(int line, int pos) override;
std::string uri;
protected: protected:
void show_type_tooltips(const Gdk::Rectangle &rectangle) override; void show_type_tooltips(const Gdk::Rectangle &rectangle) override;
void apply_similar_symbol_tag() override; void apply_similar_symbol_tag() override;

7
tests/filesystem_test.cc
Unescape View File

@ -84,4 +84,11 @@ int main() {
g_assert(filesystem::get_relative_path("/test/test/test/test.cc", "/test/base") == boost::filesystem::path("..") / "test" / "test" / "test.cc"); g_assert(filesystem::get_relative_path("/test/test/test/test.cc", "/test/base") == boost::filesystem::path("..") / "test" / "test" / "test.cc");
g_assert(filesystem::get_relative_path("/test2/test.cc", "/test/base") == boost::filesystem::path("..") / ".." / "test2" / "test.cc"); g_assert(filesystem::get_relative_path("/test2/test.cc", "/test/base") == boost::filesystem::path("..") / ".." / "test2" / "test.cc");
} }
{
boost::filesystem::path path = "/ro ot/te stæøå.txt";
auto uri = filesystem::get_uri_from_path(path);
g_assert(uri == "file:///ro%20ot/te%20st%C3%A6%C3%B8%C3%A5.txt");
g_assert(path == filesystem::get_path_from_uri(uri));
}
} }
Write Preview
Loading…
Cancel
Save