Correctly indent nested generic object initializers

This properly closes #85

Author: josteink

csharp-mode.el

@@ -484,8 +484,11 @@ to work properly with code that includes attributes.
                       ;; typename
                       "\\(?:[A-Za-z_][[:alnum:]]*\\.\\)*"
                       "[A-Za-z_][[:alnum:]]*"
-                      ;; optional generic constraint
-                      "\\(?:<\\(?:[[:alpha:]][[:alnum:]]*\\)\\(?:[, ]+[[:alpha:]][[:alnum:]]*\\)*>\\)?"
+                      ;; simplified generic constraint.
+                      ;; handles generic sub-types.
+                      ;; { is optional because otherwise initializers with
+                      ;; bracket on same line will indent wrongly.
+                      "\\(?:<[[:alnum:], <>]+>[ \t\n\f\v\r]*{?\\)?"
                       ;; optional array-specifier
                       "\\(?:\\[\\]\\)?"
                       ;; spacing

test-files/indentation-tests.cs

@@ -69,6 +69,11 @@ public void Test()
                 { 2, "false" },
             };
 
+            var map3 = new Dictionary<string,Func<int, bool>>
+            {
+                { "IsZero", (int i) => i == 0 }
+            };
+
             using (test)
             {
                 System.Console.WriteLine("boo");