fix off by one in code lens resolve #994
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
baronfel
commented
Aug 17, 2022
| @@ -1776,70 +1776,67 @@ type FSharpLspServer(state: State, lspClient: FSharpLspClient) = | |||
|
|
|||
| let handler f (arg: CodeLens) = | |||
| async { | |||
| let pos = FcsPos.mkPos (arg.Range.Start.Line + 1) (arg.Range.Start.Character + 2) | |||
| let pos = protocolPosToPos arg.Range.Start | |||
There was a problem hiding this comment.
this is the core fix, the rest is refactoring
baronfel
force-pushed
the
support-reference-lens-for-1-char-identifiers
branch
from
f54da69 to
a675d94
Compare
|
CI failing with errors that look related to code lenses... |
|
yeah, the type signature lenses in particular. I'll get it green at some point. |
baronfel
commented
Aug 17, 2022
| @@ -481,7 +481,7 @@ type ParseAndCheckResults | |||
| Ok(symboluse, symboluses) | |||
|
|
|||
| member __.TryGetSignatureData (pos: Position) (lineStr: LineStr) = | |||
| match Lexer.findLongIdents (pos.Column - 1, lineStr) with | |||
| match Lexer.findLongIdents (pos.Column, lineStr) with | |||
There was a problem hiding this comment.
fixing the first off-by-one (https://github.com/fsharp/FsAutoComplete/pull/994/files#r948031768) surfaced this off-by-one.
sigh
baronfel
commented
Aug 17, 2022
| @@ -101,10 +101,23 @@ let tests state = | |||
| (args[1] :?> JObject).ToObject<Ionide.LanguageServerProtocol.Types.Position>(), | |||
| (args[2] :?> JArray) |> Seq.map (fun t -> (t:?>JObject).ToObject<Ionide.LanguageServerProtocol.Types.Location>()) |> Array.ofSeq | |||
| Expect.equal filePath doc.Uri "File path should be the doc we're checking" | |||
| Expect.equal triggerPos { Line = 1; Character = 8 } "Position should be 0:0" | |||
| Expect.equal triggerPos { Line = 1; Character = 6 } "Position should be 1:6" | |||
There was a problem hiding this comment.
This changed because we stopped adding 2 to the column count as part of this fix. Why did we do that originally? Completely unknown to me reasons.
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.
Fixes ionide/ionide-vscode-fsharp#1763
Turns out it was an off by one! We basically should never use Pos.mkPos directly IMO if possible :(