query_commands: refactor type_enclosing
query_commands: refactor type_enclosing

rgrinberg/merlin,rgrinberg/merlin,dra27/merlin,dra27/merlin,rgrinberg/merlin,the-lambda-church/merlin,ocaml/merlin,dra27/merlin,the-lambda-church/merlin,the-lambda-church/merlin,ocaml/merlin,ocaml/merlin,dra27/merlin,ocaml/merlin,rgrinberg/merlin