From 19efc3d8f31523148bf460d339cc524bf58bfef2 Mon Sep 17 00:00:00 2001 From: Stephan Seitz Date: Fri, 23 Apr 2021 17:33:00 +0200 Subject: highlights(cpp): reduce number of regexes --- queries/cpp/highlights.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'queries/cpp') diff --git a/queries/cpp/highlights.scm b/queries/cpp/highlights.scm index 1efdf759a..36d8531df 100644 --- a/queries/cpp/highlights.scm +++ b/queries/cpp/highlights.scm @@ -1,13 +1,7 @@ ; inherits: c ((identifier) @field - (#match? @field "^_")) - -((identifier) @field - (#match? @field "^m_")) - -((identifier) @field - (#match? @field "_$")) + (#match? @field "(^_|^m_|_$)")) (parameter_declaration declarator: (reference_declarator) @parameter) @@ -39,12 +33,12 @@ ((identifier) @type - (#match? @type "^[A-Z][a-z]") + (#match? @type "^[A-Z].*[a-z]") (#not-has-parent? @type function_declarator)) (namespace_identifier) @namespace ((namespace_identifier) @type - (#match? @type "^[A-Z].*[a-z]")) + (#match? @type "^[A-Z]")) ((namespace_identifier) @constant (#match? @constant "^[A-Z][A-Z_0-9]*$")) (namespace_definition -- cgit v1.2.3-70-g09d2