Ticket #283: indent-lit.patch

Source/CobraParser.cobra

@@ -3378 +3378 @@
 
     def literalList as ListLit
         token = .expect('LBRACKET')
+        sail = _spaceAgnosticIndentLevel
         exprs = .commaSepExprs('RBRACKET.', true)
+        _adjustForIndents(_spaceAgnosticIndentLevel - sail)
         return ListLit(token, exprs)
-
+        
+    def _adjustForIndents(extraIndents as int)
+        """
+        Absorb any trailing dedents due indentation in a commaSepExpr with spaceAgnostic.
+        This allows collectionLit terminating delimiters to be indented wrt line containing 
+        leading delimiter.
+        """
+        if extraIndents >0 and .peek.which == 'EOL'
+            _finishSpaceAgnostic 
+            # reassert the trailing EOL the spaceAgnostic cleanup cleared
+            .ungrab
+            .replace(.peek.copy('EOL', '\n'))
+        
     def literalArray as ArrayLit
         token = .expect('ARRAY_OPEN')
+        sail = _spaceAgnosticIndentLevel
         exprs = .commaSepExprs('RBRACKET.', true)
+        _adjustForIndents(_spaceAgnosticIndentLevel - sail)
         return ArrayLit(token, exprs)
 
     def literalDictOrSet as CompositeLiteral
@@ -3414 +3430 @@
                 throw Exception('')  # for code flow analysis
 
     def _literalSet(token as IToken, expr as Expr?) as SetLit
+        sail = _spaceAgnosticIndentLevel
         if expr
             exprs = [expr]
             while true
@@ -3429 +3446 @@
                 _spaceAgnostic
                 if .optional('RCURLY')
                     break
-            return SetLit(token, exprs)
+            litSet = SetLit(token, exprs)
         else
             .expect('COMMA')
             _spaceAgnostic
             .expect('RCURLY')
-            return SetLit(token, List<of Expr>())
-
+            litSet = SetLit(token, List<of Expr>())
+        _adjustForIndents(_spaceAgnosticIndentLevel - sail)
+        return litSet
+        
     def _literalDict(token as IToken, expr as Expr?) as DictLit
+        sail = _spaceAgnosticIndentLevel
         if expr
             expectComma = false
             entries = List<of List<of Expr>>()
@@ -3464 +3484 @@
                 value = .expression
                 entries.add([key, value])
                 expectComma = true
-            return DictLit(token, entries)
+            litDict = DictLit(token, entries)
         else
             .expect('COLON')
             _spaceAgnostic
             .expect('RCURLY')
-            return DictLit(token, List<of List<of Expr>>())
-        
+            litDict = DictLit(token, List<of List<of Expr>>())
+        _adjustForIndents(_spaceAgnosticIndentLevel - sail)
+        return litDict
+            
     def nameExpr as NameExpr
         nameToken = .expect('ID')
         name = nameToken.text

Tests/320-misc-two/450-list-lit-indent.cobra

@@ +1 @@
+# indented closing delimiter gave parse error - tkt:283
+class ListIndent
+
+    var t = [ 0, 1, 3
+        ]
+    var aa= @[1,2,3
+        ]
+    
+    var obj as Object?
+
+    def main
+        pass

Tests/320-misc-two/452-dict-set-lit-indent.cobra

@@ +1 @@
+# indented closing delimiter gave parse error - tkt:283
+class LitDictIndent
+
+    var t = { 'a': 0, 'b':1, 'c':3
+        }
+    var aa= {1,2,3
+        }
+    
+    var obj as Object?
+
+    def main
+        pass