-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
318 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| open SharedTypes | ||
|
|
||
| type inlayHintKind = Type | Parameter | ||
| let inlayKindToNumber = function | ||
| | Type -> 1 | ||
| | Parameter -> 2 | ||
|
|
||
| let locItemToTypeHint ~full:{file; package} locItem = | ||
| match locItem.locType with | ||
| | Constant t -> | ||
| Some | ||
| (match t with | ||
| | Const_int _ -> "int" | ||
| | Const_char _ -> "char" | ||
| | Const_string _ -> "string" | ||
| | Const_float _ -> "float" | ||
| | Const_int32 _ -> "int32" | ||
| | Const_int64 _ -> "int64" | ||
| | Const_nativeint _ -> "int") | ||
| | Typed (_, t, locKind) -> | ||
| let fromType typ = | ||
| typ |> Shared.typeToString | ||
| |> Str.global_replace (Str.regexp "[\r\n\t]") "" | ||
| in | ||
| Some | ||
| (match References.definedForLoc ~file ~package locKind with | ||
| | None -> fromType t | ||
| | Some (_, res) -> ( | ||
| match res with | ||
| | `Declared -> fromType t | ||
| | `Constructor _ -> fromType t | ||
| | `Field -> fromType t)) | ||
| | _ -> None | ||
|
|
||
| let inlay ~path ~pos ~maxLength ~debug = | ||
| let maxlen = try Some (int_of_string maxLength) with Failure _ -> None in | ||
| let hints = ref [] in | ||
| let start_line, end_line = pos in | ||
| let push loc kind = | ||
| let range = Utils.cmtLocToRange loc in | ||
| if start_line <= range.end_.line && end_line >= range.start.line then | ||
| hints := (range, kind) :: !hints | ||
| in | ||
| let rec processFunction (exp : Parsetree.expression) = | ||
| match exp.pexp_desc with | ||
| | Pexp_fun (_, _, pat_exp, e) -> ( | ||
| match pat_exp with | ||
| | {ppat_desc = Ppat_var _} -> | ||
| push pat_exp.ppat_loc Type; | ||
| processFunction e | ||
| | _ -> processFunction e) | ||
| | _ -> () | ||
| in | ||
| let value_binding (iterator : Ast_iterator.iterator) | ||
| (vb : Parsetree.value_binding) = | ||
| (match vb with | ||
| | { | ||
| pvb_pat = {ppat_desc = Ppat_var _}; | ||
| pvb_expr = | ||
| { | ||
| pexp_desc = | ||
| ( Pexp_constant _ | Pexp_tuple _ | Pexp_record _ | Pexp_variant _ | ||
| | Pexp_apply _ | Pexp_match _ | Pexp_construct _ | Pexp_ifthenelse _ | ||
| | Pexp_array _ | Pexp_ident _ | Pexp_try _ | Pexp_lazy _ | ||
| | Pexp_send _ | Pexp_field _ | Pexp_open _ ); | ||
| }; | ||
| } -> | ||
| push vb.pvb_pat.ppat_loc Type | ||
| | {pvb_pat = {ppat_desc = Ppat_tuple tuples}} -> | ||
| List.iter | ||
| (fun (tuple : Parsetree.pattern) -> push tuple.ppat_loc Type) | ||
| tuples | ||
| | { | ||
| pvb_pat = {ppat_desc = Ppat_var _}; | ||
| pvb_expr = {pexp_desc = Pexp_fun (_, _, pat, e)}; | ||
| } -> | ||
| (match pat with | ||
| | {ppat_desc = Ppat_var _} -> push pat.ppat_loc Type | ||
| | _ -> ()); | ||
| processFunction e | ||
| | _ -> ()); | ||
| Ast_iterator.default_iterator.value_binding iterator vb | ||
| in | ||
| let iterator = {Ast_iterator.default_iterator with value_binding} in | ||
| (if Filename.check_suffix path ".res" then | ||
| let parser = | ||
| Res_driver.parsingEngine.parseImplementation ~forPrinter:false | ||
| in | ||
| let {Res_driver.parsetree = structure} = parser ~filename:path in | ||
| iterator.structure iterator structure |> ignore); | ||
| !hints | ||
| |> List.filter_map (fun ((range : Protocol.range), hintKind) -> | ||
| match Cmt.fullFromPath ~path with | ||
| | None -> None | ||
| | Some full -> ( | ||
| match | ||
| References.getLocItem ~full | ||
| ~pos:(range.start.line, range.start.character + 1) | ||
| ~debug | ||
| with | ||
| | None -> None | ||
| | Some locItem -> ( | ||
| let position : Protocol.position = | ||
| {line = range.start.line; character = range.end_.character} | ||
| in | ||
| match locItemToTypeHint locItem ~full with | ||
| | Some label -> ( | ||
| let result = | ||
| Protocol.stringifyHint | ||
| { | ||
| kind = inlayKindToNumber hintKind; | ||
| position; | ||
| paddingLeft = true; | ||
| paddingRight = false; | ||
| label = ": " ^ label; | ||
| } | ||
| in | ||
| match maxlen with | ||
| | Some value -> | ||
| if String.length label > value then None else Some result | ||
| | None -> Some result) | ||
| | None -> None))) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| let string = "ReScript" | ||
| let number = 1 | ||
| let float = 1.1 | ||
| let char = 'c' | ||
|
|
||
| let add = (x, y) => x + y | ||
|
|
||
| let my_sum = 3->add(1)->add(1)->add(1)->add(8) | ||
|
|
||
| let withAs = (~xx as yyy) => yyy + 1 | ||
|
|
||
|
|
||
| @react.component | ||
| let make = (~name) => React.string(name) | ||
|
|
||
| let tuple = ("ReScript", "lol") | ||
|
|
||
| let (lang, _) = tuple | ||
|
|
||
| //^hin |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| DCE src/Dce.res | ||
| issues:235 | ||
| issues:243 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| Inlay Hint src/InlayHint.res 0:6 | ||
| [{ | ||
| "position": {"line": 5, "character": 15}, | ||
| "label": ": int", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }, { | ||
| "position": {"line": 5, "character": 12}, | ||
| "label": ": int", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }, { | ||
| "position": {"line": 3, "character": 8}, | ||
| "label": ": char", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }, { | ||
| "position": {"line": 2, "character": 9}, | ||
| "label": ": float", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }, { | ||
| "position": {"line": 1, "character": 10}, | ||
| "label": ": int", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }, { | ||
| "position": {"line": 0, "character": 10}, | ||
| "label": ": string", | ||
| "kind": 1, | ||
| "paddingLeft": true, | ||
| "paddingRight": false | ||
| }] | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.