@@ -862,20 +862,6 @@ let findLocalCompletionsWithOpens ~pos ~(env : QueryEnv.t) ~prefix ~exact ~opens
862
862
(* There's no local completion for fields *)
863
863
[]
864
864
865
- (* TODO filter out things that are defined after the current position *)
866
- let resolveRawOpens ~env ~rawOpens ~package =
867
- (* TODO Stdlib instead of Pervasives *)
868
- let packageOpens = " Pervasives" :: package.opens in
869
- Log. log (" Package opens " ^ String. concat " " packageOpens);
870
- let opens =
871
- resolveOpens ~env
872
- ~previous:
873
- (List. map QueryEnv. fromFile
874
- (packageOpens |> Utils. filterMap (ProcessCmt. fileForModule ~package )))
875
- (List. rev rawOpens) ~package
876
- in
877
- opens
878
-
879
865
let rec extractRecordType ~env ~package (t : Types.type_expr ) =
880
866
match t.desc with
881
867
| Tlink t1 | Tsubst t1 | Tpoly (t1 , [] ) -> extractRecordType ~env ~package t1
@@ -1132,15 +1118,21 @@ let rec getCompletionsForContextPath ~package ~opens ~rawOpens ~allFiles ~pos
1132
1118
1133
1119
let getOpens ~rawOpens ~package ~env =
1134
1120
Log. log
1135
- (" Opens folkz > "
1121
+ (" Raw ppens: "
1136
1122
^ string_of_int (List. length rawOpens)
1137
1123
^ " "
1138
1124
^ String. concat " ... " (rawOpens |> List. map pathToString));
1139
- let packageOpens = " Pervasives " :: package.opens in
1125
+ let packageOpens = package.opens in
1140
1126
Log. log (" Package opens " ^ String. concat " " packageOpens);
1141
- let resolvedOpens = resolveRawOpens ~env ~raw Opens ~package in
1127
+ let resolvedOpens =
1128
+ resolveOpens ~env
1129
+ ~previous:
1130
+ (List. map QueryEnv. fromFile
1131
+ (packageOpens |> Utils. filterMap (ProcessCmt. fileForModule ~package )))
1132
+ (List. rev rawOpens) ~package
1133
+ in
1142
1134
Log. log
1143
- (" Opens nows "
1135
+ (" Resolved opens "
1144
1136
^ string_of_int (List. length resolvedOpens)
1145
1137
^ " "
1146
1138
^ String. concat " "
0 commit comments