mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-05 22:20:24 -08:00
73feb431b3
Rename a couple of faces to solidify the convention that the face name 'elisp-foo' implies "references to foo", not "foo definitions". For definitions we use 'elisp-deffoo' if foo is only one word, or 'elisp-bar-baz-definition' otherwise. * lisp/progmodes/elisp-mode.el (elisp-function-reference): Rename to 'elisp-function'. (elisp-macro-call): Rename to 'elisp-macro'. (elisp-non-local-exit): (elisp-unknown-call): (elisp-special-form): * lisp/emacs-lisp/elisp-scope.el: * test/lisp/progmodes/elisp-mode-resources/semantic-highlighting.el: Update references to renamed faces.
125 lines
4.9 KiB
EmacsLisp
125 lines
4.9 KiB
EmacsLisp
;;; semantic-highlighting.el --- -*- lexical-binding: t; -*-
|
|
|
|
(defun foo (bar)
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ (elisp-defun font-lock-function-name-face)
|
|
;; ^ elisp-binding-variable
|
|
(let ((cpa current-prefix-arg))
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-binding-variable
|
|
;; ^ elisp-free-variable
|
|
(or cpa (ignore bar)))
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-bound-variable
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
)
|
|
|
|
(add-face-text-property
|
|
;; ^ elisp-function
|
|
(point) (mark)
|
|
;; ^ elisp-function
|
|
;; ^ elisp-function
|
|
(if not-good
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-free-variable
|
|
'error
|
|
;; ^ elisp-face
|
|
(message "Good.")
|
|
;; ^ elisp-function
|
|
'success))
|
|
;; ^ elisp-face
|
|
|
|
(require 'cl-lib)
|
|
;; ^ (elisp-function font-lock-keyword-face)
|
|
;; ^ (elisp-feature font-lock-constant-face)
|
|
|
|
;; Taken from `completion-shorthand-try-completion' in minibuffer.el:
|
|
(defun foobaz (string table pred point)
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ (elisp-defun font-lock-function-name-face)
|
|
;; ^ ^ ^ ^ elisp-binding-variable
|
|
(cl-loop with expanded
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ elisp-binding-variable
|
|
for (short . long) in
|
|
;; ^ elisp-binding-variable
|
|
;; ^ elisp-binding-variable
|
|
(with-current-buffer minibuffer--original-buffer
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ elisp-free-variable
|
|
read-symbol-shorthands)
|
|
;; ^ elisp-free-variable
|
|
for probe =
|
|
;; ^ elisp-binding-variable
|
|
(and (> point (length short))
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
(string-prefix-p short string)
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
;; ^ elisp-bound-variable
|
|
(try-completion (setq expanded
|
|
;; ^ elisp-function
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-bound-variable
|
|
(concat long
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
(substring
|
|
;; ^ elisp-function
|
|
string
|
|
;; ^ elisp-bound-variable
|
|
(length short))))
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
table pred))
|
|
;; ^ elisp-bound-variable
|
|
;; ^ elisp-bound-variable
|
|
when probe
|
|
;; ^ elisp-bound-variable
|
|
do (message "Shorthand expansion")
|
|
;; ^ elisp-function
|
|
and return (cons expanded (max (length long)
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
;; ^ elisp-function
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
(+ (- point (length short))
|
|
;; ^ elisp-function
|
|
;; ^ elisp-function
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
(length long))))))
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
|
|
(let ((foo 'bar))
|
|
;; ^ (elisp-special-form font-lock-keyword-face)
|
|
;; ^ elisp-binding-variable
|
|
(cl-flet ((foo () 'baz))
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ elisp-function
|
|
(foo)
|
|
;; ^ elisp-function
|
|
(cl-macrolet ((foo () 'foo))
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ elisp-macro
|
|
(foo))))
|
|
;; ^ elisp-macro
|
|
|
|
(when-let* ((foo (symbol-at-point))
|
|
;; ^ (elisp-macro font-lock-keyword-face)
|
|
;; ^ elisp-binding-variable
|
|
;; ^ elisp-function
|
|
current-prefix-arg
|
|
;; ^ elisp-shadowing-variable
|
|
((commandp foo)))
|
|
;; ^ elisp-function
|
|
;; ^ elisp-bound-variable
|
|
foo)
|
|
;; ^ elisp-bound-variable
|