Merge pull request #2830 from DougGregor/var-decl-without-init-then-accessor

Braces following a variable declaration with no initializer clause are accessors

Author: DougGregor

Sources/SwiftParser/Declarations.swift

@@ -1355,7 +1355,8 @@ extension Parser {
 
         let accessors: RawAccessorBlockSyntax?
         if (self.at(.leftBrace)
-          && (!self.currentToken.isAtStartOfLine || self.withLookahead({ $0.atStartOfGetSetAccessor() })))
+          && (initializer == nil || !self.currentToken.isAtStartOfLine
+            || self.withLookahead({ $0.atStartOfGetSetAccessor() })))
           || (inMemberDeclList && self.at(anyIn: AccessorDeclSyntax.AccessorSpecifierOptions.self) != nil
             && !self.at(.keyword(.`init`)))
         {

Tests/SwiftParserTest/DeclarationTests.swift

@@ -2259,6 +2259,17 @@ final class DeclarationTests: ParserTestCase {
     )
   }
 
+  func testVariableGetSetNextLine() {
+    assertParse(
+      """
+      struct X {
+        var x: Int
+        { 17 }
+      }
+      """
+    )
+  }
+
   func testVariableFollowedByReferenceToSet() {
     assertParse(
       """