diff options
| author |  Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-04-07 21:53:06 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias <e+git@x80.org> | 2018-04-11 10:06:50 +0200 |
| commit | 2dbb54b1bc3967ee5d6e838cce8c56b88bd9477d (patch) | |
| tree | 7671cdaccac0ba46a5c21f5a6d1fb88c07007064 /toplevel | |
| parent | ccf5c0879e3341ebfc8d3d00d35cc10b8b32a9e4 (diff) | |
[warnings] Remove `set_current_loc` hack.
Instead of the current hack that won't work as soon as we check some
part of the document asynchronously, we make the warning processor
recover a proper location if the warning doesn't have one attached.
This is what CoqIDE does [but it queries it's own document model].
Fixes: #6172
Diffstat (limited to 'toplevel')
| -rw-r--r-- | toplevel/coqloop.ml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/toplevel/coqloop.ml b/toplevel/coqloop.ml index d0989cfcc..63b8b538a 100644 --- a/toplevel/coqloop.ml +++ b/toplevel/coqloop.ml @@ -272,6 +272,15 @@ let read_sentence ~state input = (* TopErr.print_toplevel_parse_error reraise top_buffer; *) Exninfo.iraise reraise +let extract_default_loc loc doc_id sid : Loc.t option = + match loc with + | Some _ -> loc + | None -> + try + let doc = Stm.get_doc doc_id in + Option.cata fst None Stm.(get_ast ~doc sid) + with _ -> loc + (** Coqloop Console feedback handler *) let coqloop_feed (fb : Feedback.feedback) = let open Feedback in match fb.contents with @@ -290,6 +299,9 @@ let coqloop_feed (fb : Feedback.feedback) = let open Feedback in (* Re-enable when we switch back to feedback-based error printing *) | Message (Error,loc,msg) -> () (* TopErr.print_error_for_buffer ?loc lvl msg top_buffer *) + | Message (Warning,loc,msg) -> + let loc = extract_default_loc loc fb.doc_id fb.span_id in + TopErr.print_error_for_buffer ?loc Warning msg top_buffer | Message (lvl,loc,msg) -> TopErr.print_error_for_buffer ?loc lvl msg top_buffer |