Enable mlx in documentSelector and a few small features (#1964)

* documentSelector includes mlx

* Add entrylog for mlx

* Add ocaml.mlx into keybindings

* Enalbe shiwting impl/intf for mlx

* Enalbe AST editor for mlx

* Add changelog entires

* Make sure editorTextFocus and editorLangId works together

* Remove ocamllex and mehir from ocaml.switch-impl-intf

* Fix identation on ocaml.prev-hole

* Fix identation on ocaml.search-by-type

* Add editorTextFocus in ocaml.next-hole|prev-hole

* Remove ocamllex from ocaml.search-by-type

Author: davesnx

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+- Add mlx language support to document selector
+- Enable AST editor for mlx files
+- Enable switching between implementation and interface for mlx files
+- Add keybindings for OCaml.mlx language
+
 ## 1.32.4
 
 - Fix editor focus condition for interface file keybindings. Previously,

package.json

@@ -785,84 +785,84 @@
       {
         "command": "ocaml.switch-impl-intf",
         "key": "Alt+O",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "editor.action.codeAction",
         "key": "Alt+D",
         "args": {
           "kind": "destruct (enumerate cases)"
         },
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.construct",
         "key": "Alt+C",
         "args": {
           "kind": "construct"
         },
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.jump",
         "key": "Alt+J",
         "args": {
           "kind": "jump"
         },
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "editor.action.codeAction",
         "key": "Alt+P",
         "args": {
           "kind": "inferred_intf"
         },
-        "when": "editorLangId == ocaml.interface || editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.evaluate-selection",
         "key": "Shift+Enter",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.next-hole",
         "key": "Alt+Y",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.prev-hole",
         "key": "Shift+Alt+Y",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.ocamllex || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.reveal-ast-node",
         "key": "Alt+N",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.switch-hover-mode",
         "key": "Alt+H",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.search-by-type",
         "key": "Alt+F",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.type-selection",
         "key": "Alt+T",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.type-previous-selection",
         "key": "Shift+Alt+T",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == ocaml.mlx)"
       },
       {
         "command": "ocaml.augment-selection-type-verbosity",
         "key": "Alt+V",
-        "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface"
+        "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == ocaml.mlx)"
       }
     ],
     "languages": [
@@ -1089,7 +1089,7 @@
         {
           "command": "ocaml.evaluate-selection",
           "group": "OCaml",
-          "when": "editorTextFocus && editorLangId == ocaml || editorTextFocus && editorLangId == ocaml.interface || editorTextFocus && editorLangId == reason"
+          "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
         },
         {
           "command": "ocaml.reveal-ast-node",
@@ -1104,11 +1104,11 @@
         },
         {
           "command": "ocaml.next-hole",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
+          "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
         },
         {
           "command": "ocaml.prev-hole",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
+          "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)"
         },
         {
           "command": "ocaml.refresh-switches",
@@ -1168,7 +1168,7 @@
         },
         {
           "command": "ocaml.search-by-type",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason"
+          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx"
         },
         {
           "command": "ocaml.navigate-typed-holes",
@@ -1179,7 +1179,7 @@
         {
           "command": "ocaml.switch-impl-intf",
           "key": "Alt+O",
-          "when": "editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason",
+          "when": "editorTextFocus && (editorLangId == ocaml || editorLangId == ocaml.interface || editorLangId == reason || editorLangId == ocaml.mlx)",
           "group": "navigation"
         }
       ],

src/ast_editor.ml

@@ -68,6 +68,7 @@ end = struct
     match Stdlib.Filename.extension relative with
     | ".ml" -> Structure `Ocaml
     | ".re" -> Structure `Reason
+    | ".mlx" -> Structure `Ocaml
     | ".mli" -> Signature `Ocaml
     | ".rei" -> Signature `Reason
     | _ -> Unknown

src/extension_instance.ml

@@ -169,6 +169,7 @@ end = struct
          ; language "ocaml.ocamllex"
          ; language "ocaml.menhir"
          ; language "reason"
+         ; language "ocaml.mlx"
         |]
     in
     let (lazy outputChannel) = Output.language_server_output_channel in

src/switch_impl_intf.ml

@@ -3,7 +3,9 @@ open Import
 let insert_inferred_intf ~source_uri client text_editor =
   let open Promise.Syntax in
   match
-    String.is_suffix source_uri ~suffix:".ml" || String.is_suffix source_uri ~suffix:".re"
+    String.is_suffix source_uri ~suffix:".ml"
+    || String.is_suffix source_uri ~suffix:".re"
+    || String.is_suffix source_uri ~suffix:".mlx"
   with
   | false -> Promise.return ()
   | true ->