branch: elpa/rust-mode
commit 304ae4bab477873b3e5a9898728210667c62738a
Author: Georg Brandl <[email protected]>
Commit: Georg Brandl <[email protected]>
Change font-lock face for module names.
Use font-lock-constant-face instead of font-lock-type-face. Especially in
paths, this
tones down the importance of the path prefix, and makes the suffix more
visible.
---
rust-mode-tests.el | 28 +++++++++++++++++++++++-----
rust-mode.el | 42 ++++++++++++++++++++++++------------------
2 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/rust-mode-tests.el b/rust-mode-tests.el
index 8375d35..8390ab6 100644
--- a/rust-mode-tests.el
+++ b/rust-mode-tests.el
@@ -1422,16 +1422,34 @@ this_is_not_a_string();)"
"\"/*! doc */\""
'("\"/*! doc */\"" font-lock-string-face)))
-(ert-deftest font-lock-module ()
+(ert-deftest font-lock-module-def ()
+ (rust-test-font-lock
+ "mod foo;"
+ '("mod" font-lock-keyword-face
+ "foo" font-lock-constant-face)))
+
+(ert-deftest font-lock-module-use ()
+ (rust-test-font-lock
+ "use foo;"
+ '("use" font-lock-keyword-face
+ "foo" font-lock-constant-face)))
+
+(ert-deftest font-lock-module-path ()
(rust-test-font-lock
"foo::bar"
- '("foo" font-lock-type-face)))
+ '("foo" font-lock-constant-face)))
-(ert-deftest font-lock-submodule ()
+(ert-deftest font-lock-submodule-path ()
(rust-test-font-lock
"foo::bar::baz"
- '("foo" font-lock-type-face
- "bar" font-lock-type-face)))
+ '("foo" font-lock-constant-face
+ "bar" font-lock-constant-face)))
+
+(ert-deftest font-lock-type ()
+ (rust-test-font-lock
+ "foo::Bar::baz"
+ '("foo" font-lock-constant-face
+ "Bar" font-lock-type-face)))
(ert-deftest font-lock-type-annotation ()
"Ensure type annotations are not confused with modules."
diff --git a/rust-mode.el b/rust-mode.el
index a1a3db4..72e1e70 100644
--- a/rust-mode.el
+++ b/rust-mode.el
@@ -28,6 +28,8 @@
(list 'set (list 'make-local-variable (list 'quote var)) val))))
(defconst rust-re-ident
"[[:word:][:multibyte:]_][[:word:][:multibyte:]_[:digit:]]*")
+(defconst rust-re-lc-ident
"[[:lower:][:multibyte:]_][[:word:][:multibyte:]_[:digit:]]*")
+(defconst rust-re-uc-ident "[[:upper:]][[:word:][:multibyte:]_[:digit:]]*")
(defconst rust-re-non-standard-string
(rx
@@ -527,19 +529,21 @@ function or trait. When nil, where will be aligned with
fn or trait."
(defconst rust-re-special-types (regexp-opt-symbols rust-special-types))
-(defun rust-module-font-lock-matcher (limit)
- "Matches module names \"foo::\" but does not match type annotations
\"foo::<\"."
- (block nil
- (while t
- (let* ((symbol-then-colons (rx-to-string `(seq (group (regexp
,rust-re-ident)) "::")))
- (match (re-search-forward symbol-then-colons limit t)))
- (cond
- ;; If we didn't find a match, there are no more occurrences
- ;; of foo::, so return.
- ((null match) (return nil))
- ;; If this isn't a type annotation foo::<, we've found a
- ;; match, so a return it!
- ((not (looking-at (rx (0+ space) "<"))) (return match)))))))
+(defun rust-path-font-lock-matcher (re-ident)
+ "Matches names like \"foo::\" or \"Foo::\" (depending on RE-IDENT, which
should match
+the desired identifiers), but does not match type annotations \"foo::<\"."
+ `(lambda (limit)
+ (block nil
+ (while t
+ (let* ((symbol-then-colons (rx-to-string '(seq (group (regexp
,re-ident)) "::")))
+ (match (re-search-forward symbol-then-colons limit t)))
+ (cond
+ ;; If we didn't find a match, there are no more occurrences
+ ;; of foo::, so return.
+ ((null match) (return nil))
+ ;; If this isn't a type annotation foo::<, we've found a
+ ;; match, so a return it!
+ ((not (looking-at (rx (0+ space) "<"))) (return match))))))))
(defvar rust-mode-font-lock-keywords
(append
@@ -564,8 +568,11 @@ function or trait. When nil, where will be aligned with
fn or trait."
;; Field names like `foo:`, highlight excluding the :
(,(concat (rust-re-grab rust-re-ident) ":[^:]") 1
font-lock-variable-name-face)
+ ;; Type names like `Foo::`, highlight excluding the ::
+ (,(rust-path-font-lock-matcher rust-re-uc-ident) 1 font-lock-type-face)
+
;; Module names like `foo::`, highlight excluding the ::
- (rust-module-font-lock-matcher 1 font-lock-type-face)
+ (,(rust-path-font-lock-matcher rust-re-lc-ident) 1
font-lock-constant-face)
;; Lifetimes like `'foo`
(,(concat "'" (rust-re-grab rust-re-ident) "[^']") 1
font-lock-variable-name-face)
@@ -581,10 +588,9 @@ function or trait. When nil, where will be aligned with
fn or trait."
'(("enum" . font-lock-type-face)
("struct" . font-lock-type-face)
("type" . font-lock-type-face)
- ("mod" . font-lock-type-face)
- ("use" . font-lock-type-face)
- ("fn" . font-lock-function-name-face)
- ("static" . font-lock-constant-face)))))
+ ("mod" . font-lock-constant-face)
+ ("use" . font-lock-constant-face)
+ ("fn" . font-lock-function-name-face)))))
(defvar font-lock-beg)
(defvar font-lock-end)
