summaryrefslogtreecommitdiff
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2023-02-28 04:07:55 +0200
committerDmitry Gutov <dgutov@yandex.ru>2023-02-28 04:08:55 +0200
commit613de662811fccbdcc3521aef394134e8c255127 (patch)
tree6be6c79232bcf36313cba8a78a587a79ef68bbfe /lisp/progmodes
parentf601e9666d8b861712c09025711dc3a4261cb0ea (diff)
downloademacs-613de662811fccbdcc3521aef394134e8c255127.tar.gz
emacs-613de662811fccbdcc3521aef394134e8c255127.tar.bz2
emacs-613de662811fccbdcc3521aef394134e8c255127.zip
Rename the newly added -ref- faces to -use-
* lisp/font-lock.el (font-lock-variable-use-face) (font-lock-property-use-face): Rename from font-lock-variable-ref-face and font-lock-property-ref-face. Update all references (bug#61655).
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/c-ts-mode.el6
-rw-r--r--lisp/progmodes/cmake-ts-mode.el2
-rw-r--r--lisp/progmodes/csharp-mode.el20
-rw-r--r--lisp/progmodes/go-ts-mode.el6
-rw-r--r--lisp/progmodes/java-ts-mode.el6
-rw-r--r--lisp/progmodes/js.el12
-rw-r--r--lisp/progmodes/json-ts-mode.el2
-rw-r--r--lisp/progmodes/python.el6
-rw-r--r--lisp/progmodes/ruby-ts-mode.el4
-rw-r--r--lisp/progmodes/rust-ts-mode.el42
-rw-r--r--lisp/progmodes/typescript-ts-mode.el6
11 files changed, 56 insertions, 56 deletions
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 2cb6c2709cc..4b66824c44f 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -547,7 +547,7 @@ MODE is either `c' or `cpp'."
'((assignment_expression
left: (identifier) @font-lock-variable-name-face)
(assignment_expression
- left: (field_expression field: (_) @font-lock-property-ref-face))
+ left: (field_expression field: (_) @font-lock-property-use-face))
(assignment_expression
left: (pointer_expression
(identifier) @font-lock-variable-name-face))
@@ -583,7 +583,7 @@ MODE is either `c' or `cpp'."
:language mode
:feature 'property
- '((field_identifier) @font-lock-property-ref-face)
+ '((field_identifier) @font-lock-property-use-face)
:language mode
:feature 'bracket
@@ -660,7 +660,7 @@ OVERRIDE, START, END, and ARGS, see `treesit-font-lock-rules'."
"call_expression"))
(treesit-fontify-with-override
(treesit-node-start node) (treesit-node-end node)
- 'font-lock-variable-ref-face override start end)))
+ 'font-lock-variable-use-face override start end)))
(defun c-ts-mode--fontify-defun (node override start end &rest _)
"Correctly fontify the DEFUN macro.
diff --git a/lisp/progmodes/cmake-ts-mode.el b/lisp/progmodes/cmake-ts-mode.el
index a3f9279ec1c..d83a956af21 100644
--- a/lisp/progmodes/cmake-ts-mode.el
+++ b/lisp/progmodes/cmake-ts-mode.el
@@ -154,7 +154,7 @@
:language 'cmake
:feature 'variable
:override t
- '((variable) @font-lock-variable-ref-face)
+ '((variable) @font-lock-variable-use-face)
:language 'cmake
:feature 'error
diff --git a/lisp/progmodes/csharp-mode.el b/lisp/progmodes/csharp-mode.el
index 31c87171281..47cd13e7fdb 100644
--- a/lisp/progmodes/csharp-mode.el
+++ b/lisp/progmodes/csharp-mode.el
@@ -708,9 +708,9 @@ compilation and evaluation time conflicts."
(treesit-font-lock-rules
:language 'c-sharp
:feature 'expression
- '((conditional_expression (identifier) @font-lock-variable-ref-face)
- (postfix_unary_expression (identifier)* @font-lock-variable-ref-face)
- (initializer_expression (assignment_expression left: (identifier) @font-lock-variable-ref-face)))
+ '((conditional_expression (identifier) @font-lock-variable-use-face)
+ (postfix_unary_expression (identifier)* @font-lock-variable-use-face)
+ (initializer_expression (assignment_expression left: (identifier) @font-lock-variable-use-face)))
:language 'c-sharp
:feature 'bracket
@@ -739,8 +739,8 @@ compilation and evaluation time conflicts."
:language 'c-sharp
:override t
:feature 'property
- `((attribute (identifier) @font-lock-property-ref-face (attribute_argument_list))
- (attribute (identifier) @font-lock-property-ref-face))
+ `((attribute (identifier) @font-lock-property-use-face (attribute_argument_list))
+ (attribute (identifier) @font-lock-property-use-face))
:language 'c-sharp
:override t
@@ -878,23 +878,23 @@ compilation and evaluation time conflicts."
:override t
'((if_directive
"if" @font-lock-preprocessor-face
- (identifier) @font-lock-variable-ref-face)
+ (identifier) @font-lock-variable-use-face)
(elif_directive
"elif" @font-lock-preprocessor-face
- (identifier) @font-lock-variable-ref-face)
+ (identifier) @font-lock-variable-use-face)
(else_directive) @font-lock-preprocessor-face
(endif_directive) @font-lock-preprocessor-face
(define_directive
"define" @font-lock-preprocessor-face
- (identifier) @font-lock-variable-ref-face)
+ (identifier) @font-lock-variable-use-face)
(nullable_directive) @font-lock-preprocessor-face
(pragma_directive) @font-lock-preprocessor-face
(region_directive) @font-lock-preprocessor-face
(endregion_directive) @font-lock-preprocessor-face
(region_directive
- (preproc_message) @font-lock-variable-ref-face)
+ (preproc_message) @font-lock-variable-use-face)
(endregion_directive
- (preproc_message) @font-lock-variable-ref-face))))
+ (preproc_message) @font-lock-variable-use-face))))
;;;###autoload
(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode))
diff --git a/lisp/progmodes/go-ts-mode.el b/lisp/progmodes/go-ts-mode.el
index d4bafdb577b..e8f93d14744 100644
--- a/lisp/progmodes/go-ts-mode.el
+++ b/lisp/progmodes/go-ts-mode.el
@@ -177,12 +177,12 @@
:language 'go
:feature 'property
- '((selector_expression field: (field_identifier) @font-lock-property-ref-face)
- (keyed_element (_ (identifier) @font-lock-property-ref-face)))
+ '((selector_expression field: (field_identifier) @font-lock-property-use-face)
+ (keyed_element (_ (identifier) @font-lock-property-use-face)))
:language 'go
:feature 'variable
- '((identifier) @font-lock-variable-ref-face)
+ '((identifier) @font-lock-variable-use-face)
:language 'go
:feature 'escape-sequence
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index a1f3ad692c2..827d38e30c2 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -244,7 +244,7 @@
name: (identifier) @font-lock-variable-name-face)
(element_value_pair
- key: (identifier) @font-lock-property-ref-face)
+ key: (identifier) @font-lock-property-use-face)
(formal_parameter
name: (identifier) @font-lock-variable-name-face)
@@ -255,14 +255,14 @@
:override t
:feature 'expression
'((method_invocation
- object: (identifier) @font-lock-variable-ref-face)
+ object: (identifier) @font-lock-variable-use-face)
(method_invocation
name: (identifier) @font-lock-function-call-face)
(argument_list (identifier) @font-lock-variable-name-face)
- (expression_statement (identifier) @font-lock-variable-ref-face))
+ (expression_statement (identifier) @font-lock-variable-use-face))
:language 'java
:feature 'bracket
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index e53a80bd499..52ed19cc682 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3563,13 +3563,13 @@ This function is intended for use in `after-change-functions'."
:language 'javascript
:feature 'property
- '(((property_identifier) @font-lock-property-ref-face
+ '(((property_identifier) @font-lock-property-use-face
(:pred js--treesit-property-not-function-p
- @font-lock-property-ref-face))
+ @font-lock-property-use-face))
- (pair value: (identifier) @font-lock-variable-ref-face)
+ (pair value: (identifier) @font-lock-variable-use-face)
- ((shorthand_property_identifier) @font-lock-property-ref-face))
+ ((shorthand_property_identifier) @font-lock-property-use-face))
:language 'javascript
:feature 'assignment
@@ -3681,8 +3681,8 @@ For OVERRIDE, START, END, see `treesit-font-lock-rules'."
(treesit-fontify-with-override
(treesit-node-start node) (treesit-node-end node)
(pcase (treesit-node-type node)
- ("identifier" 'font-lock-variable-ref-face)
- ("property_identifier" 'font-lock-property-ref-face))
+ ("identifier" 'font-lock-variable-use-face)
+ ("property_identifier" 'font-lock-property-use-face))
override start end)))
(defun js--treesit-defun-name (node)
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 72f90d5c997..6272c0073e1 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -101,7 +101,7 @@
:language 'json
:feature 'pair
:override t ; Needed for overriding string face on keys.
- '((pair key: (_) @font-lock-property-ref-face))
+ '((pair key: (_) @font-lock-property-use-face))
:language 'json
:feature 'error
:override t
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5aab31c3ea8..1f970633bfc 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1147,7 +1147,7 @@ fontified."
@font-lock-variable-name-face)
(assignment left: (attribute
attribute: (identifier)
- @font-lock-property-ref-face))
+ @font-lock-property-use-face))
(pattern_list (identifier)
@font-lock-variable-name-face)
(tuple_pattern (identifier)
@@ -1184,12 +1184,12 @@ fontified."
:feature 'property
:language 'python
'((attribute
- attribute: (identifier) @font-lock-property-ref-face)
+ attribute: (identifier) @font-lock-property-use-face)
(class_definition
body: (block
(expression_statement
(assignment left:
- (identifier) @font-lock-property-ref-face)))))
+ (identifier) @font-lock-property-use-face)))))
:feature 'operator
:language 'python
diff --git a/lisp/progmodes/ruby-ts-mode.el b/lisp/progmodes/ruby-ts-mode.el
index fedba200f83..fa1d8626f14 100644
--- a/lisp/progmodes/ruby-ts-mode.el
+++ b/lisp/progmodes/ruby-ts-mode.el
@@ -292,11 +292,11 @@ values of OVERRIDE"
:language language
:feature 'global
- '((global_variable) @font-lock-variable-ref-face)
+ '((global_variable) @font-lock-variable-use-face)
:language language
:feature 'instance
- '((instance_variable) @font-lock-variable-ref-face)
+ '((instance_variable) @font-lock-variable-use-face)
:language language
:feature 'method-definition
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index a46d442a0e5..2d5c3211c1a 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -239,8 +239,8 @@
:language 'rust
:feature 'property
- '((field_identifier) @font-lock-property-ref-face
- (shorthand_field_initializer (identifier) @font-lock-property-ref-face))
+ '((field_identifier) @font-lock-property-use-face
+ (shorthand_field_initializer (identifier) @font-lock-property-use-face))
;; Must be under type, otherwise some imports can be highlighted as constants.
:language 'rust
@@ -251,25 +251,25 @@
:language 'rust
:feature 'variable
- '((arguments (identifier) @font-lock-variable-ref-face)
- (array_expression (identifier) @font-lock-variable-ref-face)
- (assignment_expression right: (identifier) @font-lock-variable-ref-face)
- (binary_expression left: (identifier) @font-lock-variable-ref-face)
- (binary_expression right: (identifier) @font-lock-variable-ref-face)
- (block (identifier) @font-lock-variable-ref-face)
- (compound_assignment_expr right: (identifier) @font-lock-variable-ref-face)
- (field_expression value: (identifier) @font-lock-variable-ref-face)
- (field_initializer value: (identifier) @font-lock-variable-ref-face)
- (if_expression condition: (identifier) @font-lock-variable-ref-face)
- (let_condition value: (identifier) @font-lock-variable-ref-face)
- (let_declaration value: (identifier) @font-lock-variable-ref-face)
- (match_arm value: (identifier) @font-lock-variable-ref-face)
- (match_expression value: (identifier) @font-lock-variable-ref-face)
- (reference_expression value: (identifier) @font-lock-variable-ref-face)
- (return_expression (identifier) @font-lock-variable-ref-face)
- (tuple_expression (identifier) @font-lock-variable-ref-face)
- (unary_expression (identifier) @font-lock-variable-ref-face)
- (while_expression condition: (identifier) @font-lock-variable-ref-face))
+ '((arguments (identifier) @font-lock-variable-use-face)
+ (array_expression (identifier) @font-lock-variable-use-face)
+ (assignment_expression right: (identifier) @font-lock-variable-use-face)
+ (binary_expression left: (identifier) @font-lock-variable-use-face)
+ (binary_expression right: (identifier) @font-lock-variable-use-face)
+ (block (identifier) @font-lock-variable-use-face)
+ (compound_assignment_expr right: (identifier) @font-lock-variable-use-face)
+ (field_expression value: (identifier) @font-lock-variable-use-face)
+ (field_initializer value: (identifier) @font-lock-variable-use-face)
+ (if_expression condition: (identifier) @font-lock-variable-use-face)
+ (let_condition value: (identifier) @font-lock-variable-use-face)
+ (let_declaration value: (identifier) @font-lock-variable-use-face)
+ (match_arm value: (identifier) @font-lock-variable-use-face)
+ (match_expression value: (identifier) @font-lock-variable-use-face)
+ (reference_expression value: (identifier) @font-lock-variable-use-face)
+ (return_expression (identifier) @font-lock-variable-use-face)
+ (tuple_expression (identifier) @font-lock-variable-use-face)
+ (unary_expression (identifier) @font-lock-variable-use-face)
+ (while_expression condition: (identifier) @font-lock-variable-use-face))
:language 'rust
:feature 'escape-sequence
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 5b49b8f50a8..65fba72373c 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -249,9 +249,9 @@ Argument LANGUAGE is either `typescript' or `tsx'."
(public_field_definition
name: (property_identifier) @font-lock-property-name-face)
- (pair key: (property_identifier) @font-lock-property-ref-face)
+ (pair key: (property_identifier) @font-lock-property-use-face)
- ((shorthand_property_identifier) @font-lock-property-ref-face))
+ ((shorthand_property_identifier) @font-lock-property-use-face))
:language language
:feature 'expression
@@ -272,7 +272,7 @@ Argument LANGUAGE is either `typescript' or `tsx'."
:language language
:feature 'pattern
`((pair_pattern
- key: (property_identifier) @font-lock-property-ref-face
+ key: (property_identifier) @font-lock-property-use-face
value: [(identifier) @font-lock-variable-name-face
(assignment_pattern left: (identifier) @font-lock-variable-name-face)])