Improved syntax highlighting support
This commit is contained in:
parent
923039813e
commit
33185c30a0
2 changed files with 108 additions and 2 deletions
|
|
@ -54,10 +54,20 @@ impl Highlighter {
|
|||
Self { entries, matchers }
|
||||
}
|
||||
|
||||
pub fn with(mut self, token: TokenKind, p: impl AsRef<str>) -> Self {
|
||||
self.entries.push(token);
|
||||
self.matchers
|
||||
.push(Regex::parser().parse(p.as_ref()).unwrap());
|
||||
self
|
||||
}
|
||||
|
||||
pub fn from_file_name(file_name: &Path) -> Option<Self> {
|
||||
match file_name.extension()?.to_str()? {
|
||||
"rs" => Some(Self::rust()),
|
||||
"md" => Some(Self::markdown()),
|
||||
"toml" => Some(Self::toml()),
|
||||
"c" | "h" | "cpp" | "hpp" | "cxx" | "js" | "ts" | "go" => Some(Self::generic_clike()),
|
||||
"glsl" | "vert" | "frag" => Some(Self::glsl()),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
|
|
@ -99,7 +109,7 @@ impl Highlighter {
|
|||
),
|
||||
(TokenKind::Constant, r"\b[(true)(false)]\b"),
|
||||
// Flow-control operators count as keywords
|
||||
(TokenKind::Keyword, r"\b[(\.await)\?]\b"),
|
||||
(TokenKind::Keyword, r"\.await\b"),
|
||||
// Macro invocations: println!
|
||||
(TokenKind::Macro, r"\b[A-Za-z_][A-Za-z0-9_]*!"),
|
||||
// Meta-variables
|
||||
|
|
@ -120,7 +130,7 @@ impl Highlighter {
|
|||
),
|
||||
(
|
||||
TokenKind::Operator,
|
||||
r"[(&(mut)?)(\+=?)(\-=?)(\*=?)(\/=?)(%=?)(!=?)(==?)(&&?=?)(\|\|?=?)(<<?=?)(>>?=?)(\.\.[\.=]?)\\\~\^:;,\@(=>?)]",
|
||||
r"[(&(mut)?)(\?)(\+=?)(\-=?)(\*=?)(\/=?)(%=?)(!=?)(==?)(&&?=?)(\|\|?=?)(<<?=?)(>>?=?)(\.\.[\.=]?)\\\~\^:;,\@(=>?)]",
|
||||
),
|
||||
// Fields and methods: a.foo
|
||||
(TokenKind::Property, r"\.[a-z_][A-Za-z0-9_]*"),
|
||||
|
|
@ -136,6 +146,100 @@ impl Highlighter {
|
|||
])
|
||||
}
|
||||
|
||||
pub fn clike(keyword: &str, r#type: &str, builtin: &str) -> Self {
|
||||
Self::new_from_regex([
|
||||
// Both kinds of comments match multiple lines
|
||||
(
|
||||
TokenKind::Doc,
|
||||
r"\/\/[\/!][^\n]*$(\n[[:space:]]\/\/[\/!][^\n]*$)*",
|
||||
),
|
||||
(TokenKind::Comment, r"\/\/[^$]*$(\n[[:space:]]\/\/[^$]*$)*"),
|
||||
// Multi-line comment
|
||||
(TokenKind::Comment, r"\/\*[^(\*\/)]*\*\/"),
|
||||
(TokenKind::Keyword, keyword),
|
||||
(TokenKind::Macro, builtin),
|
||||
(TokenKind::Constant, r"\b[(true)(false)]\b"),
|
||||
// Flow-control operators count as keywords
|
||||
(TokenKind::Keyword, r"\b[(\.await)\?]\b"),
|
||||
(TokenKind::Constant, r"\b[A-Z][A-Z0-9_]+\b"),
|
||||
(TokenKind::Type, r"\b[A-Z][A-Za-z0-9_]*\b"),
|
||||
// Primitives
|
||||
(TokenKind::Type, r#type),
|
||||
// "foo" or b"foo" or r#"foo"#
|
||||
(TokenKind::String, r#"b?r?(#*)@("[(\\")[^("~)]]*("~))"#),
|
||||
// Character strings
|
||||
(
|
||||
TokenKind::String,
|
||||
r#"b?'[(\\[nrt\\0(x[0-7A-Za-z][0-7A-Za-z])])[^']]*'"#,
|
||||
),
|
||||
(
|
||||
TokenKind::Operator,
|
||||
r"[(&)(\?)(\+\+)(\-\-)(\+=?)(\-=?)(\*=?)(\/=?)(%=?)(!=?)(==?)(&&?=?)(\|\|?=?)(<<?=?)(>>?=?)(\.\.[\.=]?)\\\~\^:;,\@(=>?)]",
|
||||
),
|
||||
// Fields and methods: a.foo
|
||||
(TokenKind::Property, r"\.[a-z_][A-Za-z0-9_]*"),
|
||||
// Paths: std::foo::bar
|
||||
(TokenKind::Property, r"[A-Za-z_][A-Za-z0-9_]*::"),
|
||||
(TokenKind::Ident, r"\b[a-z_][A-Za-z0-9_]*\b"),
|
||||
(TokenKind::Number, r"[0-9][A-Za-z0-9_\.]*"),
|
||||
(TokenKind::Delimiter, r"[\{\}\(\)\[\]]"),
|
||||
// Preprocessor
|
||||
(TokenKind::Macro, r"^#[^$]*$"),
|
||||
])
|
||||
}
|
||||
|
||||
pub fn generic_clike() -> Self {
|
||||
Self::clike(
|
||||
// keyword
|
||||
r"\b[(var)(enum)(let)(this)(fn)(struct)(class)(import)(if)(while)(for)(in)(loop)(else)(break)(continue)(const)(static)(type)(extern)(return)(async)(throw)(catch)(union)(auto)(namespace)(public)(private)(function)(func)]\b",
|
||||
// types
|
||||
r"\b[(([(unsigned)(signed)][[:space:]])*u?int[0-9]*(_t)?)(float)(double)(bool)(char)(size_t)(void)]\b",
|
||||
"[]",
|
||||
)
|
||||
}
|
||||
|
||||
pub fn glsl() -> Self {
|
||||
Self::clike(
|
||||
// keyword
|
||||
r"\b[(struct)(if)(while)(for)(else)(break)(continue)(const)(return)(layout)(uniform)(set)(binding)(location)(in)]\b",
|
||||
// types
|
||||
r"\b[(u?int)(float)(double)(bool)(void)([ui]?vec[1-4]*)([ui]?mat[1-4]*)(texture[(2D)(3D)]?(Cube)?)([ui]?sampler[(2D)(3D)]?(Shadow)?)]\b",
|
||||
// Builtins
|
||||
r"\b[(dot)(cross)(textureSize)(normalize)(texelFetch)(textureProj)(max)(min)(clamp)(reflect)(mix)(distance)(length)(abs)(pow)(sign)(sin)(cos)(tan)(fract)(mod)]\b",
|
||||
)
|
||||
}
|
||||
|
||||
pub fn toml() -> Self {
|
||||
Self::new_from_regex([
|
||||
// // Links
|
||||
// (TokenKind::String, r"\[[^\]]*\](\([^\)]*\))?"),
|
||||
// Header
|
||||
(TokenKind::Doc, r#"^\[[^\]]*\]$"#),
|
||||
// Delimiters
|
||||
(TokenKind::Delimiter, r"[\{\}\(\)\[\]]"),
|
||||
// Operators
|
||||
(TokenKind::Operator, r"[=,]"),
|
||||
// Numbers
|
||||
(TokenKind::Number, r"[0-9][A-Za-z0-9_\.]*"),
|
||||
// Double-quoted strings
|
||||
(
|
||||
TokenKind::String,
|
||||
r#"b?"[(\\[nrt\\0(x[0-7A-Za-z][0-7A-Za-z])])[^"]]*""#,
|
||||
),
|
||||
// Single-quoted strings
|
||||
(
|
||||
TokenKind::String,
|
||||
r#"b?'[(\\[nrt\\0(x[0-7A-Za-z][0-7A-Za-z])])[^']]*'"#,
|
||||
),
|
||||
// Booleans
|
||||
(TokenKind::Constant, r"\b[(true)(false)]\b"),
|
||||
// Identifier
|
||||
(TokenKind::Ident, r"\b[a-z_][A-Za-z0-9_\-]*\b"),
|
||||
// Comments
|
||||
(TokenKind::Comment, r"^#[^$]*$"),
|
||||
])
|
||||
}
|
||||
|
||||
fn highlight_str(&self, mut s: &[char]) -> Vec<Token> {
|
||||
let mut tokens = Vec::new();
|
||||
let mut i = 0;
|
||||
|
|
|
|||
|
|
@ -456,6 +456,8 @@ impl Buffer {
|
|||
_ => return self.undo.push(change),
|
||||
}
|
||||
|
||||
last.action_id = change.action_id;
|
||||
|
||||
for (id, (from2, to2)) in change.cursors {
|
||||
last.cursors
|
||||
.entry(id)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue