From aae26bc5b864971ef54f4d95d5ed89a6436334e2 Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Mon, 15 Jun 2020 20:17:26 -0400 Subject: Add highlighting support for doc comments --- crates/ra_ide/src/syntax_highlighting/injection.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'crates/ra_ide/src/syntax_highlighting/injection.rs') diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs index 929a5cc5c..40436c5a2 100644 --- a/crates/ra_ide/src/syntax_highlighting/injection.rs +++ b/crates/ra_ide/src/syntax_highlighting/injection.rs @@ -7,7 +7,10 @@ use hir::Semantics; use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; use stdx::SepBy; -use crate::{call_info::ActiveParameter, Analysis, HighlightTag, HighlightedRange, RootDatabase}; +use crate::{ + call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag, + HighlightedRange, RootDatabase, +}; use super::HighlightedRangeStack; @@ -118,7 +121,8 @@ pub(super) fn extract_doc_comments( range.start(), range.start() + TextSize::try_from(pos).unwrap(), ), - highlight: HighlightTag::Comment.into(), + highlight: Highlight::from(HighlightTag::Comment) + | HighlightModifier::Documentation, binding_hash: None, }); line_start += range.len() - TextSize::try_from(pos).unwrap(); -- cgit v1.2.3 From a951108173349f9ff0b9936ec2af8881fd92fc98 Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Wed, 17 Jun 2020 09:33:21 -0400 Subject: Ensure all existing doctest code highlights have documentation modifier --- crates/ra_ide/src/syntax_highlighting/injection.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'crates/ra_ide/src/syntax_highlighting/injection.rs') diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs index 40436c5a2..dc12c8f5a 100644 --- a/crates/ra_ide/src/syntax_highlighting/injection.rs +++ b/crates/ra_ide/src/syntax_highlighting/injection.rs @@ -8,8 +8,8 @@ use ra_syntax::{ast, AstToken, SyntaxNode, SyntaxToken, TextRange, TextSize}; use stdx::SepBy; use crate::{ - call_info::ActiveParameter, Analysis, Highlight, HighlightModifier, HighlightTag, - HighlightedRange, RootDatabase, + call_info::ActiveParameter, Analysis, HighlightModifier, HighlightTag, HighlightedRange, + RootDatabase, }; use super::HighlightedRangeStack; @@ -121,8 +121,7 @@ pub(super) fn extract_doc_comments( range.start(), range.start() + TextSize::try_from(pos).unwrap(), ), - highlight: Highlight::from(HighlightTag::Comment) - | HighlightModifier::Documentation, + highlight: HighlightTag::Comment | HighlightModifier::Documentation, binding_hash: None, }); line_start += range.len() - TextSize::try_from(pos).unwrap(); @@ -168,6 +167,8 @@ pub(super) fn highlight_doc_comment( h.range.start() + start_offset, h.range.end() + end_offset.unwrap_or(start_offset), ); + + h.highlight |= HighlightModifier::Documentation; stack.add(h); } } -- cgit v1.2.3 From 66fc084a86e8f5d207d63e33173d1e203cb5ce5e Mon Sep 17 00:00:00 2001 From: Paul Daniel Faria Date: Thu, 18 Jun 2020 09:14:02 -0400 Subject: Remove logic to mark all doctest code as --- crates/ra_ide/src/syntax_highlighting/injection.rs | 1 - 1 file changed, 1 deletion(-) (limited to 'crates/ra_ide/src/syntax_highlighting/injection.rs') diff --git a/crates/ra_ide/src/syntax_highlighting/injection.rs b/crates/ra_ide/src/syntax_highlighting/injection.rs index dc12c8f5a..415f24a6d 100644 --- a/crates/ra_ide/src/syntax_highlighting/injection.rs +++ b/crates/ra_ide/src/syntax_highlighting/injection.rs @@ -168,7 +168,6 @@ pub(super) fn highlight_doc_comment( h.range.end() + end_offset.unwrap_or(start_offset), ); - h.highlight |= HighlightModifier::Documentation; stack.add(h); } } -- cgit v1.2.3