More clever highlighting, incl draft for structs

This commit is contained in:
Pascal Hertleif 2019-05-25 16:23:58 +02:00
parent ed89b0638b
commit 43d5a49653
No known key found for this signature in database
GPG key ID: EDBB1A8D2047A074
10 changed files with 159 additions and 414 deletions

1
Cargo.lock generated
View file

@ -1155,6 +1155,7 @@ dependencies = [
"ra_prof 0.1.0", "ra_prof 0.1.0",
"ra_syntax 0.1.0", "ra_syntax 0.1.0",
"ra_text_edit 0.1.0", "ra_text_edit 0.1.0",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

View file

@ -16,7 +16,10 @@ fn main() -> Result<()> {
.setting(clap::AppSettings::SubcommandRequiredElseHelp) .setting(clap::AppSettings::SubcommandRequiredElseHelp)
.subcommand(SubCommand::with_name("parse").arg(Arg::with_name("no-dump").long("--no-dump"))) .subcommand(SubCommand::with_name("parse").arg(Arg::with_name("no-dump").long("--no-dump")))
.subcommand(SubCommand::with_name("symbols")) .subcommand(SubCommand::with_name("symbols"))
.subcommand(SubCommand::with_name("highlight")) .subcommand(
SubCommand::with_name("highlight")
.arg(Arg::with_name("rainbow").short("r").long("rainbow"))
)
.subcommand( .subcommand(
SubCommand::with_name("analysis-stats") SubCommand::with_name("analysis-stats")
.arg(Arg::with_name("verbose").short("v").long("verbose")) .arg(Arg::with_name("verbose").short("v").long("verbose"))
@ -39,9 +42,9 @@ fn main() -> Result<()> {
println!("{:?}", s); println!("{:?}", s);
} }
} }
("highlight", _) => { ("highlight", Some(matches)) => {
let (analysis, file_id) = Analysis::from_single_file(read_stdin()?); let (analysis, file_id) = Analysis::from_single_file(read_stdin()?);
let html = analysis.highlight_as_html(file_id).unwrap(); let html = analysis.highlight_as_html(file_id, matches.is_present("rainbow")).unwrap();
println!("{}", html); println!("{}", html);
} }
("analysis-stats", Some(matches)) => { ("analysis-stats", Some(matches)) => {

View file

@ -15,6 +15,7 @@ rustc-hash = "1.0"
parking_lot = "0.7.0" parking_lot = "0.7.0"
unicase = "2.2.0" unicase = "2.2.0"
superslice = "1.0.0" superslice = "1.0.0"
rand = "0.6.5"
jemallocator = { version = "0.1.9", optional = true } jemallocator = { version = "0.1.9", optional = true }
jemalloc-ctl = { version = "0.2.0", optional = true } jemalloc-ctl = { version = "0.2.0", optional = true }

View file

@ -464,7 +464,7 @@ impl Analysis {
/// Computes syntax highlighting for the given file. /// Computes syntax highlighting for the given file.
pub fn highlight_as_html(&self, file_id: FileId) -> Cancelable<String> { pub fn highlight_as_html(&self, file_id: FileId) -> Cancelable<String> {
self.with_db(|db| syntax_highlighting::highlight_as_html(db, file_id)) self.with_db(|db| syntax_highlighting::highlight_as_html(db, file_id, true))
} }
/// Computes completions at the given position. /// Computes completions at the given position.

View file

@ -1,10 +1,7 @@
<style> <style>
pre { body { margin: 0; }
color: #DCDCCC; pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
background-color: #3F3F3F;
font-size: 22px;
}
.comment { color: #7F9F7F; } .comment { color: #7F9F7F; }
.string { color: #CC9393; } .string { color: #CC9393; }
@ -19,13 +16,11 @@ pre {
.keyword { color: #F0DFAF; } .keyword { color: #F0DFAF; }
.keyword\.unsafe { color: #F0DFAF; font-weight: bold; } .keyword\.unsafe { color: #F0DFAF; font-weight: bold; }
.keyword\.control { color: #DC8CC3; } .keyword\.control { color: #DC8CC3; }
</style> </style>
<pre><code> <pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
<span class="attribute">#</span><span class="attribute">[</span><span class="attribute">derive</span><span class="attribute">(</span><span class="attribute">Clone</span><span class="attribute">,</span><span class="attribute"> </span><span class="attribute">Debug</span><span class="attribute">)</span><span class="attribute">]</span>
<span class="keyword">struct</span> <span class="function">Foo</span> { <span class="keyword">struct</span> <span class="function">Foo</span> {
<span class="keyword">pub</span> <span class="function">x</span>: <span class="text">i32</span>, <span class="keyword">pub</span> <span class="variable" data-binding-hash="12067179602561426350" style="color: hsl(78,84%,47%);">x</span>: <span class="text">i32</span>,
<span class="keyword">pub</span> <span class="function">y</span>: <span class="text">i32</span>, <span class="keyword">pub</span> <span class="variable" data-binding-hash="15562018766631452210" style="color: hsl(318,95%,78%);">y</span>: <span class="text">i32</span>,
} }
<span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type function">T</span>&gt;() -&gt; <span class="type">T</span> { <span class="keyword">fn</span> <span class="function">foo</span>&lt;<span class="type function">T</span>&gt;() -&gt; <span class="type">T</span> {
@ -36,10 +31,9 @@ pre {
<span class="keyword">fn</span> <span class="function">main</span>() { <span class="keyword">fn</span> <span class="function">main</span>() {
<span class="macro">println</span><span class="macro">!</span>(<span class="string">"Hello, {}!"</span>, <span class="literal">92</span>); <span class="macro">println</span><span class="macro">!</span>(<span class="string">"Hello, {}!"</span>, <span class="literal">92</span>);
<span class="keyword">let</span> <span class="keyword">mut</span> <span class="function">vec</span> = <span class="text">Vec</span>::<span class="text">new</span>(); <span class="keyword">let</span> <span class="keyword">mut</span> <span class="variable" data-binding-hash="9636295041291189729" style="color: hsl(51,57%,74%);">vec</span> = <span class="text">Vec</span>::<span class="text">new</span>();
<span class="keyword.control">if</span> <span class="keyword">true</span> { <span class="keyword.control">if</span> <span class="keyword">true</span> {
<span class="text">vec</span>.<span class="text">push</span>(<span class="type">Foo</span> { <span class="field">x</span>: <span class="literal">0</span>, <span class="field">y</span>: <span class="literal">1</span> }); <span class="variable" data-binding-hash="8496027264380925433" style="color: hsl(18,48%,55%);">vec</span>.<span class="text">push</span>(<span class="type">Foo</span> { <span class="field" data-binding-hash="17368948500121423555" style="color: hsl(49,97%,70%);">x</span>: <span class="literal">0</span>, <span class="field" data-binding-hash="13663097548341495469" style="color: hsl(26,51%,46%);">y</span>: <span class="literal">1</span> });
} }
<span class="keyword.unsafe">unsafe</span> { <span class="text">vec</span>.<span class="text">set_len</span>(<span class="literal">0</span>); } <span class="keyword.unsafe">unsafe</span> { <span class="variable" data-binding-hash="8496027264380925433" style="color: hsl(18,48%,55%);">vec</span>.<span class="text">set_len</span>(<span class="literal">0</span>); }
} }</code></pre>
</code></pre>

View file

@ -0,0 +1,27 @@
<style>
body { margin: 0; }
pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
.comment { color: #7F9F7F; }
.string { color: #CC9393; }
.function { color: #93E0E3; }
.parameter { color: #94BFF3; }
.builtin { color: #DD6718; }
.text { color: #DCDCCC; }
.attribute { color: #BFEBBF; }
.literal { color: #DFAF8F; }
.macro { color: #DFAF8F; }
.keyword { color: #F0DFAF; }
.keyword\.unsafe { color: #F0DFAF; font-weight: bold; }
.keyword\.control { color: #DC8CC3; }
</style>
<pre><code><span class="keyword">fn</span> <span class="function">main</span>() {
<span class="keyword">let</span> <span class="variable" data-binding-hash="3888301305669440875" style="color: hsl(242,59%,59%);">hello</span> = <span class="string">"hello"</span>;
<span class="keyword">let</span> <span class="variable" data-binding-hash="5695551762718493399" style="color: hsl(272,48%,45%);">x</span> = <span class="variable" data-binding-hash="3888301305669440875" style="color: hsl(242,59%,59%);">hello</span>.<span class="text">to_string</span>();
<span class="keyword">let</span> <span class="variable" data-binding-hash="5435401749617022797" style="color: hsl(353,77%,74%);">y</span> = <span class="variable" data-binding-hash="3888301305669440875" style="color: hsl(242,59%,59%);">hello</span>.<span class="text">to_string</span>();
<span class="keyword">let</span> <span class="variable" data-binding-hash="1903207544374197704" style="color: hsl(58,61%,61%);">x</span> = <span class="string">"other color please!"</span>;
<span class="keyword">let</span> <span class="variable" data-binding-hash="14878783531007968800" style="color: hsl(265,73%,83%);">y</span> = <span class="variable" data-binding-hash="1903207544374197704" style="color: hsl(58,61%,61%);">x</span>.<span class="text">to_string</span>();
}</code></pre>

View file

@ -1,192 +0,0 @@
---
created: "2019-05-25T11:24:53.486036Z"
creator: insta@0.8.1
source: crates/ra_ide_api/src/syntax_highlighting.rs
expression: result
---
Ok(
[
HighlightedRange {
range: [1; 24),
tag: "attribute",
id: None,
},
HighlightedRange {
range: [25; 31),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [32; 35),
tag: "variable",
id: Some(
8465336196764640996,
),
},
HighlightedRange {
range: [42; 45),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [46; 47),
tag: "variable",
id: Some(
176272420896316891,
),
},
HighlightedRange {
range: [49; 52),
tag: "text",
id: None,
},
HighlightedRange {
range: [58; 61),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [62; 63),
tag: "variable",
id: Some(
15061637676198917049,
),
},
HighlightedRange {
range: [65; 68),
tag: "text",
id: None,
},
HighlightedRange {
range: [73; 75),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [76; 79),
tag: "variable",
id: Some(
14077410872302487760,
),
},
HighlightedRange {
range: [80; 81),
tag: "type",
id: None,
},
HighlightedRange {
range: [80; 81),
tag: "variable",
id: Some(
8379786015941272633,
),
},
HighlightedRange {
range: [88; 89),
tag: "type",
id: None,
},
HighlightedRange {
range: [96; 110),
tag: "macro",
id: None,
},
HighlightedRange {
range: [117; 127),
tag: "comment",
id: None,
},
HighlightedRange {
range: [128; 130),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [131; 135),
tag: "variable",
id: Some(
5766414492220109266,
),
},
HighlightedRange {
range: [145; 153),
tag: "macro",
id: None,
},
HighlightedRange {
range: [154; 166),
tag: "string",
id: None,
},
HighlightedRange {
range: [168; 170),
tag: "literal",
id: None,
},
HighlightedRange {
range: [178; 181),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [182; 185),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [186; 189),
tag: "macro",
id: None,
},
HighlightedRange {
range: [197; 200),
tag: "macro",
id: None,
},
HighlightedRange {
range: [192; 195),
tag: "text",
id: None,
},
HighlightedRange {
range: [208; 211),
tag: "macro",
id: None,
},
HighlightedRange {
range: [212; 216),
tag: "macro",
id: None,
},
HighlightedRange {
range: [226; 227),
tag: "literal",
id: None,
},
HighlightedRange {
range: [232; 233),
tag: "literal",
id: None,
},
HighlightedRange {
range: [242; 248),
tag: "keyword.unsafe",
id: None,
},
HighlightedRange {
range: [251; 254),
tag: "text",
id: None,
},
HighlightedRange {
range: [255; 262),
tag: "text",
id: None,
},
HighlightedRange {
range: [263; 264),
tag: "literal",
id: None,
},
],
)

View file

@ -1,128 +0,0 @@
---
created: "2019-05-25T11:21:56.117898Z"
creator: insta@0.8.1
source: crates/ra_ide_api/src/syntax_highlighting.rs
expression: result
---
Ok(
[
HighlightedRange {
range: [1; 3),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [4; 8),
tag: "variable",
id: Some(
5766414492220109266,
),
},
HighlightedRange {
range: [17; 20),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [21; 26),
tag: "variable",
id: Some(
15975256018338854530,
),
},
HighlightedRange {
range: [29; 36),
tag: "string",
id: None,
},
HighlightedRange {
range: [42; 45),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [46; 47),
tag: "variable",
id: Some(
176272420896316891,
),
},
HighlightedRange {
range: [50; 55),
tag: "variable",
id: Some(
15975256018338854530,
),
},
HighlightedRange {
range: [56; 65),
tag: "text",
id: None,
},
HighlightedRange {
range: [73; 76),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [77; 78),
tag: "variable",
id: Some(
15061637676198917049,
),
},
HighlightedRange {
range: [81; 86),
tag: "variable",
id: Some(
15975256018338854530,
),
},
HighlightedRange {
range: [87; 96),
tag: "text",
id: None,
},
HighlightedRange {
range: [105; 108),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [109; 110),
tag: "variable",
id: Some(
1714508680417729339,
),
},
HighlightedRange {
range: [113; 134),
tag: "string",
id: None,
},
HighlightedRange {
range: [140; 143),
tag: "keyword",
id: None,
},
HighlightedRange {
range: [144; 145),
tag: "variable",
id: Some(
15953336624848413466,
),
},
HighlightedRange {
range: [148; 149),
tag: "variable",
id: Some(
1714508680417729339,
),
},
HighlightedRange {
range: [150; 159),
tag: "text",
id: None,
},
],
)

View file

@ -10,7 +10,7 @@ use crate::{FileId, db::RootDatabase};
pub struct HighlightedRange { pub struct HighlightedRange {
pub range: TextRange, pub range: TextRange,
pub tag: &'static str, pub tag: &'static str,
pub id: Option<u64>, pub binding_hash: Option<u64>,
} }
fn is_control_keyword(kind: SyntaxKind) -> bool { fn is_control_keyword(kind: SyntaxKind) -> bool {
@ -30,9 +30,9 @@ fn is_control_keyword(kind: SyntaxKind) -> bool {
pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> { pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
let _p = profile("highlight"); let _p = profile("highlight");
let source_file = db.parse(file_id); let source_file = db.parse(file_id);
fn calc_binding_hash(file_id: FileId, text: &SmolStr, shadow_count: u32) -> u64 {
fn hash<T: std::hash::Hash + std::fmt::Debug>(x: T) -> u64 { fn hash<T: std::hash::Hash + std::fmt::Debug>(x: T) -> u64 {
use std::{collections::hash_map::DefaultHasher, hash::Hasher}; use std::{collections::hash_map::DefaultHasher, hash::Hasher};
@ -41,6 +41,9 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
hasher.finish() hasher.finish()
} }
hash((file_id, text, shadow_count))
}
// Visited nodes to handle highlighting priorities // Visited nodes to handle highlighting priorities
let mut highlighted: FxHashSet<SyntaxElement> = FxHashSet::default(); let mut highlighted: FxHashSet<SyntaxElement> = FxHashSet::default();
let mut bindings_shadow_count: FxHashMap<SmolStr, u32> = FxHashMap::default(); let mut bindings_shadow_count: FxHashMap<SmolStr, u32> = FxHashMap::default();
@ -50,66 +53,92 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
if highlighted.contains(&node) { if highlighted.contains(&node) {
continue; continue;
} }
let (tag, id) = match node.kind() { let mut binding_hash = None;
COMMENT => ("comment", None), let tag = match node.kind() {
STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => ("string", None), COMMENT => "comment",
ATTR => ("attribute", None), STRING | RAW_STRING | RAW_BYTE_STRING | BYTE_STRING => "string",
ATTR => "attribute",
NAME_REF => { NAME_REF => {
if let Some(name_ref) = node.as_ast_node::<ast::NameRef>() { if let Some(name_ref) = node.as_node().and_then(ast::NameRef::cast) {
use crate::name_ref_kind::{classify_name_ref, NameRefKind::*}; use crate::name_ref_kind::{classify_name_ref, NameRefKind::*};
use hir::{ModuleDef, ImplItem}; use hir::{ModuleDef, ImplItem};
// FIXME: try to reuse the SourceAnalyzers // FIXME: try to reuse the SourceAnalyzers
let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None); let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
match classify_name_ref(db, &analyzer, name_ref) { match classify_name_ref(db, &analyzer, name_ref) {
Some(Method(_)) => ("function", None), Some(Method(_)) => "function",
Some(Macro(_)) => ("macro", None), Some(Macro(_)) => "macro",
Some(FieldAccess(_)) => ("field", None), Some(FieldAccess(field)) => {
Some(AssocItem(ImplItem::Method(_))) => ("function", None), let (hir_file_id, src) = field.source(db);
Some(AssocItem(ImplItem::Const(_))) => ("constant", None), if let hir::FieldSource::Named(name) = src {
Some(AssocItem(ImplItem::TypeAlias(_))) => ("type", None), let text = name.syntax().text().to_smol_string();
Some(Def(ModuleDef::Module(_))) => ("module", None), let shadow_count = 0; // potentially even from different file
Some(Def(ModuleDef::Function(_))) => ("function", None), binding_hash = Some(calc_binding_hash(hir_file_id.original_file(db), &text, shadow_count));
Some(Def(ModuleDef::Struct(_))) => ("type", None), }
Some(Def(ModuleDef::Union(_))) => ("type", None),
Some(Def(ModuleDef::Enum(_))) => ("type", None), "field"
Some(Def(ModuleDef::EnumVariant(_))) => ("constant", None), },
Some(Def(ModuleDef::Const(_))) => ("constant", None), Some(AssocItem(ImplItem::Method(_))) => "function",
Some(Def(ModuleDef::Static(_))) => ("constant", None), Some(AssocItem(ImplItem::Const(_))) => "constant",
Some(Def(ModuleDef::Trait(_))) => ("type", None), Some(AssocItem(ImplItem::TypeAlias(_))) => "type",
Some(Def(ModuleDef::TypeAlias(_))) => ("type", None), Some(Def(ModuleDef::Module(_))) => "module",
Some(SelfType(_)) => ("type", None), Some(Def(ModuleDef::Function(_))) => "function",
Some(Pat(ptr)) => ("variable", Some(hash({ Some(Def(ModuleDef::Struct(_))) => "type",
Some(Def(ModuleDef::Union(_))) => "type",
Some(Def(ModuleDef::Enum(_))) => "type",
Some(Def(ModuleDef::EnumVariant(_))) => "constant",
Some(Def(ModuleDef::Const(_))) => "constant",
Some(Def(ModuleDef::Static(_))) => "constant",
Some(Def(ModuleDef::Trait(_))) => "type",
Some(Def(ModuleDef::TypeAlias(_))) => "type",
Some(SelfType(_)) => "type",
Some(Pat(ptr)) => {
binding_hash = Some({
let text = ptr.syntax_node_ptr().to_node(&source_file.syntax()).text().to_smol_string(); let text = ptr.syntax_node_ptr().to_node(&source_file.syntax()).text().to_smol_string();
let shadow_count = bindings_shadow_count.entry(text.clone()).or_default(); let shadow_count = bindings_shadow_count.entry(text.clone()).or_default();
(text, shadow_count) calc_binding_hash(file_id, &text, *shadow_count)
}))), });
Some(SelfParam(_)) => ("type", None),
Some(GenericParam(_)) => ("type", None), "variable"
None => ("text", None), },
Some(SelfParam(_)) => "type",
Some(GenericParam(_)) => "type",
None => "text",
} }
} else { } else {
("text", None) "text"
} }
} }
NAME => { NAME => {
if let Some(name) = node.as_ast_node::<ast::Name>() { if let Some(name) = node.as_node().and_then(ast::Name::cast) {
("variable", Some(hash({ if name.syntax().ancestors().any(|x| ast::BindPat::cast(x).is_some()) {
binding_hash = Some({
let text = name.syntax().text().to_smol_string(); let text = name.syntax().text().to_smol_string();
let shadow_count = bindings_shadow_count.entry(text.clone()).or_insert(1); let shadow_count = bindings_shadow_count.entry(text.clone()).or_insert(0);
*shadow_count += 1; *shadow_count += 1;
(text, shadow_count) calc_binding_hash(file_id, &text, *shadow_count)
}))) });
"variable"
} else if name.syntax().ancestors().any(|x| ast::NamedFieldDef::cast(x).is_some()) {
binding_hash = Some({
let text = name.syntax().text().to_smol_string();
let shadow_count = 0;
calc_binding_hash(file_id, &text, shadow_count)
});
"variable"
} else { } else {
("text", None) "function"
}
} else {
"text"
} }
} }
TYPE_ALIAS_DEF | TYPE_ARG | TYPE_PARAM => ("type", None), TYPE_ALIAS_DEF | TYPE_ARG | TYPE_PARAM => "type",
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => ("literal", None), INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
LIFETIME => ("parameter", None), LIFETIME => "parameter",
T![unsafe] => ("keyword.unsafe", None), T![unsafe] => "keyword.unsafe",
k if is_control_keyword(k) => ("keyword.control", None), k if is_control_keyword(k) => "keyword.control",
k if k.is_keyword() => ("keyword", None), k if k.is_keyword() => "keyword",
_ => { _ => {
// let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None); // let analyzer = hir::SourceAnalyzer::new(db, file_id, name_ref.syntax(), None);
if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) { if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) {
@ -128,7 +157,7 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
res.push(HighlightedRange { res.push(HighlightedRange {
range: TextRange::from_to(range_start, range_end), range: TextRange::from_to(range_start, range_end),
tag: "macro", tag: "macro",
id: None, binding_hash: None,
}) })
} }
} }
@ -137,14 +166,24 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
continue; continue;
} }
}; };
res.push(HighlightedRange { range: node.range(), tag, id }) res.push(HighlightedRange { range: node.range(), tag, binding_hash })
} }
res res
} }
pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId) -> String { pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId, rainbow: bool) -> String {
let source_file = db.parse(file_id); let source_file = db.parse(file_id);
fn rainbowify(seed: u64) -> String {
use rand::prelude::*;
let mut rng = SmallRng::seed_from_u64(seed);
format!("hsl({h},{s}%,{l}%)",
h = rng.gen_range::<u16, _, _>(0, 361),
s = rng.gen_range::<u16, _, _>(42, 99),
l = rng.gen_range::<u16, _, _>(40, 91),
)
}
let mut ranges = highlight(db, file_id); let mut ranges = highlight(db, file_id);
ranges.sort_by_key(|it| it.range.start()); ranges.sort_by_key(|it| it.range.start());
// quick non-optimal heuristic to intersect token ranges and highlighted ranges // quick non-optimal heuristic to intersect token ranges and highlighted ranges
@ -166,16 +205,20 @@ pub(crate) fn highlight_as_html(db: &RootDatabase, file_id: FileId) -> String {
} }
} }
let text = html_escape(&token.text()); let text = html_escape(&token.text());
let classes = could_intersect let ranges = could_intersect
.iter() .iter()
.filter(|it| token.range().is_subrange(&it.range)) .filter(|it| token.range().is_subrange(&it.range))
.map(|it| it.tag)
.collect::<Vec<_>>(); .collect::<Vec<_>>();
if classes.is_empty() { if ranges.is_empty() {
buf.push_str(&text); buf.push_str(&text);
} else { } else {
let classes = classes.join(" "); let classes = ranges.iter().map(|x| x.tag).collect::<Vec<_>>().join(" ");
buf.push_str(&format!("<span class=\"{}\">{}</span>", classes, text)); let binding_hash = ranges.first().and_then(|x| x.binding_hash);
let color = match (rainbow, binding_hash) {
(true, Some(hash)) => format!(" data-binding-hash=\"{}\" style=\"color: {};\"", hash, rainbowify(hash)),
_ => "".into()
};
buf.push_str(&format!("<span class=\"{}\"{}>{}</span>", classes, color, text));
} }
} }
buf.push_str("</code></pre>"); buf.push_str("</code></pre>");
@ -189,11 +232,8 @@ fn html_escape(text: &str) -> String {
const STYLE: &str = " const STYLE: &str = "
<style> <style>
pre { body { margin: 0; }
color: #DCDCCC; pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }
background-color: #3F3F3F;
font-size: 22px;
}
.comment { color: #7F9F7F; } .comment { color: #7F9F7F; }
.string { color: #CC9393; } .string { color: #CC9393; }
@ -208,7 +248,6 @@ pre {
.keyword { color: #F0DFAF; } .keyword { color: #F0DFAF; }
.keyword\\.unsafe { color: #F0DFAF; font-weight: bold; } .keyword\\.unsafe { color: #F0DFAF; font-weight: bold; }
.keyword\\.control { color: #DC8CC3; } .keyword\\.control { color: #DC8CC3; }
</style> </style>
"; ";
@ -241,12 +280,12 @@ fn main() {
} }
unsafe { vec.set_len(0); } unsafe { vec.set_len(0); }
} }
"#, "#.trim(),
); );
let dst_file = project_dir().join("crates/ra_ide_api/src/snapshots/highlighting.html"); let dst_file = project_dir().join("crates/ra_ide_api/src/snapshots/highlighting.html");
let actual_html = &analysis.highlight_as_html(file_id).unwrap(); let actual_html = &analysis.highlight_as_html(file_id).unwrap();
let expected_html = &read_text(&dst_file); let expected_html = &read_text(&dst_file);
// std::fs::write(dst_file, &actual_html).unwrap(); std::fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html); assert_eq_text!(expected_html, actual_html);
} }
@ -261,9 +300,13 @@ fn main() {
let x = "other color please!"; let x = "other color please!";
let y = x.to_string(); let y = x.to_string();
}"#, }
"#.trim(),
); );
let result = analysis.highlight(file_id); let dst_file = project_dir().join("crates/ra_ide_api/src/snapshots/rainbow_highlighting.html");
assert_debug_snapshot_matches!("rainbow_highlighting", result); let actual_html = &analysis.highlight_as_html(file_id).unwrap();
let expected_html = &read_text(&dst_file);
std::fs::write(dst_file, &actual_html).unwrap();
assert_eq_text!(expected_html, actual_html);
} }
} }

View file

@ -523,10 +523,6 @@ impl<'a> SyntaxElement<'a> {
} }
} }
pub fn as_ast_node<T: AstNode>(&self) -> Option<&T> {
self.as_node().and_then(|x| <T as AstNode>::cast(x))
}
pub fn as_token(&self) -> Option<SyntaxToken<'a>> { pub fn as_token(&self) -> Option<SyntaxToken<'a>> {
match self { match self {
SyntaxElement::Node(_) => None, SyntaxElement::Node(_) => None,