From f05b440572860b94053ed24c7d84d9faa2500074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8B=90=E7=8B=B8?= <134658521+Huliiiiii@users.noreply.github.com> Date: Thu, 10 Oct 2024 01:25:46 +0800 Subject: [PATCH] Improve syntax highlights (#18728) Closes #18722 - Replace the `@escape` capture name with `@string.escape` for escape sequences in Go, Python, Regex, Racket, Ruby, and Scheme. - Rust - Add syntax highlighting for escape sequences. Close #18722 - Fix the issue where `@punctuation.delimiter` is being overwritten by `@operator`. - Add the period (".") to `@punctuation.delimiter`. Release Notes: - N/A --- crates/languages/src/go/highlights.scm | 2 +- crates/languages/src/python/highlights.scm | 2 +- crates/languages/src/regex/highlights.scm | 2 +- crates/languages/src/rust/highlights.scm | 7 +++---- extensions/racket/languages/racket/highlights.scm | 2 +- extensions/ruby/languages/ruby/highlights.scm | 2 +- extensions/scheme/languages/scheme/highlights.scm | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/crates/languages/src/go/highlights.scm b/crates/languages/src/go/highlights.scm index 17b009da35..b9ce232112 100644 --- a/crates/languages/src/go/highlights.scm +++ b/crates/languages/src/go/highlights.scm @@ -102,7 +102,7 @@ (rune_literal) ] @string -(escape_sequence) @escape +(escape_sequence) @string.escape [ (int_literal) diff --git a/crates/languages/src/python/highlights.scm b/crates/languages/src/python/highlights.scm index 5edbefa7be..5b64642771 100644 --- a/crates/languages/src/python/highlights.scm +++ b/crates/languages/src/python/highlights.scm @@ -54,7 +54,7 @@ (comment) @comment (string) @string -(escape_sequence) @escape +(escape_sequence) @string.escape [ "(" diff --git a/crates/languages/src/regex/highlights.scm b/crates/languages/src/regex/highlights.scm index 8b653465b4..d1ebcda0d3 100644 --- a/crates/languages/src/regex/highlights.scm +++ b/crates/languages/src/regex/highlights.scm @@ -22,7 +22,7 @@ (end_assertion) (boundary_assertion) (non_boundary_assertion) -] @escape +] @string.escape [ "*" diff --git a/crates/languages/src/rust/highlights.scm b/crates/languages/src/rust/highlights.scm index 8d4bad06e0..d25b8a7347 100644 --- a/crates/languages/src/rust/highlights.scm +++ b/crates/languages/src/rust/highlights.scm @@ -65,6 +65,7 @@ ">" @punctuation.bracket) [ + "." ";" "," "::" @@ -121,6 +122,8 @@ (char_literal) ] @string +(escape_sequence) @string.escape + [ (integer_literal) (float_literal) @@ -147,20 +150,16 @@ "&&" "*" "*=" - "*" "+" "+=" - "," "-" "-=" "->" - "." ".." "..=" "..." "/=" ":" - ";" "<<" "<<=" "<" diff --git a/extensions/racket/languages/racket/highlights.scm b/extensions/racket/languages/racket/highlights.scm index 3caf1d88e9..0b462a9c26 100644 --- a/extensions/racket/languages/racket/highlights.scm +++ b/extensions/racket/languages/racket/highlights.scm @@ -4,7 +4,7 @@ (here_string) (byte_string)] @string (regex) @string.regex -(escape_sequence) @escape +(escape_sequence) @string.escape [(comment) (block_comment) diff --git a/extensions/ruby/languages/ruby/highlights.scm b/extensions/ruby/languages/ruby/highlights.scm index 17dbb4b07d..7b4d2ff616 100644 --- a/extensions/ruby/languages/ruby/highlights.scm +++ b/extensions/ruby/languages/ruby/highlights.scm @@ -116,7 +116,7 @@ ] @string.special.symbol (regex) @string.regex -(escape_sequence) @escape +(escape_sequence) @string.escape [ (integer) diff --git a/extensions/scheme/languages/scheme/highlights.scm b/extensions/scheme/languages/scheme/highlights.scm index 40ba61cd05..76a4ba7a52 100644 --- a/extensions/scheme/languages/scheme/highlights.scm +++ b/extensions/scheme/languages/scheme/highlights.scm @@ -7,7 +7,7 @@ (symbol) @variable (string) @string -(escape_sequence) @escape +(escape_sequence) @string.escape [(comment) (block_comment)