From 575e9d44cf74d4d470565cb201aef9e31fc5028f Mon Sep 17 00:00:00 2001 From: Las Date: Mon, 28 May 2018 00:57:34 +0200 Subject: [PATCH 1/2] Improve rust syntax highlighting Changes: - Highlight float literals with float type suffixes (nf64 and nf32) - Make module items use the module color - Highlight macro variables $variable - Highlight lifetimes - Highlight u128 and i128 - Highlight character literals (e.g. 'a') - Highlight dyn keyword (will in the future be used for trait objects) --- rc/base/rust.kak | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/rc/base/rust.kak b/rc/base/rust.kak index 3573cf7d..d6a32a29 100644 --- a/rc/base/rust.kak +++ b/rc/base/rust.kak @@ -22,14 +22,18 @@ add-highlighter shared/rust/comment fill comment add-highlighter shared/rust/code regex \b[A-z0-9_]+! 0:meta # the number literals syntax is defined here: # https://doc.rust-lang.org/reference.html#number-literals -add-highlighter shared/rust/code regex \b(?:self|true|false|[0-9][_0-9]*(?:\.[0-9][_0-9]*|(?:\.[0-9][_0-9]*)?E[\+\-][_0-9]+)(?:f(?:32|64))?|(?:0x[_0-9a-fA-F]+|0o[_0-7]+|0b[_01]+|[0-9][_0-9]*)(?:(?:i|u)(?:8|16|32|64|size))?)\b 0:value +add-highlighter shared/rust/code regex \b(?:self|true|false|[0-9][_0-9]*(?:\.[0-9][_0-9]*|(?:\.[0-9][_0-9]*)?E[\+\-][_0-9]+)(?:f(?:32|64))?|(?:0x[_0-9a-fA-F]+|0o[_0-7]+|0b[_01]+|[0-9][_0-9]*)(?:(?:i|u|f)(?:8|16|32|64|128|size))?)\b 0:value add-highlighter shared/rust/code regex \b(?:&&|\|\|)\b 0:operator # the language keywords are defined here, but many of them are reserved and unused yet: # https://doc.rust-lang.org/grammar.html#keywords -add-highlighter shared/rust/code regex \b(?:crate|use|extern)\b 0:meta -add-highlighter shared/rust/code regex \b(?:let|as|fn|return|match|if|else|loop|for|in|while|break|continue|move|box|where|impl|pub|unsafe)\b 0:keyword -add-highlighter shared/rust/code regex \b(?:mod|trait|struct|enum|type|mut|ref|static|const)\b 0:attribute -add-highlighter shared/rust/code regex \b(?:u8|u16|u32|u64|usize|i8|i16|i32|i64|isize|f32|f64|bool|char|str|Self)\b 0:type +add-highlighter shared/rust/code regex (?:#!?\[.*?\]) 0:meta +add-highlighter shared/rust/code regex \b(?:let|as|fn|return|match|if|else|loop|for|in|while|break|continue|move|box|where|impl|dyn|pub|unsafe)\b 0:keyword +add-highlighter shared/rust/code regex \b(?:trait|struct|enum|type|mut|ref|static|const)\b 0:attribute +add-highlighter shared/rust/code regex \b(?:u8|u16|u32|u64|u128|usize|i8|i16|i32|i64|i128|isize|f32|f64|bool|char|str|Self)\b 0:type +add-highlighter shared/rust/code regex \b(?:mod|crate|use|extern)\b 0:module +add-highlighter shared/rust/code regex \$\w+\b 0:variable +add-highlighter shared/rust/code regex "'\\\\?.'" 0:value +add-highlighter shared/rust/code regex "'\w+[^']" 0:meta # Commands # ‾‾‾‾‾‾‾‾