fix record stub generation off-by-one #905
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
Mar 26, 2022
| @@ -19,7 +19,7 @@ type CodeGenerationService(checker : FSharpCompilerServiceChecker, state : State | |||
| option { | |||
| let! text = state.TryGetFileSource fileName |> Option.ofResult | |||
| try | |||
| let! line = text.GetLine (Position.mkPos (i - 1) 0) | |||
| let! line = text.GetLine (Position.mkPos i 0) | |||
There was a problem hiding this comment.
this was the core issue - we don't need to do a -1 line position because this helper covers that already.
baronfel
commented
Mar 26, 2022
| @@ -117,7 +117,10 @@ module CodeGenerationUtils = | |||
| range | |||
|
|
|||
| let lineIdxAndTokenSeq = seq { | |||
| for lineIdx = range.StartLine to range.EndLine do | |||
| let lines = | |||
There was a problem hiding this comment.
cover edge cases where the line range is on the same line
baronfel
commented
Mar 26, 2022
| @@ -20,6 +20,7 @@ type RecordExpr = { | |||
| Expr: SynExpr | |||
| CopyExprOption: option<SynExpr * BlockSeparator> | |||
| FieldExprList: SynExprRecordField list | |||
| LastKnownGoodPosForSymbolLookup: Position | |||
There was a problem hiding this comment.
in case we are at the end of a record declaration (e.g. the | in { a = "";| }), we need some kind of identifier to use to look up the symbol to find the record's type definition. this field allows us to grab that during the AST walk for later use.
baronfel
commented
Mar 26, 2022
| new SyntaxVisitorBase<RecordExpr>() with | ||
| member x.VisitExpr(path: SyntaxVisitorPath, traverseSynExpr: (SynExpr -> _ option), defaultTraverse: (SynExpr -> _ option), synExpr: SynExpr) = | ||
| match synExpr with | ||
| | SynExpr.Record (recordFields = recordFields; copyInfo = copyInfo) -> |
There was a problem hiding this comment.
this is a lot less code than the other version and expresses the majority of the same intent. any addition we want to make to this will be much easier in the standard walker.
baronfel
force-pushed
the
ionide-1674-record-stub-generation
branch
from
3680abe to
69dae0d
Compare
baronfel
force-pushed
the
ionide-1674-record-stub-generation
branch
from
69dae0d to
55aec5b
Compare
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#1674 by