RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:17:35 +00:00
Code Issues Activity Actions

js: Convert non-UTF-8 encoded files to UTF-8 before parsing

Browse source
This commit is contained in:
Timothy Flynn 2022-04-03 09:31:04 -04:00 • committed by Linus Groh
parent 9e5abec6f1
commit b36c3a68d8
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meta/Lagom/CMakeLists.txt
View file

@ -388,7 +388,7 @@ if (BUILD_LAGOM)
list(REMOVE_ITEM LIBJS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibJS/SyntaxHighlighter.cpp") list(REMOVE_ITEM LIBJS_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../../Userland/Libraries/LibJS/SyntaxHighlighter.cpp")
lagom_lib(JS js lagom_lib(JS js
SOURCES ${LIBJS_SOURCES} ${LIBJS_SUBDIR_SOURCES} ${LIBJS_SUBSUBDIR_SOURCES} SOURCES ${LIBJS_SOURCES} ${LIBJS_SUBDIR_SOURCES} ${LIBJS_SUBSUBDIR_SOURCES}
LIBS m LagomCrypto LagomRegex LagomUnicode LIBS m LagomCrypto LagomRegex LagomUnicode LagomTextCodec
) )
# Line # Line

2
Userland/Utilities/CMakeLists.txt
View file

@ -122,7 +122,7 @@ target_link_libraries(ifconfig LibMain)
target_link_libraries(ini LibMain) target_link_libraries(ini LibMain)
target_link_libraries(install-bin LibMain) target_link_libraries(install-bin LibMain)
target_link_libraries(jp LibMain) target_link_libraries(jp LibMain)
target_link_libraries(js LibJS LibLine LibMain) target_link_libraries(js LibJS LibLine LibMain LibTextCodec)
link_with_unicode_data(js) link_with_unicode_data(js)
target_link_libraries(kcov-example LibMain) target_link_libraries(kcov-example LibMain)
target_link_libraries(keymap LibKeyboard LibMain) target_link_libraries(keymap LibKeyboard LibMain)

12
Userland/Utilities/js.cpp
View file

@ -71,6 +71,7 @@
#include <LibJS/SourceTextModule.h> #include <LibJS/SourceTextModule.h>
#include <LibLine/Editor.h> #include <LibLine/Editor.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <LibTextCodec/Decoder.h>
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <stdio.h> #include <stdio.h>
@ -1653,7 +1654,16 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly)); auto file = TRY(Core::File::open(path, Core::OpenMode::ReadOnly));
auto file_contents = file->read_all(); auto file_contents = file->read_all();
auto source = StringView { file_contents }; auto source = StringView { file_contents };
builder.append(source);
if (Utf8View { file_contents }.validate()) {
builder.append(source);
} else {
auto* decoder = TextCodec::decoder_for("windows-1252");
VERIFY(decoder);
auto utf8_source = TextCodec::convert_input_to_utf8_using_given_decoder_unless_there_is_a_byte_order_mark(*decoder, source);
builder.append(utf8_source);
}
} }
source_name = script_paths[0]; source_name = script_paths[0];