[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/nix-mode 8118a807a7 346/500: Handle more edge cases in key
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/nix-mode 8118a807a7 346/500: Handle more edge cases in keywords |
Date: |
Sat, 29 Jan 2022 08:27:19 -0500 (EST) |
branch: elpa/nix-mode
commit 8118a807a7cc643686a0ba133c6b5f56ccb1b293
Author: Matthew Bauer <mjbauer95@gmail.com>
Commit: Matthew Bauer <mjbauer95@gmail.com>
Handle more edge cases in keywords
when a symbol comes after or before the keyword, it is still okay to
use as a keyword.
---
nix-mode.el | 4 ++--
tests/nix-font-lock-tests.el | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nix-mode.el b/nix-mode.el
index b1a263465a..2e873a45e6 100644
--- a/nix-mode.el
+++ b/nix-mode.el
@@ -132,9 +132,9 @@ very large Nix files (all-packages.nix)."
"Produce a regexp matching some keywords of Nix.
KEYWORDS a list of strings to match as Nix keywords."
(concat
- "\\(?:[[:space:]]\\|^\\)"
+ "\\(?:[[:space:];:{}()]\\|^\\)"
(regexp-opt keywords t)
- "\\(?:[[:space:]]\\|$\\)"
+ "\\(?:[[:space:];:{}()]\\|$\\)"
))
(defconst nix-font-lock-keywords
diff --git a/tests/nix-font-lock-tests.el b/tests/nix-font-lock-tests.el
index e2fdfd457b..5abdb5744f 100644
--- a/tests/nix-font-lock-tests.el
+++ b/tests/nix-font-lock-tests.el
@@ -76,7 +76,7 @@ if all of its characters have syntax and face. See
(ert-deftest nix-issue-84 ()
(check-properties
- '("{ with-a ? { let-in = 1; } , ... }: with with-a; { foo = \"bar\"; }")
+ '("{ with-a ? {let-in=1; } , ... }:with with-a; { foo = \"bar\"; }")
'(("let-in" t nix-attribute-face)
("with" t nix-keyword-face)
("foo" t nix-attribute-face))))
- [nongnu] elpa/nix-mode 1cda7dabbc 309/500: Bug fix: replace memq with member, (continued)
- [nongnu] elpa/nix-mode 1cda7dabbc 309/500: Bug fix: replace memq with member, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 4016a1c89b 321/500: Release 1.4.0, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 91834848b4 320/500: Generate AUTHORS.md, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 0bab799a87 325/500: Add failing test that checks indentation of closing parens., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode dd5f937a49 331/500: Change the description of a couple of tests., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 10ac680cd6 332/500: Merge pull request #80 from j-piecuch/smie-tweaks, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 907336cd0b 337/500: Silence byte compiler warnings in nix-shell, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 2f4bd0f09c 336/500: Release 1.4.1, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 00750803d9 356/500: Don't freeze full executable paths at load time, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 3248864b56 348/500: Add failing tests that check for correct lexing of angle paths., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 8118a807a7 346/500: Handle more edge cases in keywords,
ELPA Syncer <=
- [nongnu] elpa/nix-mode c2725000ab 349/500: Use pcase-exhaustive instead of pcase in nix-smie--skip-path, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 795cc0c4c5 350/500: Handle angle paths correctly, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode a0fc6db303 365/500: Fix testcase file name., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode f77ae8fb54 380/500: Add more builtins, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode e4e604ae3a 389/500: Release 1.4.4, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 228f9f9d39 387/500: Release 1.4.3, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode bdfe3b3ae3 391/500: Fix nix-get-completions, add to nix-repl-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 70af0efc9f 076/500: Fix antiquote closing brace., ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 59e9ca0abd 084/500: Improve fontification, ELPA Syncer, 2022/01/29
- [nongnu] elpa/nix-mode 68793d91c5 107/500: Add require 'cl for case statements., ELPA Syncer, 2022/01/29