Skip to content

Make semicolons optional between attributes when on separate lines #18303

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 6 commits into from
Closed

Make semicolons optional between attributes when on separate lines #18303

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
386664c
Make semicolons optional between attributes when on separate lines
edgarfgp Feb 9, 2025
d99c24c
Merge branch 'main' into multiple-attributes-no-semicolon
edgarfgp Feb 9, 2025
1c66f66
more tests
edgarfgp Feb 9, 2025
65a4286
Merge branch 'multiple-attributes-no-semicolon' of github.com:edgarfg…
edgarfgp Feb 9, 2025
73f6fcb
follow the logic in LexFilter for sequential expressions
Feb 26, 2025
82d22c0
Merge branch 'main' into multiple-attributes-no-semicolon
edgarfgp Feb 26, 2025
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
4 changes: 3 additions & 1 deletion src/Compiler/pars.fsy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,9 +1530,11 @@ attributeListElements:
| attribute
{ [$1] }

| attributeListElements seps attribute
| attributeListElements SEMICOLON attribute /* Same line requires semicolon */
{ $1 @ [$3] }

| attributeListElements OBLOCKSEP attribute /* Different lines - no separator needed */
{ $1 @ [$3] }

/* One custom attribute */
attribute:
Expand Down
3 changes: 3 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes01.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

[<MyAttribute(foo ="bar"); MyAttribute(foo ="bar")>]
do ()
53 changes: 53 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes01.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
ImplFile
(ParsedImplFileInput
("/root/Attribute/MultipleAttributes01.fs", false,
QualifiedNameOfFile MultipleAttributes01, [], [],
[SynModuleOrNamespace
([MultipleAttributes01], false, AnonModule,
[Attributes
([{ Attributes =
[{ TypeName = SynLongIdent ([MyAttribute], [], [None])
ArgExpr =
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [],
[Some (OriginalNotation "=")]), None,
(2,18--2,19)), Ident foo, (2,14--2,19)),
Const
(String ("bar", Regular, (2,19--2,24)),
(2,19--2,24)), (2,14--2,24)), (2,13--2,14),
Some (2,24--2,25), (2,13--2,25))
Target = None
AppliesToGetterAndSetter = false
Range = (2,2--2,25) };
{ TypeName = SynLongIdent ([MyAttribute], [], [None])
ArgExpr =
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [],
[Some (OriginalNotation "=")]), None,
(2,43--2,44)), Ident foo, (2,39--2,44)),
Const
(String ("bar", Regular, (2,44--2,49)),
(2,44--2,49)), (2,39--2,49)), (2,38--2,39),
Some (2,49--2,50), (2,38--2,50))
Target = None
AppliesToGetterAndSetter = false
Range = (2,27--2,50) }]
Range = (2,0--2,52) }], (2,0--2,52));
Expr (Do (Const (Unit, (3,3--3,5)), (3,0--3,5)), (3,0--3,5))],
PreXmlDocEmpty, [], None, (2,0--4,0), { LeadingKeyword = None })],
(true, true), { ConditionalDirectives = []
CodeComments = [] }, set []))
4 changes: 4 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes02.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[<MyAttribute(foo ="bar")
MyAttribute(foo ="bar")>]
Comment on lines +2 to +3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it worth having a test where the second one is not indented far enough? Would it be considered offsides? What about a mixture of semicolons and newlines?

do ()
52 changes: 52 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes02.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
ImplFile
(ParsedImplFileInput
("/root/Attribute/MultipleAttributes02.fs", false,
QualifiedNameOfFile MultipleAttributes02, [], [],
[SynModuleOrNamespace
([MultipleAttributes02], false, AnonModule,
[Attributes
([{ Attributes =
[{ TypeName = SynLongIdent ([MyAttribute], [], [None])
ArgExpr =
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [],
[Some (OriginalNotation "=")]), None,
(2,18--2,19)), Ident foo, (2,14--2,19)),
Const
(String ("bar", Regular, (2,19--2,24)),
(2,19--2,24)), (2,14--2,24)), (2,13--2,14),
Some (2,24--2,25), (2,13--2,25))
Target = None
AppliesToGetterAndSetter = false
Range = (2,2--2,25) }]
Range = (2,0--2,25) }], (2,0--2,25));
Expr
(App
(Atomic, false, Ident MyAttribute,
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [], [Some (OriginalNotation "=")]),
None, (3,18--3,19)), Ident foo, (3,14--3,19)),
Const
(String ("bar", Regular, (3,19--3,24)), (3,19--3,24)),
(3,14--3,24)), (3,13--3,14), Some (3,24--3,25),
(3,13--3,25)), (3,2--3,25)), (3,2--3,25))], PreXmlDocEmpty,
[], None, (2,0--3,25), { LeadingKeyword = None })], (true, true),
{ ConditionalDirectives = []
CodeComments = [] }, set []))

(3,2)-(3,13) parse error Unexpected identifier in attribute list
(3,25)-(3,27) parse error Unexpected symbol '>]' in implementation file
4 changes: 4 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes03.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

[<MyAttribute(foo ="bar");
MyAttribute(foo ="bar")>]
do ()
53 changes: 53 additions & 0 deletions tests/service/data/SyntaxTree/Attribute/MultipleAttributes03.fs.bsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
ImplFile
(ParsedImplFileInput
("/root/Attribute/MultipleAttributes03.fs", false,
QualifiedNameOfFile MultipleAttributes03, [], [],
[SynModuleOrNamespace
([MultipleAttributes03], false, AnonModule,
[Attributes
([{ Attributes =
[{ TypeName = SynLongIdent ([MyAttribute], [], [None])
ArgExpr =
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [],
[Some (OriginalNotation "=")]), None,
(2,18--2,19)), Ident foo, (2,14--2,19)),
Const
(String ("bar", Regular, (2,19--2,24)),
(2,19--2,24)), (2,14--2,24)), (2,13--2,14),
Some (2,24--2,25), (2,13--2,25))
Target = None
AppliesToGetterAndSetter = false
Range = (2,2--2,25) };
{ TypeName = SynLongIdent ([MyAttribute], [], [None])
ArgExpr =
Paren
(App
(NonAtomic, false,
App
(NonAtomic, true,
LongIdent
(false,
SynLongIdent
([op_Equality], [],
[Some (OriginalNotation "=")]), None,
(3,18--3,19)), Ident foo, (3,14--3,19)),
Const
(String ("bar", Regular, (3,19--3,24)),
(3,19--3,24)), (3,14--3,24)), (3,13--3,14),
Some (3,24--3,25), (3,13--3,25))
Target = None
AppliesToGetterAndSetter = false
Range = (3,2--3,25) }]
Range = (2,0--3,27) }], (2,0--3,27));
Expr (Do (Const (Unit, (4,3--4,5)), (4,0--4,5)), (4,0--4,5))],
PreXmlDocEmpty, [], None, (2,0--5,0), { LeadingKeyword = None })],
(true, true), { ConditionalDirectives = []
CodeComments = [] }, set []))
Loading