mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-26 07:33:47 +00:00
Propertize character literals and special global variables differently
* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize): Propertize character literals and global variables with special names with prefix and symbol syntax classes, for SMIE to tokenize them together automatically. (ruby-font-lock-keywords): Fix an old regression in highlighting character literals.
This commit is contained in:
parent
a7d6f39d8a
commit
28532a91a9
@ -1844,13 +1844,15 @@ It will be properly highlighted even when the call omits parens.")
|
||||
(syntax-propertize-rules
|
||||
;; $' $" $` .... are variables.
|
||||
;; ?' ?" ?` are character literals (one-char strings in 1.9+).
|
||||
("\\([?$]\\)[#\"'`]"
|
||||
("\\([?$]\\)[#\"'`:?]"
|
||||
(1 (if (save-excursion
|
||||
(nth 3 (syntax-ppss (match-beginning 0))))
|
||||
;; Within a string, skip.
|
||||
(ignore
|
||||
(goto-char (match-end 1)))
|
||||
(string-to-syntax "\\"))))
|
||||
(put-text-property (match-end 1) (match-end 0)
|
||||
'syntax-table (string-to-syntax "_"))
|
||||
(string-to-syntax "'"))))
|
||||
;; Symbols with special characters.
|
||||
("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\)\\)"
|
||||
(3 (string-to-syntax "_")))
|
||||
@ -2222,7 +2224,7 @@ See `font-lock-syntax-table'.")
|
||||
1 font-lock-negation-char-face)
|
||||
;; Character literals.
|
||||
;; FIXME: Support longer escape sequences.
|
||||
("\\_<\\?\\\\?\\S " 0 font-lock-string-face)
|
||||
("\\?\\\\?\\_<.\\_>" 0 font-lock-string-face)
|
||||
;; Regexp options.
|
||||
("\\(?:\\s|\\|/\\)\\([imxo]+\\)"
|
||||
1 (when (save-excursion
|
||||
|
@ -174,6 +174,9 @@ def test2 (arg)
|
||||
bar,
|
||||
:a
|
||||
|
||||
b = $:
|
||||
c = ??
|
||||
|
||||
# Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
|
||||
d = 4 + 5 + # no '\' needed
|
||||
6 + 7
|
||||
|
Loading…
Reference in New Issue
Block a user