From 1735b3ef6a7c7f7b3f5cdecdbf204c85991bcd63 Mon Sep 17 00:00:00 2001 From: Chetan Khilosiya Date: Tue, 6 Apr 2021 00:09:17 +0530 Subject: 8279: Added initial implementation for Operator semantic highlighting. --- crates/ide/src/lib.rs | 2 +- crates/ide/src/syntax_highlighting/highlight.rs | 66 ++++++++++++++++++++----- crates/ide/src/syntax_highlighting/tags.rs | 24 ++++++++- 3 files changed, 77 insertions(+), 15 deletions(-) (limited to 'crates/ide') diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 3f73c0632..b5ae51d28 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs @@ -82,7 +82,7 @@ pub use crate::{ references::{rename::RenameError, ReferenceSearchResult}, runnables::{Runnable, RunnableKind, TestId}, syntax_highlighting::{ - tags::{Highlight, HlMod, HlMods, HlPunct, HlTag}, + tags::{Highlight, HlMod, HlMods, HlOperator, HlPunct, HlTag}, HlRange, }, }; diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs index 5ccb84714..7734ea301 100644 --- a/crates/ide/src/syntax_highlighting/highlight.rs +++ b/crates/ide/src/syntax_highlighting/highlight.rs @@ -12,7 +12,10 @@ use syntax::{ SyntaxNode, SyntaxToken, T, }; -use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag}; +use crate::{ + syntax_highlighting::tags::{HlOperator, HlPunct}, + Highlight, HlMod, HlTag, +}; pub(super) fn element( sema: &Semantics, @@ -132,7 +135,7 @@ pub(super) fn element( INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(), BYTE => HlTag::ByteLiteral.into(), CHAR => HlTag::CharLiteral.into(), - QUESTION => Highlight::new(HlTag::Operator) | HlMod::ControlFlow, + QUESTION => Highlight::new(HlTag::Operator(HlOperator::Other)) | HlMod::ControlFlow, LIFETIME => { let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap(); @@ -146,8 +149,11 @@ pub(super) fn element( } } p if p.is_punct() => match p { + T![&] if element.parent().and_then(ast::BinExpr::cast).is_some() => { + HlTag::Operator(HlOperator::Bitwise).into() + } T![&] => { - let h = HlTag::Operator.into(); + let h = HlTag::Operator(HlOperator::Other).into(); let is_unsafe = element .parent() .and_then(ast::RefExpr::cast) @@ -159,13 +165,21 @@ pub(super) fn element( h } } - T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => HlTag::Operator.into(), + T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => { + HlTag::Operator(HlOperator::Other).into() + } T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => { + eprintln!("in macro call: {}", element); HlTag::Symbol(SymbolKind::Macro).into() } T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => { + eprintln!("in never type : {}", element); HlTag::BuiltinType.into() } + T![!] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => { + eprintln!("pre expr for : {}", element); + HlTag::Operator(HlOperator::Bitwise).into() + } T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => { HlTag::Keyword.into() } @@ -175,32 +189,60 @@ pub(super) fn element( let expr = prefix_expr.expr()?; let ty = sema.type_of_expr(&expr)?; if ty.is_raw_ptr() { - HlTag::Operator | HlMod::Unsafe + HlTag::Operator(HlOperator::Other) | HlMod::Unsafe } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() { - HlTag::Operator.into() + HlTag::Operator(HlOperator::Other).into() } else { HlTag::Punctuation(HlPunct::Other).into() } } T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => { + eprintln!("the - operator: {}", element); let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?; let expr = prefix_expr.expr()?; match expr { ast::Expr::Literal(_) => HlTag::NumericLiteral, - _ => HlTag::Operator, + _ => HlTag::Operator(HlOperator::Other), } .into() } _ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => { - HlTag::Operator.into() + eprintln!("the prefix expr block: {}", element); + HlTag::Operator(HlOperator::Other).into() + } + T![+] | T![-] | T![*] | T![/] | T![+=] | T![-=] | T![*=] | T![/=] + if element.parent().and_then(ast::BinExpr::cast).is_some() => + { + HlTag::Operator(HlOperator::Arithmetic).into() + } + T![|] | T![&] | T![!] | T![^] | T![|=] | T![&=] | T![^=] + if element.parent().and_then(ast::BinExpr::cast).is_some() => + { + HlTag::Operator(HlOperator::Bitwise).into() + } + T![&&] | T![||] if element.parent().and_then(ast::BinExpr::cast).is_some() => { + HlTag::Operator(HlOperator::Logical).into() + } + T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=] + if element.parent().and_then(ast::BinExpr::cast).is_some() => + { + HlTag::Operator(HlOperator::Comparision).into() + } + _ if element.parent().and_then(ast::BinExpr::cast).is_some() => { + eprintln!("the bin expr : {}", element); + HlTag::Operator(HlOperator::Other).into() } - _ if element.parent().and_then(ast::BinExpr::cast).is_some() => HlTag::Operator.into(), _ if element.parent().and_then(ast::RangeExpr::cast).is_some() => { - HlTag::Operator.into() + eprintln!("the range expr block: {}", element); + HlTag::Operator(HlOperator::Other).into() + } + _ if element.parent().and_then(ast::RangePat::cast).is_some() => { + HlTag::Operator(HlOperator::Other).into() + } + _ if element.parent().and_then(ast::RestPat::cast).is_some() => { + HlTag::Operator(HlOperator::Other).into() } - _ if element.parent().and_then(ast::RangePat::cast).is_some() => HlTag::Operator.into(), - _ if element.parent().and_then(ast::RestPat::cast).is_some() => HlTag::Operator.into(), _ if element.parent().and_then(ast::Attr::cast).is_some() => HlTag::Attribute.into(), kind => HlTag::Punctuation(match kind { T!['['] | T![']'] => HlPunct::Bracket, diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs index 1cec991aa..8128d231d 100644 --- a/crates/ide/src/syntax_highlighting/tags.rs +++ b/crates/ide/src/syntax_highlighting/tags.rs @@ -28,7 +28,7 @@ pub enum HlTag { FormatSpecifier, Keyword, NumericLiteral, - Operator, + Operator(HlOperator), Punctuation(HlPunct), StringLiteral, UnresolvedReference, @@ -87,6 +87,20 @@ pub enum HlPunct { Other, } +#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)] +pub enum HlOperator { + /// |, &, !, ^, |=, &=, ^= + Bitwise, + /// +, -, *, /, +=, -=, *=, /= + Arithmetic, + /// &&, ||, ! + Logical, + /// >, <, ==, >=, <=, != + Comparision, + /// + Other, +} + impl HlTag { fn as_str(self) -> &'static str { match self { @@ -133,7 +147,13 @@ impl HlTag { HlPunct::Other => "punctuation", }, HlTag::NumericLiteral => "numeric_literal", - HlTag::Operator => "operator", + HlTag::Operator(op) => match op { + HlOperator::Bitwise => "bitwise", + HlOperator::Arithmetic => "arithmetic", + HlOperator::Logical => "logical", + HlOperator::Comparision => "comparision", + HlOperator::Other => "operator", + }, HlTag::StringLiteral => "string_literal", HlTag::UnresolvedReference => "unresolved_reference", HlTag::None => "none", -- cgit v1.2.3