Merge pull request #65 from plummer/fix/Fix-52-‘#export()'depends-on-‘{‘-location

Fix/fix 52 ‘#export()'depends on ‘{‘ location

Author: loganwright

Resources/no-body-whitespace.leaf

@@ -0,0 +1,3 @@
+#extend("basic-extendable")
+
+#export("greeting"){ Aloha }

Resources/variable-body-whitespace.leaf

@@ -0,0 +1,9 @@
+#extend("basic-extendable")
+
+#export("greeting")
+
+
+
+      { Aloha }
+
+

Sources/Leaf/Buffer/Buffer+Leaf.swift

@@ -126,12 +126,24 @@ extension Buffer {
     mutating func extractInstruction(stem: Stem) throws -> TagTemplate {
         let name = try extractInstructionName()
         let parameters = try extractInstructionParameters()
-
-        // check if body
-        moveForward()
-        guard current == .space, next == .leftCurlyBracket else {
+        
+        // check if body exists
+        
+        // Check for immediate curly brace without whitespace.
+        // If there is an immediate brace, do nothing.
+        if next != .leftCurlyBracket {
+            moveForward()
+        }
+        
+        // Move through any redundant whitespace
+        while current?.isWhitespace == true && next?.isWhitespace == true {
+             moveForward()
+        }
+        
+        guard next == .leftCurlyBracket else {
             return TagTemplate(name: name, parameters: parameters, body: Leaf?.none)
         }
+        
         moveForward() // queue up `{`
 
         // TODO: Body should be leaf components
@@ -153,6 +165,7 @@ extension Buffer {
         guard current == .leftParenthesis else {
             throw ParseError.expectedOpenParenthesis(line: line, column: column)
         }
+        
         return name.makeString()
     }
 
@@ -168,6 +181,7 @@ extension Buffer {
     }
 
     mutating func extractSection(opensWith opener: Byte, closesWith closer: Byte) throws -> Bytes {
+        
         guard current ==  opener else {
             let have = current.flatMap { [$0] }?.makeString()
             throw ParseError.missingBodyOpener(

Tests/LeafTests/BodyWhitespaceTests.swift

@@ -0,0 +1,26 @@
+import Foundation
+import XCTest
+@testable import Leaf
+
+class BodyWhitespaceTests: XCTestCase {
+    
+    static let allTests = [
+        ("testAdditionalWhitespace", testAdditionalWhitespace),
+        ("testNoWhitespace", testNoWhitespace)
+    ]
+    
+    func testAdditionalWhitespace() throws {
+        let leaf = try stem.spawnLeaf(at: "variable-body-whitespace")
+        let rendered = try stem.render(leaf, with: Context(["name": "World"])).makeString()
+        let expectation = "Aloha, World!"
+        XCTAssertEqual(rendered, expectation)
+    }
+    
+    func testNoWhitespace() throws {
+        let leaf = try stem.spawnLeaf(at: "no-body-whitespace")
+        let rendered = try stem.render(leaf, with: Context(["name": "World"])).makeString()
+        let expectation = "Aloha, World!"
+        XCTAssertEqual(rendered, expectation)
+    }
+
+}

Tests/LinuxMain.swift

@@ -21,4 +21,5 @@ XCTMain([
      testCase(VariableTests.allTests),
      testCase(LayoutTests.allTests),
      testCase(RawTests.allTests),
+     testCase(BodyWhitespaceTests.allTests)
 ])