From f5494db35906bcdfdb810e4e6816c6a4a8bef682 Mon Sep 17 00:00:00 2001 From: PixieDust <111846546+PizieDust@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:26:07 +0100 Subject: [PATCH 1/5] release of merlin 5.3-402 and 4.18-414 --- .../2024-23-12-merlin-5.3.502-and-4.18.414.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md diff --git a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md new file mode 100644 index 0000000000..f87d7cbe3b --- /dev/null +++ b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md @@ -0,0 +1,19 @@ +--- +title: Merlin 5.3-502 for OCaml 5.2 and 4.18-414 for OCaml 5.1 and 4.14 +tags: [merlin, platform] +changelog: | + + merlin binary + + - Respect the EXCLUDE_QUERY_DIR configuration directive when looking for cmt files [#1854](https://github.com/ocaml/merlin/pull/1854) + - Fix exception in polarity search ([#1858](https://github.com/ocaml/merlin/pull/1858) fixes [#1113](https://github.com/ocaml/merlin/issues/1113)) + - Fix type-enclosing results instability. This reverts some overly aggressive deduplication that should be done on the client side. [#1864](https://github.com/ocaml/merlin/pull/1864) + + + only in 5.3-502 + - Fix occurrences bug in which relative paths in index files are resolved against the PWD rather than the SOURCE_ROOT [#1855](https://github.com/ocaml/merlin/pull/1855) + - Fix `jump to fun` targets not working ([#1863](https://github.com/ocaml/merlin/pull/1863), fixes [#1862](https://github.com/ocaml/merlin/issues/1862)) + - Fix occurrences not working when the definition comes from a hidden source file [#1865](https://github.com/ocaml/merlin/pull/1865) + +--- + +This release introduces **Merlin 5.3-502**, compatible with OCaml 5.2, and **4.18-414**, compatible with OCaml 5.1 and 4.14. Key updates include `EXCLUDE_QUERY_DIR` for better file management, resolving exceptions in polarity search, +and stabilizing type-enclosing results. For users of 5.3-502, additional enhancements address path resolution issues, improve `jump to fun` functionality, and ensure proper handling of occurrences for hidden source files. From e83b8a3ca779bcb4f2ec5bd0e81f417336e9a43a Mon Sep 17 00:00:00 2001 From: PixieDust <111846546+PizieDust@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:36:33 +0100 Subject: [PATCH 2/5] Update data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md Co-authored-by: Ulysse <5031221+voodoos@users.noreply.github.com> --- data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md index f87d7cbe3b..1e0001549c 100644 --- a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md +++ b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md @@ -1,5 +1,5 @@ --- -title: Merlin 5.3-502 for OCaml 5.2 and 4.18-414 for OCaml 5.1 and 4.14 +title: Merlin 5.3-502 for OCaml 5.2 and 4.18-414 for OCaml 4.14 tags: [merlin, platform] changelog: | + merlin binary From fe27f6e8b7acb545e6aaa433587c9b10b60582a3 Mon Sep 17 00:00:00 2001 From: PixieDust <111846546+PizieDust@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:36:43 +0100 Subject: [PATCH 3/5] Update data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md Co-authored-by: Ulysse <5031221+voodoos@users.noreply.github.com> --- .../merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md index 1e0001549c..49165d85c1 100644 --- a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md +++ b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md @@ -8,10 +8,10 @@ changelog: | - Fix exception in polarity search ([#1858](https://github.com/ocaml/merlin/pull/1858) fixes [#1113](https://github.com/ocaml/merlin/issues/1113)) - Fix type-enclosing results instability. This reverts some overly aggressive deduplication that should be done on the client side. [#1864](https://github.com/ocaml/merlin/pull/1864) - + only in 5.3-502 - - Fix occurrences bug in which relative paths in index files are resolved against the PWD rather than the SOURCE_ROOT [#1855](https://github.com/ocaml/merlin/pull/1855) - - Fix `jump to fun` targets not working ([#1863](https://github.com/ocaml/merlin/pull/1863), fixes [#1862](https://github.com/ocaml/merlin/issues/1862)) - - Fix occurrences not working when the definition comes from a hidden source file [#1865](https://github.com/ocaml/merlin/pull/1865) + + merlin binary (only in 5.3-502) + - Fix occurrences bug in which relative paths in index files are resolved against the PWD rather than the SOURCE_ROOT [#1855](https://github.com/ocaml/merlin/pull/1855) + - Fix `jump to fun` targets not working ([#1863](https://github.com/ocaml/merlin/pull/1863), fixes [#1862](https://github.com/ocaml/merlin/issues/1862)) + - Fix occurrences not working when the definition comes from a hidden source file [#1865](https://github.com/ocaml/merlin/pull/1865) --- From 2c3b257a3ce7cdb3f289536b7caf33ad9e1599b5 Mon Sep 17 00:00:00 2001 From: PixieDust <111846546+PizieDust@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:36:51 +0100 Subject: [PATCH 4/5] Update data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md Co-authored-by: Ulysse <5031221+voodoos@users.noreply.github.com> --- .../changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md index 49165d85c1..655e622bfe 100644 --- a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md +++ b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md @@ -15,5 +15,6 @@ changelog: | --- -This release introduces **Merlin 5.3-502**, compatible with OCaml 5.2, and **4.18-414**, compatible with OCaml 5.1 and 4.14. Key updates include `EXCLUDE_QUERY_DIR` for better file management, resolving exceptions in polarity search, +This release introduces **Merlin 5.3-502**, compatible with OCaml 5.2, and **4.18-414**, compatible with OCaml 4.14. Key updates include `EXCLUDE_QUERY_DIR` for better file management, resolving exceptions in polarity search, + and stabilizing type-enclosing results. For users of 5.3-502, additional enhancements address path resolution issues, improve `jump to fun` functionality, and ensure proper handling of occurrences for hidden source files. From f93414fab83fd24c0dd341cf4b80ed0f7156c348 Mon Sep 17 00:00:00 2001 From: PixieDust <111846546+PizieDust@users.noreply.github.com> Date: Mon, 23 Dec 2024 12:37:06 +0100 Subject: [PATCH 5/5] Update data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md Co-authored-by: Ulysse <5031221+voodoos@users.noreply.github.com> --- data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md index 655e622bfe..bf16e0d42f 100644 --- a/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md +++ b/data/changelog/merlin/2024-23-12-merlin-5.3.502-and-4.18.414.md @@ -17,4 +17,4 @@ changelog: | This release introduces **Merlin 5.3-502**, compatible with OCaml 5.2, and **4.18-414**, compatible with OCaml 4.14. Key updates include `EXCLUDE_QUERY_DIR` for better file management, resolving exceptions in polarity search, -and stabilizing type-enclosing results. For users of 5.3-502, additional enhancements address path resolution issues, improve `jump to fun` functionality, and ensure proper handling of occurrences for hidden source files. +and stabilizing type-enclosing results. For users of 5.3-502, additional enhancements address path resolution issues, fixes `jump to fun` functionality, and ensure proper handling of occurrences from hidden source files.