Improve signature help precision #675
Merged
Conversation
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
zth
commented
Jan 4, 2023
| @@ -152,159 +152,206 @@ let docsForLabel typeExpr ~file ~package ~supportsMarkdownLinks = | |||
| typeString :: typeDefinitions |> String.concat "\n" | |||
|
|
|||
| let signatureHelp ~path ~pos ~currentFile ~debug = | |||
| let posBeforeCursor = Pos.posBeforeCursor pos in | |||
There was a problem hiding this comment.
Absolutely terrible display of the diff in GitHub. I've added two optional unwrappings which messes with the indentation, which messes up the diff. Haven't really changed that much.
I added comments highlighting the things I've actually changed/added.
zth
commented
Jan 4, 2023
Comment on lines
+155
to
+167
| let textOpt = Files.readFile currentFile in | ||
| match textOpt with | ||
| | None | Some "" -> None | ||
| | Some text -> ( | ||
| match Pos.positionToOffset text pos with | ||
| | None -> None | ||
| | Some offset -> ( | ||
| let posBeforeCursor = Pos.posBeforeCursor pos in | ||
| let offsetNoWhite = Utils.skipWhite text (offset - 1) in | ||
| let firstCharBeforeCursorNoWhite = | ||
| if offsetNoWhite < String.length text && offsetNoWhite >= 0 then | ||
| Some text.[offsetNoWhite] | ||
| else None |
zth
commented
Jan 4, 2023
Comment on lines
+192
to
+198
| (* If this unlabelled arg doesn't have the cursor, record | ||
| it as the last seen unlabelled arg before the | ||
| cursor.*) | ||
| if posBeforeCursor >= (arg.exp.pexp_loc |> Loc.start) | ||
| then | ||
| lastUnlabelledArgBeforeCursor := | ||
| currentUnlabelledArgCount; |
zth
commented
Jan 4, 2023
Comment on lines
+222
to
+237
| match argAtCursor_ with | ||
| | None -> | ||
| Some | ||
| (Unlabelled | ||
| (!lastUnlabelledArgBeforeCursor | ||
| + | ||
| if firstCharBeforeCursorNoWhite = Some ',' then 1 | ||
| (* If we found no argument with the cursor, we might still be | ||
| able to complete for an unlabelled argument, if the char | ||
| before the cursor is ',', like: `someFn(123, <com>)` | ||
| complete for argument 2, or: `someFn(123, <com>, true)` | ||
| complete for argument 2 as well. Adding 1 here accounts | ||
| for the comma telling us that the users intent is to fill | ||
| in the next argument. *) | ||
| else 0)) | ||
| | v -> v |
… intent to fill in the next argument)
zth
force-pushed
the
improve-signature-help-precision
branch
from
2ea95d1
to
897443a
Compare
cristianoc
approved these changes
Jan 5, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Better precision in signature help. You now don't have to start typing in an argument for it to highlight. We now look at commas to decide which argument you're currently intending to fill in.
Closes #672