diff --git a/sample_files/compare.expected b/sample_files/compare.expected index 9dd4a1154..0b9d61425 100644 --- a/sample_files/compare.expected +++ b/sample_files/compare.expected @@ -8,10 +8,10 @@ sample_files/added_line_1.txt sample_files/added_line_2.txt 8a1587e6b5fc53f2ec2ac665a5d00372 - sample_files/align_footer_1.txt sample_files/align_footer_2.txt -0383f321edb71358f332b19ae6857761 - +0c2a263268f6c1dd27aa5e6aed686b6c - sample_files/all_changed_1.js sample_files/all_changed_2.js -52b2e6426e85dd16d163cd0c36851ac4 - +6f6cbd4d2ed1045e3883143787dbd75b - sample_files/apex_1.cls sample_files/apex_2.cls 8e477350907734ac4d5201752523dff3 - @@ -20,73 +20,73 @@ sample_files/b2_math_1.h sample_files/b2_math_2.h 1ab24165d072f91be11893b92bc0943f - sample_files/bad_combine_1.rs sample_files/bad_combine_2.rs -4b8f23f390a3030f17b5f35e6a645fb1 - +b3539df794190eca6f6a3ac7c094d03b - sample_files/big_text_hunk_1.txt sample_files/big_text_hunk_2.txt fc26d41a5ff771670e04033b177973d2 - sample_files/change_outer_1.el sample_files/change_outer_2.el -ad0a4f5dbd67ab305985ff7d7334bbc9 - +13d4673474ea6c7ee980f8a955fff26b - sample_files/chinese_1.po sample_files/chinese_2.po -bc4f10d497c0dd7b490ebaad2784e054 - +a729587c647a4390573c86e95abe6263 - sample_files/clojure_1.clj sample_files/clojure_2.clj -a97bbf9eee7a8e0cf3d804e9405acf29 - +592b9f4e3bc12ede3075d23551074b3e - sample_files/comma_1.js sample_files/comma_2.js -bd6406f270701ef1b384eaedcb7fda8d - +a4e3564f6e336fead6eb0410496c20f1 - sample_files/comma_and_comment_1.js sample_files/comma_and_comment_2.js -20893a96add35942b967eb35af7eec72 - +0a5ccbcd368607e62eaff0c4ae25049f - sample_files/comments_1.rs sample_files/comments_2.rs -6a18626592e8a9f0ad81db9c101de804 - +4e1515be02b2e14bcd7bcaca3520a542 - sample_files/context_1.rs sample_files/context_2.rs -e22fa619f851e56752acd7876df9865c - +e59180fa7029db7939222cb61c95c97c - sample_files/contiguous_1.js sample_files/contiguous_2.js 22da862378dbee68e55ecba8b0fcec42 - sample_files/css_1.css sample_files/css_2.css -e8a27b8a3a5b27583a475f4d3907c433 - +3d911704ac4d76697c748e1dcd40eece - sample_files/dart_1.dart sample_files/dart_2.dart -c10bad9bcc508b91347d93d14a7cb312 - +107d073c2922ff14e9ba66ee0f489592 - sample_files/devicetree_1.dts sample_files/devicetree_2.dts -e6e8d7f010ba2e73c393679bcf3aef3c - +f7c4e7b4444b02d87b2eec1485d86211 - sample_files/elisp_1.el sample_files/elisp_2.el -e44eda0da58fe6eb3fba9ce3244044ad - +74b5c1cd11a21bbba2bcbc9493f7e46a - sample_files/elisp_contiguous_1.el sample_files/elisp_contiguous_2.el -05dbe7211cea3ae2a48e843cece1192c - +4a5a33873a4f84ee055d95e1448fba35 - sample_files/elm_1.elm sample_files/elm_2.elm -c710af5361caabce1d4366272eb3fd1b - +f16895057138c5e720e656e9c3d9c52b - sample_files/elvish_1.elv sample_files/elvish_2.elv -ee0f6fd7069d635db1ec537975b3a039 - +b1ad27b8907793632e235878f154b1af - sample_files/erlang_1.erl sample_files/erlang_2.erl dccdb8f65d2f099ab1a8cb66011376a2 - sample_files/f_sharp_1.fs sample_files/f_sharp_2.fs -fbc43ac80cb00d773397751f52f9a5ab - +ff1cccc272e2b4eb160fae1f809cbc0d - sample_files/hack_1.php sample_files/hack_2.php c2bb0aa7d7b07d6ced79f6a5363e878b - sample_files/hare_1.ha sample_files/hare_2.ha -ff1c12bc51b7a0f65ae750aff6ea9a2c - +ef6fd59edc55241311a97d21dd81e4c0 - sample_files/haskell_1.hs sample_files/haskell_2.hs -0dd4fbf66884bf98784fbdef2e6a2415 - +c30ce9ca8a248c1b677670e44aa3bb91 - sample_files/hcl_1.hcl sample_files/hcl_2.hcl -a3acefa04dd3657e727a1843e04c742d - +f3961a9d1e6eb972ca2b8ed3683b4685 - sample_files/hello_world_1.smali sample_files/hello_world_2.smali 296286b067e86cccfad1fa9a0440993b - @@ -98,7 +98,7 @@ sample_files/html_1.html sample_files/html_2.html 3cc8b445a56b74f05e1d7bb84874edab - sample_files/html_simple_1.html sample_files/html_simple_2.html -ace7e39fbbef914a31f93a7eadcff5be - +bb129dce38cd26eac81ca52d2016bade - sample_files/huge_cpp_1.cpp sample_files/huge_cpp_2.cpp 3a500d7b0c58fa6874eb0e4f5493a9e5 - @@ -107,7 +107,7 @@ sample_files/identical_1.scala sample_files/identical_2.scala 15c5a789e644348cb7e0de051ff4b63e - sample_files/if_1.py sample_files/if_2.py -5b38230a7c872337dea793f23065fbb1 - +a30c2b8952c48c775d7339b35614afd8 - sample_files/insert_blank_1.txt sample_files/insert_blank_2.txt a5fd75afcc99aa7b2b285f1f9ced8607 - @@ -116,31 +116,31 @@ sample_files/janet_1.janet sample_files/janet_2.janet 15071de26554028495ed6b78de5f8803 - sample_files/java_1.java sample_files/java_2.java -25e46abd388b165ef3c1c3b737fe8824 - +028c9176ac031eb3859f3d04bc43ed10 - sample_files/javascript_1.js sample_files/javascript_2.js -2fb45d826ded2712470f1c5825be4dd8 - +af4e9343168d88afd88adbba3ccc0373 - sample_files/javascript_simple_1.js sample_files/javascript_simple_2.js -37db8d50e3688296001ca023c860c1e9 - +449a5a824892da502f7211714214684e - sample_files/json_1.json sample_files/json_2.json -984965832bb62b398fb13eb4152fbf5a - +133c9224b47a5ee9940536a6ad70fd2e - sample_files/jsx_1.jsx sample_files/jsx_2.jsx -871632cdfd1d14648db17666a499b076 - +da06f61f2cc837a172595db138ea86f6 - sample_files/julia_1.jl sample_files/julia_2.jl -b7f0b11beeb336471c68c46f091d4971 - +8524e48b950e8876bc8f7170e94c7cb5 - sample_files/load_1.js sample_files/load_2.js -1796a6f9415737cee3a336baf498b199 - +8defc3cea4d10a8db826973352abe2a1 - sample_files/long_line_1.txt sample_files/long_line_2.txt 7fc50bd547f0c20fda89a1931e5eb61e - sample_files/lua_1.lua sample_files/lua_2.lua -65ff16b6819bb2f9d0fcba83d687275b - +81ad9478e64494320e96284cb7632ced - sample_files/makefile_1.mk sample_files/makefile_2.mk d0572210b5121ce68ac0ce45e43b922b - @@ -155,31 +155,31 @@ sample_files/modules_1.ml sample_files/modules_2.ml 05438d347d9e2ee90376b193098fc1fc - sample_files/multibyte_1.py sample_files/multibyte_2.py -4f0c51db0e4308a6be4e6d5a65569285 - +f761255d521267ace4f4887a21664a12 - sample_files/multiline_string_1.ml sample_files/multiline_string_2.ml -2bf819cd2e6e50bb7dc5b1d541046e10 - +ed80815053ba156505d156277d0f4195 - sample_files/nest_1.rs sample_files/nest_2.rs d3a799fe2cd9d81aa251c96af5cd9711 - sample_files/nested_slider_1.el sample_files/nested_slider_2.el -98e032abe915edeebef04e777feb8d01 - +f68f8b8c09afb86965d5e54519f2d881 - sample_files/nested_slider_1.rs sample_files/nested_slider_2.rs e9045007a25352eb81655458aebb452c - sample_files/nesting_1.el sample_files/nesting_2.el -38fbec6f69e99af237b0d3c2f23078a6 - +cf32f6b798a080a2bf14a430337ac4a6 - sample_files/newick_1.nwk sample_files/newick_2.nwk 45ec08ce924513fb24846b9609d3cbe8 - sample_files/nix_1.nix sample_files/nix_2.nix -7a07c155b1ea9d5a0035438949e9dcd3 - +486bb1ac5a844c41ca6bd59003c71c18 - sample_files/nullable_1.kt sample_files/nullable_2.kt -026ab4b0bdf6276121adb2f618b81b47 - +d0a51e7201cc16dc6bcb99cbad64f6be - sample_files/objc_header_1.h sample_files/objc_header_2.h 0c6b6736a646246a502238b4aa4adb37 - @@ -188,7 +188,7 @@ sample_files/objc_module_1.m sample_files/objc_module_2.m f4a376b78a73c190dc91b39d739490a5 - sample_files/ocaml_1.ml sample_files/ocaml_2.ml -b88e6a49a107227a5f5ae716d2202747 - +36e6ea64ce5cfbbf5178b56f2469478b - sample_files/outer_delimiter_1.el sample_files/outer_delimiter_2.el a7e206f6391237be0ce8ed244ec3dd62 - @@ -197,7 +197,7 @@ sample_files/pascal_1.pascal sample_files/pascal_2.pascal acc46c16e83dd1b48c6f761e59541923 - sample_files/perl_1.pl sample_files/perl_2.pl -dacc6268875e05fe74506712206f4976 - +9bb6ae2a12bc0debfde17013ed190344 - sample_files/prefer_outer_1.el sample_files/prefer_outer_2.el 991038c9988cccc2c824652e33f772a2 - @@ -206,13 +206,13 @@ sample_files/preprocesor_1.h sample_files/preprocesor_2.h a680158a7980d738ba831aab3a63165d - sample_files/qml_1.qml sample_files/qml_2.qml -44b5b6204fdbbc19092edc883aaaccbc - +41a0432c03b87ad59fc8c942d83b20b5 - sample_files/r_1.R sample_files/r_2.R 10f45a80a8554419bf30a2a0f574ab86 - sample_files/racket_1.rkt sample_files/racket_2.rkt -1ca70ce0b328cdbd500ed4611b0272d5 - +b017e169d9fc79336fd7ef82140fe8a7 - sample_files/repeated_line_no_eol_1.txt sample_files/repeated_line_no_eol_2.txt 3786f55d2c9b1897e866b4602e50408d - @@ -221,19 +221,19 @@ sample_files/ruby_1.rb sample_files/ruby_2.rb d4d591902030355656f5c18c78f965a6 - sample_files/scala_1.scala sample_files/scala_2.scala -4b60bbc0603f79089713da5738b505d4 - +13181dc30f15675747ce5315cd8073e6 - sample_files/scheme_1.scm sample_files/scheme_2.scm 09f8683219a8491c22d9a2fa1ce98c16 - sample_files/simple_1.js sample_files/simple_2.js -0257d2969eb57ad9a1bcd201310cfdfe - +1d49d0e440067284015eb5621f4a6adf - sample_files/simple_1.scss sample_files/simple_2.scss 265261e79df78abfc09392d72a0273d8 - sample_files/simple_1.txt sample_files/simple_2.txt -97f638f74e85410893c295c40ca6ceb8 - +60e62ad60b18c754acd99aeb0ac2120e - sample_files/slider_1.rs sample_files/slider_2.rs d10128f3d9ffc4a8670f417a9371bacc - @@ -245,40 +245,40 @@ sample_files/slow_1.rs sample_files/slow_2.rs 2e76c128e008d5d255fdd29562208abc - sample_files/small_1.js sample_files/small_2.js -9220162ad05083f00105f6ad13f328f7 - +42506285003bb4eacdb2f8d3bd1b07bb - sample_files/string_subwords_1.el sample_files/string_subwords_2.el -f00fc509492e97b985ae18b9a500e5d3 - +b66e960672189960c2d35ef68b47a195 - sample_files/strings_1.el sample_files/strings_2.el 7e136d188ce03cc8fba2b1530a502ffc - sample_files/swift_1.swift sample_files/swift_2.swift -d3f0a5a4ecdb1842f14924a0593e5632 - +d31e3d17538b5508d10bd9aa8f7f4159 - sample_files/syntax_error_1.js sample_files/syntax_error_2.js -731820175981d0cb8174a955cc5c0023 - +5bbd81f688bdcfbdbdf69d870f0c1357 - sample_files/tab_1.c sample_files/tab_2.c -7eb552b4601d085766c4b7f5f4688a6b - +a7f9bce0ca76ce356413fb218d82d686 - sample_files/tab_1.txt sample_files/tab_2.txt a17e978720fe4c1b25614402910cc695 - sample_files/tailwind_1.css sample_files/tailwind_2.css -fe8007248d09904705ae9e746dd898ff - +132f217659bf9dac8b82feabf5643f47 - sample_files/text_1.txt sample_files/text_2.txt -c2f6d5e201426ab263198f41edff4e75 - +f8f81946284fc625ac8e9ae441f31e6d - sample_files/todomvc_1.gleam sample_files/todomvc_2.gleam -c40a606f67aa5e2b3ab7b48396b96d7a - +9fe64f7d77ad99095ac29357554f3d71 - sample_files/toml_1.toml sample_files/toml_2.toml -172543ecd333a2c4ec3b18db49dc1299 - +a771827287e174fc2e18a1cd2624bc9c - sample_files/trailling_newline_1.yaml sample_files/trailling_newline_2.yaml -775f6edcdbf4100d3522f2f960884798 - +8e37febfec957288576f9c2020cfc4f2 - sample_files/typescript_1.ts sample_files/typescript_2.ts fee7ee33d2037ad1941ba6bb5532a1db - @@ -287,20 +287,20 @@ sample_files/typing_1.ml sample_files/typing_2.ml 36161bd77a8c86643bc90656ec41c92c - sample_files/utf16_1.py sample_files/utf16_2.py -6322047430c9d24e009283e755c2cc30 - +3bcee785d4cebc38a42eafe49a198b52 - sample_files/vhdl_1.vhd sample_files/vhdl_2.vhd -c4d787ed17c8c8eff647f12ef611db42 - +ca98b4d14fc21e0f04cf24aeb3d2526c - sample_files/whitespace_1.tsx sample_files/whitespace_2.tsx ac8b1a89ac26333f2d4e9433b2ca3958 - sample_files/xml_1.xml sample_files/xml_2.xml -cd16fbf2e7b7bea33b60b9ab8c94671f - +e629cbd2e721fd249c7ce1626f17e953 - sample_files/yaml_1.yaml sample_files/yaml_2.yaml -f47f848f47d71ecb83d60a6d6ae5630c - +521a2075e4f8b0ea9fb74436e0445b52 - sample_files/zig_1.zig sample_files/zig_2.zig -c5c46b71c94e011a67fa46acb4a7df16 - +b297af687ee8b40dbf04f8461cb21608 - diff --git a/src/display/side_by_side.rs b/src/display/side_by_side.rs index eb219adc9..b3a43a68d 100644 --- a/src/display/side_by_side.rs +++ b/src/display/side_by_side.rs @@ -190,7 +190,7 @@ impl SourceDimensions { // If the file lines are extremely short, treat them as if // they have a line of 25 characters. - let content_max_width = min(content_max_width, 25); + let content_max_width = max(content_max_width, 25); // If the terminal is very wide, we don't want to use the full // 50% for the LHS column, we end up with too much space