From 1552116221016722bb97fff18fdcb9d417e6f2e9 Mon Sep 17 00:00:00 2001 From: TEC Date: Wed, 25 Oct 2023 23:59:05 +0800 Subject: [PATCH 1/2] Update StyledStrings version This gets us two particular commits of interest: - Replace within-module eval with hygienic eval: which makes it possible to include StyledStrings in the sysimage without running into precompile errors. - Load the JULIA_*_COLOR env vars for compat: which mirrors the current behaviour to the relevant faces. --- .../md5 | 1 - .../sha512 | 1 - .../md5 | 1 + .../sha512 | 1 + stdlib/StyledStrings.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/md5 delete mode 100644 deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/sha512 create mode 100644 deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/md5 create mode 100644 deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/sha512 diff --git a/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/md5 b/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/md5 deleted file mode 100644 index 1439d220e9cab..0000000000000 --- a/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -1767902e25a2154a94ddfdc507754602 diff --git a/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/sha512 b/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/sha512 deleted file mode 100644 index 3098a0b23f238..0000000000000 --- a/deps/checksums/StyledStrings-302a0d023a58d38cddf0a1b82c618621613c8d2a.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -7cc74330c9e2721cd4721fdff924a1c81c611497d0e16fe43dab380b631fb118dfd36e69f23998f96f2b8e33670d5a129f475a5da2d6f6675487330937da9aea diff --git a/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/md5 b/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/md5 new file mode 100644 index 0000000000000..fc675ee83125a --- /dev/null +++ b/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/md5 @@ -0,0 +1 @@ +c1fd1bb7e3f9ab00afe0758a8a101374 diff --git a/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/sha512 b/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/sha512 new file mode 100644 index 0000000000000..09d5a8a619295 --- /dev/null +++ b/deps/checksums/StyledStrings-a1b2ae2434cd7d8199fa8647339422fe0e1d0324.tar.gz/sha512 @@ -0,0 +1 @@ +373302f1d32a5b5ad0efacf14fa82a16fd877c11ca589fc1f1492eb1d4bcd0f49a2a5a3f471f8577649309c8a03634e7467e31b403cfd6ab8a8e4a775d7f4e53 diff --git a/stdlib/StyledStrings.version b/stdlib/StyledStrings.version index f287f7d81b714..8180223575f05 100644 --- a/stdlib/StyledStrings.version +++ b/stdlib/StyledStrings.version @@ -1,4 +1,4 @@ STYLEDSTRINGS_BRANCH = main -STYLEDSTRINGS_SHA1 = 302a0d023a58d38cddf0a1b82c618621613c8d2a +STYLEDSTRINGS_SHA1 = a1b2ae2434cd7d8199fa8647339422fe0e1d0324 STYLEDSTRINGS_GIT_URL := https://github.com/JuliaLang/StyledStrings.jl.git STYLEDSTRINGS_TAR_URL = https://api.github.com/repos/JuliaLang/StyledStrings.jl/tarball/$1 From 30ccace4277ac457ad3dfd2c611e22a8aa3b1ac0 Mon Sep 17 00:00:00 2001 From: TEC Date: Wed, 25 Oct 2023 23:51:33 +0800 Subject: [PATCH 2/2] Load StyledStrings in REPL By loading the StyledStrings stdlib in REPL, we load the privateered print/show methods for the Annotated{String,Char} types defined there. This is nice to have, because it means that styled annotated strings can be constructed in Base and elsewhere without loading the StyledStrings stdlib, but they will be displayed as intended in the REPL. --- doc/Manifest.toml | 5 ++++- pkgimage.mk | 2 +- stdlib/REPL/Project.toml | 1 + stdlib/REPL/src/REPL.jl | 2 +- stdlib/REPL/src/precompile.jl | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/Manifest.toml b/doc/Manifest.toml index 3e973e043f60a..f3e4b08306bd2 100644 --- a/doc/Manifest.toml +++ b/doc/Manifest.toml @@ -205,7 +205,7 @@ uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" version = "1.11.0" [[deps.REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "StyledStrings", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" version = "1.11.0" @@ -242,6 +242,9 @@ deps = ["ArgTools", "SHA"] uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" version = "1.10.0" +[[deps.StyledStrings]] +uuid = "f489334b-da3d-4c2e-b8f0-e476e12c162b" + [[deps.Test]] deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" diff --git a/pkgimage.mk b/pkgimage.mk index 4fd23fbe8fa2c..776a97e65a950 100644 --- a/pkgimage.mk +++ b/pkgimage.mk @@ -111,7 +111,7 @@ $(eval $(call stdlib_builder,InteractiveUtils,Markdown)) # 3-depth packages $(eval $(call stdlib_builder,LibGit2_jll,MbedTLS_jll LibSSH2_jll Artifacts Libdl)) $(eval $(call stdlib_builder,LibCURL_jll,LibSSH2_jll nghttp2_jll MbedTLS_jll Zlib_jll Artifacts Libdl)) -$(eval $(call stdlib_builder,REPL,InteractiveUtils Markdown Sockets Unicode)) +$(eval $(call stdlib_builder,REPL,InteractiveUtils Markdown Sockets StyledStrings Unicode)) $(eval $(call stdlib_builder,SharedArrays,Distributed Mmap Random Serialization)) $(eval $(call stdlib_builder,TOML,Dates)) $(eval $(call stdlib_builder,Test,Logging Random Serialization InteractiveUtils)) diff --git a/stdlib/REPL/Project.toml b/stdlib/REPL/Project.toml index 77eca2bfe4240..6318bd0258ab3 100644 --- a/stdlib/REPL/Project.toml +++ b/stdlib/REPL/Project.toml @@ -6,6 +6,7 @@ version = "1.11.0" InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240" Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a" Sockets = "6462fe0b-24de-5631-8697-dd941f90decc" +StyledStrings = "f489334b-da3d-4c2e-b8f0-e476e12c162b" Unicode = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" [extras] diff --git a/stdlib/REPL/src/REPL.jl b/stdlib/REPL/src/REPL.jl index 5cd0c3abe917e..39b09a55c6e30 100644 --- a/stdlib/REPL/src/REPL.jl +++ b/stdlib/REPL/src/REPL.jl @@ -91,7 +91,7 @@ function __init__() return nothing end -using Base.Meta, Sockets +using Base.Meta, Sockets, StyledStrings import InteractiveUtils export diff --git a/stdlib/REPL/src/precompile.jl b/stdlib/REPL/src/precompile.jl index 7baf55e2f57bf..0eea4c140e39b 100644 --- a/stdlib/REPL/src/precompile.jl +++ b/stdlib/REPL/src/precompile.jl @@ -16,6 +16,7 @@ end using Base.Meta import Markdown +import StyledStrings ## Debugging options # Disable parallel precompiles generation by setting `false`