refactor completion

Author: cristianoc

analysis/src/Commands.ml

@@ -33,9 +33,16 @@ let dump files =
 
 let completion ~path ~line ~col ~currentFile =
   let uri = Uri2.fromPath path in
+  let pos = (line, col) in
   let result =
     let textOpt = Files.readFile currentFile in
-    NewCompletions.computeCompletions ~uri ~textOpt ~pos:(line, col)
+    let completionItems =
+      match NewCompletions.getCompletable ~textOpt ~pos with
+      | None -> []
+      | Some (completable, rawOpens) ->
+        NewCompletions.computeCompletions ~completable ~pos ~rawOpens ~uri
+    in
+    completionItems
     |> List.map Protocol.stringifyCompletionItem
     |> Protocol.array
   in
@@ -143,38 +150,41 @@ let references ~path ~line ~col =
 
 let documentSymbol ~path =
   let uri = Uri2.fromPath path in
-  match ProcessCmt.getFullFromCmt ~uri with
-  | None -> print_endline Protocol.null
-  | Some {file} ->
-    let open SharedTypes in
-    let rec getItems {topLevel} =
-      let rec getItem = function
-        | MValue v -> (v |> SharedTypes.variableKind, [])
-        | MType (t, _) -> (t.decl |> SharedTypes.declarationKind, [])
-        | Module (Structure contents) -> (Module, getItems contents)
-        | Module (Constraint (_, modTypeItem)) -> getItem (Module modTypeItem)
-        | Module (Ident _) -> (Module, [])
+  let result =
+    match ProcessCmt.getFullFromCmt ~uri with
+    | None -> Protocol.null
+    | Some {file} ->
+      let open SharedTypes in
+      let rec getItems {topLevel} =
+        let rec getItem = function
+          | MValue v -> (v |> SharedTypes.variableKind, [])
+          | MType (t, _) -> (t.decl |> SharedTypes.declarationKind, [])
+          | Module (Structure contents) -> (Module, getItems contents)
+          | Module (Constraint (_, modTypeItem)) -> getItem (Module modTypeItem)
+          | Module (Ident _) -> (Module, [])
+        in
+        let fn {name = {txt}; extentLoc; item} =
+          let item, siblings = getItem item in
+          if extentLoc.loc_ghost then siblings
+          else (txt, extentLoc, item) :: siblings
+        in
+        let x = topLevel |> List.map fn |> List.concat in
+        x
       in
-      let fn {name = {txt}; extentLoc; item} =
-        let item, siblings = getItem item in
-        if extentLoc.loc_ghost then siblings
-        else (txt, extentLoc, item) :: siblings
+      let allSymbols =
+        getItems file.contents
+        |> List.map (fun (name, loc, kind) ->
+               Protocol.stringifyDocumentSymbolItem
+                 {
+                   name;
+                   location =
+                     {uri = Uri2.toString uri; range = Utils.cmtLocToRange loc};
+                   kind = SharedTypes.symbolKind kind;
+                 })
       in
-      let x = topLevel |> List.map fn |> List.concat in
-      x
-    in
-    let allSymbols =
-      getItems file.contents
-      |> List.map (fun (name, loc, kind) ->
-             Protocol.stringifyDocumentSymbolItem
-               {
-                 name;
-                 location =
-                   {uri = Uri2.toString uri; range = Utils.cmtLocToRange loc};
-                 kind = SharedTypes.symbolKind kind;
-               })
-    in
-    print_endline ("[\n" ^ (allSymbols |> String.concat ",\n") ^ "\n]")
+      "[\n" ^ (allSymbols |> String.concat ",\n") ^ "\n]"
+  in
+  print_endline result
 
 let rename ~path ~line ~col ~newName =
   let uri = Uri2.fromPath path in

analysis/src/NewCompletions.ml

@@ -1133,33 +1133,32 @@ let processCompletable ~findItems ~full ~package ~rawOpens
            Utils.startsWith name prefix && not (List.mem name identsSeen))
     |> List.map mkLabel
 
-let computeCompletions ~uri ~textOpt ~pos =
+let getCompletable ~textOpt ~pos =
   match textOpt with
-  | None -> []
+  | None -> None
   | Some text -> (
     match PartialParser.positionToOffset text pos with
-    | None -> []
+    | None -> None
     | Some offset -> (
       match PartialParser.findCompletable text offset with
-      | None -> []
-      | Some completable -> (
-        match ProcessCmt.getFullFromCmt ~uri with
-        | None -> []
-        | Some full ->
-          let rawOpens = PartialParser.findOpens text offset in
-          let package = full.package in
-          let allFiles =
-            FileSet.union package.projectFiles package.dependenciesFiles
-          in
-          let findItems ~exact parts =
-            let items =
-              getItems ~full ~package ~rawOpens ~allFiles ~pos ~parts
-            in
-            match parts |> List.rev with
-            | last :: _ when exact ->
-              items
-              |> List.filter (fun {SharedTypes.name = {txt}} -> txt = last)
-            | _ -> items
-          in
-          completable |> processCompletable ~findItems ~full ~package ~rawOpens)
-      ))
+      | None -> None
+      | Some completable ->
+        let rawOpens = PartialParser.findOpens text offset in
+        Some (completable, rawOpens)))
+
+let computeCompletions ~completable ~pos ~rawOpens ~uri =
+  match ProcessCmt.getFullFromCmt ~uri with
+  | None -> []
+  | Some full ->
+    let package = full.package in
+    let allFiles =
+      FileSet.union package.projectFiles package.dependenciesFiles
+    in
+    let findItems ~exact parts =
+      let items = getItems ~full ~package ~rawOpens ~allFiles ~pos ~parts in
+      match parts |> List.rev with
+      | last :: _ when exact ->
+        items |> List.filter (fun {SharedTypes.name = {txt}} -> txt = last)
+      | _ -> items
+    in
+    completable |> processCompletable ~findItems ~full ~package ~rawOpens