diff --git a/internal/exp/diffview/diffview.go b/internal/exp/diffview/diffview.go index 8776c90d5c07ee00d938a990f3a1382176451016..bdaa25b8e23fabbf15e886d281845933c8b28a6b 100644 --- a/internal/exp/diffview/diffview.go +++ b/internal/exp/diffview/diffview.go @@ -292,7 +292,8 @@ func (dv *DiffView) renderUnified() string { fullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth) printedLines := 0 - for _, h := range dv.unified.Hunks { +outer: + for i, h := range dv.unified.Hunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.afterNumDigits))) @@ -305,7 +306,23 @@ func (dv *DiffView) renderUnified() string { beforeLine := h.FromLine afterLine := h.ToLine - for _, l := range h.Lines { + for j, l := range h.Lines { + // print ellipis if we don't have enough space to print the rest of the diff + hasReachedHeight := dv.height > 0 && printedLines+1 == dv.height + isLastHunk := i+1 == len(dv.unified.Hunks) + isLastLine := j+1 == len(h.Lines) + if hasReachedHeight && (!isLastHunk || !isLastLine) { + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + } + b.WriteString(fullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + b.WriteRune('\n') + break outer + } + content := strings.TrimSuffix(l.Content, "\n") content = ansi.Truncate(content, dv.codeWidth, "…") @@ -368,6 +385,7 @@ func (dv *DiffView) renderSplit() string { afterFullContentStyle := lipgloss.NewStyle().MaxWidth(dv.fullCodeWidth + btoi(dv.extraColOnAfter)) printedLines := 0 +outer: for i, h := range dv.splitHunks { if dv.lineNumbers { b.WriteString(dv.style.DividerLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) @@ -384,7 +402,28 @@ func (dv *DiffView) renderSplit() string { beforeLine := h.fromLine afterLine := h.toLine - for _, l := range h.lines { + for j, l := range h.lines { + // print ellipis if we don't have enough space to print the rest of the diff + hasReachedHeight := dv.height > 0 && printedLines+1 == dv.height + isLastHunk := i+1 == len(dv.unified.Hunks) + isLastLine := j+1 == len(h.lines) + if hasReachedHeight && (!isLastHunk || !isLastLine) { + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.beforeNumDigits))) + } + b.WriteString(beforeFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + if dv.lineNumbers { + b.WriteString(dv.style.EqualLine.LineNumber.Render(pad("…", dv.afterNumDigits))) + } + b.WriteString(afterFullContentStyle.Render( + dv.style.EqualLine.Code.Width(dv.fullCodeWidth).Render(" …"), + )) + b.WriteRune('\n') + break outer + } + var beforeContent string var afterContent string if l.before != nil { diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden index f549eeeab4aee92d5d2bb63c38410cd1eebea9fd..c508eb369e1db309c3a4e8101d7e4ee3c8a3f6eb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf002.golden @@ -1,2 +1,2 @@   …  @@ -2,6 +2,7 @@    …    -  2     2    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden index 10f9502fcb816c392861420f3d88c2514cb1bd99..b31c3992a9364df7907eebf98c5415489173235c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf003.golden @@ -1,3 +1,3 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden index 29e41b5288bb1f14d63fdda2bb88b7eb7eb32ea1..926aa7919ab55ad7e2095b846ded1a3fcabe8e92 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf004.golden @@ -1,4 +1,4 @@   …  @@ -2,6 +2,7 @@    …      2     2      3  import (   3  import (  -  4  "fmt"   4  "fmt"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden index 619338ac411b7f7af5cc7509979a82d1b1847460..bf3ca743fa08655692d08469b7751841592e66a3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -       5 +  "strings"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden index 32feede59f034251f1dc8f4c93e07796e2ad7832..e571a2d96159c754af9bab8bf378b7538f386e4c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf006.golden @@ -3,4 +3,4 @@   3  import (   3  import (    4  "fmt"   4  "fmt"         5 +  "strings"  -  5  )   6  )  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden index 98159050f96605563ee6941217b95a9d9d0d8146..79d11d366c4531dc5622ce534bceb9178a69e92b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf007.golden @@ -4,4 +4,4 @@   4  "fmt"   4  "fmt"         5 +  "strings"    5  )   6  )  -  6     7    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden index 90f0e1e41a2d163a5548b5c0ab552dd0a3754310..4dd23002f17899d3d2ae4f5605362203342d235c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf008.golden @@ -5,4 +5,4 @@        5 +  "strings"    5  )   6  )    6     7    -  7  func main() {   8  func main() {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden index 2d5414cb8e9b188ba00c4e749a6a72e8495fcb58..62e8e9fc7ce467f5f623754623634e7a8bcfd068 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf010.golden @@ -7,4 +7,4 @@   6     7      7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden index 1c3a7cac7bc69e7f605ea5133e83da1589975e4a..6ec35f4f6595e6b9c1cad504c8d2d506a36542d3 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf011.golden @@ -8,4 +8,4 @@   7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      9  }  10  }  - 10    11    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden index ddc3c7d8dfedfe272c9b0dd6657bfb046a2a0a0d..c9db3fa57f49b5bda659a924beb74769b0d9f426 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf012.golden @@ -9,4 +9,4 @@   …  @@ -9,5 +10,6 @@    …      9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden index 47f76810267f82a6d74b128852cd85dba8614799..45e0f1271727e29e1f20898a1c1d431fe9bca073 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden index 154b52bea62f209bb48a2a34b969f07999890047..54207639856f930f4c629e1fcfcbfbdda5c7b691 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden index 48c221580aa0472dee3f56745e3185b2d2b02eba..2a4e8eff92df5b3539dad4578a0715e0ec6ce42a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf002.golden @@ -1,2 +1,2 @@   …  @@ -2,6 +2,7 @@    …    -  2     2    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden index 44ec83b3c19eeb2b4f2f57d6bef88aa11fc74b0a..8b77ca205d3f1c85a25f733f0a3044a541805c10 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf003.golden @@ -1,3 +1,3 @@   …  @@ -2,6 +2,7 @@    …      2     2    -  3  import (   3  import (  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden index 7d63be0dc2cc84ede9acb2957f693462de121c39..fca802e8b1cb57de2887cffadba3771a68d6d10c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf004.golden @@ -1,4 +1,4 @@   …  @@ -2,6 +2,7 @@    …      2     2      3  import (   3  import (  -  4  "fmt"   4  "fmt"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden index 977891156902da565de6dec7636a7207bfac7bde..14803d08c905475b4cd0146c363da33f85eb7979 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2     2      3  import (   3  import (    4  "fmt"   4  "fmt"  -       5 +  "strings"  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden index 0312e9812a320684e88ea147d72e91479f3ee677..1112cc8316a3f084872381f3d2e18d4c4e61ef30 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf006.golden @@ -3,4 +3,4 @@   3  import (   3  import (    4  "fmt"   4  "fmt"         5 +  "strings"  -  5  )   6  )  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden index eab2005ff14cba831ebbf41dd1b616a0700b5782..85dcb7a4e8351a549d717b0d5f5ff87baba89c04 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf007.golden @@ -4,4 +4,4 @@   4  "fmt"   4  "fmt"         5 +  "strings"    5  )   6  )  -  6     7    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden index b059c88d7cf99a4ec0581da4c9b4f7eab8fbf50c..b64d596e6eaa36aa837a0be6cde7aa5cbe5e2d0a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf008.golden @@ -5,4 +5,4 @@        5 +  "strings"    5  )   6  )    6     7    -  7  func main() {   8  func main() {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden index 0cca35d21a408ad949a1ab57af491699a26bd971..9b0cc01038150ecba239f81876ac4ea693729ef7 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf010.golden @@ -7,4 +7,4 @@   6     7      7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …    -  9  }  10  }  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden index 99ae20e7054f3b0385f087213d5aeded1e979a58..0284e20729c6cae98d1115eb8684a31415739883 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf011.golden @@ -8,4 +8,4 @@   7  func main() {   8  func main() {    …  @@ -9,5 +10,6 @@    …      9  }  10  }  - 10    11    \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden index 196a46c2f890ba7b87587a0462cb072383d7ed5c..a8b368aa5c64c7fb5b2de195fdccd7704c61a476 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf012.golden @@ -9,4 +9,4 @@   …  @@ -9,5 +10,6 @@    …      9  }  10  }   10    11    - 11  func getContent() string {  12  func getContent() string {  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden index ead74e3119611a3c8588263ddd598a208f21f94d..fdb87616054a57763875bf5119b2c834391cdbeb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  }  10  }   10    11     11  func getContent() string {  12  func getContent() string {  - 12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden index bee90f09e45814a15ebf6c542101167d989e2230..7f71193ca70d6c3fe17a87a3d96ff8fe91f2adef 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Split/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10    11     11  func getContent() string {  12  func getContent() string {   12 -  return "Hello, world!"  13 +  content := strings.ToUpper("Hello, World!")  -      14 +  return content  \ No newline at end of file +  …  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden index faffac06f361089cc904bd5d39779c16559514e8..2402ae251e95b60d1824cafe9097a16fb3e0e8d6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf002.golden @@ -1,2 +1,2 @@   …   …  @@ -2,6 +2,7 @@   -  2   2    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden index 4b08786279a0af10376ac6a4a3b2ca8861de0a1f..37017963f7a11f0d86ed36205928a4e74f86951b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf003.golden @@ -1,3 +1,3 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden index 539337c3373c377ea915d9033b3a0805f028e619..061471516c6383e30301209203d2465e91c4c540 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf004.golden @@ -1,4 +1,4 @@   …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (  -  4   4  "fmt"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden index 5c6a37fac3582293e7d4af5c50aa838cb06ed656..769af9e0f214d92e24447a3a4efce6916cb8e25a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -     5 +  "strings"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden index 1dd0991ff069a060f70d6b3402c1108c11e30d15..666944fe745621fd386f4697b150fddf77c86c8c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf006.golden @@ -3,4 +3,4 @@   3   3  import (    4   4  "fmt"       5 +  "strings"  -  5   6  )  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden index 06fd092d72e16243410114c721e75af3ae3ffd33..819c12589a9e708622441fd37b505cce76208527 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf007.golden @@ -4,4 +4,4 @@   4   4  "fmt"       5 +  "strings"    5   6  )  -  6   7    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden index f1c6a0b6129115905cf93364654400bdae15dccc..349961591727969718bfe0cdb4f3fe384fed7cc5 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf008.golden @@ -5,4 +5,4 @@      5 +  "strings"    5   6  )    6   7    -  7   8  func main() {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden index 8aed8c8a187573ac0aa13a796426bd4b74f89f7e..13362a10859cec473f0cfa26d411d709dc6c535f 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf010.golden @@ -7,4 +7,4 @@   6   7      7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden index 867f1a6e3fc02c8b27c0eeb67a3c9a0f4c6f34b3..8048f0e742b0ad409e13f8b06239b04f4e4a0c7c 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf011.golden @@ -8,4 +8,4 @@   7   8  func main() {    …   …  @@ -9,5 +10,6 @@     9  10  }  - 10  11    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden index 30bb3b118d9e20f0df68a348a5a887360540ba4b..11220325ed2d66f98484899f8061b8bf0574adbb 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf012.golden @@ -9,4 +9,4 @@   …   …  @@ -9,5 +10,6 @@     9  10  }   10  11    - 11  12  func getContent() string {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden index e1a253d03b1ca631cc58dd8b0d85e23ea00325b8..e3841b3152f9bb355db26223ce5e5afa8dd930b1 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  - 12    -  return "Hello, world!"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden index 7712155c3ffd6879e75b0f57939ae23012f6a78e..1c95c2530d5324b105d9674fca17b5c387410a0b 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden index b0a459603f6f739b6b7f0eaa0087ea963c7fc842..4b40f3f5844a477be7c55bafbabc86a6d9c7cf04 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/DarkMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden index a0f2c53692883080fda9647e3262957ba78fd236..61a03f25c81520058f8fd3856a03e84daac6cbb6 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf002.golden @@ -1,2 +1,2 @@   …   …  @@ -2,6 +2,7 @@   -  2   2    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden index 4e835eb42451c4982dabf9d65d5d6e3729dc38be..6951d63de62756d581aa7a98564d6547dd244609 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf003.golden @@ -1,3 +1,3 @@   …   …  @@ -2,6 +2,7 @@     2   2    -  3   3  import (  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden index 64e6a891511c95c64bb770671118d6b47b4aa8e6..9de759b3ee15fd074cab28ee2866ad5b48f5ec66 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf004.golden @@ -1,4 +1,4 @@   …   …  @@ -2,6 +2,7 @@     2   2      3   3  import (  -  4   4  "fmt"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden index 4589e89ef94be4afa6e26dec9bb4905dd8441ea8..50e179fe27212fc7bab77c96cf966daa0b070a14 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf005.golden @@ -2,4 +2,4 @@   2   2      3   3  import (    4   4  "fmt"  -     5 +  "strings"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden index e1e8d7ee5c629f02f3e866a3d06ae62313f5e04c..119066f8acbae929a9555c32a338116e140fc724 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf006.golden @@ -3,4 +3,4 @@   3   3  import (    4   4  "fmt"       5 +  "strings"  -  5   6  )  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden index 71efab2fd169bafd2294f8cc19e744bddb4321a3..251adc55165c98fcf8cadd7d8e5214a15fda7e33 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf007.golden @@ -4,4 +4,4 @@   4   4  "fmt"       5 +  "strings"    5   6  )  -  6   7    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden index 4276ebd96aca71d453f4b24a4be53b988d1ae078..c5e77f40c2fe54f0456ac88fb3511e0cb9f6db99 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf008.golden @@ -5,4 +5,4 @@      5 +  "strings"    5   6  )    6   7    -  7   8  func main() {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden index 1dda4a0bdbbc734da99d2f06e0f834f2d1b0a747..03288eb048726d484e1b41dddf7bf9cef64ea078 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf010.golden @@ -7,4 +7,4 @@   6   7      7   8  func main() {    …   …  @@ -9,5 +10,6 @@   -  9  10  }  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden index 0faa9e1e32f0beadf4b265d735790e6a6b4262aa..1285ef27e22ca7cb8db77be33b88544bc34448af 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf011.golden @@ -8,4 +8,4 @@   7   8  func main() {    …   …  @@ -9,5 +10,6 @@     9  10  }  - 10  11    \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden index bb8e59a58be13b3b3e04ade30ae35dbd9780a034..fd6fea0459398c72b70e78367cb41a03f71f109a 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf012.golden @@ -9,4 +9,4 @@   …   …  @@ -9,5 +10,6 @@     9  10  }   10  11    - 11  12  func getContent() string {  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden index 4d265424acdc4693196fef8c4f4b42f2a0f682e0..2cc1825ce79a03986a0e45f597a35dce309430e8 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf013.golden @@ -10,4 +10,4 @@   9  10  }   10  11     11  12  func getContent() string {  - 12    -  return "Hello, world!"  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden index c98e674b3c5ec999515f4aed9c6b2ce2363dafc5..261c703aca33987a9bb1312f859ff896cb9cb471 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf014.golden @@ -11,4 +11,4 @@  10  11     11  12  func getContent() string {   12    -  return "Hello, world!"  -    13 +  content := strings.ToUpper("Hello, World!")  \ No newline at end of file +  …   …  …  \ No newline at end of file diff --git a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden index 62eb2afc37b63d90bef79c25518eacc08b185ff9..96c15aec6aabdf2d1e079d66f4e914ee31f15e18 100644 --- a/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden +++ b/internal/exp/diffview/testdata/TestDiffViewHeight/Unified/LightMode/HeightOf015.golden @@ -12,4 +12,4 @@  11  12  func getContent() string {   12    -  return "Hello, world!"      13 +  content := strings.ToUpper("Hello, World!")  -    14 +  return content  \ No newline at end of file +  …   …  …  \ No newline at end of file