Skip to content

Support UTF-16 characters in inspector Log domain #1418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 11, 2019
Merged

Support UTF-16 characters in inspector Log domain #1418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions test-app/runtime/src/main/cpp/v8_inspector/src/inspector/utils/v8-inspector-common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
//

#include <v8_inspector/src/inspector/utils/v8-inspector-common.h>
#include <codecvt>
#include <locale>
#include <ArgConverter.h>
#include <NativeScriptAssert.h>

Expand Down Expand Up @@ -39,6 +41,16 @@ protocol::DispatchResponse Common::protocolCommandNotSupportedDispatchResponse()
return protocol::DispatchResponse::Error(s_notImplemented);
}

std::vector<uint16_t> Common::toVector(const std::string &value) {
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> convert;
std::u16string valueu16 = convert.from_bytes(value);

const uint16_t *begin = reinterpret_cast<uint16_t const *>(valueu16.data());
const uint16_t *end = reinterpret_cast<uint16_t const *>(valueu16.data() + valueu16.size());
std::vector<uint16_t> vector(begin, end);
return vector;
}

const String16 Common::s_notImplemented = "Protocol command not supported.";
}
}
2 changes: 2 additions & 0 deletions test-app/runtime/src/main/cpp/v8_inspector/src/inspector/utils/v8-inspector-common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ class Common {

static protocol::DispatchResponse protocolCommandNotSupportedDispatchResponse();

static std::vector<uint16_t> toVector(const std::string& value);

private:
static const String16 s_notImplemented;
};
Expand Down
3 changes: 2 additions & 1 deletion test-app/runtime/src/main/cpp/v8_inspector/src/inspector/v8-log-agent-impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ void V8LogAgentImpl::EntryAdded(const std::string& text, std::string verbosityLe
auto nano = std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::system_clock::now());
double timestamp = nano.time_since_epoch().count();

auto textString16 = String16(text.data());
auto vector = utils::Common::toVector(text);
auto textString16 = String16(vector.data(), vector.size());

auto logEntry = protocol::Log::LogEntry::create()
.setSource(protocol::Log::LogEntry::SourceEnum::Javascript)
Expand Down