Presence of .merlin.skip-if-not-cwd skips config in dir

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+beb4b4c5ed38984534effc3cc8733db57820bc7b

.github/workflows/changelog.yml

@@ -2,7 +2,7 @@ name: Changelog check
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
     types: [ opened, synchronize, reopened, labeled, unlabeled ]
 
 jobs:

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: CI
 # events but only for the master branch
 on:
   push:
-    branches: [ master ]
+    branches: [ '414' ]
     paths-ignore:
       - '**.md'
       - '**.txt'
@@ -16,7 +16,7 @@ on:
       - 'vim/**'
       - '**/emacs-lint.yml'
   pull_request:
-    branches: [ master ]
+    branches: [ '414' ]
     paths-ignore:
       - '**.md'
       - '**.txt'
@@ -38,7 +38,6 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
         ocaml-compiler:
           - 4.14.x
     # The type of runner that the job will run on
@@ -82,3 +81,10 @@ jobs:
           opam exec -- dune clean
           opam exec -- dune build
           git diff --exit-code
+
+
+      - name: Check that the changes are correctly formatted
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          opam install ocamlformat.0.26.2
+          opam exec -- dune build @fmt

.ocamlformat

@@ -0,0 +1,11 @@
+version=0.26.2
+disable=false
+
+break-cases=fit-or-vertical
+doc-comments=before
+cases-exp-indent=2
+dock-collection-brackets=false
+# Preserve begin/end
+exp-grouping=preserve
+module-item-spacing=preserve
+parse-docstrings=false

.ocamlformat-ignore

@@ -0,0 +1 @@
+upstream/**

CHANGES.md

@@ -1,5 +1,52 @@
-merlin NEXT_VERSION
-==================
+merlin 4.18
+===========
+Tue Nov 26 17:30:42 CET 2024
+
+  + merlin binary
+    - Respect the `EXCLUDE_QUERY_DIR` configuration directive when looking for
+      cmt files (#1854)
+    - Fix exception in polarity search (#1858 fixes #1113)
+    - Fix type-enclosing results instability. This reverts some overly
+      aggressive deduplication that should be done on the client side. (#1864)
+
+
+merlin 4.17.1
+=============
+Fri Sep 27 12:02:42 CEST 2024
+
+  + merlin binary
+    - A new `WRAPPING_PREFIX` configuration directive that can be used to tell Merlin
+      what to append to the current unit name in the presence of wrapping (#1788)
+    - Add `-unboxed-types` and `-no-unboxed-types` as ocaml ignored flags (#1795, fixes #1794)
+    - destruct: Refinement in the presence of optional arguments (#1800 #1807, fixes #1770)
+    - Implement new expand-node command for expanding PPX annotations (#1745)
+    - Implement new inlay-hints command for adding hints on a sourcetree (#1812)
+    - Add `signature-help` command (#1720)
+    - Implement new search-by-type command for searching values by types (#1828)
+    - Fix dot-merlin-reader ignoring `SOURCE_ROOT` and `STDLIB` directives
+      (#1839, #1803)
+  + editor modes
+    - vim: fix python-3.12 syntax warnings in merlin.py (#1798)
+    - vim: Dead code / doc removal for previously deleted MerlinPhrase command (#1804)
+    - emacs: Improve the way that result of polarity search is displayed (#1814)
+    - emacs: Add `merlin-search-by-type`, `merlin-search-by-polarity` and change the
+	  behaviour of `merlin-search` to switch between `by-type` or `by-polarity`
+	  depending on the query (#1828)
+
+merlin 4.16
+===========
+Mon Jun 10 17:35:42 CEST 2024
+
+  + merlin binary
+    - Addition of a `merlin-lib.commands` library which disassociates the
+      execution of commands from the `new_protocol`, from the binary, allowing
+      it to be invoked from other projects (#1758)
+    - `merlin-lib.commands`: Add a `find_command_opt` alternative to
+      `find_command` that does not raise (#1778)
+
+merlin 4.15
+===========
+Fri May 31 14:02:42 CEST 2024
 
   + merlin binary
     - destruct: Removal of residual patterns (#1737, fixes #1560)

doc/dev/PROTOCOL.md

@@ -388,11 +388,13 @@ shape =
 
 ### `type-enclosing -position <position> [ -expression <string> ] [ -cursor <int> ] [verbosity <smart|int>] [ -index <int> ]`
 
-      -position <position>  Position to complete
-      -expression <string>  Expression to type
-             -cursor <int>  Position of the cursor inside expression
-              -index <int>  Only print type of <index>'th result
-    -verbosity <smart|int>  Verbosity level
+```
+  -position <position>  Position to complete
+  -expression <string>  Expression to type
+         -cursor <int>  Position of the cursor inside expression
+          -index <int>  Only print type of <index>'th result
+-verbosity <smart|int>  Verbosity level
+```
 
 Returns a list of type information for all expressions at given position, sorted by increasing size.
 That is asking for type enlosing around `2` in `string_of_int 2` will return the types of `2 : int` and `string_of_int 2 : string`.
@@ -420,11 +422,156 @@ The result is returned as a list of:
 
 ### `type-expression -position <position> -expression <string>`
 
-    -position <position>  Position to complete
-    -expression <string>  Expression to type
+```
+  -position <position>  Position to complete
+  -expression <string>  Expression to type
+```
 
 Returns the type of the expression when typechecked in the environment around the specified position.
 
+### `search-by-polarity -position <position> -query <string>`
+
+```
+-position <position>  Position to search
+     -query <string>  The query
+```
+
+Returns a list (in the form of a completion list) of values matching the query. A query is defined by polarity (and does not support type parameters). Arguments are prefixed with `-` and the return type is prefixed with `+`. For example, to find a function that takes a string and returns an integer: `-string +int`. `-list +option` will returns every definition that take a list an option.
+
+### `search-by-type -position <position> -query <string> -limit <int> -with-doc <bool>`
+
+```
+-position <position>  Position to search
+     -query <string>  The query
+        -limit <int>  The maximum-size of the result set
+    -with-doc <bool>  If true, values' documentation will be included in the result
+```
+
+Returns a list of values matching the query. A query is a type expression, ie: `string -> int option` will search every definition that take a string and returns an option of int. It is also possible to search by polarity.
+
+The result is returned as a list of:
+```javascript
+{
+  'file': filename, // the file where the definition is defined
+  'start': position,
+  'end': position,
+  'name': string, // the name of the definition
+  'type': string, // the type of the definition
+  'cost': int, // the cost/distance of the definition and the query
+  'doc': string | null // the docstring of the definition
+}
+```
+
+### `refactor-open -postion <position> -action <qualify|unqualify>`
+
+```
+       -position <position>  Position to refactor open
+-action <qualify|unqualify>  Direction of rewriting
+```
+
+Returns a list of `content` and `location` (the position referenced by the `location` must be replaced by the `content`).
+
+The result is returned as a list of:
+
+```javascript
+{
+  'start': position, // the start of the region to be substituted
+  'end': position, // the end of the region to be substituted
+  'content' string // the content of the substitution
+}
+```
+
+### `syntax-document -position <position>`
+
+	-position <position>  The position of the keyword to be documented
+
+Returns the string `No documentation found` (if the position does not refer to any keyword) or the following object:
+
+```javascript
+{
+  'name': string, // the name of the keyword under the position
+  'description': string, // the description of the keyword under the position
+  'url': string // a reference link in the OCaml manual
+}
+```
+
+### `expand-ppx -position <position>`
+
+	-position <position>  The position where to expand the ppx preprocessors
+
+Returns the string `No PPX deriver/extension node found on this position` (if the position does not refer to any keyword) or the following object:
+
+```javascript
+{
+  'code': string, // the generated code by a ppx
+  'deriver': {
+    'start': position, // the start of the region expanded by the ppx
+    'end': position, // the end of the region expanded by the ppx
+  }
+}
+```
+
+### `locate-type -position <position>`
+
+	-position <position>  The position of the type to be located
+
+Returns the location of the type at the given position.
+If the type cannot be located (because the cursor is already at the right position, or because it is a referenced built-in type, or because the type cannot be found), the result is a string explaining why it cannot be located.
+The type is defined in the same file, and the result will be the following object:
+
+```javascript
+{
+  'pos': {
+    'start': position, // the start of the region where the type is defined
+	'end': position // the end of the region where the type is defined
+  }
+}
+```
+
+The type is described in another file, and the result will be the following object:
+
+```javascript
+{
+  'file': string, // the file where the type is defined
+  'pos': {
+    'start': position, // the start of the region where the type is defined
+	'end': position // the end of the region where the type is defined
+  }
+}
+```
+
+### `signature-help -position <position>`
+
+	-position <position>  The position where to request additional information for signature help
+
+This command is essentially useful for an LSP server, as it can be used to return information additional to the completion of a function and its parameters.
+If no help is found, the command returns an empty object, otherwise it returns a structured object with signatures and active parameters.
+You can find more information here <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_signatureHelp>
+
+### `inlay-hints -start <position> -end <position> -let-binding <bool> -pattern-binding <bool> -avoid-ghost <bool>`
+
+```
+      -start <position>  the start of the region where to activate the inlay-hints
+        -end <position>  the end of the region where to activate the inlay-hints
+    -let-binding <bool>  activate for `let-bindings
+-pattern-binding <bool>  activate for `pattern-bindings
+    -avoid-ghost <bool>  deactivate for node attached with a ghost location (mainly for tests)
+```
+
+This command is essentially useful for an LSP server, and returns the list of inlay hints for a given region in a list of the following object:
+
+```javascript
+{
+  'pos': {
+    'start': position, // the start of the region where the hint should be attached
+	'end': position // the end of the region where the hint should be attached
+  },
+  'label': string // the value fo the hint
+}
+```
+
+You can find more information here <https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#inlayHint_resolve>
+
 ### `check-configuration`
 
 

dot-merlin-reader.opam

@@ -11,9 +11,9 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "4.08" & < "5.0"}
-  "dune" {>= "2.9.0"}
-  "merlin-lib" {>= "4.9"}
+  "ocaml" {>= "4.14"}
+  "dune" {>= "3.0.0"}
+  "merlin-lib" {>= "4.17"}
   "ocamlfind" {>= "1.6.0"}
 ]
 description:

dune-project

@@ -3,6 +3,6 @@
 (using menhir 2.0)
 
 (cram enable)
-(formatting disabled)
+(formatting (enabled_for ocaml))
 (implicit_transitive_deps false)
 (use_standard_c_and_cxx_flags true)