这是indexloc提供的服务，不要输入任何密码
Skip to content

Adjust completion order #157

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 16, 2025
Merged

Adjust completion order #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417538a
De-prioritize types in expression completion
liam923 Jul 8, 2025
b0e7c80
Add tests
liam923 Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/analysis/completion.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ let gen_values = `Group [ `Values; `Constructor ]
let default_kinds = [ `Variants; gen_values; `Types; `Modules; `Modules_type ]

let completion_order = function
| `Expression -> [ `Variants; gen_values; `Types; `Modules; `Modules_type ]
| `Expression -> [ gen_values; `Variants; `Modules; `Types; `Modules_type ]
| `Structure -> [ gen_values; `Types; `Modules; `Modules_type ]
| `Pattern ->
[ `Variants;
Expand Down
193 changes: 193 additions & 0 deletions tests/test-dirs/completion/prioritization.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
This test demonstrates Merlin's prioritization of identifiers in various namespaces when
performing completion.

Define a bunch of intentifiers with the name foobar/Foobar in the environment.
$ cat >env.ml <<EOF
> type foobar = Foobar
> type record = { foobar : int }
> type poly_variant = [ \`Foobar ]
> module Foobar = struct end
> module type foobar = sig end
> let foobar ~foobar = ()
> EOF

Given a line of ocaml and a column number, return the completions for that line and
column, with the identifiers defined in env.ml in scope.
$ completions_for () {
> line="$1"
> col_num="$2"
> # Create a file test.ml that is env.ml, but with $line appended to the end of it
> cat env.ml > test.ml
> echo "$line" >> test.ml
> line_num="$(wc -l < test.ml)"
> $MERLIN single complete-prefix -position "$line_num":"$col_num" -filename test.ml < test.ml \
> | revert-newlines \
> | jq '.value.entries | .[] | select(.name == "foobar" or .name == "Foobar")' \
> | jq '{name, kind}'
> }

Completions in an expression context
$ completions_for "let _ = " 18
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Type"
}
{
"name": "foobar",
"kind": "Signature"
}

Completions in a module context
$ completions_for "module M = " 11
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Signature"
}
{
"name": "foobar",
"kind": "Type"
}
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}

Completions in a type context
$ completions_for "type t = " 9
{
"name": "foobar",
"kind": "Type"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Signature"
}
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}

Completions in a module type context.
# CR-someday: Make Merlin infer a module type context
$ completions_for "module type S = " 16
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Type"
}
{
"name": "foobar",
"kind": "Signature"
}

Completions in a pattern
$ completions_for "let _ = match _ with | " 23
{
"name": "Foobar",
"kind": "Constructor"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Label"
}
{
"name": "foobar",
"kind": "Value"
}
{
"name": "foobar",
"kind": "Type"
}
{
"name": "foobar",
"kind": "Signature"
}

Completions in a structure context
$ completions_for "module M = struct end" 18
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}
{
"name": "foobar",
"kind": "Type"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Signature"
}

Completions in a signature context
$ completions_for "module type S = sig end" 20
{
"name": "foobar",
"kind": "Type"
}
{
"name": "Foobar",
"kind": "Module"
}
{
"name": "foobar",
"kind": "Signature"
}
{
"name": "foobar",
"kind": "Value"
}
{
"name": "Foobar",
"kind": "Constructor"
}