Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use ThemeColor and add support for light themes #1299

Merged
merged 2 commits into from May 21, 2019
Merged

Use ThemeColor and add support for light themes #1299

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ade271
Use ThemeColor and add support for light themes
lnicola May 21, 2019
b08362f
Address feedback
lnicola May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion crates/ra_ide_api/src/syntax_highlighting.rs
View file
Open in desktop
@@ -1,6 +1,6 @@
use rustc_hash::FxHashSet;

use ra_syntax::{ast, AstNode, TextRange, Direction, SyntaxKind::*, SyntaxElement, T};
use ra_syntax::{ast, AstNode, TextRange, Direction, SyntaxKind, SyntaxKind::*, SyntaxElement, T};
use ra_db::SourceDatabase;

use crate::{FileId, db::RootDatabase};
Expand All @@ -11,6 +11,14 @@ pub struct HighlightedRange {
pub tag: &'static str,
}

fn is_control_keyword(kind: SyntaxKind) -> bool {
match kind {
FOR_KW | LOOP_KW | WHILE_KW | CONTINUE_KW | BREAK_KW | IF_KW | ELSE_KW | MATCH_KW
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new syntax for this is

match kind {
    T![for], T![loop], ...
}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that better? 😅

Updated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is, but the beauty is in the eye of the beholder :)

| RETURN_KW => true,
_ => false,
}
}

pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRange> {
let source_file = db.parse(file_id);

Expand All @@ -29,6 +37,8 @@ pub(crate) fn highlight(db: &RootDatabase, file_id: FileId) -> Vec<HighlightedRa
NAME => "function",
INT_NUMBER | FLOAT_NUMBER | CHAR | BYTE => "literal",
LIFETIME => "parameter",
UNSAFE_KW => "unsafe",
k if is_control_keyword(k) => "control",
k if k.is_keyword() => "keyword",
_ => {
if let Some(macro_call) = node.as_node().and_then(ast::MacroCall::cast) {
Expand Down
119 changes: 119 additions & 0 deletions editors/code/package.json
View file
Open in desktop
Expand Up @@ -268,6 +268,125 @@
},
"pattern": "$rustc"
}
],
"colors": [
{
"id": "ralsp.background",
"description": "Background color",
"defaults": {
"dark": "#3F3F3F",
"light": "#001080",
"highContrast": "#000000"
}
},
{
"id": "ralsp.comment",
"description": "Color for comments",
"defaults": {
"dark": "#7F9F7F",
"light": "#008000",
"highContrast": "#7CA668"
}
},
{
"id": "ralsp.string",
"description": "Color for strings",
"defaults": {
"dark": "#CC9393",
"light": "#A31515",
"highContrast": "#CE9178"
}
},
{
"id": "ralsp.unsafe",
"description": "Color for unsafe",
"defaults": {
"dark": "#FF3030",
"light": "#FF1010",
"highContrast": "#FF1010"
}
},
{
"id": "ralsp.keyword",
"description": "Color for keywords",
"defaults": {
"dark": "#F0DFAF",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW, I'd be perfectly fine with picking a color from default dark theme. This is now configurable, so I can just specify zenburn colors in my config

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I switched to the default colors.

"light": "#0000FF",
"highContrast": "#569CD6"
}
},
{
"id": "ralsp.control",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an easy way to allow both

  • highligting all keywords the same (this is what I personally prefer)
  • highlight various different classes of keywords differently

Perhaps we should just name classes ralsp.keyword, ralsp.keyword.controlflow, ralsp.keyword.unsafe?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated. I used ralsp.keyword.control to match the default theme (keyword.control).

"description": "Color for control keywords",
"defaults": {
"dark": "#CF20FB",
"light": "#AF00DB",
"highContrast": "#C586C0"
}
},
{
"id": "ralsp.function",
"description": "Color for functions",
"defaults": {
"dark": "#93E0E3",
"light": "#795E26",
"highContrast": "#DCDCAA"
}
},
{
"id": "ralsp.parameter",
"description": "Color for parameters",
"defaults": {
"dark": "#94BFF3",
"light": "#001080",
"highContrast": "#9CDCFE"
}
},
{
"id": "ralsp.builtin",
"description": "Color for builtins",
"defaults": {
"dark": "#DD6718",
"light": "#DD6718",
"highContrast": "#DD6718"
}
},
{
"id": "ralsp.text",
"description": "Color for text",
"defaults": {
"dark": "#DCDCCC",
"light": "#000000",
"highContrast": "#FFFFFF"
}
},
{
"id": "ralsp.attribute",
"description": "Color for attributes",
"defaults": {
"dark": "#BFEBBF",
"light": "#1F4B1F",
"highContrast": "#108010"
}
},
{
"id": "ralsp.literal",
"description": "Color for literals",
"defaults": {
"dark": "#DFAF8F",
"light": "#09885A",
"highContrast": "#B5CEA8"
}
},
{
"id": "ralsp.macro",
"description": "Color for DFAF8F",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't be it Color for macros?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you, fixed in #1305.

"defaults": {
"dark": "#BFEBBF",
"light": "#DD6718",
"highContrast": "#ED7718"
}
}
]
}
}
35 changes: 22 additions & 13 deletions editors/code/src/highlighting.ts
View file
Open in desktop
Expand Up @@ -13,23 +13,32 @@ export class Highlighter {
string,
vscode.TextEditorDecorationType
> {
const decor = (color: string) =>
vscode.window.createTextEditorDecorationType({ color });
const colorContrib = (
tag: string
): [string, vscode.TextEditorDecorationType] => {
const color = new vscode.ThemeColor('ralsp.' + tag);
const decor = vscode.window.createTextEditorDecorationType({
color
});
return [tag, decor];
};

const decorations: Iterable<
[string, vscode.TextEditorDecorationType]
> = [
['background', decor('#3F3F3F')],
['comment', decor('#7F9F7F')],
['string', decor('#CC9393')],
['keyword', decor('#F0DFAF')],
['function', decor('#93E0E3')],
['parameter', decor('#94BFF3')],
['builtin', decor('#DD6718')],
['text', decor('#DCDCCC')],
['attribute', decor('#BFEBBF')],
['literal', decor('#DFAF8F')],
['macro', decor('#DFAF8F')]
colorContrib('background'),
colorContrib('comment'),
colorContrib('string'),
colorContrib('unsafe'),
colorContrib('keyword'),
colorContrib('control'),
colorContrib('function'),
colorContrib('parameter'),
colorContrib('builtin'),
colorContrib('text'),
colorContrib('attribute'),
colorContrib('literal'),
colorContrib('macro')
];

return new Map<string, vscode.TextEditorDecorationType>(decorations);
Expand Down