c-mode: fix () in first statement after 'case'

The code to avoid extra-indenting within a {} block in a case also
broke indenting within () or [].
Fix it.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/python/render-c-mode.py b/python/render-c-mode.py
index 0b92dd18b91f13f484e58b66c808e9a394d93e09..dfea62e10c48341772e3f80299d4acac2610c330 100644 (file)
--- a/python/render-c-mode.py
+++ b/python/render-c-mode.py
@@ -185,7 +185,7 @@ class parse_state:
                 if ('=' in seen or 'enum' in seen or
                     'define' in seen or 'define-body' in seen):
                     self.comma_ends = True
-            if 'case' not in seen:
+            if 'case' not in seen or c != '{':
                 self.d = self.column+1
                 self.last_was_open = True
             return

diff --git a/tests.d/01-c-mode b/tests.d/01-c-mode
index c2280cbca9dcf4e8c6ec29041535aa3be8456581..5592cb601a136d312d46be6870f167e2c6233181 100644 (file)
--- a/tests.d/01-c-mode
+++ b/tests.d/01-c-mode
@@ -449,4 +449,118 @@ Display 80,30 6A0A27835906B7884783CEF91CD60FA4 1,22
 Key ":Up"
 Display 80,30 4CC8AC842E6BD5C068C1714CA37CA4C0 1,21
 Key ":Tab"
-Close 823
+Key ":A-<"
+Display 80,30 947160176BC0CB5E7C464FBA436201FF 1,0
+Key ":C-S"
+Display 80,30 16262FED7B2BDFCFFB3E55B8B5ADE0CA 50,0
+Key "-s"
+Display 80,30 117A0C8952076854F8DCA711C142A71C 51,0
+Display 80,30 C4148F34220A6682861F1210B975AA79 51,0
+Key "-w"
+Display 80,30 A4312EDB54EEC35C492CEE9B14EFB0D3 52,0
+Key "-i"
+Display 80,30 29904D0D1507FD76565C55243C8B81ED 53,0
+Key "-t"
+Display 80,30 7C6C58DD0ED152A299B1F2028867763C 54,0
+Key "-c"
+Display 80,30 7C3F548EA25E295E454FF66F3E236C36 55,0
+Key "-h"
+Display 80,30 311242CC24196DBD0DD517C88C009CB0 56,0
+Key ":C-S"
+Display 80,30 B30F6476D0BB45689176B846E92EEB03 56,0
+Key ":Enter"
+Display 80,30 0A67DC3038B025EC5AE4203469327514 15,13
+Key ":C-N"
+Display 80,30 1A0ACA4C39CF3D5952117916D9942EA9 15,14
+Key ":C-N"
+Display 80,30 1AC20B19AB2E94E47E0CF926BD246650 15,15
+Key ":C-N"
+Display 80,30 9F2C331F075AE932A99CD2B21058A243 9,16
+Key ":C-N"
+Display 80,30 329122A5AA15D12DA08DCA61BD84052C 9,17
+Key ":C-N"
+Display 80,30 8840DE06E0821AF454F9B0DD6ECA83B7 9,18
+Key ":C-N"
+Display 80,30 8CFE7DBE3C83065202A901DEBF931379 15,19
+Key ":C-N"
+Display 80,30 53A45AC9D859A9259DBB1BE439BBDA80 9,20
+Key ":C-N"
+Display 80,30 D2EE2C5F4754A3A5ACD908D0275FBA5A 9,21
+Key ":C-N"
+Display 80,30 FE68A6F055502F336582A708A5C8CB03 9,22
+Key ":C-N"
+Display 80,30 5FE8EC0380E65BDCCDF6C298BC4A3708 9,23
+Key ":C-N"
+Display 80,30 820171436AC0854F28A6C58BD7704C84 9,24
+Key ":C-N"
+Display 80,30 38CC55E689497A8CD7A05DB6C07DDC64 9,25
+Key ":C-N"
+Display 80,30 0DDD910D75E65AA4298CC3794A474892 15,26
+Key ":C-N"
+Display 80,30 17D19973FA793ECFD8371AEC90215B89 9,27
+Key ":A-f"
+Display 80,30 17D19973FA793ECFD8371AEC90215B89 19,27
+Key ":A-f"
+Display 80,30 17D19973FA793ECFD8371AEC90215B89 26,27
+Key ":A-f"
+Display 80,30 17D19973FA793ECFD8371AEC90215B89 34,27
+Key ":A-f"
+Display 80,30 17D19973FA793ECFD8371AEC90215B89 37,27
+Key ":Enter"
+Display 80,30 FE36B5F37EA65A8DB8FC319257A46B1F 21,27
+Key ":C-L"
+Display 80,30 58D363643FF2967FE85ABD19877AE49A 21,13
+Key ":C-N"
+Display 80,30 56DD90BE5CBF3B8E5136FD54056D8DBB 17,14
+Key ":C-N"
+Display 80,30 0BAE992AD46942D8098A8C2732715D60 21,15
+Key ":C-N"
+Display 80,30 AFE2477BFE4FD92114DA2B9F392F0552 17,16
+Key ":C-N"
+Display 80,30 C6AE13E59F24AC9EE060F21648359B08 21,17
+Key ":C-N"
+Display 80,30 66D44951A82917C7BB594BBFB958FAB7 21,18
+Key ":C-N"
+Display 80,30 EFF86D696A3D60C032A8BCAC6ABF4F24 21,19
+Key ":C-N"
+Display 80,30 724FA214C1BCDBFAC966366F51DAD56E 21,20
+Key ":C-E"
+Display 80,30 724FA214C1BCDBFAC966366F51DAD56E 24,20
+Key "- "
+Display 80,30 724FA214C1BCDBFAC966366F51DAD56E 25,20
+Key "-{"
+Display 80,30 447B8E80B3DBD34803CEF16656925079 26,20
+Key ":C-L"
+Display 80,30 05C4AB2A5CA149F9E38F8C4A894DEB12 26,13
+Key ":C-N"
+Display 80,30 D248AF27BA7AA0438029062C6F3D00A9 26,14
+Key ":C-N"
+Display 80,30 AFE8D3E5D974846A08DD9A57254EA1C2 26,15
+Key ":C-N"
+Display 80,30 3D1493093ECDB76614EC82D05638E617 26,16
+Key ":C-N"
+Display 80,30 B7B8142073E26ADD1987FF908A13FC97 26,17
+Key ":C-N"
+Display 80,30 379E37884E861F0BF93E6FACD4591AAD 26,18
+Key ":C-N"
+Display 80,30 746CA594E93B4466A1BB2D6884CF28E9 26,19
+Key ":C-N"
+Display 80,30 EF77F36BAA32BBCC99815760CDEE977A 23,20
+Key ":Enter"
+Display 80,30 5EF4914FD032A86E675F2B553422B363 17,21
+Key "-}"
+Display 80,30 7BF5BD0AA301CC66CBACCEB4A00134B9 18,21
+Key ":A:C-B"
+Display 80,30 E77C2DB763FB0CE9193DD7E645D07B38 25,13
+Key ":A:C-Q"
+Display 80,30 3D31F10D13F3F874C826F057405BB1AA 1,22
+Key ":C-X"
+Display 80,30 D073CC8DB7A79F5DB22F7F2823E740C9 1,22
+Key ":C-S"
+Display 80,30 7996593A95F76AA26DF90ACEAFC666FF 1,22
+Key ":C-X"
+Display 80,30 0BFBAC9A38865191F8B8BD526D88E147 1,22
+Key ":C-C"
+Display 80,30 02095F4E624010B3B164BD2E62DDF854 21,8
+Key "-n"
+Close 1130