From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs 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 Message-ID: <878rr4kzrh.fsf@gnus.org> References: <83r19d5c1i.fsf@gnu.org> <87wnj486il.fsf@gnus.org> <87mtfks8r2.fsf@runbox.com> <87czggl26a.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="37562"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: Eli Zaretskii , 53203@debbugs.gnu.org, Colin To: Simen =?UTF-8?Q?Heggest=C3=B8yl?= Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat May 14 15:31:11 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nprrT-0009aB-9C for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 14 May 2022 15:31:11 +0200 Original-Received: from localhost ([::1]:40002 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nprrR-0005Xv-Pj for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 14 May 2022 09:31:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nprrK-0005Xm-Lf for bug-gnu-emacs@gnu.org; Sat, 14 May 2022 09:31:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nprrK-0005gK-Cg for bug-gnu-emacs@gnu.org; Sat, 14 May 2022 09:31:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nprrK-0006u4-8B for bug-gnu-emacs@gnu.org; Sat, 14 May 2022 09:31:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 14 May 2022 13:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53203 X-GNU-PR-Package: emacs Original-Received: via spool by 53203-submit@debbugs.gnu.org id=B53203.165253503926502 (code B ref 53203); Sat, 14 May 2022 13:31:02 +0000 Original-Received: (at 53203) by debbugs.gnu.org; 14 May 2022 13:30:39 +0000 Original-Received: from localhost ([127.0.0.1]:45999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nprqw-0006tN-Ks for submit@debbugs.gnu.org; Sat, 14 May 2022 09:30:38 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:49146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nprqv-0006t6-6H for 53203@debbugs.gnu.org; Sat, 14 May 2022 09:30:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=JoX8JILU1pb9iNvunTB5nn1qDhGYBg+NDaLsixcdbi8=; b=GigsGQ61A8+gjlaXEz54XqJr2+ NhVoiPL0dgEWJyBFHi9z99nKaqahxLA14tagG/1yy8J0OqTO5FANl4FIN2utnCa1BROgNqqLUNYO9 iUWAvU6AU3LK/UIxCILGiyHUGE5cc3lpfy8GA3RSJTAacUVe82vzy1WyqJKl0RtOtfEk=; Original-Received: from 77.18.168.214.tmi.telenormobil.no ([77.18.168.214] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nprql-0004aC-L9; Sat, 14 May 2022 15:30:30 +0200 In-Reply-To: <87czggl26a.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sat, 14 May 2022 14:38:21 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:232235 Archived-At: 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