Merge pull request #130 from vi4m/fix/eof-comments-parsing

tanner0101 · web-flow · commit d35f54cbac72 · 2018-10-30T09:53:33.000-04:00
Fix parsing inline comments
diff --git a/Sources/Leaf/Parser/LeafParser.swift b/Sources/Leaf/Parser/LeafParser.swift
@@ -195,14 +195,20 @@ extension TemplateByteScanner {
         // Extract tag body.
         let body: [TemplateSyntax]?
         if name == "//" {
+            let isEntirelyCommentLine: Bool = (peek(by: -4) == .newLine)
+
             let s = makeSourceStart()
             let bytes = try extractBytes(untilUnescaped: [.newLine])
-            // pop the newline
-            try requirePop()
+
+            if isEntirelyCommentLine {
+                try requirePop()
+            }
+
             body = [TemplateSyntax(
                 type: .raw(TemplateRaw(data: bytes)),
                 source: makeSource(using: s)
             )]
+
         } else if name == "/*" {
             let s = makeSourceStart()
             var i = 0
diff --git a/Tests/LeafTests/LeafTests.swift b/Tests/LeafTests/LeafTests.swift
@@ -433,6 +433,46 @@ class LeafTests: XCTestCase {
         }
     }
 
+    // https://github.com/vapor/leaf/issues/127
+    func testGH127Inline() throws {
+        do {
+            let template = """
+            <html>
+            <head>
+            <title></title>#// Translate all copy!!!!!
+            <style>
+            """
+            let expected = """
+            <html>
+            <head>
+            <title></title>
+            <style>
+            """
+            let data = try TemplateDataEncoder().testEncode(["a": "a"])
+            try XCTAssertEqual(renderer.testRender(template, data), expected)
+        }
+    }
+
+    func testGH127SingleLine() throws {
+        do {
+            let template = """
+            <html>
+            <head>
+            <title></title>
+            #// Translate all copy!!!!!
+            <style>
+            """
+            let expected = """
+            <html>
+            <head>
+            <title></title>
+            <style>
+            """
+            let data = try TemplateDataEncoder().testEncode(["a": "a"])
+            try XCTAssertEqual(renderer.testRender(template, data), expected)
+        }
+    }
+
     static var allTests = [
         ("testPrint", testPrint),
         ("testConstant", testConstant),
@@ -464,6 +504,8 @@ class LeafTests: XCTestCase {
         ("testGH99", testGH99),
         ("testGH101", testGH101),
         ("testGH105", testGH105),
+        ("testGH127Inline", testGH127Inline),
+        ("testGH127SingleLine", testGH127SingleLine)
     ]
 }
 
