Skip to content

Fix recovery of member _ #15540

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Fix recovery of member _ #15540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8675996
Fix recovery of member with wildcard this
kerams Jul 3, 2023
9b7e987
Update CheckExpressions.fs
kerams Jul 3, 2023
f95b2aa
Refactor
kerams Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Compiler/Checking/CheckDeclarations.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -915,6 +915,7 @@ module MutRecBindingChecking =
let innerState = (incrClassCtorLhsOpt, envForTycon, tpenv, recBindIdx, uncheckedBindsRev)
[Phase2AIncrClassBindings (tcref, letBinds, isStatic, isRec, m)], innerState

| SynMemberDefn.Member(SynBinding(headPat = SynPat.Wild _; expr = SynExpr.ArbitraryAfterError _), _), _
| SynMemberDefn.Member(SynBinding(headPat = SynPat.FromParseError(SynPat.Wild _, _)), _), _ ->
[], innerState

Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3928,7 +3928,7 @@ let GetInstanceMemberThisVariable (vspec: Val, expr) =
// Skip over LAM tps. Choose 'a.
if vspec.IsInstanceMember then
let rec firstArg e =
match stripDebugPoints e with
match stripDebugPoints e with
| Expr.TyLambda (_, _, b, _, _) -> firstArg b
| Expr.TyChoose (_, b, _) -> firstArg b
| Expr.Lambda (_, _, _, [v], _, _, _) -> Some v
Expand Down
6 changes: 6 additions & 0 deletions tests/service/data/SyntaxTree/Member/Member 10.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Module

type U =
| A

member _
48 changes: 48 additions & 0 deletions tests/service/data/SyntaxTree/Member/Member 10.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Member 10.fs", false, QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [U],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
Simple
(Union
(None,
[SynUnionCase
([], SynIdent (A, None), Fields [],
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, (4,6--4,7), { BarRange = Some (4,4--4,5) })],
(4,4--4,7)), (4,4--4,7)),
[Member
(SynBinding
(None, Normal, false, false, [],
PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
SynValData
(Some { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
SynValInfo
([[SynArgInfo ([], false, None)]; []],
SynArgInfo ([], false, None)), None),
Wild (6,11--6,12), None,
ArbitraryAfterError ("memberCore2", (6,12--6,12)),
(6,11--6,12), NoneAtInvisible,
{ LeadingKeyword = Member (6,4--6,10)
InlineKeyword = None
EqualsRange = None }), (6,4--6,12))], None,
(3,5--6,12), { LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,7--3,8)
WithKeyword = None })], (3,0--6,12))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--6,12), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(7,0)-(7,0) parse error Incomplete structured construct at or before this point in member definition. Expected 'with', '=' or other token.
6 changes: 6 additions & 0 deletions tests/service/data/SyntaxTree/Member/Member 11.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Module

type U =
| A

member _.
48 changes: 48 additions & 0 deletions tests/service/data/SyntaxTree/Member/Member 11.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Member 11.fs", false, QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [U],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
Simple
(Union
(None,
[SynUnionCase
([], SynIdent (A, None), Fields [],
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, (4,6--4,7), { BarRange = Some (4,4--4,5) })],
(4,4--4,7)), (4,4--4,7)),
[Member
(SynBinding
(None, Normal, false, false, [],
PreXmlDoc ((6,4), FSharp.Compiler.Xml.XmlDocCollector),
SynValData
(Some { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
SynValInfo
([[SynArgInfo ([], false, None)]; []],
SynArgInfo ([], false, None)), None),
FromParseError (Wild (6,10--6,10), (6,10--6,10)), None,
ArbitraryAfterError ("classDefnMember1", (6,10--6,10)),
(6,4--6,10), NoneAtInvisible,
{ LeadingKeyword = Member (6,4--6,10)
InlineKeyword = None
EqualsRange = None }), (6,4--6,10))], None,
(3,5--6,10), { LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,7--3,8)
WithKeyword = None })], (3,0--6,10))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--6,10), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(7,0)-(7,0) parse error Incomplete structured construct at or before this point in member definition. Expected identifier, '(', '(*)' or other token.