From c5bf83060e40b7cdc1d6cac2b2afe82506d7f3d3 Mon Sep 17 00:00:00 2001 From: Andrey Nering Date: Wed, 11 Jun 2025 15:19:54 -0300 Subject: [PATCH] fix(diffview): do not print ellipsis after content has being fully printed --- internal/exp/diffview/diffview.go | 4 ++-- .../Split/DarkMode/HeightOf016.golden | 2 +- .../Split/DarkMode/HeightOf017.golden | 4 ++-- .../Split/DarkMode/HeightOf018.golden | 6 +++--- .../Split/DarkMode/HeightOf019.golden | 8 ++++---- .../Split/DarkMode/HeightOf020.golden | 10 +++++----- .../Split/LightMode/HeightOf016.golden | 2 +- .../Split/LightMode/HeightOf017.golden | 4 ++-- .../Split/LightMode/HeightOf018.golden | 6 +++--- .../Split/LightMode/HeightOf019.golden | 8 ++++---- .../Split/LightMode/HeightOf020.golden | 10 +++++----- .../TestDiffViewYOffset/Split/YOffsetOf11.golden | 2 +- .../TestDiffViewYOffset/Split/YOffsetOf12.golden | 4 ++-- .../TestDiffViewYOffset/Split/YOffsetOf13.golden | 6 +++--- .../TestDiffViewYOffset/Split/YOffsetOf14.golden | 8 ++++---- .../TestDiffViewYOffset/Split/YOffsetOf15.golden | 10 +++++----- .../TestDiffViewYOffset/Split/YOffsetOf16.golden | 10 +++++----- 17 files changed, 52 insertions(+), 52 deletions(-) diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index f3801afb26f77a7285053369277be787c93e39f5..41212b340c1a94bb188c374d9b989e14c708875a 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -539,11 +539,11 @@ outer: for printedLines < dv.height { if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.beforeNumDigits))) } write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth).Render(" ")) if dv.lineNumbers { - write(dv.style.MissingLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + write(dv.style.MissingLine.LineNumber.Render(pad(" ", dv.afterNumDigits))) } write(dv.style.MissingLine.Code.Width(dv.fullCodeWidth + btoi(dv.extraColOnAfter)).Render(" ")) write("\n") diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden index a773ac9ffd45048eafdd50147ca73391c219cc7c..2e051d5ad88af68b4a75aaa726a0b637d6299004 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf016.golden @@ -13,4 +13,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden index 104d7dd7d64f4aa85c4581ac1ff88589c32c5d95..1e65410e215a0dae090d79b1e3a6347f46208b3d 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf017.golden @@ -13,5 +13,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden index 23da4e0335e31eaa87fec338a4de3107e78af8ed..93474d6a026b69354dcc9d2363dcdc8b2ce18463 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf018.golden @@ -13,6 +13,6 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden index 2d6bded74cf72745a42cc0d15248cce161d13c86..6f6418350b12deea6338f19f238a131b7ec9441f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf019.golden @@ -13,7 +13,7 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden index 4b32f54e3b2481aa962eee1c3d77a4433a6e51c8..f3714069848e7c073c447f60e4aa3127d1dbdd53 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf020.golden @@ -13,8 +13,8 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden index 156e76239d826e3ba845a5a303633377d162e2e4..70ca3fc122c17259015d6614d3056292cc0bbe39 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf016.golden @@ -13,4 +13,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden index 355ffadc3f22216b2375b90f68c9b101860f2bba..c055ca2cbf739903fba0bccf0ded1e147b1751f7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf017.golden @@ -13,5 +13,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden index f525be8e890a98f9b9c655ff8d2c313359fd6e08..b512e1810c53da0a889edc95c4dde3c655f6c28c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf018.golden @@ -13,6 +13,6 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden index 7acc43329ce9815498e59409eef941ed040b78bd..2b209f23854f5db9107401558b06b60f588b3a49 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf019.golden @@ -13,7 +13,7 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden index 7af2554bf2992dde1d0af1f3f00c47294d9607ab..2ab516a4ab5957130c0e7274b001189d50b35a32 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf020.golden @@ -13,8 +13,8 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden index 3f363d0a7e59883fefba9c0c60c1231943821705..6d36f26029566dc85857299fd6054f1b8a338d1e 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf11.golden @@ -2,4 +2,4 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    \ No newline at end of file +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden index 1b44a42fcfba8d182ca9215beae5001fd623873f..43fb8d355221bd73fee2b27cd3b481eb6094c150 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf12.golden @@ -1,5 +1,5 @@  12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")        14 +  return content   13  }  15  }  -  …     …    -  …     …    \ No newline at end of file +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden index e835a66406d56409debab9bc4f9007decf81042c..8bef8d4e6a2713175f0d6242ef99a78fa5b195bc 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf13.golden @@ -1,5 +1,5 @@       14 +  return content   13  }  15  }  -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden index 0bb5000165b4ef15dabc116aaf9e0195c215061d..eed5712fe427c783f84ebef0b16322459e3de751 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf14.golden @@ -1,5 +1,5 @@  13  }  15  }  -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden index a948b73aaf92cb90f712d625e8b2cc3078a5fa13..c989070ae313dcd1212208115acf3603671ceab6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf15.golden @@ -1,5 +1,5 @@ -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden index a948b73aaf92cb90f712d625e8b2cc3078a5fa13..c989070ae313dcd1212208115acf3603671ceab6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden +++ b/internal/exp/diffview/testdata/TestDiffViewYOffset/Split/YOffsetOf16.golden @@ -1,5 +1,5 @@ -  …     …    -  …     …    -  …     …    -  …     …    -  …     …    \ No newline at end of file +           +           +           +           +           \ No newline at end of file