Skip to content

Parser: recover on missing types in decls #15042

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

Closed
wants to merge 1 commit into from
Closed

Parser: recover on missing types in decls #15042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/Compiler/SyntaxTree/LexFilter.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2382,11 +2382,12 @@ type LexFilterImpl (
returnToken tokenLexbufState OFUN

| INTERFACE, _ ->
let lookaheadTokenTup = peekNextTokenTup()
let lookaheadTokenTup = peekNextTokenTup ()
let lookaheadTokenStartPos = startPosOfTokenTup lookaheadTokenTup
match lookaheadTokenTup.Token with
// type I = interface .... end
| DEFAULT | OVERRIDE | INTERFACE | NEW | TYPE | STATIC | END | MEMBER | ABSTRACT | INHERIT | LBRACK_LESS ->
| DEFAULT | OVERRIDE | INTERFACE | NEW | TYPE | STATIC | END | MEMBER | ABSTRACT | INHERIT | LBRACK_LESS when
not strictIndentation || (tokenStartCol < lookaheadTokenStartPos.Column || match lookaheadTokenTup.Token with END -> true | _ -> false) ->
if debug then dprintf "INTERFACE, pushing CtxtParen, tokenStartPos = %a, lookaheadTokenStartPos = %a\n" outputPos tokenStartPos outputPos lookaheadTokenStartPos
pushCtxt tokenTup (CtxtParen (token, tokenStartPos))
pushCtxtSeqBlock tokenTup AddBlockEnd
Expand Down
221 changes: 184 additions & 37 deletions src/Compiler/pars.fsy
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 01.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Module

type T() =
member val P1:

member this.P2 = 1
79 changes: 79 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 01.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Auto property - Missing type 01.fs", false,
QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [T],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
ObjectModel
(Unspecified,
[ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None });
AutoProperty
([], false, P1, Some (FromParseError (4,18--4,18)),
Member, { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
{ IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = PropertySet },
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, ArbitraryAfterError ("autoProp2", (4,18--4,18)),
(4,4--4,18),
{ LeadingKeyword =
MemberVal ((4,4--4,10), (4,11--4,14))
WithKeyword = None
EqualsRange = None
GetSetKeywords = None });
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),
LongIdent
(SynLongIdent
([this; P2], [(6,15--6,16)], [None; None]),
None, None, Pats [], None, (6,11--6,18)), None,
Const (Int32 1, (6,21--6,22)), (6,11--6,18),
NoneAtInvisible,
{ LeadingKeyword = Member (6,4--6,10)
InlineKeyword = None
EqualsRange = Some (6,19--6,20) }), (6,4--6,22))],
(4,4--6,22)), [],
Some
(ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None })), (3,5--6,22),
{ LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,9--3,10)
WithKeyword = None })], (3,0--6,22))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--6,22), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(4,19)-(6,4) parse error Incomplete structured construct at or before this point in member definition
(4,19)-(6,4) parse error Expecting member body
6 changes: 6 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 02.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Module

type T() =
member val P1: = 1

member this.P2 = 1
77 changes: 77 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 02.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Auto property - Missing type 02.fs", false,
QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [T],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
ObjectModel
(Unspecified,
[ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None });
AutoProperty
([], false, P1, Some (FromParseError (4,18--4,18)),
Member, { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
{ IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = PropertySet },
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, Const (Int32 1, (4,21--4,22)), (4,4--4,22),
{ LeadingKeyword =
MemberVal ((4,4--4,10), (4,11--4,14))
WithKeyword = None
EqualsRange = Some (4,19--4,20)
GetSetKeywords = None });
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),
LongIdent
(SynLongIdent
([this; P2], [(6,15--6,16)], [None; None]),
None, None, Pats [], None, (6,11--6,18)), None,
Const (Int32 1, (6,21--6,22)), (6,11--6,18),
NoneAtInvisible,
{ LeadingKeyword = Member (6,4--6,10)
InlineKeyword = None
EqualsRange = Some (6,19--6,20) }), (6,4--6,22))],
(4,4--6,22)), [],
Some
(ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None })), (3,5--6,22),
{ LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,9--3,10)
WithKeyword = None })], (3,0--6,22))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--6,22), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(4,19)-(4,20) parse error Unexpected symbol '=' in member definition
4 changes: 4 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 03.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
module Module

type T() =
member val P1:
54 changes: 54 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 03.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Auto property - Missing type 03.fs", false,
QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [T],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
ObjectModel
(Unspecified,
[ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None });
AutoProperty
([], false, P1, Some (FromParseError (4,18--4,18)),
Member, { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
{ IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = PropertySet },
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, ArbitraryAfterError ("autoProp1", (4,18--4,18)),
(4,4--4,18),
{ LeadingKeyword =
MemberVal ((4,4--4,10), (4,11--4,14))
WithKeyword = None
EqualsRange = None
GetSetKeywords = None })], (4,4--4,18)), [],
Some
(ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None })), (3,5--4,18),
{ LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,9--3,10)
WithKeyword = None })], (3,0--4,18))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--4,18), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(5,0)-(5,0) parse error Incomplete structured construct at or before this point in member definition
6 changes: 6 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 04.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module Module

type T() =
member val P1:

()
55 changes: 55 additions & 0 deletions tests/service/data/SyntaxTree/Member/Auto property - Missing type 04.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Auto property - Missing type 04.fs", false,
QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [T],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
ObjectModel
(Unspecified,
[ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None });
AutoProperty
([], false, P1, Some (FromParseError (4,18--4,18)),
Member, { IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = Member },
{ IsInstance = true
IsDispatchSlot = false
IsOverrideOrExplicitImpl = false
IsFinal = false
GetterOrSetterIsCompilerGenerated = false
MemberKind = PropertySet },
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, ArbitraryAfterError ("autoProp1", (4,18--4,18)),
(4,4--4,18),
{ LeadingKeyword =
MemberVal ((4,4--4,10), (4,11--4,14))
WithKeyword = None
EqualsRange = None
GetSetKeywords = None })], (4,4--4,18)), [],
Some
(ImplicitCtor
(None, [], SimplePats ([], [], (3,6--3,8)), None,
PreXmlDoc ((3,6), FSharp.Compiler.Xml.XmlDocCollector),
(3,5--3,6), { AsKeyword = None })), (3,5--4,18),
{ LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,9--3,10)
WithKeyword = None })], (3,0--4,18));
Expr (Const (Unit, (6,0--6,2)), (6,0--6,2))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--6,2), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(6,0)-(6,1) parse error Incomplete structured construct at or before this point in member definition
5 changes: 5 additions & 0 deletions tests/service/data/SyntaxTree/Member/Field - Missing type 01.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Module

type T =
val F1
val F2: int
39 changes: 39 additions & 0 deletions tests/service/data/SyntaxTree/Member/Field - Missing type 01.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
ImplFile
(ParsedImplFileInput
("/root/Member/Field - Missing type 01.fs", false,
QualifiedNameOfFile Module, [], [],
[SynModuleOrNamespace
([Module], false, NamedModule,
[Types
([SynTypeDefn
(SynComponentInfo
([], None, [], [T],
PreXmlDoc ((3,0), FSharp.Compiler.Xml.XmlDocCollector),
false, None, (3,5--3,6)),
ObjectModel
(Unspecified,
[ValField
(SynField
([], false, Some F1, FromParseError (4,10--4,10),
false,
PreXmlDoc ((4,4), FSharp.Compiler.Xml.XmlDocCollector),
None, (4,8--4,10),
{ LeadingKeyword = Some (Val (4,4--4,7)) }),
(4,4--4,10));
ValField
(SynField
([], false, Some F2,
LongIdent (SynLongIdent ([int], [], [None])), false,
PreXmlDoc ((5,4), FSharp.Compiler.Xml.XmlDocCollector),
None, (5,8--5,15),
{ LeadingKeyword = Some (Val (5,4--5,7)) }),
(5,4--5,15))], (4,4--5,15)), [], None, (3,5--5,15),
{ LeadingKeyword = Type (3,0--3,4)
EqualsRange = Some (3,7--3,8)
WithKeyword = None })], (3,0--5,15))],
PreXmlDoc ((1,0), FSharp.Compiler.Xml.XmlDocCollector), [], None,
(1,0--5,15), { LeadingKeyword = Module (1,0--1,6) })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(4,11)-(5,4) parse error Incomplete structured construct at or before this point in type definition. Expected ':' or other token.
5 changes: 5 additions & 0 deletions tests/service/data/SyntaxTree/Member/Field - Missing type 01.fsi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module Module

type T =
val F1
val F2: int
Loading