From: Lars Ingebrigtsen <larsi@gnus.org>
To: "Simen Heggestøyl" <simenheg@runbox.com>
Cc: Eli Zaretskii <eliz@gnu.org>,
53203@debbugs.gnu.org, Colin <my.old.email.sucked@gmail.com>
Subject: bug#53203: Comment with lots of color codes crashes or hangs emacs in scss-mode
Date: Sat, 14 May 2022 15:30:26 +0200 [thread overview]
Message-ID: <878rr4kzrh.fsf@gnus.org> (raw)
In-Reply-To: <87czggl26a.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sat, 14 May 2022 14:38:21 +0200")
But how about just trying to make it stricter? That is, just allow any
number of selectors, with the separators between. The following seems
to work fine in the test cases.
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 1139fd1976..4db3ae82f0 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -944,29 +944,29 @@ css--font-lock-keywords
;; I use `keep' this should work better). But really the part of the
;; selector between [...] should simply not be highlighted.
(,(concat
- "^[ \t]*\\("
+ "^[ \t]*\\(\\(?:"
(if (not sassy)
;; We don't allow / as first char, so as not to
;; take a comment as the beginning of a selector.
- "[^@/:{}() \t\n][^:{}()]*"
+ "[[:alnum:]%*#.>]+"
;; Same as for non-sassy except we do want to allow { and }
;; chars in selectors in the case of #{$foo}
;; variable interpolation!
(concat "\\(?:" scss--hash-re
- "\\|[^@/:{}() \t\n#]\\)"
- "[^:{}()#]*\\(?:" scss--hash-re "[^:{}()#]*\\)*"))
+ "\\|[[:alnum:]%*#.>]+\\)"))
;; Even though pseudo-elements should be prefixed by ::, a
;; single colon is accepted for backward compatibility.
"\\(?:\\(:" (regexp-opt (append css-pseudo-class-ids
css-pseudo-element-ids)
t)
- "\\|::" (regexp-opt css-pseudo-element-ids t) "\\)"
+ "\\|::" (regexp-opt css-pseudo-element-ids t) "\\)\\)?"
+ ;; Braces after selectors.
+ "\\(?:\\[[^]]+\\]\\)?"
+ ;; Parentheses after selectors.
"\\(?:([^)]+)\\)?"
- (if (not sassy)
- "[^:{}()\n]*"
- (concat "[^:{}()\n#]*\\(?:" scss--hash-re "[^:{}()\n#]*\\)*"))
- "\\)*"
- "\\)\\(?:\n[ \t]*\\)*{")
+ ;; Separators between selectors.
+ "[ \t,+~>]*"
+ "\\)+\\)\\(?:\n[ \t]*\\)*{")
(1 'css-selector keep))
;; In the above rule, we allow the open-brace to be on some subsequent
;; line. This will only work if we properly mark the intervening text
--
(domestic pets only, the antidote for overdose, milk.)
bloggy blog: http://lars.ingebrigtsen.no
next prev parent reply other threads:[~2022-05-14 13:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-12 7:20 bug#53203: Comment with lots of color codes crashes or hangs emacs in scss-mode Colin
2022-01-12 13:16 ` Eli Zaretskii
2022-01-13 7:00 ` Lars Ingebrigtsen
2022-01-13 8:58 ` Eli Zaretskii
2022-05-14 10:34 ` Simen Heggestøyl
2022-05-14 12:02 ` Lars Ingebrigtsen
2022-05-14 12:38 ` Lars Ingebrigtsen
2022-05-14 13:30 ` Lars Ingebrigtsen [this message]
2022-05-14 15:33 ` Lars Ingebrigtsen
2022-05-15 10:45 ` Simen Heggestøyl
2022-05-15 12:14 ` Lars Ingebrigtsen
2022-05-15 14:46 ` Simen Heggestøyl
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878rr4kzrh.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=53203@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=my.old.email.sucked@gmail.com \
--cc=simenheg@runbox.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).