Remove ocaml.ocamllex from type-dependent command conditions (#1984)

smorimoto · web-flow · commit ecf77ad5e216 · 2025-10-26T23:15:06.000+09:00
* Remove `ocaml.ocamllex` from type-dependent command conditions

OCamllex files (.mll) use a specialised lexer definition syntax and do
not have full LSP support with type information. Commands that require
type information should not be available for these files.

Remove `ocaml.ocamllex` from the when conditions of the following
type-dependent commands in both `keybindings` and `commandPalette`:
- `ocaml.construct`
- `ocaml.next-hole`
- `ocaml.prev-hole`
- `ocaml.search-by-type`
- `ocaml.copy-type-under-cursor`

Signed-off-by: Sora Morimoto &lt;sora@morimoto.io&gt;

* Update CHANGELOG.md

Signed-off-by: Sora Morimoto &lt;sora@morimoto.io&gt;

---------

Signed-off-by: Sora Morimoto &lt;sora@morimoto.io&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@
 - Fix editor focus condition for interface file keybindings. Previously,
   keybindings for `ocaml.interface` files were active even when the editor
   did not have focus due to operator precedence in the when clauses. (#1983)
+- Remove `ocaml.ocamllex` from type-dependent command conditions. OCamllex
+  files use a specialised lexer definition syntax and do not have full LSP
+  support with type information. Commands requiring type information
+  (`construct`, `next-hole`, `prev-hole`, `search-by-type`,
+  `copy-type-under-cursor`) were incorrectly enabled for `.mll` files and
+  have been removed. (#1984)
 
 ## 1.32.3
 
diff --git a/package.json b/package.json
@@ -827,12 +827,12 @@
       {
         "command": "ocaml.next-hole",
         "key": "Alt+Y",
-        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
       },
       {
         "command": "ocaml.prev-hole",
         "key": "Shift+Alt+Y",
-        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
       },
       {
         "command": "ocaml.reveal-ast-node",
@@ -847,7 +847,7 @@
       {
         "command": "ocaml.search-by-type",
         "key": "Alt+F",
-        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+        "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
       },
       {
         "command": "ocaml.type-selection",
@@ -1104,11 +1104,11 @@
         },
         {
           "command": "ocaml.next-hole",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
         },
         {
           "command": "ocaml.prev-hole",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
         },
         {
           "command": "ocaml.refresh-switches",
@@ -1160,15 +1160,15 @@
         },
         {
           "command": "ocaml.copy-type-under-cursor",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
         },
         {
           "command": "ocaml.construct",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
         },
         {
           "command": "ocaml.search-by-type",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
         },
         {
           "command": "ocaml.navigate-typed-holes",

Original file line number	Diff line number	Diff line change
`@@ -827,12 +827,12 @@`
`827`	`827`	`{`
`828`	`828`	`"command": "ocaml.next-hole",`
`829`	`829`	`"key": "Alt+Y",`
`830`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`830`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`831`	`831`	`},`
`832`	`832`	`{`
`833`	`833`	`"command": "ocaml.prev-hole",`
`834`	`834`	`"key": "Shift+Alt+Y",`
`835`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`835`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`836`	`836`	`},`
`837`	`837`	`{`
`838`	`838`	`"command": "ocaml.reveal-ast-node",`
`@@ -847,7 +847,7 @@`
`847`	`847`	`{`
`848`	`848`	`"command": "ocaml.search-by-type",`
`849`	`849`	`"key": "Alt+F",`
`850`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`850`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`851`	`851`	`},`
`852`	`852`	`{`
`853`	`853`	`"command": "ocaml.type-selection",`
`@@ -1104,11 +1104,11 @@`
`1104`	`1104`	`},`
`1105`	`1105`	`{`
`1106`	`1106`	`"command": "ocaml.next-hole",`
`1107`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`1107`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`1108`	`1108`	`},`
`1109`	`1109`	`{`
`1110`	`1110`	`"command": "ocaml.prev-hole",`
`1111`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`1111`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`1112`	`1112`	`},`
`1113`	`1113`	`{`
`1114`	`1114`	`"command": "ocaml.refresh-switches",`
`@@ -1160,15 +1160,15 @@`
`1160`	`1160`	`},`
`1161`	`1161`	`{`
`1162`	`1162`	`"command": "ocaml.copy-type-under-cursor",`
`1163`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`1163`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`1164`	`1164`	`},`
`1165`	`1165`	`{`
`1166`	`1166`	`"command": "ocaml.construct",`
`1167`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`1167`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`1168`	`1168`	`},`
`1169`	`1169`	`{`
`1170`	`1170`	`"command": "ocaml.search-by-type",`
`1171`		`- "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason \|\| editorLangId == ocaml.ocamllex"`
	`1171`	`+ "when": "editorLangId == ocaml \|\| editorLangId == ocaml.interface \|\| editorLangId == reason"`
`1172`	`1172`	`},`
`1173`	`1173`	`{`
`1174`	`1174`	`"command": "ocaml.navigate-typed-holes",`