[RFC FS-1054] less strict indentation on common DSL pattern (#4929)

* less strict indentation on common DSL pattern

* missed one case

* missing file

* fix test

Author: dsyme

src/fsharp/LexFilter.fs

@@ -669,8 +669,11 @@ type LexFilterImpl (lightSyntaxStatus:LightSyntaxStatus, compilingFsLib, lexer,
                       -> unindentationLimit false rest
 
             // 'f ...{' places no limit until we hit a CtxtLetDecl etc... 
-            | _,(CtxtParen (LBRACE,_) :: CtxtVanilla _ :: CtxtSeqBlock _ :: rest)
-            | _,(CtxtSeqBlock _ :: CtxtParen(LBRACE,_) :: CtxtVanilla _ :: CtxtSeqBlock _ :: rest)
+            // 'f ...[' places no limit until we hit a CtxtLetDecl etc... 
+            // 'f ...[|' places no limit until we hit a CtxtLetDecl etc... 
+            | _,(CtxtParen ((LBRACE | LBRACK | LBRACK_BAR),_) :: CtxtSeqBlock _ :: rest)
+            | _,(CtxtParen ((LBRACE | LBRACK | LBRACK_BAR),_) :: CtxtVanilla _ :: CtxtSeqBlock _ :: rest)
+            | _,(CtxtSeqBlock _ :: CtxtParen((LBRACE | LBRACK | LBRACK_BAR),_) :: CtxtVanilla _ :: CtxtSeqBlock _ :: rest)
                       -> unindentationLimit false rest
 
 

tests/fsharp/tests.fs

@@ -1824,6 +1824,12 @@ module TypecheckTests =
         fsc cfg "%s --target:exe -o:pos29.exe" cfg.fsc_flags ["pos29.fsi"; "pos29.fs"; "pos29.app.fs"]
         peverify cfg "pos29.exe"
 
+    [<Test>]
+    let ``sigs pos30`` () = 
+        let cfg = testConfig "typecheck/sigs"
+        fsc cfg "%s --target:exe -o:pos30.exe --warnaserror+" cfg.fsc_flags ["pos30.fs"]
+        peverify cfg "pos30.exe"
+
     [<Test>]
     let ``sigs pos24`` () = 
         let cfg = testConfig "typecheck/sigs"

tests/fsharp/typecheck/sigs/pos30.fs

@@ -0,0 +1,70 @@
+module Pos30
+
+module Test0 = 
+    System.Console.WriteLine(format="{0}", arg = (Array.ofSeq <| seq {
+        yield box "hello"
+    }))
+
+module Test0b = 
+    System.Console.WriteLine(seq {
+        yield 1 
+    })
+
+module Test1 = 
+    System.Console.WriteLine(format="{0}", arg = [| 
+        "hello"
+    |])
+    System.Console.WriteLine([|
+        "hello"
+    |])
+
+module Test2 = 
+    System.Console.WriteLine(format="{0}", arg = Array.ofList [ 
+        "hello"
+    ])
+    System.Console.WriteLine([
+        "hello"
+    ])
+
+module Test3 = 
+    System.Console.WriteLine(format="{0}", arg = [| 
+    |])
+    System.Console.WriteLine([|
+    |])
+
+
+module Test4 = 
+    System.Console.WriteLine(format="{0}", arg = Array.ofList [ 
+    ])
+    System.Console.WriteLine([
+    ])
+
+module Test5 = 
+    System.Console.WriteLine(format="{0}", arg = [|
+        yield box "hello"
+        yield box "hello"
+        yield box "hello"
+        yield box "hello"
+    |])
+
+module Test6 = 
+    System.Console.WriteLine(format="{0}", arg = Array.ofList [ 
+        yield box "hello"
+        yield box "hello"
+        yield box "hello"
+        yield box "hello"
+        yield box "hello"
+    ])
+
+
+module Test7 = 
+    System.Console.WriteLine [| 
+        yield "hello"
+        yield "hello"
+        yield "hello"
+        yield "hello"
+        yield "hello"
+    |]
+
+
+