From ac106408bb146b09c85ce802ed6a189f0a58ca1b Mon Sep 17 00:00:00 2001
From: KristofferC <kristoffer.carlsson@juliacomputing.com>
Date: Thu, 15 Aug 2024 16:16:33 +0200
Subject: [PATCH] propagate the terminals displaysize to the IOContext used by
 the REPL

---
 base/strings/io.jl      | 7 ++++++-
 stdlib/REPL/src/REPL.jl | 1 +
 test/show.jl            | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/base/strings/io.jl b/base/strings/io.jl
index acbd945c8e137..ae666d72a121a 100644
--- a/base/strings/io.jl
+++ b/base/strings/io.jl
@@ -208,7 +208,12 @@ function show(
         get(io, :limit, false)::Bool || return show(io, str)
         limit = max(20, displaysize(io)[2])
         # one line in collection, seven otherwise
-        get(io, :typeinfo, nothing) === nothing && (limit *= 7)
+        if get(io, :typeinfo, nothing) === nothing
+            limit *= 7
+        else
+            # strings in collections are typically indented one space
+            limit -= 1
+        end
     end
 
     # early out for short strings
diff --git a/stdlib/REPL/src/REPL.jl b/stdlib/REPL/src/REPL.jl
index 67f5860082c8a..de9777904c8d3 100644
--- a/stdlib/REPL/src/REPL.jl
+++ b/stdlib/REPL/src/REPL.jl
@@ -510,6 +510,7 @@ function display(d::REPLDisplay, mime::MIME"text/plain", x)
             # this can override the :limit property set initially
             io = foldl(IOContext, d.repl.options.iocontext, init=io)
         end
+        io = IOContext(io, :displaysize => displaysize(outstream(d.repl)))
         show_repl(io, mime, x[])
         println(io)
     end
diff --git a/test/show.jl b/test/show.jl
index 63663152d9d91..4d7d892cc8c00 100644
--- a/test/show.jl
+++ b/test/show.jl
@@ -897,7 +897,7 @@ end
         @test r == repr("x"^271) * " ⋯ 459 bytes ⋯ " * repr("x"^270)
         r = replstr(["x"^1000])
         @test length(r) < 120
-        @test r == "1-element Vector{String}:\n " * repr("x"^31) * " ⋯ 939 bytes ⋯ " * repr("x"^30)
+        @test r == "1-element Vector{String}:\n " * repr("x"^30) * " ⋯ 940 bytes ⋯ " * repr("x"^30)
     end
 end