From 36de1b2a5a5a9ceb246e449743a900f015d6ee1d Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 16 Feb 2022 21:17:23 -0700 Subject: [PATCH] fix: catch Ill_typed from merlin Signed-off-by: Rudi Grinberg ps-id: A0F9104E-BC4D-4A88-9378-7587291A2AAF --- CHANGES.md | 6 ++++++ ocaml-lsp-server/src/code_actions/action_destruct.ml | 1 + 2 files changed, 7 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 2fe809801..55e993e68 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +# 1.10.2 + +## Fixes + +- Catch merlin desturct exceptions (#626) + # 1.10.1 ## Fixes diff --git a/ocaml-lsp-server/src/code_actions/action_destruct.ml b/ocaml-lsp-server/src/code_actions/action_destruct.ml index a01863954..bc57027f7 100644 --- a/ocaml-lsp-server/src/code_actions/action_destruct.ml +++ b/ocaml-lsp-server/src/code_actions/action_destruct.ml @@ -65,6 +65,7 @@ let code_action (state : State.t) doc (params : CodeActionParams.t) = ( Merlin_analysis.Destruct.Wrong_parent _ | Query_commands.No_nodes | Merlin_analysis.Destruct.Not_allowed _ | Merlin_analysis.Destruct.Useless_refine + | Merlin_analysis.Destruct.Ill_typed | Merlin_analysis.Destruct.Nothing_to_do ) ; backtrace = _ } ->