wip wrk command to dump cmt contents

Author: zth

analysis/bin/main.ml

@@ -225,8 +225,8 @@ let main () =
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | [_; "cmt"; path] -> CmtViewer.dump path
   | [_; "cmt"; line; col; path] ->
-    let cursor = Some (int_of_string line, int_of_string col) in
-    CmtViewer.dump ~cursor path
+    let cursor = (int_of_string line, int_of_string col) in
+    CmtViewer.dump ~filter:(Cursor cursor) path
   | _ ->
     prerr_endline help;
     exit 1

analysis/src/Cfg.ml

@@ -20,3 +20,5 @@ let readProjectConfigCache =
 
 let useRevampedCompletion =
   ref (Sys.getenv_opt "RESCRIPT_NEW_ANALYSIS_ENGINE" |> Option.is_some)
+
+let isTestWorkmode = ref false

analysis/src/Cmt.ml

@@ -29,9 +29,7 @@ let fullFromUri ~uri =
       else None
     in
     match incremental with
-    | Some cmtInfo ->
-      if Debug.verbose () then Printf.printf "[cmt] Found incremental cmt\n";
-      Some cmtInfo
+    | Some cmtInfo -> Some cmtInfo
     | None -> (
       match Hashtbl.find_opt package.pathsForModule moduleName with
       | Some paths ->

analysis/src/CmtViewer.ml

@@ -20,19 +20,28 @@ let filter_by_cursor cursor (loc : Warnings.loc) : bool =
     in
     line_in && col_in
 
-let dump ?(cursor = None) path =
+type filter = Cursor of (int * int) | Loc of Loc.t
+
+let dump ?filter path =
   match Cmt.loadFullCmtFromPath ~path with
   | None -> failwith (Format.sprintf "Could not load cmt for %s" path)
   | Some full ->
     let open SharedTypes in
     let open SharedTypes.Stamps in
-    let filter = filter_by_cursor cursor in
-    cursor
-    |> Option.iter (fun (line, col) ->
-           Printf.printf "Filtering by cursor %d,%d\n" line col);
+    let applyFilter =
+      match filter with
+      | None -> fun _ -> true
+      | Some (Cursor cursor) -> Loc.hasPos ~pos:cursor
+      | Some (Loc loc) -> Loc.isInside loc
+    in
+    (match filter with
+    | None -> ()
+    | Some (Cursor (line, col)) ->
+      Printf.printf "Filtering by cursor %d,%d\n" line col
+    | Some (Loc loc) -> Printf.printf "Filtering by loc %s\n" (Loc.toString loc));
     let stamps =
       full.file.stamps |> getEntries
-      |> List.filter (fun (_, stamp) -> filter (locOfKind stamp))
+      |> List.filter (fun (_, stamp) -> applyFilter (locOfKind stamp))
     in
 
     let total_stamps = List.length stamps in
@@ -65,7 +74,7 @@ let dump ?(cursor = None) path =
     let locItems =
       match full.extra with
       | {locItems} ->
-        locItems |> List.filter (fun locItem -> filter locItem.loc)
+        locItems |> List.filter (fun locItem -> applyFilter locItem.loc)
     in
 
     Printf.printf "\nFound %d locItems (typed nodes):\n\n"

analysis/src/Commands.ml

@@ -359,6 +359,9 @@ let test ~path ~debug =
           | "db+" -> Log.verbose := true
           | "db-" -> Log.verbose := false
           | "dv+" -> Debug.debugLevel := Verbose
+          | "wrk" ->
+            Cfg.isTestWorkmode := true;
+            Debug.debugLevel := Verbose
           | "dv-" -> Debug.debugLevel := Off
           | "in+" -> Cfg.inIncrementalTypecheckingMode := true
           | "in-" -> Cfg.inIncrementalTypecheckingMode := false
@@ -382,6 +385,11 @@ let test ~path ~debug =
             let currentFile = createCurrentFile () in
             if !Cfg.useRevampedCompletion then (
               Code_frame.setup (Some Misc.Color.Never);
+              if !Cfg.isTestWorkmode then (
+                print_endline "===== CMT CONTENT =====";
+                CmtViewer.dump path
+                (*print_endline "\n===== CMT FILTERED BY CURSOR =====";
+                CmtViewer.dump path ~filter:(Cursor (line, col))*));
               let source = Files.readFile currentFile in
               let completions =
                 completionRevamped ~debug ~path ~pos:(line, col) ~currentFile
@@ -392,8 +400,13 @@ let test ~path ~debug =
               | Some (completable, completionsText), Some text -> (
                 match SharedTypes.CompletableRevamped.try_loc completable with
                 | Some loc ->
-                  Printf.printf "Found Completable: %s\n\n"
-                    (SharedTypes.CompletableRevamped.toString completable);
+                  Printf.printf "Found Completable: %s at type loc: %s\n\n"
+                    (SharedTypes.CompletableRevamped.toString completable)
+                    (Loc.toString loc);
+                  if !Cfg.isTestWorkmode then (
+                    print_endline "\n===== CMT FILTERED BY TYPE LOC =====";
+                    CmtViewer.dump path ~filter:(Loc loc);
+                    print_endline "\n\n");
                   Code_frame.print ~is_warning:true ~draw_underline:true
                     ~src:text ~start_pos:loc.loc_start ~end_pos:loc.loc_end
                   |> print_endline;

analysis/src/Loc.ml

@@ -21,3 +21,9 @@ let rangeOfLoc (loc : t) =
   let start = loc |> start |> mkPosition in
   let end_ = loc |> end_ |> mkPosition in
   {Protocol.start; end_}
+
+let isInside (x : t) (y : t) =
+  x.loc_start.pos_cnum >= y.loc_start.pos_cnum
+  && x.loc_end.pos_cnum <= y.loc_end.pos_cnum
+  && x.loc_start.pos_lnum >= y.loc_start.pos_lnum
+  && x.loc_end.pos_lnum <= y.loc_end.pos_lnum

tests/analysis_new_tests/tests/test_files/__snapshots__/RecordFieldCompletions.res_Record_field_completion_in_nested_record.snap

@@ -1,4 +1,4 @@
-Found Completable: Cexpression
+Found Completable: Cexpression at type loc: [1:8->1:37]
 
   1 │ // Record field completion in nested record
   2 │ let x = TestTypeDefs.nestedTestRecord.

tests/analysis_new_tests/tests/test_files/__snapshots__/RecordFieldCompletions.res_Record_field_completion_in_nested_record_another_level.snap

@@ -1,4 +1,4 @@
-Found Completable: Cexpression
+Found Completable: Cexpression at type loc: [1:8->1:44]
 
   1 │ // Record field completion in nested record, another level
   2 │ let x = TestTypeDefs.nestedTestRecord.nested.

tests/analysis_new_tests/tests/test_files/__snapshots__/SwitchCaseCompletions.res_Empty_case_array.snap

@@ -1,4 +1,4 @@
-Found Completable: Cpattern
+Found Completable: Cpattern at type loc: [3:15->3:28]
 
   2 │ let someStringArr = ["hello"]
   3 │ 

tests/analysis_new_tests/tests/test_files/__snapshots__/SwitchCaseCompletions.res_Empty_case_bool.snap

@@ -1,4 +1,4 @@
-Found Completable: Cpattern
+Found Completable: Cpattern at type loc: [1:15->1:19]
 
   1 │ // Empty case, bool
   2 │ let x = switch true {

tests/analysis_new_tests/tests/test_files/__snapshots__/SwitchCaseCompletions.res_Empty_case_record.snap

@@ -1,4 +1,4 @@
-Found Completable: Cpattern
+Found Completable: Cpattern at type loc: [1:15->1:44]
 
   1 │ // Empty case, record
   2 │ let x = switch TestTypeDefs.nestedTestRecord {

tests/analysis_new_tests/tests/test_files/__snapshots__/SwitchCaseCompletions.res_Empty_case_string.snap

@@ -1,4 +1,4 @@
-Found Completable: Cpattern
+Found Completable: Cpattern at type loc: [2:15->2:18]
 
   1 │ // Empty case, string
   2 │ let str = "hello"