Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: merlin document safety #890

Merged
merged 1 commit into from
Oct 21, 2022
Merged

Conversation

rgrinberg
Copy link
Member

only use merlin features on merlin sources. enforce this with the type
system

Signed-off-by: Rudi Grinberg [email protected]

ps-id: dedef00c-ebda-4e88-b85d-258bc07144e1

@rgrinberg rgrinberg added this to the 1.14.1 milestone Oct 20, 2022
@rgrinberg rgrinberg force-pushed the ps/rr/fix__merlin_document_safety branch 3 times, most recently from 6c0ed90 to 195bb01 Compare October 20, 2022 23:20
only use merlin features on merlin sources. enforce this with the type
system

Signed-off-by: Rudi Grinberg <[email protected]>

ps-id: dedef00c-ebda-4e88-b85d-258bc07144e1
@rgrinberg rgrinberg force-pushed the ps/rr/fix__merlin_document_safety branch from 195bb01 to e74d9d3 Compare October 20, 2022 23:32
@rgrinberg rgrinberg merged commit 5e6b3c9 into master Oct 21, 2022
Khady added a commit to Khady/ocaml-lsp that referenced this pull request Nov 4, 2022
* master:
  fix(go-to-def): report error in response (ocaml#899)
  Update readme (ocaml#895)
  chore(nix): update flakes and dune-release (ocaml#894)
  chore: remove ocamlformat-rpc (ocaml#892)
  chore(nix): pass opam-repository and nixpkgs (ocaml#893)
  chore: unvendor ocamlc-loc (ocaml#869)
  fix: merlin document safety (ocaml#890)
  chore: more precise CHANGES (ocaml#889)
  fix: diagnostics on non dune files (ocaml#887)
  refactor: remove Document.is_merlin (ocaml#888)
  fix: symbols in non merlin docs (ocaml#886)
  refactor: style tweaks in document_symbol (ocaml#885)
  fix: handle incorrect document types (ocaml#884)
  Ignore unknown config tags (ocaml#883)
  Make sure nodejs packages required are installed
  chore: prepare 1.14.0
  Don't let opam ask when not needed
  Allow copy-and-paste of contributing instructions
  Add code action for inlining (ocaml#847)
  Add note about protocol extensions to the readme
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant