Merge branch 'master' into errors-logs-improvements

2018-08-12 22:08:13 +01:00
parent b54292788f 4f14b4b044
commit 3a4cd8aa27
28 changed files with 1145 additions and 134 deletions
--- a/Sources/Lexer.swift
+++ b/Sources/Lexer.swift
@@ -14,7 +14,12 @@ struct Lexer {
      guard string.characters.count > 4 else { return "" }
      let start = string.index(string.startIndex, offsetBy: 2)
      let end = string.index(string.endIndex, offsetBy: -2)
-      return String(string[start..<end]).trim(character: " ")
+      let trimmed = String(string[start..<end])
+        .components(separatedBy: "\n")
+        .filter({ !$0.isEmpty })
+        .map({ $0.trim(character: " ") })
+        .joined(separator: " ")
+      return trimmed
    }

    if string.hasPrefix("{{") || string.hasPrefix("{%") || string.hasPrefix("{#") {