Use available terminal columns instead of hardcoded 80 columns (HaxeF…

…oundation#11404) * Use available terminal columns instead of hardcoded 80 columns * hotfix on phone * embrace laziness --------- Co-authored-by: Rudy G <[email protected]> Co-authored-by: Simon Krajewski <[email protected]>
sysfce2 · Nov 22, 2023 · b588672 · b588672
1 parent 297353c
commit b588672
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/haxe.opam b/haxe.opam
@@ -33,4 +33,5 @@ depends: [
   "conf-neko"
   "luv" {>= "0.5.12"}
   "ipaddr"
+  "terminal_size"
 ]
diff --git a/src/compiler/args.ml b/src/compiler/args.ml
@@ -2,8 +2,10 @@ open Globals
 open Common
 open CompilationContext
 
+let columns = lazy (match Terminal_size.get_columns () with None -> 80 | Some c -> c)
+
 let limit_string s offset =
-	let rest = 80 - offset in
+	let rest = (Lazy.force columns) - offset in
 	let words = ExtString.String.nsplit s " " in
 	let rec loop i words = match words with
 		| word :: words ->

diff --git a/src/dune b/src/dune
@@ -20,7 +20,7 @@
 		extc extproc extlib_leftovers ilib javalib mbedtls neko objsize pcre2 camlp-streams swflib ttflib ziplib
 		json
 		unix ipaddr str bigarray threads dynlink
-		xml-light extlib sha
+		xml-light extlib sha terminal_size
 		luv
 	)
 	(modules (:standard \ haxe))