Do not accept closing comma for configuration files

marta-file-manager · Feb 5, 2019 · f03c5f8 · f03c5f8
1 parent e114ebf
commit f03c5f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/marco/parser/MarcoParser.swift b/marco/parser/MarcoParser.swift
@@ -128,7 +128,9 @@ internal class MarcoParser {
 
             guard try !parseCommaSeparatorIfPresent(&children) else { continue }
 
-            guard try parseStructuralIfPresent(.rightCurlyBracket, &children) else { break }
+            if (withBrackets) {
+                guard try parseStructuralIfPresent(.rightCurlyBracket, &children) else { break }
+            }
 
             if (whitespaceBeforeKey == nil && !keyMappings.isEmpty) {
                 try throwOrRecord(state.error("Whitespace required between object entries"))

diff --git a/marcoTests/testData/error/object15.marcoConfig b/marcoTests/testData/error/object15.marcoConfig
@@ -0,0 +1,11 @@
+--before
+foo {
+    a 1
+}}
+
+--after
+15: Whitespace required between object entries
+
+foo {
+    a 1
+}💥