Skip to content

Commit eb4cea5

Browse files
zthzth
committed
change strategy for removing dot on completion
1 parent b6f7ccc commit eb4cea5

21 files changed

+437
-364
lines changed

‎analysis/src/Codemod.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let transform ~path ~pos ~debug ~typ ~hint =
4141
if debug then print_endline "Found no result";
4242
exit 1
4343
| Some switchExpr ->
44-
printExpr ~range:(Xform.rangeOfLoc switchExpr.pexp_loc) switchExpr)
44+
printExpr ~range:(Loc.rangeOfLoc switchExpr.pexp_loc) switchExpr)
4545
| _ ->
4646
if debug then print_endline "Mismatch in expected structure";
4747
exit 1)

‎analysis/src/CompletionBackEnd.ml

+12-28
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,8 @@ let completionsForPipeFromCompletionPath ~envCompletionIsMadeFrom ~opens ~pos
664664
in
665665
completions
666666

667-
let getPipeCompletions ~env ~full ~identifierLoc ~debug ~envCompletionIsMadeFrom
668-
~opens ~pos ~scope ~prefix ~rawOpens ~inJsx
667+
let getPipeCompletions ~env ~full ~identifierLoc ?posOfDot ~debug
668+
~envCompletionIsMadeFrom ~opens ~pos ~scope ~prefix ~rawOpens ~inJsx
669669
?(mainCompletionsAreSynthetic = false) ?(formatCompletionsWithPipes = false)
670670
typ =
671671
let env, typ =
@@ -750,8 +750,8 @@ let getPipeCompletions ~env ~full ~identifierLoc ~debug ~envCompletionIsMadeFrom
750750
allCompletions
751751
|> List.filter_map (fun (c : Completion.t) ->
752752
c
753-
|> TypeUtils.transformCompletionToPipeCompletion ~env
754-
~replaceRange:identifierLoc ~synthetic:c.synthetic)
753+
|> TypeUtils.transformCompletionToPipeCompletion ~env ?posOfDot
754+
~synthetic:c.synthetic)
755755
else allCompletions
756756

757757
let rec digToRecordFieldsForCompletion ~debug ~package ~opens ~full ~pos ~env
@@ -772,8 +772,8 @@ let rec digToRecordFieldsForCompletion ~debug ~package ~opens ~full ~pos ~env
772772
| {kind = Type {kind = Record fields}} :: _ -> Some fields
773773
| _ -> None
774774

775-
let mkItem ?data ?(range : Location.t option) name ~kind ~detail ~deprecated
776-
~docstring =
775+
let mkItem ?data ?additionalTextEdits name ~kind ~detail ~deprecated ~docstring
776+
=
777777
let docContent =
778778
(match deprecated with
779779
| None -> ""
@@ -802,23 +802,7 @@ let mkItem ?data ?(range : Location.t option) name ~kind ~detail ~deprecated
802802
insertTextFormat = None;
803803
filterText = None;
804804
data;
805-
range =
806-
(match range with
807-
| None -> None
808-
| Some range ->
809-
Some
810-
{
811-
start =
812-
{
813-
line = range.loc_start.pos_lnum - 1;
814-
character = range.loc_start.pos_cnum - range.loc_start.pos_bol;
815-
};
816-
end_ =
817-
{
818-
line = range.loc_end.pos_lnum - 1;
819-
character = range.loc_end.pos_cnum - range.loc_end.pos_bol;
820-
};
821-
});
805+
additionalTextEdits;
822806
}
823807

824808
let completionToItem
@@ -833,10 +817,10 @@ let completionToItem
833817
filterText;
834818
detail;
835819
env;
836-
range;
820+
additionalTextEdits;
837821
} ~full =
838822
let item =
839-
mkItem name ?range
823+
mkItem name ?additionalTextEdits
840824
?data:(kindToData (full.file.uri |> Uri.toPath) kind)
841825
~kind:(Completion.kindToInt kind)
842826
~deprecated
@@ -1096,7 +1080,7 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
10961080
path @ [fieldName]
10971081
|> getCompletionsForPath ~debug ~opens ~full ~pos ~exact
10981082
~completionContext:Field ~env ~scope
1099-
| CPField {contextPath = cp; fieldName; fieldNameLoc} -> (
1083+
| CPField {contextPath = cp; fieldName; fieldNameLoc; posOfDot} -> (
11001084
if Debug.verbose () then print_endline "[dot_completion]--> Triggered";
11011085
let completionsFromCtxPath =
11021086
cp
@@ -1116,10 +1100,10 @@ and getCompletionsForContextPath ~debug ~full ~opens ~rawOpens ~pos ~env ~exact
11161100
| Some (typ, env) ->
11171101
let fieldCompletions =
11181102
DotCompletionUtils.fieldCompletionsForDotCompletion typ ~env ~package
1119-
~prefix:fieldName ~fieldNameLoc ~exact
1103+
~prefix:fieldName ?posOfDot ~exact
11201104
in
11211105
let pipeCompletions =
1122-
getPipeCompletions ~env ~full ~identifierLoc:fieldNameLoc
1106+
getPipeCompletions ~env ~full ~identifierLoc:fieldNameLoc ?posOfDot
11231107
~envCompletionIsMadeFrom ~debug ~opens ~rawOpens ~scope ~pos
11241108
~inJsx:false ~prefix:fieldName ~formatCompletionsWithPipes:true typ
11251109
in

‎analysis/src/CompletionFrontEnd.ml

+8-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ let rec exprToContextPathInner (e : Parsetree.expression) =
225225
| Pexp_field (e1, {txt = Lident name; loc}) -> (
226226
match exprToContextPath e1 with
227227
| Some contextPath ->
228-
Some (CPField {contextPath; fieldName = name; fieldNameLoc = loc})
228+
Some
229+
(CPField
230+
{contextPath; fieldName = name; fieldNameLoc = loc; posOfDot = None})
229231
| _ -> None)
230232
| Pexp_field (_, {loc; txt = Ldot (lid, name)}) ->
231233
(* Case x.M.field ignore the x part *)
@@ -241,6 +243,7 @@ let rec exprToContextPathInner (e : Parsetree.expression) =
241243
};
242244
fieldName = name;
243245
fieldNameLoc = loc;
246+
posOfDot = None;
244247
})
245248
| Pexp_send (e1, {txt}) -> (
246249
match exprToContextPath e1 with
@@ -332,6 +335,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
332335
Some text.[offsetNoWhite]
333336
else None
334337
in
338+
let posOfDot = Pos.posOfDot text ~pos:posCursor ~offset in
335339
let charAtCursor =
336340
if offset < String.length text then text.[offset] else '\n'
337341
in
@@ -1167,6 +1171,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
11671171
contextPath;
11681172
fieldName = name;
11691173
fieldNameLoc = fieldName.loc;
1174+
posOfDot;
11701175
}
11711176
in
11721177
setResult (Cpath contextPath)
@@ -1189,6 +1194,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
11891194
else if name = "_" then ""
11901195
else name);
11911196
fieldNameLoc = fieldName.loc;
1197+
posOfDot;
11921198
}
11931199
in
11941200
setResult (Cpath contextPath)
@@ -1208,6 +1214,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor
12081214
loc_end = e.pexp_loc.loc_end;
12091215
loc_ghost = false;
12101216
};
1217+
posOfDot;
12111218
}))
12121219
| None -> ())
12131220
| Pexp_apply ({pexp_desc = Pexp_ident compName}, args)

‎analysis/src/DotCompletionUtils.ml

+11-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ let filterRecordFields ~env ~recordAsString ~prefix ~exact fields =
88
~kind:(SharedTypes.Completion.Field (field, recordAsString)))
99
else None)
1010

11-
let fieldCompletionsForDotCompletion typ ~env ~package ~prefix ~fieldNameLoc
12-
~exact =
11+
let fieldCompletionsForDotCompletion ?posOfDot typ ~env ~package ~prefix ~exact
12+
=
1313
let asObject = typ |> TypeUtils.extractObjectType ~env ~package in
1414
match asObject with
1515
| Some (objEnv, obj) ->
@@ -22,8 +22,15 @@ let fieldCompletionsForDotCompletion typ ~env ~package ~prefix ~fieldNameLoc
2222
let fullObjFieldName = Printf.sprintf "[\"%s\"]" field in
2323
Some
2424
(SharedTypes.Completion.create fullObjFieldName ~synthetic:true
25-
~range:fieldNameLoc ~insertText:fullObjFieldName ~env:objEnv
26-
~kind:(SharedTypes.Completion.ObjLabel typ))
25+
~insertText:fullObjFieldName ~env:objEnv
26+
~kind:(SharedTypes.Completion.ObjLabel typ)
27+
?additionalTextEdits:
28+
(match posOfDot with
29+
| None -> None
30+
| Some posOfDot ->
31+
Some
32+
(TypeUtils.makeAdditionalTextEditsForRemovingDot
33+
posOfDot)))
2734
else None)
2835
| None -> (
2936
match typ |> TypeUtils.extractRecordType ~env ~package with

‎analysis/src/Loc.ml

+9
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,12 @@ let hasPos ~pos loc = start loc <= pos && pos < end_ loc
1212
(** Allows the character after the end to be included. Ie when the cursor is at the
1313
end of the word, like `someIdentifier<cursor>`. Useful in some scenarios. *)
1414
let hasPosInclusiveEnd ~pos loc = start loc <= pos && pos <= end_ loc
15+
16+
let mkPosition (pos : Pos.t) =
17+
let line, character = pos in
18+
{Protocol.line; character}
19+
20+
let rangeOfLoc (loc : t) =
21+
let start = loc |> start |> mkPosition in
22+
let end_ = loc |> end_ |> mkPosition in
23+
{Protocol.start; end_}

‎analysis/src/Pos.ml

+16
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,19 @@ let positionToOffset text (line, character) =
2626
else None
2727

2828
let posBeforeCursor pos = (fst pos, max 0 (snd pos - 1))
29+
30+
let posOfDot text ~(pos : int * int) ~offset =
31+
let rec loop i =
32+
if i < 0 then None
33+
else
34+
match text.[i] with
35+
| '.' -> Some (i + 1)
36+
| '\n' -> None
37+
| _ -> loop (i - 1)
38+
in
39+
match loop (offset - 1) with
40+
| None -> None
41+
| Some offsetBeforeDot ->
42+
let line, col = pos in
43+
let newCol = max 0 (col - (offset - offsetBeforeDot)) in
44+
Some (line, newCol)

‎analysis/src/Protocol.ml

+16-27
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ let insertTextFormatToInt f =
4040
match f with
4141
| Snippet -> 2
4242

43+
type textEdit = {range: range; newText: string}
44+
4345
type completionItem = {
4446
label: string;
4547
kind: int;
@@ -51,7 +53,7 @@ type completionItem = {
5153
insertText: string option;
5254
documentation: markupContent option;
5355
data: (string * string) list option;
54-
range: range option;
56+
additionalTextEdits: textEdit list option;
5557
}
5658

5759
type location = {uri: string; range: range}
@@ -62,8 +64,6 @@ type documentSymbolItem = {
6264
children: documentSymbolItem list;
6365
}
6466
type renameFile = {oldUri: string; newUri: string}
65-
type textEdit = {range: range; newText: string}
66-
6767
type diagnostic = {range: range; message: string; severity: int}
6868

6969
type optionalVersionedTextDocumentIdentifier = {
@@ -105,6 +105,14 @@ let stringifyRange r =
105105
(stringifyPosition r.start)
106106
(stringifyPosition r.end_)
107107

108+
let stringifyTextEdit (te : textEdit) =
109+
Printf.sprintf
110+
{|{
111+
"range": %s,
112+
"newText": %s
113+
}|}
114+
(stringifyRange te.range) (wrapInQuotes te.newText)
115+
108116
let stringifyMarkupContent (m : markupContent) =
109117
Printf.sprintf {|{"kind": %s, "value": %s}|} (wrapInQuotes m.kind)
110118
(wrapInQuotes m.value)
@@ -143,10 +151,7 @@ let stringifyCompletionItem c =
143151
| Some doc -> stringifyMarkupContent doc) );
144152
("sortText", optWrapInQuotes c.sortText);
145153
("filterText", optWrapInQuotes c.filterText);
146-
( "insertText",
147-
match c.range with
148-
| Some _ -> None
149-
| None -> optWrapInQuotes c.insertText );
154+
("insertText", optWrapInQuotes c.insertText);
150155
( "insertTextFormat",
151156
match c.insertTextFormat with
152157
| None -> None
@@ -160,19 +165,10 @@ let stringifyCompletionItem c =
160165
(fields
161166
|> List.map (fun (key, value) -> (key, Some (wrapInQuotes value)))
162167
|> stringifyObject ~indentation:2) );
163-
( "textEdit",
164-
match c.range with
165-
| Some range ->
166-
Some
167-
(stringifyObject
168-
[
169-
("range", Some (stringifyRange range));
170-
( "newText",
171-
optWrapInQuotes
172-
(match c.insertText with
173-
| None -> Some c.label
174-
| v -> v) );
175-
])
168+
( "additionalTextEdits",
169+
match c.additionalTextEdits with
170+
| Some additionalTextEdits ->
171+
Some (additionalTextEdits |> List.map stringifyTextEdit |> array)
176172
| None -> None );
177173
]
178174

@@ -233,13 +229,6 @@ let stringifyRenameFile {oldUri; newUri} =
233229
}|}
234230
(wrapInQuotes oldUri) (wrapInQuotes newUri)
235231

236-
let stringifyTextEdit (te : textEdit) =
237-
Printf.sprintf {|{
238-
"range": %s,
239-
"newText": %s
240-
}|}
241-
(stringifyRange te.range) (wrapInQuotes te.newText)
242-
243232
let stringifyoptionalVersionedTextDocumentIdentifier td =
244233
Printf.sprintf {|{
245234
"version": %s,

‎analysis/src/SharedTypes.ml

+4-3
Original file line numberDiff line numberDiff line change
@@ -614,6 +614,7 @@ module Completable = struct
614614
| CPField of {
615615
contextPath: contextPath;
616616
fieldName: string;
617+
posOfDot: (int * int) option;
617618
fieldNameLoc: Location.t;
618619
}
619620
| CPObj of contextPath * string
@@ -812,12 +813,12 @@ module Completion = struct
812813
detail: string option;
813814
typeArgContext: typeArgContext option;
814815
data: (string * string) list option;
815-
range: Location.t option;
816+
additionalTextEdits: Protocol.textEdit list option;
816817
synthetic: bool;
817818
(** Whether this item is an made up, synthetic item or not. *)
818819
}
819820

820-
let create ?(synthetic = false) ?range ?data ?typeArgContext
821+
let create ?(synthetic = false) ?additionalTextEdits ?data ?typeArgContext
821822
?(includesSnippets = false) ?insertText ~kind ~env ?sortText ?deprecated
822823
?filterText ?detail ?(docstring = []) name =
823824
{
@@ -834,7 +835,7 @@ module Completion = struct
834835
detail;
835836
typeArgContext;
836837
data;
837-
range;
838+
additionalTextEdits;
838839
synthetic;
839840
}
840841

‎analysis/src/TypeUtils.ml

+21-6
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,20 @@ let getFirstFnUnlabelledArgType ~env ~full t =
11421142
| Some t -> Some (t, env)
11431143
| _ -> None
11441144

1145+
let makeAdditionalTextEditsForRemovingDot posOfDot =
1146+
[
1147+
{
1148+
Protocol.range =
1149+
{
1150+
start = {line = fst posOfDot; character = snd posOfDot - 1};
1151+
end_ = {line = fst posOfDot; character = snd posOfDot};
1152+
};
1153+
newText = "";
1154+
};
1155+
]
1156+
11451157
(** Turns a completion into a pipe completion. *)
1146-
let transformCompletionToPipeCompletion ?(synthetic = false) ~env ~replaceRange
1158+
let transformCompletionToPipeCompletion ?(synthetic = false) ~env ?posOfDot
11471159
(completion : Completion.t) =
11481160
let name = completion.name in
11491161
let nameWithPipe = "->" ^ name in
@@ -1154,8 +1166,11 @@ let transformCompletionToPipeCompletion ?(synthetic = false) ~env ~replaceRange
11541166
sortText = Some (name |> String.split_on_char '.' |> List.rev |> List.hd);
11551167
insertText = Some nameWithPipe;
11561168
env;
1157-
range = Some replaceRange;
11581169
synthetic;
1170+
additionalTextEdits =
1171+
(match posOfDot with
1172+
| None -> None
1173+
| Some posOfDot -> Some (makeAdditionalTextEditsForRemovingDot posOfDot));
11591174
}
11601175

11611176
(** This takes a type expr and the env that type expr was found in, and produces a globally unique
@@ -1202,7 +1217,7 @@ let rec findRootTypeId ~full ~env (t : Types.type_expr) =
12021217
| _ -> None
12031218

12041219
(** Filters out completions that are not pipeable from a list of completions. *)
1205-
let filterPipeableFunctions ~env ~full ?synthetic ?targetTypeId ?replaceRange
1220+
let filterPipeableFunctions ~env ~full ?synthetic ?targetTypeId ?posOfDot
12061221
completions =
12071222
match targetTypeId with
12081223
| None -> completions
@@ -1222,10 +1237,10 @@ let filterPipeableFunctions ~env ~full ?synthetic ?targetTypeId ?replaceRange
12221237
in
12231238
match thisCompletionItemTypeId with
12241239
| Some mainTypeId when mainTypeId = targetTypeId -> (
1225-
match replaceRange with
1240+
match posOfDot with
12261241
| None -> Some completion
1227-
| Some replaceRange ->
1228-
transformCompletionToPipeCompletion ?synthetic ~env ~replaceRange
1242+
| Some posOfDot ->
1243+
transformCompletionToPipeCompletion ?synthetic ~env ~posOfDot
12291244
completion)
12301245
| _ -> None)
12311246

0 commit comments

Comments
 (0)