Przeglądaj źródła

[MessageReporting] Invert logic for color handling (#12295)

* [MessageReporting] Invert logic for color handling

Default is now to not enable colors; colors can be enabled with -D message.color

* [tests] Simplify tests
Rudy Ges 3 tygodni temu
rodzic
commit
d71c2a7c05
40 zmienionych plików z 4 dodań i 42 usunięć
  1. 3 3
      src-json/define.json
  2. 1 1
      src/compiler/messageReporting.ml
  3. 0 1
      tests/misc/Issue11280/compile-fail.hxml
  4. 0 1
      tests/misc/Issue11280/compile2-fail.hxml
  5. 0 1
      tests/misc/java/projects/Issue11095/pretty-fail.hxml
  6. 0 1
      tests/misc/projects/Issue10623/pretty-fail.hxml
  7. 0 1
      tests/misc/projects/Issue10844/user-defined-meta-pretty-fail.hxml
  8. 0 1
      tests/misc/projects/Issue10863/compile.hxml
  9. 0 1
      tests/misc/projects/Issue11055/compile-pretty-fail.hxml
  10. 0 1
      tests/misc/projects/Issue11121/compile-fail.hxml
  11. 0 1
      tests/misc/projects/Issue11162/compile-fail.hxml
  12. 0 1
      tests/misc/projects/Issue11162/compile2-fail.hxml
  13. 0 1
      tests/misc/projects/Issue11164/compile.hxml
  14. 0 1
      tests/misc/projects/Issue11164/compile2-fail.hxml
  15. 0 1
      tests/misc/projects/Issue11164/compile3-fail.hxml
  16. 0 1
      tests/misc/projects/Issue11164/compile4-fail.hxml
  17. 0 1
      tests/misc/projects/Issue11164/compile5-fail.hxml
  18. 0 1
      tests/misc/projects/Issue11164/compile6-fail.hxml
  19. 0 1
      tests/misc/projects/Issue11164/compile7-fail.hxml
  20. 0 1
      tests/misc/projects/Issue11417/compile-fail.hxml
  21. 0 1
      tests/misc/projects/Issue11417/compile1-fail.hxml
  22. 0 1
      tests/misc/projects/Issue11439/compile3-fail.hxml
  23. 0 1
      tests/misc/projects/Issue11679/compile-fail.hxml
  24. 0 1
      tests/misc/projects/Issue11700/compile-fail.hxml
  25. 0 1
      tests/misc/projects/Issue11753/compile-fail.hxml
  26. 0 1
      tests/misc/projects/Issue11753/compile.hxml
  27. 0 1
      tests/misc/projects/Issue12167/compile-fail.hxml
  28. 0 1
      tests/misc/projects/Issue3188/compile.hxml
  29. 0 1
      tests/misc/projects/Issue5644/pretty-fail.hxml
  30. 0 1
      tests/misc/projects/Issue5949/pretty-fail.hxml
  31. 0 1
      tests/misc/projects/Issue6065/pretty-fail.hxml
  32. 0 1
      tests/misc/projects/Issue6584/pretty-fail.hxml
  33. 0 1
      tests/misc/projects/Issue6790/pretty-fail.hxml
  34. 0 1
      tests/misc/projects/Issue6796/pretty-fail.hxml
  35. 0 1
      tests/misc/projects/Issue6810/pretty-fail.hxml
  36. 0 1
      tests/misc/projects/Issue7968/pretty-fail.hxml
  37. 0 1
      tests/misc/projects/Issue8303/pretty-fail.hxml
  38. 0 1
      tests/misc/projects/Issue8471/compile2-pretty.hxml
  39. 0 1
      tests/misc/projects/Issue9069/compile.hxml
  40. 0 1
      tests/misc/projects/Issue9430/compile-fail.hxml

+ 3 - 3
src-json/define.json

@@ -866,10 +866,10 @@
 		"params": ["mode: classic | pretty | indent"]
 	},
 	{
-		"name": "MessageNoColor",
-		"define": "message.no-color",
+		"name": "MessageColor",
+		"define": "message.color",
 		"signatureNeutral": true,
-		"doc": "Disable ANSI color codes in message reporting."
+		"doc": "Enable ANSI color codes in message reporting."
 	},
 	{
 		"name": "MessageAbsolutePositions",

+ 1 - 1
src/compiler/messageReporting.ml

@@ -142,7 +142,7 @@ let compiler_pretty_message_string defines ectx cm =
 
 		let gutter_len = (try String.length (Printf.sprintf "%d" (IntMap.find cm.cm_depth ectx.max_lines)) with Not_found -> 0) + 2 in
 
-		let no_color = Define.defined defines Define.MessageNoColor in
+		let no_color = not (Define.defined defines Define.MessageColor) in
 		let c_reset = if no_color then "" else "\x1b[0m" in
 		let c_bold = if no_color then "" else "\x1b[1m" in
 		let c_dim = if no_color then "" else "\x1b[2m" in

+ 0 - 1
tests/misc/Issue11280/compile-fail.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/Issue11280/compile2-fail.hxml

@@ -1,3 +1,2 @@
 -main Main2
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/java/projects/Issue11095/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue10623/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue10844/user-defined-meta-pretty-fail.hxml

@@ -1,4 +1,3 @@
 user-defined-meta-fail.hxml
 -D message.reporting=pretty
--D message.no-color
 

+ 0 - 1
tests/misc/projects/Issue10863/compile.hxml

@@ -1,5 +1,4 @@
 -main Main
 -js js.js
 -D message.reporting=pretty
--D message.no-color
 --no-output

+ 0 - 1
tests/misc/projects/Issue11055/compile-pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11121/compile-fail.hxml

@@ -1,3 +1,2 @@
 --main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11162/compile-fail.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11162/compile2-fail.hxml

@@ -1,3 +1,2 @@
 -main Main2
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile2-fail.hxml

@@ -1,3 +1,2 @@
 -main Main2
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile3-fail.hxml

@@ -1,3 +1,2 @@
 -main Main3
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile4-fail.hxml

@@ -1,3 +1,2 @@
 -main Main4
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile5-fail.hxml

@@ -1,3 +1,2 @@
 -main Main5
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile6-fail.hxml

@@ -1,3 +1,2 @@
 -main Main6
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11164/compile7-fail.hxml

@@ -1,3 +1,2 @@
 -main Main7
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11417/compile-fail.hxml

@@ -1,3 +1,2 @@
 Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11417/compile1-fail.hxml

@@ -1,3 +1,2 @@
 Main1
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11439/compile3-fail.hxml

@@ -1,4 +1,3 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color
 -D message.absolute-positions

+ 0 - 1
tests/misc/projects/Issue11679/compile-fail.hxml

@@ -1,3 +1,2 @@
 -main Main
--D message.no-color
 -D message.reporting=pretty

+ 0 - 1
tests/misc/projects/Issue11700/compile-fail.hxml

@@ -2,4 +2,3 @@
 -cp src
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11753/compile-fail.hxml

@@ -1,4 +1,3 @@
 -main Main
 --hl bin/main.hl
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue11753/compile.hxml

@@ -1,4 +1,3 @@
 -main Main2
 --hl bin/main.hl
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue12167/compile-fail.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue3188/compile.hxml

@@ -1,3 +1,2 @@
 --macro Main.init()
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue5644/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue5949/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue6065/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue6584/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile5-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue6790/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue6796/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue6810/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue7968/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue8303/pretty-fail.hxml

@@ -1,3 +1,2 @@
 compile-fail.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue8471/compile2-pretty.hxml

@@ -1,3 +1,2 @@
 compile2.hxml
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue9069/compile.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color

+ 0 - 1
tests/misc/projects/Issue9430/compile-fail.hxml

@@ -1,3 +1,2 @@
 -main Main
 -D message.reporting=pretty
--D message.no-color