From 1c8467e20aa8d481a4583a1c2cf40fad3d2ff53c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 17 Dec 2019 14:43:37 +0100 Subject: [PATCH] Fix highlighting token names --- crates/ra_ide/src/snapshots/highlighting.html | 2 +- crates/ra_ide/src/snapshots/rainbow_highlighting.html | 2 +- crates/ra_ide/src/syntax_highlighting.rs | 2 +- editors/code/src/highlighting.ts | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/ra_ide/src/snapshots/highlighting.html b/crates/ra_ide/src/snapshots/highlighting.html index 40605d9efdf..2157139f664 100644 --- a/crates/ra_ide/src/snapshots/highlighting.html +++ b/crates/ra_ide/src/snapshots/highlighting.html @@ -7,9 +7,9 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd .string { color: #CC9393; } .function { color: #93E0E3; } .parameter { color: #94BFF3; } -.builtin { color: #DD6718; } .text { color: #DCDCCC; } .type { color: #7CB8BB; } +.type\.builtin { color: #8CD0D3; } .type\.param { color: #20999D; } .attribute { color: #94BFF3; } .literal { color: #BFEBBF; } diff --git a/crates/ra_ide/src/snapshots/rainbow_highlighting.html b/crates/ra_ide/src/snapshots/rainbow_highlighting.html index ecf26c70847..871a52cf62f 100644 --- a/crates/ra_ide/src/snapshots/rainbow_highlighting.html +++ b/crates/ra_ide/src/snapshots/rainbow_highlighting.html @@ -7,9 +7,9 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd .string { color: #CC9393; } .function { color: #93E0E3; } .parameter { color: #94BFF3; } -.builtin { color: #DD6718; } .text { color: #DCDCCC; } .type { color: #7CB8BB; } +.type\.builtin { color: #8CD0D3; } .type\.param { color: #20999D; } .attribute { color: #94BFF3; } .literal { color: #BFEBBF; } diff --git a/crates/ra_ide/src/syntax_highlighting.rs b/crates/ra_ide/src/syntax_highlighting.rs index eb3dd177935..15e75709c1d 100644 --- a/crates/ra_ide/src/syntax_highlighting.rs +++ b/crates/ra_ide/src/syntax_highlighting.rs @@ -284,9 +284,9 @@ fn html_escape(text: &str) -> String { .string { color: #CC9393; } .function { color: #93E0E3; } .parameter { color: #94BFF3; } -.builtin { color: #DD6718; } .text { color: #DCDCCC; } .type { color: #7CB8BB; } +.type\\.builtin { color: #8CD0D3; } .type\\.param { color: #20999D; } .attribute { color: #94BFF3; } .literal { color: #BFEBBF; } diff --git a/editors/code/src/highlighting.ts b/editors/code/src/highlighting.ts index d7c0ae1316a..e1b0d13e701 100644 --- a/editors/code/src/highlighting.ts +++ b/editors/code/src/highlighting.ts @@ -52,12 +52,12 @@ export class Highlighter { decoration('function'), decoration('parameter'), decoration('constant'), - decoration('type'), - decoration('type.self'), + decoration('type.builtin'), decoration('type.generic'), - decoration('type.param'), decoration('type.lifetime'), - decoration('builtin'), + decoration('type.param'), + decoration('type.self'), + decoration('type'), decoration('text'), decoration('attribute'), decoration('literal'), -- 2.44.0