procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename the newly added -ref- faces to -use-

Browse source 
* 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).
This commit is contained in:
Dmitry Gutov 2023-02-28 04:07:55 +02:00
parent f601e9666d
commit 613de66281
18 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/lispref/modes.texi
View file

@ -3688,8 +3688,8 @@ default, from @code{font-lock-function-name-face}.
@vindex font-lock-variable-name-face
for the name of a variable being defined or declared.
@item font-lock-variable-ref-face
@vindex font-lock-variable-ref-face
@item font-lock-variable-use-face
@vindex font-lock-variable-use-face
for the name of a variable being referenced. This face inherits, by
default, from @code{font-lock-variable-name-face}.
@ -3772,8 +3772,8 @@ for properties of an object, such as the declaration of fields in a
struct. This face inherits, by default, from
@code{font-lock-variable-name-face}.
@item font-lock-property-ref-face
@vindex font-lock-property-ref-face
@item font-lock-property-use-face
@vindex font-lock-property-use-face
for properties of an object, such as use of fields in a struct. This
face inherits, by default, from @code{font-lock-property-name-face}.

4
etc/NEWS
View file

@ -832,8 +832,8 @@ These faces are primarily meant for use with tree-sitter. They are:
'font-lock-escape-face', 'font-lock-function-call-face',
'font-lock-misc-punctuation-face', 'font-lock-number-face',
'font-lock-operator-face', 'font-lock-property-name-face',
'font-lock-property-ref-face', 'font-lock-punctuation-face',
'font-lock-regexp-face', and 'font-lock-variable-ref-face'.
'font-lock-property-use-face', 'font-lock-punctuation-face',
'font-lock-regexp-face', and 'font-lock-variable-use-face'.
+++
** New face 'variable-pitch-text'.

4
lisp/cus-theme.el
View file

@ -73,11 +73,11 @@ Do not call this mode function yourself. It is meant for internal use."
font-lock-keyword-face font-lock-negation-char-face
font-lock-number-face font-lock-misc-punctuation-face
font-lock-operator-face font-lock-preprocessor-face
font-lock-property-name-face font-lock-property-ref-face
font-lock-property-name-face font-lock-property-use-face
font-lock-punctuation-face
font-lock-regexp-grouping-backslash font-lock-regexp-grouping-construct
font-lock-string-face font-lock-type-face font-lock-variable-name-face
font-lock-variable-ref-face
font-lock-variable-use-face
font-lock-warning-face button link link-visited fringe
header-line tooltip mode-line mode-line-buffer-id
mode-line-emphasis mode-line-highlight mode-line-inactive

4
lisp/font-lock.el
View file

@ -2046,7 +2046,7 @@ as the constructs of Haddock, Javadoc and similar systems."
"Font Lock mode face used to highlight variable names."
:group 'font-lock-faces)
(defface font-lock-variable-ref-face
(defface font-lock-variable-use-face
'((t :inherit font-lock-variable-name-face))
"Font Lock mode face used to highlight variable references."
:group 'font-lock-faces
@ -2134,7 +2134,7 @@ For example, the declaration of fields in a struct."
:group 'font-lock-faces
:version "29.1")
(defface font-lock-property-ref-face
(defface font-lock-property-use-face
'((t :inherit font-lock-property-name-face))
"Font Lock mode face used to highlight property references.
For example, property lookup of fields in a struct."

6
lisp/progmodes/c-ts-mode.el
View file

@ -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.

2
lisp/progmodes/cmake-ts-mode.el
View file

@ -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

20
lisp/progmodes/csharp-mode.el
View file

@ -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))

6
lisp/progmodes/go-ts-mode.el
View file

@ -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

6
lisp/progmodes/java-ts-mode.el
View file

@ -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

12
lisp/progmodes/js.el
View file

@ -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)

2
lisp/progmodes/json-ts-mode.el
View file

@ -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

6
lisp/progmodes/python.el
View file

@ -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

4
lisp/progmodes/ruby-ts-mode.el
View file

@ -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

42
lisp/progmodes/rust-ts-mode.el
View file

@ -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

6
lisp/progmodes/typescript-ts-mode.el
View file

@ -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)])

4
lisp/textmodes/css-mode.el
View file

@ -1399,8 +1399,8 @@ for determining whether point is within a selector."
:feature 'query
:language 'css
'((keyword_query) @font-lock-property-ref-face
(feature_name) @font-lock-property-ref-face)
'((keyword_query) @font-lock-property-use-face
(feature_name) @font-lock-property-use-face)
:feature 'bracket
:language 'css

4
lisp/textmodes/toml-ts-mode.el
View file

@ -92,8 +92,8 @@
:language 'toml
:feature 'pair
:override t ; Needed for overriding string face on keys.
'((bare_key) @font-lock-property-ref-face
(quoted_key) @font-lock-property-ref-face
'((bare_key) @font-lock-property-use-face
(quoted_key) @font-lock-property-use-face
(table ("[" @font-lock-bracket-face
(_) @font-lock-type-face
"]" @font-lock-bracket-face))

12
lisp/textmodes/yaml-ts-mode.el
View file

@ -94,22 +94,22 @@
:feature 'property
:override t
'((block_mapping_pair
key: (flow_node (plain_scalar (string_scalar) @font-lock-property-ref-face)))
key: (flow_node (plain_scalar (string_scalar) @font-lock-property-use-face)))
(block_mapping_pair
key: (flow_node
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-ref-face))
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-use-face))
(flow_mapping
(_ key: (flow_node (plain_scalar (string_scalar) @font-lock-property-ref-face))))
(_ key: (flow_node (plain_scalar (string_scalar) @font-lock-property-use-face))))
(flow_mapping
(_ key:
(flow_node
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-ref-face)))
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-use-face)))
(flow_sequence
(_ key: (flow_node (plain_scalar (string_scalar) @font-lock-property-ref-face))))
(_ key: (flow_node (plain_scalar (string_scalar) @font-lock-property-use-face))))
(flow_sequence
(_ key:
(flow_node
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-ref-face))))
[(double_quote_scalar) (single_quote_scalar)] @font-lock-property-use-face))))
:language 'yaml
:feature 'error