From 28c554ec2185a15e22f0408ce485ed4afe035e03 Mon Sep 17 00:00:00 2001 From: Laurenz Date: Sat, 28 Jan 2023 12:01:05 +0100 Subject: Rework math attachments and accents --- src/ide/complete.rs | 6 +++--- src/ide/highlight.rs | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/ide') diff --git a/src/ide/complete.rs b/src/ide/complete.rs index 9302b552..83d0ca9c 100644 --- a/src/ide/complete.rs +++ b/src/ide/complete.rs @@ -216,7 +216,7 @@ fn complete_math(ctx: &mut CompletionContext) -> bool { Some(SyntaxKind::Formula) | Some(SyntaxKind::Math) | Some(SyntaxKind::MathFrac) - | Some(SyntaxKind::MathScript) + | Some(SyntaxKind::MathAttach) ) { return false; } @@ -584,7 +584,7 @@ fn complete_code(ctx: &mut CompletionContext) -> bool { None | Some(SyntaxKind::Markup) | Some(SyntaxKind::Math) | Some(SyntaxKind::MathFrac) - | Some(SyntaxKind::MathScript) + | Some(SyntaxKind::MathAttach) ) { return false; } @@ -955,7 +955,7 @@ impl<'a> CompletionContext<'a> { Some(SyntaxKind::Formula) | Some(SyntaxKind::Math) | Some(SyntaxKind::MathFrac) - | Some(SyntaxKind::MathScript) + | Some(SyntaxKind::MathAttach) ); let scope = if in_math { self.math } else { self.global }; diff --git a/src/ide/highlight.rs b/src/ide/highlight.rs index 9261d157..7f7ad6ee 100644 --- a/src/ide/highlight.rs +++ b/src/ide/highlight.rs @@ -118,7 +118,7 @@ pub fn highlight(node: &LinkedNode) -> Option { SyntaxKind::MathAtom => None, SyntaxKind::MathIdent => highlight_ident(node), SyntaxKind::MathDelimited => None, - SyntaxKind::MathScript => None, + SyntaxKind::MathAttach => None, SyntaxKind::MathFrac => None, SyntaxKind::MathAlignPoint => Some(Category::MathOperator), @@ -143,7 +143,7 @@ pub fn highlight(node: &LinkedNode) -> Option { _ => Some(Category::Operator), }, SyntaxKind::Underscore => match node.parent_kind() { - Some(SyntaxKind::MathScript) => Some(Category::MathOperator), + Some(SyntaxKind::MathAttach) => Some(Category::MathOperator), _ => None, }, SyntaxKind::Dollar => Some(Category::MathDelimiter), @@ -213,7 +213,7 @@ pub fn highlight(node: &LinkedNode) -> Option { SyntaxKind::Markup | SyntaxKind::Math | SyntaxKind::MathFrac - | SyntaxKind::MathScript, + | SyntaxKind::MathAttach, ) => Some(Category::Interpolated), Some(SyntaxKind::FieldAccess) => node.parent().and_then(highlight), _ => None, @@ -252,7 +252,7 @@ fn highlight_ident(node: &LinkedNode) -> Option { SyntaxKind::Markup | SyntaxKind::Math | SyntaxKind::MathFrac - | SyntaxKind::MathScript, + | SyntaxKind::MathAttach, ) => Some(Category::Interpolated), Some(SyntaxKind::FuncCall) => Some(Category::Function), Some(SyntaxKind::FieldAccess) -- cgit v1.2.3