diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1ded1479..504e7b46 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: name: check .editorconfig rules - repo: https://github.com/pre-commit/mirrors-clang-format - rev: v18.1.8 + rev: v19.1.0 hooks: - id: clang-format diff --git a/cpp-terminal/private/screen.cpp b/cpp-terminal/private/screen.cpp index f684dec4..29813188 100644 --- a/cpp-terminal/private/screen.cpp +++ b/cpp-terminal/private/screen.cpp @@ -24,11 +24,8 @@ Term::Screen Term::screen_size() if(GetConsoleScreenBufferInfo(Private::out.handle(), &inf)) return Term::Screen(static_cast(inf.srWindow.Bottom - inf.srWindow.Top + 1), static_cast(inf.srWindow.Right - inf.srWindow.Left + 1)); return Term::Screen(); #else - Term::Screen ret; - struct winsize window - { - 0, 0, 0, 0 - }; + Term::Screen ret; + struct winsize window{0, 0, 0, 0}; if(ioctl(Private::out.fd(), TIOCGWINSZ, &window) != -1) ret = {window.ws_row, window.ws_col}; return ret; #endif diff --git a/tests/unicode.test.cpp b/tests/unicode.test.cpp index d503dc3a..9e47c3b4 100644 --- a/tests/unicode.test.cpp +++ b/tests/unicode.test.cpp @@ -26,7 +26,7 @@ TEST_CASE("to_narrow") #if defined(_WIN32) TEST_CASE("to_wide") { - std::string in((const char*)(u8"∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i)γνωρίζω ἀπὸ τὴν ὄψηდარგებში⠝⠁⠊⠇ ⠁⠎ ⠹⠑ ⠙როგორიცააᚻ∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂᛖᛒᚢᛞᛖразличных\tопеฮั่นเสื่อมโทรมแማደሪያ የለው፥ ግንድ ይዞ ይዞራል።\n")); // Some multi-language charabia + std::string in((const char*)(u8"∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i)γνωρίζω ἀπὸ τὴν ὄψηდარგებში⠝⠁⠊⠇ ⠁⠎ ⠹⠑ ⠙როგორიცააᚻ∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂᛖᛒᚢᛞᛖразличных\tопеฮั่นเสื่อมโทรมแማደሪያ የለው፥ ግንድ ይዞ ይዞራል።\n")); // Some multi-language charabia std::wstring out{Term::Private::to_wide(in)}; CHECK(out == L"∮ E⋅da = Q, n → ∞, ∑ f(i) = ∏ g(i)γνωρίζω ἀπὸ τὴν ὄψηდარგებში⠝⠁⠊⠇ ⠁⠎ ⠹⠑ ⠙როგორიცააᚻ∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂᛖᛒᚢᛞᛖразличных\tопеฮั่นเสื่อมโทรมแማደሪያ የለው፥ ግንድ ይዞ ይዞራል።\n"); }