mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Update csharp-ts-mode font-lock (bug#73369)

Browse Source 
Adapt to the latest c-sharp grammar.

* lisp/progmodes/csharp-mode.el:
(csharp-ts-mode--test-this-expression):
(csharp-ts-mode--test-interpolated-string-text):
(csharp-ts-mode--test-type-constraint):
(csharp-ts-mode--test-type-of-expression):
(csharp-ts-mode--test-name-equals):
(csharp-ts-mode--test-if-directive):
(csharp-ts-mode--test-method-declaration-type-field): New
functions.
(csharp-ts-mode--type-field): New variable.
(csharp-ts-mode--font-lock-settings): Fix font-lock rules.
This commit is contained in:
Yuan Fu 2024-09-20 01:16:44 -07:00
parent 4c866abab9
commit bf26ff0dc8
No known key found for this signature in database
GPG Key ID: 56E19BC57664A442
1 changed files with 118 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
lisp/progmodes/csharp-mode.el
View File

@ -730,6 +730,52 @@ compilation and evaluation time conflicts."
"readonly" "unmanaged") "readonly" "unmanaged")
"C# keywords for tree-sitter font-locking.") "C# keywords for tree-sitter font-locking.")
(defun csharp-ts-mode--test-this-expression ()
"Return non-nil if (this_expression) is named in csharp grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(this_expression)" t)
t))
(defun csharp-ts-mode--test-interpolated-string-text ()
"Return non-nil if (interpolated_string_text) is in the grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(interpolated_string_text)" t)
t))
(defun csharp-ts-mode--test-type-constraint ()
"Return non-nil if (type_constraint) is in the grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(type_constraint)" t)
t))
(defun csharp-ts-mode--test-type-of-expression ()
"Return non-nil if (type_of_expression) is in the grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(type_of_expression)" t)
t))
(defun csharp-ts-mode--test-name-equals ()
"Return non-nil if (name_equals) is in the grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(name_equals)" t)
t))
(defun csharp-ts-mode--test-if-directive ()
"Return non-nil if (if_directive) is in the grammar."
(ignore-errors
(treesit-query-compile 'c-sharp "(if_directive)" t)
t))
(defun csharp-ts-mode--test-method-declaration-type-field ()
"Return non-nil if (method_declaration) has a type field."
(ignore-errors
(treesit-query-compile 'c-sharp "(method_declaration type: (_))" t)
t))
(defvar csharp-ts-mode--type-field
(if (csharp-ts-mode--test-method-declaration-type-field)
'type: 'returns:))
(defvar csharp-ts-mode--font-lock-settings (defvar csharp-ts-mode--font-lock-settings
(treesit-font-lock-rules (treesit-font-lock-rules
:language 'c-sharp :language 'c-sharp
@ -760,7 +806,9 @@ compilation and evaluation time conflicts."
:feature 'keyword :feature 'keyword
`([,@csharp-ts-mode--keywords] @font-lock-keyword-face `([,@csharp-ts-mode--keywords] @font-lock-keyword-face
(modifier) @font-lock-keyword-face (modifier) @font-lock-keyword-face
(this_expression) @font-lock-keyword-face) ,@(if (csharp-ts-mode--test-this-expression)
'((this_expression) @font-lock-keyword-face)
'("this" @font-lock-keyword-face)))
:language 'c-sharp :language 'c-sharp
:override t :override t
@ -786,18 +834,23 @@ compilation and evaluation time conflicts."
:feature 'string :feature 'string
`([(string_literal) `([(string_literal)
(verbatim_string_literal) (verbatim_string_literal)
(interpolated_string_text) ,@(if (csharp-ts-mode--test-interpolated-string-text)
(interpolated_verbatim_string_text) '((interpolated_string_text)
(character_literal) (interpolated_verbatim_string_text)
"\"" (character_literal)
"$\"" "\""
"@$\"" "$\""
"$@\""] @font-lock-string-face) "@$\""
"$@\"")
'((interpolated_string_expression)
(interpolation_start)
(interpolation_quote)))]
@font-lock-string-face)
:language 'c-sharp :language 'c-sharp
:override t :override t
:feature 'type :feature 'type
'((predefined_type) @font-lock-type-face `((predefined_type) @font-lock-type-face
(implicit_type) @font-lock-type-face (implicit_type) @font-lock-type-face
(nullable_type) @font-lock-type-face (nullable_type) @font-lock-type-face
(type_parameter (type_parameter
@ -816,10 +869,17 @@ compilation and evaluation time conflicts."
(cast_expression (generic_name (identifier) @font-lock-type-face)) (cast_expression (generic_name (identifier) @font-lock-type-face))
["operator"] @font-lock-type-face ["operator"] @font-lock-type-face
(type_parameter_constraints_clause (type_parameter_constraints_clause
target: (identifier) @font-lock-type-face) (identifier) @font-lock-type-face)
(type_constraint type: (identifier) @font-lock-type-face) ,@(if (csharp-ts-mode--test-type-constraint)
(type_constraint type: (generic_name (identifier) @font-lock-type-face)) '((type_constraint type: (identifier) @font-lock-type-face)
(type_of_expression (identifier) @font-lock-type-face) (type_constraint type: (generic_name (identifier) @font-lock-type-face)))
'((type_parameter_constraint (type type: (identifier) @font-lock-type-face))
(type_parameter_constraint (type type: (generic_name (identifier) @font-lock-type-face)))))
,@(when (csharp-ts-mode--test-type-of-expression)
'((type_of_expression (identifier) @font-lock-type-face))
'((typeof_expression (identifier) @font-lock-type-face)))
(object_creation_expression (object_creation_expression
type: (identifier) @font-lock-type-face) type: (identifier) @font-lock-type-face)
(object_creation_expression (object_creation_expression
@ -832,8 +892,9 @@ compilation and evaluation time conflicts."
:override t :override t
`((qualified_name (identifier) @font-lock-type-face) `((qualified_name (identifier) @font-lock-type-face)
(using_directive (identifier) @font-lock-type-face) (using_directive (identifier) @font-lock-type-face)
(using_directive (name_equals ,@(when (csharp-ts-mode--test-name-equals)
(identifier) @font-lock-type-face)) '((using_directive (name_equals
(identifier) @font-lock-type-face))))
(enum_declaration (identifier) @font-lock-type-face) (enum_declaration (identifier) @font-lock-type-face)
(enum_member_declaration (identifier) @font-lock-variable-name-face) (enum_member_declaration (identifier) @font-lock-variable-name-face)
@ -861,10 +922,10 @@ compilation and evaluation time conflicts."
;;; Check if keyword void_keyword is available, then return the correct rule." ;;; Check if keyword void_keyword is available, then return the correct rule."
,@(condition-case nil ,@(condition-case nil
(progn (treesit-query-capture 'csharp '((void_keyword) @capture)) (progn (treesit-query-capture 'csharp '((void_keyword) @capture))
`((method_declaration type: [(identifier) (void_keyword)] @font-lock-type-face))) `((method_declaration ,csharp-ts-mode--type-field [(identifier) (void_keyword)] @font-lock-type-face)))
(error (error
`((method_declaration type: [(identifier) (predefined_type)] @font-lock-type-face)))) `((method_declaration ,csharp-ts-mode--type-field [(identifier) (predefined_type)] @font-lock-type-face))))
(method_declaration type: (generic_name (identifier) @font-lock-type-face)) (method_declaration ,csharp-ts-mode--type-field (generic_name (identifier) @font-lock-type-face))
(method_declaration name: (_) @font-lock-function-name-face) (method_declaration name: (_) @font-lock-function-name-face)
(catch_declaration (catch_declaration
@ -907,25 +968,45 @@ compilation and evaluation time conflicts."
:language 'c-sharp :language 'c-sharp
:feature 'directives :feature 'directives
:override t :override t
'((if_directive (if (csharp-ts-mode--test-if-directive)
"if" @font-lock-preprocessor-face '((if_directive
(identifier) @font-lock-variable-use-face) "if" @font-lock-preprocessor-face
(elif_directive (identifier) @font-lock-variable-use-face)
"elif" @font-lock-preprocessor-face (elif_directive
(identifier) @font-lock-variable-use-face) "elif" @font-lock-preprocessor-face
(else_directive) @font-lock-preprocessor-face (identifier) @font-lock-variable-use-face)
(endif_directive) @font-lock-preprocessor-face (else_directive) @font-lock-preprocessor-face
(define_directive (endif_directive) @font-lock-preprocessor-face
"define" @font-lock-preprocessor-face (define_directive
(identifier) @font-lock-variable-use-face) "define" @font-lock-preprocessor-face
(nullable_directive) @font-lock-preprocessor-face (identifier) @font-lock-variable-use-face)
(pragma_directive) @font-lock-preprocessor-face (nullable_directive) @font-lock-preprocessor-face
(region_directive) @font-lock-preprocessor-face (pragma_directive) @font-lock-preprocessor-face
(endregion_directive) @font-lock-preprocessor-face (region_directive) @font-lock-preprocessor-face
(region_directive (endregion_directive) @font-lock-preprocessor-face
(preproc_message) @font-lock-variable-use-face) (region_directive
(endregion_directive (preproc_message) @font-lock-variable-use-face)
(preproc_message) @font-lock-variable-use-face)))) (endregion_directive
(preproc_message) @font-lock-variable-use-face))
'((preproc_if
"#if" @font-lock-preprocessor-face
(identifier) @font-lock-variable-use-face)
(preproc_elif
"#elif" @font-lock-preprocessor-face
(identifier) @font-lock-variable-use-face)
(preproc_else) @font-lock-preprocessor-face
"#endif" @font-lock-preprocessor-face
(preproc_define
"#define" @font-lock-preprocessor-face
(preproc_arg) @font-lock-variable-use-face)
(preproc_nullable) @font-lock-preprocessor-face
(preproc_pragma) @font-lock-preprocessor-face
(preproc_region) @font-lock-preprocessor-face
(preproc_endregion) @font-lock-preprocessor-face
(preproc_region
(preproc_arg) @font-lock-variable-use-face)
(preproc_endregion
(preproc_arg) @font-lock-variable-use-face)))))
;;;###autoload ;;;###autoload
(add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode)) (add-to-list 'auto-mode-alist '("\\.cs\\'" . csharp-mode))