[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/jade-mode 4e7a20db49 084/128: Merge pull request #38 from
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/jade-mode 4e7a20db49 084/128: Merge pull request #38 from tjefferson08/37_highlight_strings_in_parens |
Date: |
Sat, 29 Jan 2022 08:24:49 -0500 (EST) |
branch: elpa/jade-mode
commit 4e7a20db492719062f40b225ed730ed50be5db56
Merge: 03486dce69 351f756569
Author: Travis Jefferson <tjefferson@signpost.com>
Commit: Travis Jefferson <tjefferson@signpost.com>
Merge pull request #38 from tjefferson08/37_highlight_strings_in_parens
[#37] Highlight string lit. manually - Closes #37
---
example.jade | 3 ++-
jade-mode.el | 16 +++++-----------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/example.jade b/example.jade
index f7e0482632..ca47edd415 100644
--- a/example.jade
+++ b/example.jade
@@ -19,10 +19,11 @@ html(lang="en")
- else
p Get on it!
form
- input(type: "text", name='user[name]', readonly: true, disabled)
+ input(type = "text", name='user[name]', readonly = true, disabled)
div#single-quote.example
= 'this single quote should highlight as a string'
= 'this one' + "and this should too"
+ span= 'another' + "quote example"
span this one shouldn't higlight strings or... .other #things if else
| this one shouldn't highlight strings, and the same goes for
.keywords #ok ?
div#paren.content.example(style = 'float-left') Content .here #should
be plain if for
diff --git a/jade-mode.el b/jade-mode.el
index 42b9f5957e..1639fc74ff 100644
--- a/jade-mode.el
+++ b/jade-mode.el
@@ -77,15 +77,9 @@
(defvar jade-font-lock-keywords
`(
- ;; higlight string literals on lines beginning with an equals sign
- ;; TODO improve this to play nice with attribute assignments in
- ;; parentheses following tags
- (,(concat "^\\s-*"
- "=")
- (,(concat jade-single-quote-string-re "\\|"
jade-double-quote-string-re)
- nil
- nil
- (0 font-lock-string-face)))
+ ;; highlight string literals everywhere (except where we later
+ ;; remove all font lock faces)
+ (,(concat jade-single-quote-string-re "\\|" jade-double-quote-string-re) .
font-lock-string-face)
(,"!!!\\|doctype\\( ?[A-Za-z0-9\-\_]*\\)?" 0 font-lock-comment-face) ;;
doctype
(,jade-keywords . font-lock-keyword-face) ;; keywords
@@ -298,8 +292,8 @@ Follows indentation behavior of `indent-rigidly'."
(define-key jade-mode-map [backtab] 'jade-unindent)
(define-key jade-mode-map (kbd "RET") 'jade-newline-and-indent)
- ;; highlight syntax
- (setq font-lock-defaults '(jade-font-lock-keywords)))
+ ;; highlight keywords, ignore syntactic font-lock
+ (setq font-lock-defaults '(jade-font-lock-keywords t)))
;;;###autoload
- [nongnu] elpa/jade-mode fd367b9489 076/128: Remove unnecessary code from README, (continued)
- [nongnu] elpa/jade-mode fd367b9489 076/128: Remove unnecessary code from README, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode dfeadc97a5 069/128: Merge pull request #31 from tjefferson08/26_comment_highlight, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 6b9d9507e2 010/128: can detect simple region sexps, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode d28d1810fa 007/128: basic decrement tab working, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode cb82d16486 017/128: jade-mode depends on sws-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode e4c668bde5 023/128: Have documentation such that jade-mode is used for .jade files., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 2b093c23d2 071/128: [#20] add single quote ex. (currently incorrect), ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 03486dce69 082/128: Merge pull request #33 from mgalgs/master, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode cb0f564166 066/128: remove jade-mode dependency on sws-mode, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode e128ce3b07 067/128: add custom indent functions for line/region, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 4e7a20db49 084/128: Merge pull request #38 from tjefferson08/37_highlight_strings_in_parens,
ELPA Syncer <=
- [nongnu] elpa/jade-mode 40efeb499a 064/128: Indent using the number of lines in a region instead of the location of point within the original region., ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 2c830e70e0 075/128: Use \\' instead of $, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 519b455d1f 113/128: Add melpa badge and flycheck support note, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode ce2400711d 107/128: get mixin parameters to highlight correctly, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode fe250570ee 110/128: install cask in TCI setup, remove emacs 23 build, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 6a3a936de8 112/128: Merge pull request #57 from tjefferson08/makefile-and-mixin-cleanup, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 1ebb5134b6 119/128: Files with ".pug" extension are now detected, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 0d0bbf6073 118/128: Merge pull request #63 from robbyoconnor/fix-grammar-error, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode fd48e74686 120/128: Merge pull request #67 from Emeraude/pug-rename, ELPA Syncer, 2022/01/29
- [nongnu] elpa/jade-mode 8f8e3154e4 123/128: Derive from text-mode, remove unneeded code, ELPA Syncer, 2022/01/29