zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-16 17:07:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix predictive text color (#3867)

Browse Source 
This PR fixes the predictive text colors, which were no longer correct
after #3842.

Release Notes:

- Fixed predictive text colors.
This commit is contained in:
Marshall Bowers 2024-01-03 17:09:01 -05:00 committed by GitHub
parent afeae56fab
commit a4986c397d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/theme/src/themes/andromeda.rs
View File

@ -122,7 +122,7 @@ pub fn andromeda() -> UserThemeFamily {
modified: Some(rgba(0xfee56dff).into()),
modified_background: Some(rgba(0x5c5015ff).into()),
modified_border: Some(rgba(0x796b26ff).into()),
predictive: Some(rgba(0x96df72ff).into()),
predictive: Some(rgba(0x315f70ff).into()),
predictive_background: Some(rgba(0x194618ff).into()),
predictive_border: Some(rgba(0x306129ff).into()),
renamed: Some(rgba(0x11a793ff).into()),

40
crates/theme/src/themes/atelier.rs
View File

@ -123,7 +123,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa59810ff).into()),
modified_background: Some(rgba(0xf0e9d1ff).into()),
modified_border: Some(rgba(0xe3d8adff).into()),
predictive: Some(rgba(0x7d9728ff).into()),
predictive: Some(rgba(0x879a72ff).into()),
predictive_background: Some(rgba(0xe6e9d3ff).into()),
predictive_border: Some(rgba(0xd2d8b1ff).into()),
renamed: Some(rgba(0x38a166ff).into()),
@ -588,7 +588,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xc38419ff).into()),
modified_background: Some(rgba(0x371d0dff).into()),
modified_border: Some(rgba(0x4f2f12ff).into()),
predictive: Some(rgba(0x7b9727ff).into()),
predictive: Some(rgba(0x8f5b71ff).into()),
predictive_background: Some(rgba(0x1d2110ff).into()),
predictive_border: Some(rgba(0x2e3516ff).into()),
renamed: Some(rgba(0x417ee6ff).into()),
@ -1053,7 +1053,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa07e3cff).into()),
modified_background: Some(rgba(0xeee4d5ff).into()),
modified_border: Some(rgba(0xdfcfb6ff).into()),
predictive: Some(rgba(0x499963ff).into()),
predictive: Some(rgba(0x76958cff).into()),
predictive_background: Some(rgba(0xdaeadeff).into()),
predictive_border: Some(rgba(0xbedac5ff).into()),
renamed: Some(rgba(0x488c90ff).into()),
@ -1518,7 +1518,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa06e3bff).into()),
modified_background: Some(rgba(0x231a12ff).into()),
modified_border: Some(rgba(0x392a1aff).into()),
predictive: Some(rgba(0x2c9292ff).into()),
predictive: Some(rgba(0x625887ff).into()),
predictive_background: Some(rgba(0x132020ff).into()),
predictive_border: Some(rgba(0x1a3434ff).into()),
renamed: Some(rgba(0x576ddaff).into()),
@ -1983,7 +1983,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa59810ff).into()),
modified_background: Some(rgba(0x25210dff).into()),
modified_border: Some(rgba(0x3b3612ff).into()),
predictive: Some(rgba(0x7d9727ff).into()),
predictive: Some(rgba(0x5f724cff).into()),
predictive_background: Some(rgba(0x1e2110ff).into()),
predictive_border: Some(rgba(0x2f3516ff).into()),
renamed: Some(rgba(0x37a166ff).into()),
@ -2448,7 +2448,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xc08b31ff).into()),
modified_background: Some(rgba(0x311e11ff).into()),
modified_border: Some(rgba(0x4b3218ff).into()),
predictive: Some(rgba(0xac973aff).into()),
predictive: Some(rgba(0x58709aff).into()),
predictive_background: Some(rgba(0x252113ff).into()),
predictive_border: Some(rgba(0x3d351bff).into()),
renamed: Some(rgba(0x3e8fd0ff).into()),
@ -2913,7 +2913,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xc08b31ff).into()),
modified_background: Some(rgba(0xf6e6d4ff).into()),
modified_border: Some(rgba(0xeed4b3ff).into()),
predictive: Some(rgba(0xac973aff).into()),
predictive: Some(rgba(0x8599beff).into()),
predictive_background: Some(rgba(0xf1e9d6ff).into()),
predictive_border: Some(rgba(0xe4d8b7ff).into()),
renamed: Some(rgba(0x3f8fd0ff).into()),
@ -3378,7 +3378,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xae9515ff).into()),
modified_background: Some(rgba(0x2a200eff).into()),
modified_border: Some(rgba(0x413513ff).into()),
predictive: Some(rgba(0x60ac3aff).into()),
predictive: Some(rgba(0x9c6262ff).into()),
predictive_background: Some(rgba(0x1a2413ff).into()),
predictive_border: Some(rgba(0x273c1bff).into()),
renamed: Some(rgba(0x6684e0ff).into()),
@ -3843,7 +3843,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0x98981cff).into()),
modified_background: Some(rgba(0x22210fff).into()),
modified_border: Some(rgba(0x373614ff).into()),
predictive: Some(rgba(0x2ba32aff).into()),
predictive: Some(rgba(0x00788bff).into()),
predictive_background: Some(rgba(0x142310ff).into()),
predictive_border: Some(rgba(0x1b3917ff).into()),
renamed: Some(rgba(0x3e62f4ff).into()),
@ -4308,7 +4308,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa06e3cff).into()),
modified_background: Some(rgba(0xeee0d5ff).into()),
modified_border: Some(rgba(0xe0c9b5ff).into()),
predictive: Some(rgba(0x2c9292ff).into()),
predictive: Some(rgba(0x887fafff).into()),
predictive_background: Some(rgba(0xd7e9e8ff).into()),
predictive_border: Some(rgba(0xb9d7d6ff).into()),
renamed: Some(rgba(0x586ddaff).into()),
@ -4773,7 +4773,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa06e3bff).into()),
modified_background: Some(rgba(0x231a12ff).into()),
modified_border: Some(rgba(0x392a1aff).into()),
predictive: Some(rgba(0x4b8b8bff).into()),
predictive: Some(rgba(0x795369ff).into()),
predictive_background: Some(rgba(0x161f1fff).into()),
predictive_border: Some(rgba(0x203232ff).into()),
renamed: Some(rgba(0x7272caff).into()),
@ -5238,7 +5238,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xbb8a36ff).into()),
modified_background: Some(rgba(0x2d1e12ff).into()),
modified_border: Some(rgba(0x463219ff).into()),
predictive: Some(rgba(0x918b3bff).into()),
predictive: Some(rgba(0x765990ff).into()),
predictive_background: Some(rgba(0x211f12ff).into()),
predictive_border: Some(rgba(0x34321bff).into()),
renamed: Some(rgba(0x526aebff).into()),
@ -5703,7 +5703,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0x8a8a11ff).into()),
modified_background: Some(rgba(0x201f0cff).into()),
modified_border: Some(rgba(0x333211ff).into()),
predictive: Some(rgba(0x568c3bff).into()),
predictive: Some(rgba(0x427088ff).into()),
predictive_background: Some(rgba(0x171f12ff).into()),
predictive_border: Some(rgba(0x23321bff).into()),
renamed: Some(rgba(0x277fadff).into()),
@ -6168,7 +6168,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xc3841aff).into()),
modified_background: Some(rgba(0xf8e5d1ff).into()),
modified_border: Some(rgba(0xf0d1adff).into()),
predictive: Some(rgba(0x7b9728ff).into()),
predictive: Some(rgba(0xbe899eff).into()),
predictive_background: Some(rgba(0xe5e9d3ff).into()),
predictive_border: Some(rgba(0xd1d8b1ff).into()),
renamed: Some(rgba(0x417ee6ff).into()),
@ -6633,7 +6633,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xae9515ff).into()),
modified_background: Some(rgba(0xf2e8d1ff).into()),
modified_border: Some(rgba(0xe7d7aeff).into()),
predictive: Some(rgba(0x61ac3aff).into()),
predictive: Some(rgba(0xc88a8aff).into()),
predictive_background: Some(rgba(0xe0eed6ff).into()),
predictive_border: Some(rgba(0xc9e1b7ff).into()),
renamed: Some(rgba(0x6784e0ff).into()),
@ -7098,7 +7098,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa06e3cff).into()),
modified_background: Some(rgba(0xeee0d5ff).into()),
modified_border: Some(rgba(0xe0c9b5ff).into()),
predictive: Some(rgba(0x4c8b8bff).into()),
predictive: Some(rgba(0xa27a91ff).into()),
predictive_background: Some(rgba(0xdae7e7ff).into()),
predictive_border: Some(rgba(0xbfd4d4ff).into()),
renamed: Some(rgba(0x7372caff).into()),
@ -7563,7 +7563,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0x98981dff).into()),
modified_background: Some(rgba(0xede9d2ff).into()),
modified_border: Some(rgba(0xddd8afff).into()),
predictive: Some(rgba(0x2ba32bff).into()),
predictive: Some(rgba(0x00a2b5ff).into()),
predictive_background: Some(rgba(0xd9edd4ff).into()),
predictive_border: Some(rgba(0xbbdeb2ff).into()),
renamed: Some(rgba(0x3f62f4ff).into()),
@ -8028,7 +8028,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xa07e3bff).into()),
modified_background: Some(rgba(0x231d12ff).into()),
modified_border: Some(rgba(0x392e1aff).into()),
predictive: Some(rgba(0x489963ff).into()),
predictive: Some(rgba(0x506d66ff).into()),
predictive_background: Some(rgba(0x162119ff).into()),
predictive_border: Some(rgba(0x203626ff).into()),
renamed: Some(rgba(0x478c90ff).into()),
@ -8493,7 +8493,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0xbb8a36ff).into()),
modified_background: Some(rgba(0xf5e6d5ff).into()),
modified_border: Some(rgba(0xebd3b5ff).into()),
predictive: Some(rgba(0x918b3cff).into()),
predictive: Some(rgba(0xa587bfff).into()),
predictive_background: Some(rgba(0xeae6d6ff).into()),
predictive_border: Some(rgba(0xd9d4b6ff).into()),
renamed: Some(rgba(0x526aebff).into()),
@ -8958,7 +8958,7 @@ pub fn atelier() -> UserThemeFamily {
modified: Some(rgba(0x8a8a11ff).into()),
modified_background: Some(rgba(0xeae6d0ff).into()),
modified_border: Some(rgba(0xd8d3abff).into()),
predictive: Some(rgba(0x578c3cff).into()),
predictive: Some(rgba(0x6a97b2ff).into()),
predictive_background: Some(rgba(0xdde7d5ff).into()),
predictive_border: Some(rgba(0xc2d5b6ff).into()),
renamed: Some(rgba(0x277fadff).into()),

6
crates/theme/src/themes/ayu.rs
View File

@ -123,7 +123,7 @@ pub fn ayu() -> UserThemeFamily {
modified: Some(rgba(0xfeb454ff).into()),
modified_background: Some(rgba(0x572916ff).into()),
modified_border: Some(rgba(0x754221ff).into()),
predictive: Some(rgba(0xaad84cff).into()),
predictive: Some(rgba(0x5b728cff).into()),
predictive_background: Some(rgba(0x294113ff).into()),
predictive_border: Some(rgba(0x405c1dff).into()),
renamed: Some(rgba(0x5ac2feff).into()),
@ -567,7 +567,7 @@ pub fn ayu() -> UserThemeFamily {
modified: Some(rgba(0xf1ae4aff).into()),
modified_background: Some(rgba(0xffeedaff).into()),
modified_border: Some(rgba(0xffe1beff).into()),
predictive: Some(rgba(0x86b305ff).into()),
predictive: Some(rgba(0x9eb9d3ff).into()),
predictive_background: Some(rgba(0xe9efd2ff).into()),
predictive_border: Some(rgba(0xd7e3aeff).into()),
renamed: Some(rgba(0x3b9ee5ff).into()),
@ -1011,7 +1011,7 @@ pub fn ayu() -> UserThemeFamily {
modified: Some(rgba(0xfed073ff).into()),
modified_background: Some(rgba(0x584018ff).into()),
modified_border: Some(rgba(0x765a29ff).into()),
predictive: Some(rgba(0xd5fe80ff).into()),
predictive: Some(rgba(0x6d839bff).into()),
predictive_background: Some(rgba(0x426118ff).into()),
predictive_border: Some(rgba(0x5d7e2cff).into()),
renamed: Some(rgba(0x73cffeff).into()),

12
crates/theme/src/themes/gruvbox.rs
View File

@ -123,7 +123,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xb57616ff).into()),
modified_background: Some(rgba(0xf5e2d0ff).into()),
modified_border: Some(rgba(0xebccabff).into()),
predictive: Some(rgba(0x797410ff).into()),
predictive: Some(rgba(0x7d9881ff).into()),
predictive_background: Some(rgba(0xe5e1ceff).into()),
predictive_border: Some(rgba(0xd1cba8ff).into()),
renamed: Some(rgba(0x0b6678ff).into()),
@ -574,7 +574,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xf9bd30ff).into()),
modified_background: Some(rgba(0x582f10ff).into()),
modified_border: Some(rgba(0x754916ff).into()),
predictive: Some(rgba(0xb8bb27ff).into()),
predictive: Some(rgba(0x717363ff).into()),
predictive_background: Some(rgba(0x332b11ff).into()),
predictive_border: Some(rgba(0x4a4516ff).into()),
renamed: Some(rgba(0x83a598ff).into()),
@ -1025,7 +1025,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xb57616ff).into()),
modified_background: Some(rgba(0xf5e2d0ff).into()),
modified_border: Some(rgba(0xebccabff).into()),
predictive: Some(rgba(0x797410ff).into()),
predictive: Some(rgba(0x7d9881ff).into()),
predictive_background: Some(rgba(0xe5e1ceff).into()),
predictive_border: Some(rgba(0xd1cba8ff).into()),
renamed: Some(rgba(0x0b6678ff).into()),
@ -1476,7 +1476,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xf9bd30ff).into()),
modified_background: Some(rgba(0x582f10ff).into()),
modified_border: Some(rgba(0x754916ff).into()),
predictive: Some(rgba(0xb8bb27ff).into()),
predictive: Some(rgba(0x717363ff).into()),
predictive_background: Some(rgba(0x332b11ff).into()),
predictive_border: Some(rgba(0x4a4516ff).into()),
renamed: Some(rgba(0x83a598ff).into()),
@ -1927,7 +1927,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xb57616ff).into()),
modified_background: Some(rgba(0xf5e2d0ff).into()),
modified_border: Some(rgba(0xebccabff).into()),
predictive: Some(rgba(0x797410ff).into()),
predictive: Some(rgba(0x7d9881ff).into()),
predictive_background: Some(rgba(0xe5e1ceff).into()),
predictive_border: Some(rgba(0xd1cba8ff).into()),
renamed: Some(rgba(0x0b6678ff).into()),
@ -2378,7 +2378,7 @@ pub fn gruvbox() -> UserThemeFamily {
modified: Some(rgba(0xf9bd30ff).into()),
modified_background: Some(rgba(0x582f10ff).into()),
modified_border: Some(rgba(0x754916ff).into()),
predictive: Some(rgba(0xb8bb27ff).into()),
predictive: Some(rgba(0x717363ff).into()),
predictive_background: Some(rgba(0x332b11ff).into()),
predictive_border: Some(rgba(0x4a4516ff).into()),
renamed: Some(rgba(0x83a598ff).into()),

4
crates/theme/src/themes/one.rs
View File

@ -123,7 +123,7 @@ pub fn one() -> UserThemeFamily {
modified: Some(rgba(0xdec184ff).into()),
modified_background: Some(rgba(0xfaf2e6ff).into()),
modified_border: Some(rgba(0xf5e8d2ff).into()),
predictive: Some(rgba(0x669f59ff).into()),
predictive: Some(rgba(0x9c9fc7ff).into()),
predictive_background: Some(rgba(0xe0ebdcff).into()),
predictive_border: Some(rgba(0xc8dcc1ff).into()),
renamed: Some(rgba(0x5c79e2ff).into()),
@ -574,7 +574,7 @@ pub fn one() -> UserThemeFamily {
modified: Some(rgba(0xdec184ff).into()),
modified_background: Some(rgba(0x41331dff).into()),
modified_border: Some(rgba(0x5d4c2fff).into()),
predictive: Some(rgba(0xa1c181ff).into()),
predictive: Some(rgba(0x5b6b88ff).into()),
predictive_background: Some(rgba(0x222e1dff).into()),
predictive_border: Some(rgba(0x38482fff).into()),
renamed: Some(rgba(0x74ade8ff).into()),

6
crates/theme/src/themes/rose_pine.rs
View File

@ -123,7 +123,7 @@ pub fn rose_pine() -> UserThemeFamily {
modified: Some(rgba(0xe99d35ff).into()),
modified_background: Some(rgba(0xffebd6ff).into()),
modified_border: Some(rgba(0xffdab7ff).into()),
predictive: Some(rgba(0x3eaa8eff).into()),
predictive: Some(rgba(0xa2acbeff).into()),
predictive_background: Some(rgba(0xdbeee7ff).into()),
predictive_border: Some(rgba(0xbee0d5ff).into()),
renamed: Some(rgba(0x57949fff).into()),
@ -581,7 +581,7 @@ pub fn rose_pine() -> UserThemeFamily {
modified: Some(rgba(0xf5c177ff).into()),
modified_background: Some(rgba(0x50341aff).into()),
modified_border: Some(rgba(0x6d4d2bff).into()),
predictive: Some(rgba(0x5dc2a3ff).into()),
predictive: Some(rgba(0x516b83ff).into()),
predictive_background: Some(rgba(0x182e23ff).into()),
predictive_border: Some(rgba(0x254839ff).into()),
renamed: Some(rgba(0x9cced7ff).into()),
@ -1039,7 +1039,7 @@ pub fn rose_pine() -> UserThemeFamily {
modified: Some(rgba(0xf5c177ff).into()),
modified_background: Some(rgba(0x50341aff).into()),
modified_border: Some(rgba(0x6d4d2bff).into()),
predictive: Some(rgba(0x5dc2a3ff).into()),
predictive: Some(rgba(0x556b81ff).into()),
predictive_background: Some(rgba(0x182e23ff).into()),
predictive_border: Some(rgba(0x254839ff).into()),
renamed: Some(rgba(0x9cced7ff).into()),

2
crates/theme/src/themes/sandcastle.rs
View File

@ -122,7 +122,7 @@ pub fn sandcastle() -> UserThemeFamily {
modified: Some(rgba(0xa07e3bff).into()),
modified_background: Some(rgba(0x231d12ff).into()),
modified_border: Some(rgba(0x392e1aff).into()),
predictive: Some(rgba(0x83a598ff).into()),
predictive: Some(rgba(0x5c6152ff).into()),
predictive_background: Some(rgba(0x1e2321ff).into()),
predictive_border: Some(rgba(0x303a36ff).into()),
renamed: Some(rgba(0x528b8bff).into()),

4
crates/theme/src/themes/solarized.rs
View File

@ -123,7 +123,7 @@ pub fn solarized() -> UserThemeFamily {
modified: Some(rgba(0xb58904ff).into()),
modified_background: Some(rgba(0xf5e6d0ff).into()),
modified_border: Some(rgba(0xebd3aaff).into()),
predictive: Some(rgba(0x859904ff).into()),
predictive: Some(rgba(0x679aafff).into()),
predictive_background: Some(rgba(0xe9ead0ff).into()),
predictive_border: Some(rgba(0xd6d9abff).into()),
renamed: Some(rgba(0x298bd1ff).into()),
@ -567,7 +567,7 @@ pub fn solarized() -> UserThemeFamily {
modified: Some(rgba(0xb58903ff).into()),
modified_background: Some(rgba(0x2f1e0cff).into()),
modified_border: Some(rgba(0x473110ff).into()),
predictive: Some(rgba(0x859904ff).into()),
predictive: Some(rgba(0x40728bff).into()),
predictive_background: Some(rgba(0x1f210cff).into()),
predictive_border: Some(rgba(0x323610ff).into()),
renamed: Some(rgba(0x288bd1ff).into()),

2
crates/theme/src/themes/summercamp.rs
View File

@ -122,7 +122,7 @@ pub fn summercamp() -> UserThemeFamily {
modified: Some(rgba(0xf1fe29ff).into()),
modified_background: Some(rgba(0x556305ff).into()),
modified_border: Some(rgba(0x727f0aff).into()),
predictive: Some(rgba(0x5dea5aff).into()),
predictive: Some(rgba(0x79434bff).into()),
predictive_background: Some(rgba(0x0a4d13ff).into()),
predictive_border: Some(rgba(0x1a6a20ff).into()),
renamed: Some(rgba(0x499befff).into()),

6
crates/theme_importer/src/zed1/converter.rs
View File

@ -117,7 +117,11 @@ impl Zed1ThemeConverter {
.or(convert(lowest.accent.default.foreground)),
hint_background: convert(lowest.accent.default.background),
hint_border: convert(lowest.accent.default.border),
predictive: convert(lowest.positive.default.foreground),
predictive: editor
.suggestion
.color
.map(zed1_color_to_hsla)
.or(convert(lowest.positive.default.foreground)),
predictive_background: convert(lowest.positive.default.background),
predictive_border: convert(lowest.positive.default.border),
conflict: convert(lowest.warning.default.foreground),