Skip to content

Commit d818310

Browse files
chenglouchenglou
authored
Complete -> completion (#188)
Last few unconverted things
1 parent 12a1c4b commit d818310

File tree

4 files changed

+33
-33
lines changed

4 files changed

+33
-33
lines changed

‎analysis/src/Cli.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ let help =
33
**Private CLI For rescript-vscode usage only**
44

55
API examples:
6-
./rescript-editor-analysis.exe complete src/MyFile.res 0 4 currentContent.res
6+
./rescript-editor-analysis.exe completion src/MyFile.res 0 4 currentContent.res
77
./rescript-editor-analysis.exe definition src/MyFile.res 9 3
88
./rescript-editor-analysis.exe documentSymbol src/Foo.res
99
./rescript-editor-analysis.exe hover src/MyFile.res 10 2

‎analysis/src/NewCompletions.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let resolveOpens ~env ~previous opens ~package =
5353
previous opens
5454

5555
let completionForDeclareds ~pos declareds prefix transformContents =
56-
(* Log.log("complete for declares " ++ prefix); *)
56+
(* Log.log("completion for declares " ++ prefix); *)
5757
Hashtbl.fold
5858
(fun _stamp declared results ->
5959
if

‎analysis/tests/src/Complete.res ‎analysis/tests/src/Completion.res

File renamed without changes.

‎analysis/tests/src/expected/Complete.res.txt ‎analysis/tests/src/expected/Completion.res.txt

+31-31
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Complete tests/src/Complete.res 0:2
1+
Complete tests/src/Completion.res 0:2
22
[{
33
"label": "mapReverse",
44
"kind": 12,
@@ -67,7 +67,7 @@ Complete tests/src/Complete.res 0:2
6767
"documentation": null
6868
}]
6969

70-
Complete tests/src/Complete.res 1:2
70+
Complete tests/src/Completion.res 1:2
7171
[{
7272
"label": "Floatarray",
7373
"kind": 9,
@@ -286,7 +286,7 @@ Complete tests/src/Complete.res 1:2
286286
"documentation": {"kind": "markdown", "value": " [Array.blit v1 o1 v2 o2 len] copies [len] elements\n from array [v1], starting at element number [o1], to array [v2],\n starting at element number [o2]. It works correctly even if\n [v1] and [v2] are the same array, and the source and\n destination chunks overlap.\n\n Raise [Invalid_argument \"Array.blit\"] if [o1] and [len] do not\n designate a valid subarray of [v1], or if [o2] and [len] do not\n designate a valid subarray of [v2]. "}
287287
}]
288288

289-
Complete tests/src/Complete.res 2:2
289+
Complete tests/src/Completion.res 2:2
290290
[{
291291
"label": "mapi",
292292
"kind": 12,
@@ -337,7 +337,7 @@ Complete tests/src/Complete.res 2:2
337337
"documentation": {"kind": "markdown", "value": " [mem a l] is true if and only if [a] is equal\n to an element of [l].\n @since 4.03.0 "}
338338
}]
339339

340-
Complete tests/src/Complete.res 12:2
340+
Complete tests/src/Completion.res 12:2
341341
[{
342342
"label": "customDouble",
343343
"kind": 12,
@@ -346,7 +346,7 @@ Complete tests/src/Complete.res 12:2
346346
"documentation": {"kind": "markdown", "value": "Deprecated: Use customDouble instead\n\nSome doc comment"}
347347
}]
348348

349-
Complete tests/src/Complete.res 19:2
349+
Complete tests/src/Completion.res 19:2
350350
[{
351351
"label": "age",
352352
"kind": 4,
@@ -361,7 +361,7 @@ Complete tests/src/Complete.res 19:2
361361
"documentation": null
362362
}]
363363

364-
Complete tests/src/Complete.res 21:2
364+
Complete tests/src/Completion.res 21:2
365365
[{
366366
"label": "Js.Array2.mapi",
367367
"kind": 12,
@@ -376,7 +376,7 @@ Complete tests/src/Complete.res 21:2
376376
"documentation": null
377377
}]
378378

379-
Complete tests/src/Complete.res 23:2
379+
Complete tests/src/Completion.res 23:2
380380
[{
381381
"label": "Js.String2.toUpperCase",
382382
"kind": 12,
@@ -385,7 +385,7 @@ Complete tests/src/Complete.res 23:2
385385
"documentation": {"kind": "markdown", "value": "\n `toUpperCase str` converts `str` to upper case using the locale-insensitive case mappings in the Unicode Character Database. Notice that the conversion can expand the number of letters in the result; for example the German `ß` capitalizes to two `S`es in a row.\n\n ```\n toUpperCase \"abc\" = \"ABC\";;\n toUpperCase {js|Straße|js} = {js|STRASSE|js};;\n toLowerCase {js|πς|js} = {js|ΠΣ|js};;\n ```\n"}
386386
}]
387387

388-
Complete tests/src/Complete.res 27:2
388+
Complete tests/src/Completion.res 27:2
389389
[{
390390
"label": "Belt.Option.eqU",
391391
"kind": 12,
@@ -400,7 +400,7 @@ Complete tests/src/Complete.res 27:2
400400
"documentation": {"kind": "markdown", "value": "\n `eq optValue1 optvalue2 predicate`\n\n Evaluates two optional values for equality with respect to a predicate function.\n\n If both `optValue1` and `optValue2` are `None`, returns `true`.\n\n If one of the arguments is `Some value` and the other is `None`, returns `false`\n\n If arguments are `Some value1` and `Some value2`, returns the result of `predicate value1 value2`;\n the `predicate` function must return a `bool`\n\n ```\n let clockEqual = (fun a b -> a mod 12 = b mod 12);;\n eq (Some 3) (Some 15) clockEqual = true;;\n eq (Some 3) None clockEqual = false;;\n eq None (Some 3) clockEqual = false;;\n eq None None clockEqual = true;;\n ```\n"}
401401
}]
402402

403-
Complete tests/src/Complete.res 36:2
403+
Complete tests/src/Completion.res 36:2
404404
[{
405405
"label": "ForAuto.abc",
406406
"kind": 12,
@@ -415,7 +415,7 @@ Complete tests/src/Complete.res 36:2
415415
"documentation": null
416416
}]
417417

418-
Complete tests/src/Complete.res 38:2
418+
Complete tests/src/Completion.res 38:2
419419
[{
420420
"label": "unsafeGet",
421421
"kind": 12,
@@ -430,7 +430,7 @@ Complete tests/src/Complete.res 38:2
430430
"documentation": {"kind": "markdown", "value": " Experimental internal function "}
431431
}]
432432

433-
Complete tests/src/Complete.res 50:2
433+
Complete tests/src/Completion.res 50:2
434434
[{
435435
"label": "zzz",
436436
"kind": 12,
@@ -439,7 +439,7 @@ Complete tests/src/Complete.res 50:2
439439
"documentation": null
440440
}]
441441

442-
Complete tests/src/Complete.res 52:2
442+
Complete tests/src/Completion.res 52:2
443443
[{
444444
"label": "key",
445445
"kind": 4,
@@ -454,91 +454,91 @@ Complete tests/src/Complete.res 52:2
454454
"documentation": null
455455
}]
456456

457-
DocumentSymbol tests/src/Complete.res
457+
DocumentSymbol tests/src/Completion.res
458458
[
459459
{
460460
"name": "MyList",
461461
"kind": 2,
462-
"location": {"uri": "Complete.res", "range": {"start": {"line": 0, "character": 7}, "end": {"line": 0, "character": 25}}}
462+
"location": {"uri": "Completion.res", "range": {"start": {"line": 0, "character": 7}, "end": {"line": 0, "character": 25}}}
463463
},
464464
{
465465
"name": "Dep",
466466
"kind": 2,
467-
"location": {"uri": "Complete.res", "range": {"start": {"line": 6, "character": 7}, "end": {"line": 11, "character": 1}}}
467+
"location": {"uri": "Completion.res", "range": {"start": {"line": 6, "character": 7}, "end": {"line": 11, "character": 1}}}
468468
},
469469
{
470470
"name": "customDouble",
471471
"kind": 12,
472-
"location": {"uri": "Complete.res", "range": {"start": {"line": 7, "character": 2}, "end": {"line": 8, "character": 30}}}
472+
"location": {"uri": "Completion.res", "range": {"start": {"line": 7, "character": 2}, "end": {"line": 8, "character": 30}}}
473473
},
474474
{
475475
"name": "Lib",
476476
"kind": 2,
477-
"location": {"uri": "Complete.res", "range": {"start": {"line": 15, "character": 7}, "end": {"line": 18, "character": 1}}}
477+
"location": {"uri": "Completion.res", "range": {"start": {"line": 15, "character": 7}, "end": {"line": 18, "character": 1}}}
478478
},
479479
{
480480
"name": "foo",
481481
"kind": 12,
482-
"location": {"uri": "Complete.res", "range": {"start": {"line": 16, "character": 6}, "end": {"line": 16, "character": 9}}}
482+
"location": {"uri": "Completion.res", "range": {"start": {"line": 16, "character": 6}, "end": {"line": 16, "character": 9}}}
483483
},
484484
{
485485
"name": "next",
486486
"kind": 12,
487-
"location": {"uri": "Complete.res", "range": {"start": {"line": 17, "character": 6}, "end": {"line": 17, "character": 10}}}
487+
"location": {"uri": "Completion.res", "range": {"start": {"line": 17, "character": 6}, "end": {"line": 17, "character": 10}}}
488488
},
489489
{
490490
"name": "op",
491491
"kind": 13,
492-
"location": {"uri": "Complete.res", "range": {"start": {"line": 26, "character": 4}, "end": {"line": 26, "character": 6}}}
492+
"location": {"uri": "Completion.res", "range": {"start": {"line": 26, "character": 4}, "end": {"line": 26, "character": 6}}}
493493
},
494494
{
495495
"name": "ForAuto",
496496
"kind": 2,
497-
"location": {"uri": "Complete.res", "range": {"start": {"line": 30, "character": 7}, "end": {"line": 34, "character": 1}}}
497+
"location": {"uri": "Completion.res", "range": {"start": {"line": 30, "character": 7}, "end": {"line": 34, "character": 1}}}
498498
},
499499
{
500500
"name": "t",
501501
"kind": 26,
502-
"location": {"uri": "Complete.res", "range": {"start": {"line": 31, "character": 2}, "end": {"line": 31, "character": 14}}}
502+
"location": {"uri": "Completion.res", "range": {"start": {"line": 31, "character": 2}, "end": {"line": 31, "character": 14}}}
503503
},
504504
{
505505
"name": "abc",
506506
"kind": 12,
507-
"location": {"uri": "Complete.res", "range": {"start": {"line": 32, "character": 6}, "end": {"line": 32, "character": 9}}}
507+
"location": {"uri": "Completion.res", "range": {"start": {"line": 32, "character": 6}, "end": {"line": 32, "character": 9}}}
508508
},
509509
{
510510
"name": "abd",
511511
"kind": 12,
512-
"location": {"uri": "Complete.res", "range": {"start": {"line": 33, "character": 6}, "end": {"line": 33, "character": 9}}}
512+
"location": {"uri": "Completion.res", "range": {"start": {"line": 33, "character": 6}, "end": {"line": 33, "character": 9}}}
513513
},
514514
{
515515
"name": "fa",
516516
"kind": 13,
517-
"location": {"uri": "Complete.res", "range": {"start": {"line": 36, "character": 4}, "end": {"line": 36, "character": 6}}}
517+
"location": {"uri": "Completion.res", "range": {"start": {"line": 36, "character": 4}, "end": {"line": 36, "character": 6}}}
518518
},
519519
{
520520
"name": "O",
521521
"kind": 2,
522-
"location": {"uri": "Complete.res", "range": {"start": {"line": 41, "character": 7}, "end": {"line": 47, "character": 1}}}
522+
"location": {"uri": "Completion.res", "range": {"start": {"line": 41, "character": 7}, "end": {"line": 47, "character": 1}}}
523523
},
524524
{
525525
"name": "Comp",
526526
"kind": 2,
527-
"location": {"uri": "Complete.res", "range": {"start": {"line": 42, "character": 9}, "end": {"line": 46, "character": 3}}}
527+
"location": {"uri": "Completion.res", "range": {"start": {"line": 42, "character": 9}, "end": {"line": 46, "character": 3}}}
528528
},
529529
{
530530
"name": "make",
531531
"kind": 12,
532-
"location": {"uri": "Complete.res", "range": {"start": {"line": 44, "character": 8}, "end": {"line": 44, "character": 12}}}
532+
"location": {"uri": "Completion.res", "range": {"start": {"line": 44, "character": 8}, "end": {"line": 44, "character": 12}}}
533533
},
534534
{
535535
"name": "zzz",
536536
"kind": 13,
537-
"location": {"uri": "Complete.res", "range": {"start": {"line": 49, "character": 4}, "end": {"line": 49, "character": 7}}}
537+
"location": {"uri": "Completion.res", "range": {"start": {"line": 49, "character": 4}, "end": {"line": 49, "character": 7}}}
538538
}
539539
]
540540

541-
Complete tests/src/Complete.res 56:2
541+
Complete tests/src/Completion.res 56:2
542542
[{
543543
"label": "react.component",
544544
"kind": 4,
@@ -547,7 +547,7 @@ Complete tests/src/Complete.res 56:2
547547
"documentation": null
548548
}]
549549

550-
Complete tests/src/Complete.res 58:2
550+
Complete tests/src/Completion.res 58:2
551551
[{
552552
"label": "component",
553553
"kind": 4,

0 commit comments

Comments
 (0)