From c7c3b3ce0ab166d155900251222a3771013c3892 Mon Sep 17 00:00:00 2001
From: vbot <vincent.botbol@inria.fr>
Date: Thu, 31 Oct 2024 17:12:29 +0100
Subject: [PATCH] Message: also notify warnings to LSP

---
 compiler/catala_utils/message.ml  | 23 +++++++++++++++++++++--
 compiler/catala_utils/message.mli |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/compiler/catala_utils/message.ml b/compiler/catala_utils/message.ml
index 4c2ef3cc5..e7b00ccdf 100644
--- a/compiler/catala_utils/message.ml
+++ b/compiler/catala_utils/message.ml
@@ -362,7 +362,7 @@ open Content
 exception CompilerError of Content.t
 exception CompilerErrors of Content.t list
 
-type lsp_error_kind = Lexing | Parsing | Typing | Generic
+type lsp_error_kind = Lexing | Parsing | Typing | Generic | Warning
 
 type lsp_error = {
   kind : lsp_error_kind;
@@ -448,7 +448,6 @@ let debug = make ~level:Debug ~cont:emit
 let log = make ~level:Log ~cont:emit
 let result = make ~level:Result ~cont:emit
 let results r = emit (List.flatten (List.map of_result r)) Result
-let warning = make ~level:Warning ~cont:emit
 
 let join_pos ~pos ~fmt_pos ~extra_pos =
   (* Error positioning might be provided using multiple options. Thus, we look
@@ -459,6 +458,26 @@ let join_pos ~pos ~fmt_pos ~extra_pos =
     Some pos
   | _ -> None
 
+let warning
+    ?header
+    ?internal
+    ?pos
+    ?pos_msg
+    ?extra_pos
+    ?fmt_pos
+    ?outcome
+    ?suggestion
+    fmt =
+  make ?header ?internal ?pos ?pos_msg ?extra_pos ?fmt_pos ?outcome ?suggestion
+    fmt ~level:Warning ~cont:(fun m x ->
+      Option.iter
+        (fun f ->
+          let message ppf = Content.emit ~ppf m Warning in
+          let pos = join_pos ~pos ~fmt_pos ~extra_pos in
+          f { kind = Warning; message; pos; suggestion })
+        !global_error_hook;
+      emit m x)
+
 let error ?(kind = Generic) : ('a, 'exn) emitter =
  fun ?header ?internal ?pos ?pos_msg ?extra_pos ?fmt_pos ?outcome ?suggestion
      fmt ->
diff --git a/compiler/catala_utils/message.mli b/compiler/catala_utils/message.mli
index 7e3cc9fd8..3a61da557 100644
--- a/compiler/catala_utils/message.mli
+++ b/compiler/catala_utils/message.mli
@@ -66,7 +66,7 @@ end
 exception CompilerError of Content.t
 exception CompilerErrors of Content.t list
 
-type lsp_error_kind = Lexing | Parsing | Typing | Generic
+type lsp_error_kind = Lexing | Parsing | Typing | Generic | Warning
 
 type lsp_error = {
   kind : lsp_error_kind;