Use ThemeColor and add support for light themes #1299

lnicola · 2019-05-21T11:06:55Z

Part of #1294.

switch to ThemeColor
add light and high contrast theme definitions
highlight control flow keywords and unsafe

matklad

😍

matklad · 2019-05-21T11:24:17Z

editors/code/package.json

+                }
+            },
+            {
+                "id": "ralsp.control",


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?

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

matklad · 2019-05-21T11:25:17Z

editors/code/package.json

+                "id": "ralsp.keyword",
+                "description": "Color for keywords",
+                "defaults": {
+                    "dark": "#F0DFAF",


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

I switched to the default colors.

matklad · 2019-05-21T11:25:53Z

crates/ra_ide_api/src/syntax_highlighting.rs

@@ -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


The new syntax for this is

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

Is that better? 😅

Updated.

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

matklad · 2019-05-21T13:54:19Z

Thanks!

bors r+

1299: Use ThemeColor and add support for light themes r=matklad a=lnicola Part of #1294. - switch to `ThemeColor` - add light and high contrast theme definitions - highlight control flow keywords and `unsafe` Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>

bors · 2019-05-21T14:08:24Z

Build succeeded

continuous-integration/travis-ci/push

mominul · 2019-05-21T23:09:05Z

editors/code/package.json

+            },
+            {
+                "id": "ralsp.macro",
+                "description": "Color for DFAF8F",


Wouldn't be it Color for macros?

Thank you, fixed in #1305.

lnicola force-pushed the code-color branch from db56f37 to eaf19da Compare May 21, 2019 11:15

Use ThemeColor and add support for light themes

9ade271

lnicola force-pushed the code-color branch from eaf19da to 9ade271 Compare May 21, 2019 11:19

matklad reviewed May 21, 2019

View reviewed changes

Address feedback

b08362f

bors bot merged commit b08362f into rust-lang:master May 21, 2019

lnicola deleted the code-color branch May 21, 2019 14:11

mominul reviewed May 21, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use ThemeColor and add support for light themes #1299

Use ThemeColor and add support for light themes #1299

lnicola commented May 21, 2019 •

edited

matklad left a comment

matklad May 21, 2019

lnicola May 21, 2019

matklad May 21, 2019

lnicola May 21, 2019

matklad May 21, 2019

lnicola May 21, 2019

matklad May 21, 2019

matklad commented May 21, 2019

bors bot commented May 21, 2019

mominul May 21, 2019

lnicola May 23, 2019

Use ThemeColor and add support for light themes #1299

Use ThemeColor and add support for light themes #1299

Conversation

lnicola commented May 21, 2019 • edited

matklad left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matklad commented May 21, 2019

bors bot commented May 21, 2019

Build succeeded

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lnicola commented May 21, 2019 •

edited