From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#28218: 26.0.50; TOML table name fontification on lines with comments Date: Fri, 25 Aug 2017 09:57:02 -0600 Message-ID: <87lgm7iqsx.fsf@tromey.com> References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1503676757 3848 195.159.176.226 (25 Aug 2017 15:59:17 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 25 Aug 2017 15:59:17 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) Cc: 28218@debbugs.gnu.org To: Kaushal Modi Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Aug 25 17:59:11 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlH0m-0000aS-1Z for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Aug 2017 17:59:08 +0200 Original-Received: from localhost ([::1]:53872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dlH0s-0007yW-QE for geb-bug-gnu-emacs@m.gmane.org; Fri, 25 Aug 2017 11:59:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dlGzm-0007TR-Nf for bug-gnu-emacs@gnu.org; Fri, 25 Aug 2017 11:58:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dlGzi-00042d-P2 for bug-gnu-emacs@gnu.org; Fri, 25 Aug 2017 11:58:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46030) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dlGzi-00042X-HY for bug-gnu-emacs@gnu.org; Fri, 25 Aug 2017 11:58:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dlGzi-0004iS-3y for bug-gnu-emacs@gnu.org; Fri, 25 Aug 2017 11:58:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 25 Aug 2017 15:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28218 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 28218-submit@debbugs.gnu.org id=B28218.150367663618075 (code B ref 28218); Fri, 25 Aug 2017 15:58:02 +0000 Original-Received: (at 28218) by debbugs.gnu.org; 25 Aug 2017 15:57:16 +0000 Original-Received: from localhost ([127.0.0.1]:54711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlGyy-0004hT-Dr for submit@debbugs.gnu.org; Fri, 25 Aug 2017 11:57:16 -0400 Original-Received: from gproxy9-pub.mail.unifiedlayer.com ([69.89.20.122]:42812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dlGyx-0004hF-2L for 28218@debbugs.gnu.org; Fri, 25 Aug 2017 11:57:15 -0400 Original-Received: from cmgw4 (unknown [10.0.90.85]) by gproxy9.mail.unifiedlayer.com (Postfix) with ESMTP id E954B1E07AA for <28218@debbugs.gnu.org>; Fri, 25 Aug 2017 09:57:07 -0600 (MDT) Original-Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id 1Tx31w01x2f2jeq01Tx6zQ; Fri, 25 Aug 2017 09:57:07 -0600 X-Authority-Analysis: v=2.2 cv=G8xsK5s5 c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=KeKAF7QvOSUA:10 a=8pgpC_iS6D8F2OzkgeQA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:Date:CC:References: In-Reply-To:Subject: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=yfnnzwRnOsQj5sQ7hrgGfivp22ljoh/TxcA2MFJD/Qk=; b=t1dCGMqE5ScKmrEOl2T8V2uAuj BspQiggmYHcBUHpbXk2XS7RDTLBc9mueXRqexiR36LWOb0gpthDoVAiHI6L0nd2gyioKXQVgFcg6F WbaS7idaTb4UIqLoFn9KMBHLC; Original-Received: from 75-166-24-97.hlrn.qwest.net ([75.166.24.97]:39742 helo=bapiya) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.87) (envelope-from ) id 1dlGyl-001Aaq-Hn; Fri, 25 Aug 2017 09:57:03 -0600 In-Reply-To: (Kaushal Modi's message of "Thu, 24 Aug 2017 13:34:07 +0000") X-Attribution: Tom X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 75.166.24.97 X-Exim-ID: 1dlGyl-001Aaq-Hn X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-24-97.hlrn.qwest.net (bapiya) [75.166.24.97]:39742 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-Local-Domain: yes X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:136203 Archived-At: Oops, meant to CC the bug. >> As soon as I saw it, I tested it out with my Hugo blog config.toml. Nice, thanks. >> Everything looks good except for fontification on lines that have >> comments with square brackets (see the attached screenshot) The appended patch worked ok on these examples for me. Maybe it isn't ideal because I think you can do weird things like: [section."quoted[]name"] ... and this regexp won't pick that up. I'm inclined to install this anyway, since it's an improvement, even though it isn't perfect. Hmm, maybe it can be fixed using a function to search for the matching bracket. I will give that a try. Tom diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el index 7bcc695..38d617e 100644 --- a/lisp/textmodes/conf-mode.el +++ b/lisp/textmodes/conf-mode.el @@ -254,9 +254,9 @@ conf-colon-font-lock-keywords (defvar conf-toml-font-lock-keywords '(;; [section] (do this first because it may look like a parameter) - ("^[ \t]*\\[\\(.+\\)\\]" 1 'font-lock-type-face) + ("^\\s-*\\[\\([^]]+\\)\\]" 1 'font-lock-type-face) ;; var=val or var[index]=val - ("^[ \t]*\\(.+?\\)\\(?:\\[\\(.*?\\)\\]\\)?[ \t]*=" + ("^\\s-*\\(.+?\\)\\(?:\\[\\(.*?\\)\\]\\)?\\s-*=" (1 'font-lock-variable-name-face) (2 'font-lock-constant-face nil t)) ("\\_" 0 'font-lock-keyword-face))