From: Alan Mackenzie <acm@muc.de>
To: Paul Pogonyshev <pogonyshev@gmail.com>
Cc: 15465@debbugs.gnu.org
Subject: bug#15465: CC-mode misaligns enums that implement an interface in Java
Date: Sat, 28 Sep 2013 21:33:12 +0000 [thread overview]
Message-ID: <20130928213311.GE11317@acm.acm> (raw)
In-Reply-To: <CAG7BpaqR0s2_TOF5yGrQV=w5JnLKytATT6RTTuEB6ZZ8091SjQ@mail.gmail.com>
Hi, Paul.
On Sat, Sep 28, 2013 at 09:15:52PM +0200, Paul Pogonyshev wrote:
> > I've committed a fix, revision #114474, to the bzr trunk. Could you try
> > out the change, please, and either confirm it fixes the bug properly, or
> > tell me what hasn't yet been fixed.
> Thank you. The case I initially mentioned works properly now, also with
> multiple implemented interfaces. However, it seems to not know about
> interfaces with generics:
> public enum X implements Y <Z>
> {
> A,
> B;
> }
OK!
I think the following enhancement should help out here:
diff -r d51d11733869 cc-engine.el
--- a/cc-engine.el Sat Sep 28 16:39:26 2013 +0000
+++ b/cc-engine.el Sat Sep 28 21:27:53 2013 +0000
@@ -8534,6 +8534,10 @@
(setq before-identifier nil)
t)
((looking-at c-brace-list-key) nil)
+ ((and c-recognize-<>-arglists
+ (eq (char-after) ?<)
+ (looking-at "\\s("))
+ t)
(t nil))))
(looking-at c-brace-list-key))))
;; this will pick up array/aggregate init lists, even if they are nested.
diff -r d51d11733869 cc-fonts.el
--- a/cc-fonts.el Sat Sep 28 16:39:26 2013 +0000
+++ b/cc-fonts.el Sat Sep 28 21:27:53 2013 +0000
@@ -1452,6 +1452,10 @@
(setq before-identifier nil)
t)
((looking-at c-brace-list-key) nil) ; "enum"
+ ((and c-recognize-<>-arglists
+ (eq (char-after) ?<)
+ (looking-at "\\s("))
+ t)
(t nil))))
(looking-at c-brace-list-key)))))))
(c-forward-token-2)
@@ -1556,6 +1560,10 @@
(setq before-identifier nil)
t)
((looking-at c-brace-list-key) nil) ; "enum"
+ ((and c-recognize-<>-arglists
+ (eq (char-after) ?<)
+ (looking-at "\\s("))
+ t)
(t nil))))
(looking-at c-brace-list-key)))))
(c-syntactic-skip-backward "^{," nil t)
> Paul
--
Alan Mackenzie (Nuremberg, Germany).
next prev parent reply other threads:[~2013-09-28 21:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 8:31 bug#15465: CC-mode misaligns enums that implement an interface in Java Paul Pogonyshev
2013-09-28 17:33 ` Alan Mackenzie
2013-09-28 19:15 ` Paul Pogonyshev
2013-09-28 21:33 ` Alan Mackenzie [this message]
2013-09-29 15:03 ` Alan Mackenzie
2013-09-30 7:23 ` Paul Pogonyshev
2013-10-13 21:38 ` Alan Mackenzie
2013-10-14 9:19 ` Paul Pogonyshev
2013-10-20 14:37 ` Alan Mackenzie
2013-10-21 11:00 ` Paul Pogonyshev
2013-10-25 20:29 ` Alan Mackenzie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130928213311.GE11317@acm.acm \
--to=acm@muc.de \
--cc=15465@debbugs.gnu.org \
--cc=pogonyshev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.