From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 16:35:43 2016 Received: (at submit) by debbugs.gnu.org; 31 Jan 2016 21:35:43 +0000 Received: from localhost ([127.0.0.1]:43494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPzep-00072l-Ki for submit@debbugs.gnu.org; Sun, 31 Jan 2016 16:35:43 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38271) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPzen-00072Z-P8 for submit@debbugs.gnu.org; Sun, 31 Jan 2016 16:35:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPzeh-0003w3-Hj for submit@debbugs.gnu.org; Sun, 31 Jan 2016 16:35:36 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, HTML_MESSAGE,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:48874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzeh-0003vy-Ez for submit@debbugs.gnu.org; Sun, 31 Jan 2016 16:35:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57471) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzeg-000532-DA for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:35:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPzeb-0003u1-DD for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:35:34 -0500 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]:36213) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPzeb-0003tn-2A for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 16:35:29 -0500 Received: by mail-wm0-x233.google.com with SMTP id p63so45223808wmp.1 for ; Sun, 31 Jan 2016 13:35:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:subject:to:cc:message-id:mime-version:content-type; bh=gtgyLh2nOoQsMmqRDNAVxpcH8bdcIOZsitfZ5RnFNEM=; b=l1ZWuWi0uxoYGLi2WRQZGihmsx8sQgk02QTKHaeN90ReRfOYnudp/7M9fFI0uEejV+ X4HfnOVzEVR4+cEINibm3jNY2QOk5fUtpMlA/7Gc54dJ12jCK6YI7IbBqSW16bM8BkFa KLCuuJqLNqVG9lTUAyQMaqc9JaNrBq6LJoUjjBc8IIyyu6XKONgXSMI938i1yK4GUh/N vaB27MyxJxLMoRcCecsiRML+3i+esewUEWCatwxnf/A7uuSHDHqtGX35J+O1YvNoIx5Z BSJoEpWqzzTVAuiMzPEmxkK7m0O9udjU5lzEKerMKkZM8wjHWs22ChRyQ0FSVDCkbOKi x42w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:subject:to:cc:message-id:mime-version :content-type; bh=gtgyLh2nOoQsMmqRDNAVxpcH8bdcIOZsitfZ5RnFNEM=; b=ApJcqMM2uFjPEAkDVh4lQPlCYW/YNQ9RH0hke3tRyv2pqCnVO1yCg6tH20hHHEp+BH rvinuwVk716exZRcnpOFFaVf24Os0sBhn2lNAP2zU3n0pBs9UaPdvQtqK9RK5QKPj9d1 6Qr6cYrFyEYqKqWKyjADw1Sjuzh87gmrHRHL/FY8iGfodqWQm8jT9m7BYCicc72+wvY6 wIFJJk2ws0LMsdQ35hzf2jlXSpMs8NJV7frh9ptzp0KgPWGWWY0bnYk4iO4ViSEcyJCE tfimS5z2IjFsBEpAiZn0V0ZnQUCRSkWsCSJYBVLy7j9iacQNtobtX9GyjUqaq86n6g5Y 1c4Q== X-Gm-Message-State: AG10YORjZYokloS9hFhIXlCeLFu/t+EJ0knE+10XMN1nKcaN31qOUk3xAuNhvAFlRld00A== X-Received: by 10.194.116.71 with SMTP id ju7mr21779034wjb.2.1454276128073; Sun, 31 Jan 2016 13:35:28 -0800 (PST) Received: from [192.168.100.6] (cm-84.210.143.4.getinternet.no. [84.210.143.4]) by smtp.gmail.com with ESMTPSA id js8sm26005269wjc.37.2016.01.31.13.35.26 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 31 Jan 2016 13:35:27 -0800 (PST) Date: Sun, 31 Jan 2016 22:35:25 +0100 From: Simen =?iso-8859-1?q?Heggest=F8yl?= Subject: [PATCH] Highlight two additional SCSS keywords To: bug-gnu-emacs@gnu.org Message-Id: <1454276125.9296.0@smtp.gmail.com> X-Mailer: geary/0.10.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-V7c9SXCCMButEkpqnGXj" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Stefan Monnier X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) --=-V7c9SXCCMButEkpqnGXj Content-Type: multipart/alternative; boundary="=-MicHDCBj43pTDyMWlrym" --=-MicHDCBj43pTDyMWlrym Content-Type: text/plain; charset=utf-8; format=flowed Hello! The attached patch adds highlighting for two additional "bang identifiers" in SCSS mode: !default and !optional. -- Simen --=-MicHDCBj43pTDyMWlrym Content-Type: text/html; charset=utf-8
Hello!

The attached patch adds highlighting for two additional "bang
identifiers" in SCSS mode: !default and !optional.

-- Simen
--=-MicHDCBj43pTDyMWlrym-- --=-V7c9SXCCMButEkpqnGXj Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Highlight-two-additional-SCSS-keywords.patch >From b9f1b493c36a51024b8fbc2cc9ba302f1437bf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20Heggest=C3=B8yl?= Date: Sun, 31 Jan 2016 22:03:23 +0100 Subject: [PATCH] Highlight two additional SCSS keywords * lisp/textmodes/css-mode.el (css-bang-ids): New defconst holding CSS identifiers on the form !foo. (scss-bang-ids): New defconst holding SCSS identifiers on the form !foo. (css--font-lock-keywords): Highlight the new SCSS bang identifiers in `font-lock-builtin-face'. * test/indent/css-mode.css: Add bang rule test case. * test/indent/scss-mode.css: Add test cases for the introduced bang rules. --- lisp/textmodes/css-mode.el | 12 ++++++++++-- test/indent/css-mode.css | 2 +- test/indent/scss-mode.scss | 11 ++++++++++- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index 96a82ba..b3a41d3 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -54,6 +54,14 @@ css-at-ids '("charset" "font-face" "import" "media" "namespace" "page") "Identifiers that appear in the form @foo.") +(defconst css-bang-ids + '("important") + "Identifiers that appear in the form !foo.") + +(defconst scss-bang-ids + '("default" "global" "optional") + "Additional identifiers that appear in the form !foo in SCSS.") + (defconst css-descriptor-ids '("ascent" "baseline" "bbox" "cap-height" "centerline" "definition-src" "descent" "font-family" "font-size" "font-stretch" "font-style" @@ -236,8 +244,8 @@ css-proprietary-property (defun css--font-lock-keywords (&optional sassy) `((,(concat "!\\s-*" - (regexp-opt (append (if sassy '("global")) - '("important")))) + (regexp-opt (append (if sassy scss-bang-ids) + css-bang-ids))) (0 font-lock-builtin-face)) ;; Atrules keywords. IDs not in css-at-ids are valid (ignored). ;; In fact the regexp should probably be diff --git a/test/indent/css-mode.css b/test/indent/css-mode.css index 24166b0..3a00739 100644 --- a/test/indent/css-mode.css +++ b/test/indent/css-mode.css @@ -9,7 +9,7 @@ article[role="main"] { } a, b:hover, c { - color: black; + color: black !important; } a, b:hover { /* bug:20282 */ diff --git a/test/indent/scss-mode.scss b/test/indent/scss-mode.scss index 02a4a98..e1ec90a 100644 --- a/test/indent/scss-mode.scss +++ b/test/indent/scss-mode.scss @@ -40,11 +40,20 @@ p.#{$name} var } article[role="main"] { $toto: 500 !global; - float: left; + $var-with-default: 300 !default; + float: left !important; width: 600px / 888px * 100%; height: 100px / 888px * 100%; } +%placeholder { + color: #f0f0f0; +} + +button { + @extend %placeholder !optional; +} + @import 'reset'; @mixin border-radius($radius) { -- 2.7.0 --=-V7c9SXCCMButEkpqnGXj-- From debbugs-submit-bounces@debbugs.gnu.org Sun Jan 31 21:33:45 2016 Received: (at submit) by debbugs.gnu.org; 1 Feb 2016 02:33:45 +0000 Received: from localhost ([127.0.0.1]:43677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQ4JF-00072f-40 for submit@debbugs.gnu.org; Sun, 31 Jan 2016 21:33:45 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55228) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQ4JD-00072P-HG for submit@debbugs.gnu.org; Sun, 31 Jan 2016 21:33:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQ4J7-0007Js-JV for submit@debbugs.gnu.org; Sun, 31 Jan 2016 21:33:38 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:39935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQ4J7-0007Jo-Fb for submit@debbugs.gnu.org; Sun, 31 Jan 2016 21:33:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQ4J6-0008Io-OW for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 21:33:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQ4J3-0007IV-Iz for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 21:33:36 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:61071) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQ4J3-0007I0-FW for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 21:33:33 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0AsEwA731xV/3+SCkxcgxCEAoVVuzcJh0sEAgKBPDkUAQEBAQEBAYEKQQWDXQEBAwFWIwULCzQSFBgNJIg3CM8jAQEBAQYBAQEBAR2LOoUFB4QtBYwwpw+BRSNhgzUggngBAQE X-IPAS-Result: A0AsEwA731xV/3+SCkxcgxCEAoVVuzcJh0sEAgKBPDkUAQEBAQEBAYEKQQWDXQEBAwFWIwULCzQSFBgNJIg3CM8jAQEBAQYBAQEBAR2LOoUFB4QtBYwwpw+BRSNhgzUggngBAQE X-IronPort-AV: E=Sophos;i="5.13,465,1427774400"; d="scan'208";a="192061017" Received: from 76-10-146-127.dsl.teksavvy.com (HELO fmsmemgm.homelinux.net) ([76.10.146.127]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 31 Jan 2016 21:33:30 -0500 Received: by fmsmemgm.homelinux.net (Postfix, from userid 20848) id 69236AE605; Sun, 31 Jan 2016 21:33:30 -0500 (EST) From: Stefan Monnier To: Simen =?iso-8859-1?Q?Heggest=F8yl?= Subject: Re: [PATCH] Highlight two additional SCSS keywords Message-ID: References: <1454276125.9296.0@smtp.gmail.com> Date: Sun, 31 Jan 2016 21:33:30 -0500 In-Reply-To: <1454276125.9296.0@smtp.gmail.com> ("Simen =?iso-8859-1?Q?Heg?= =?iso-8859-1?Q?gest=F8yl=22's?= message of "Sun, 31 Jan 2016 22:35:25 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: bug-gnu-emacs@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) > The attached patch adds highlighting for two additional "bang > identifiers" in SCSS mode: !default and !optional. LGTM, Stefan From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 01 15:45:33 2016 Received: (at 22508-done) by debbugs.gnu.org; 1 Feb 2016 20:45:33 +0000 Received: from localhost ([127.0.0.1]:55316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQLLo-0001YU-W4 for submit@debbugs.gnu.org; Mon, 01 Feb 2016 15:45:33 -0500 Received: from mail-lf0-f48.google.com ([209.85.215.48]:36556) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aQLLn-0001YH-6F for 22508-done@debbugs.gnu.org; Mon, 01 Feb 2016 15:45:31 -0500 Received: by mail-lf0-f48.google.com with SMTP id 78so56267955lfy.3 for <22508-done@debbugs.gnu.org>; Mon, 01 Feb 2016 12:45:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:subject:to:cc:message-id:in-reply-to:references :mime-version:content-type; bh=6t6mUu2H9aZhX+TPefeEVsS2cHDkaf4rxFqDCcXKU20=; b=D2vvwU7WwsKLp8qu+QvmS4zHo4i5JUdvJMAVU48c8b4PL/l90ty/e/QtW8FqVsTWKa PamP3pKptXuOSYJlZwSyrUdHOsdVhB/AtGPzKk9fOCDNnSfY6JRlKDbxCvmZmzfCBYcD PZSXTyXIsOim8g7iBpjci+K5dpFdZ4GPZRZPi/8QhU++MV+IhTssIvcuF9RNdLyMKl1R Z0vGPLFY/0whIYtL99doixZ6nQcu6KF4FwFl/6R1z8i2PE9RLbrv/siNE2mOgxBtijjO I3Rem7gIEooLgG9cdKybGTpVs3i7L/A4dPfL/AFKEROQ3efSbw9Wupp/Z/rtj2PErEB/ zZZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:subject:to:cc:message-id:in-reply-to :references:mime-version:content-type; bh=6t6mUu2H9aZhX+TPefeEVsS2cHDkaf4rxFqDCcXKU20=; b=ImdC1RLpu9VYZzpbyjmcHoHD1nzIGRpPn+CjMwOpdaBz7sYNQun1ONaetWxbY6MKhY pHrCIGcJER2a62Ehm2NZjZskJeHxi9knckYaKior5BIZ0H1KFhal+S9UIyMo0sfRlt/e bDdL+sLShbmUxAnDQgVhr8skDjiff7T41jUm8BlaCjJqP7VyXPH7W4E8BVxfny65uvaL W0OjitLMTYDpDvR1L53TH5JdpWGSdQd95ESUDR0gKb7BjMjxX4Ny2xXPSBFyUbBy+hQW +vGlrAFGd2DR9STy8G75zZG/05KWHqI+Ve0b4ueq2AR0/6lo4FjITV7d8NDvK/E78zPC eAxA== X-Gm-Message-State: AG10YOTJUetcMYYC2venfLzwA0daXvfS0RASCE244rO+WFt92MnUhOJzSsiNLNFQccv7lQ== X-Received: by 10.25.24.82 with SMTP id o79mr9480948lfi.144.1454359525274; Mon, 01 Feb 2016 12:45:25 -0800 (PST) Received: from [192.168.100.4] (cm-84.210.143.4.getinternet.no. [84.210.143.4]) by smtp.gmail.com with ESMTPSA id rk1sm4293085lbb.0.2016.02.01.12.45.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Feb 2016 12:45:24 -0800 (PST) Date: Mon, 01 Feb 2016 21:45:22 +0100 From: Simen =?iso-8859-1?q?Heggest=F8yl?= Subject: Re: bug#22508: [PATCH] Highlight two additional SCSS keywords To: Stefan Monnier Message-Id: <1454359522.10983.0@smtp.gmail.com> In-Reply-To: References: <1454276125.9296.0@smtp.gmail.com> <=?ISO-8859-1?Q?1454276125.9296.0@smtp.gmail.com> <"Simen_Heggest=F8?= =?ISO-8859-1?Q?yl"'s_message_of_"Sun, _31_Jan_2016_22:35:25_+0100"> X-Mailer: geary/0.10.0 MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="=-WHHOHRRhXCuL4xuPieJW" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 22508-done Cc: 22508-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --=-WHHOHRRhXCuL4xuPieJW Content-Type: text/plain; charset=utf-8; format=flowed On Mon, Feb 1, 2016 at 3:33 AM, Stefan Monnier wrote: > LGTM, > > > Stefan Thanks, installed. -- Simen --=-WHHOHRRhXCuL4xuPieJW Content-Type: text/html; charset=utf-8 On Mon, Feb 1, 2016 at 3:33 AM, Stefan Monnier <monnier@iro.umontreal.ca> wrote:
LGTM, Stefan

Thanks, installed.

-- Simen
--=-WHHOHRRhXCuL4xuPieJW-- From unknown Sun Jun 15 08:50:45 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 01 Mar 2016 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator