Marshall Bowers
2d053a6413
Pull editor inlay hints from VS Code themes
2023-12-07 15:36:13 -05:00
Marshall Bowers
540de8b583
Rename members in ZedSyntaxToken
2023-12-07 14:35:58 -05:00
Marshall Bowers
e4dd8b3216
Remove commented-out code in theme importer
2023-12-07 14:33:37 -05:00
Marshall Bowers
756d1dfe10
theme_importer: Support importing themes containing comments ( #3298 )
...
This PR updates the `theme_importer` with support for parsing theme
files containing comments.
Up until now we've been manually removing comments from the VS Code
theme files.
Release Notes:
- N/A
2023-11-09 19:22:15 -05:00
Nate Butler
8b6e43ce60
Remove unused import
2023-11-09 16:41:58 -05:00
Nate Butler
1cc2984fef
Extend theme converter to allow multimatching against vscode colors
2023-11-09 16:38:48 -05:00
Nate Butler and Marshall Bowers
6460a6d1d3
Deal with special case where a VSCode theme doesn't have a foreground color
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-09 14:53:04 -05:00
Nate Butler and Marshall Bowers
c392e567a0
Finish passing Syntax from VSCode themes to Zed Themes
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-09 14:41:26 -05:00
Nate Butler and Marshall Bowers
b260ab5947
Extend UserSyntax to allow font_style and font_weight to be specified
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-09 13:46:08 -05:00
Marshall Bowers
70651e3fc1
Use IndexMap for a deterministic order when importing syntax colors
2023-11-09 13:12:36 -05:00
Marshall Bowers
7a0eef99ff
Reorganize theme_importer
2023-11-09 13:07:32 -05:00
Marshall Bowers
c2d703c963
Properly emit UserHighlightStyles
2023-11-09 12:59:20 -05:00
Marshall Bowers
9e2de5ad97
Emit unique highlights for each syntax token
2023-11-09 12:46:37 -05:00
Nate Butler and Marshall Bowers
4cabcdd6d4
WIP – Add Syntax themes to importer
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-09 12:30:53 -05:00
Nate Butler and Marshall Bowers
f727945f16
Allow imported themes to refine StatusColors
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-09 11:30:59 -05:00
Nate Butler
5ccd6e67b6
Add more vscode colors
2023-11-09 11:01:18 -05:00
Nate Butler
f57822ab1d
Extend VSCode theme importer
2023-11-09 01:39:31 -05:00
Marshall Bowers
8f89c1e77b
Replace GitStatusColors with StatusColors ( #3268 )
...
This PR removes `GitStatusColors` in favor of just using `StatusColors`
instead.
Release Notes:
- N/A
2023-11-08 11:32:32 -05:00
Nate Butler
a5eb90dc5e
Continue documenting theme colors
2023-11-07 14:04:09 -05:00
Nate Butler
0b0195f75e
Merge branch 'main' into document-theme
2023-11-07 13:36:08 -05:00
Nate Butler
723ac00cbf
Begin documenting theme colors
2023-11-07 13:36:01 -05:00
Marshall Bowers
a0f395f419
theme_importer: Format generated themes ( #3255 )
...
This PR makes the `theme_importer` format the themes that it generates
automatically.
Release Notes:
- N/A
2023-11-07 12:45:09 -05:00
Marshall Bowers
fc9a860c79
Rework third-party themes ( #3254 )
...
This PR reworks the way we define our third-party themes to make them
work as overlays on top of a base theme.
We introduce the concept of a `UserThemeFamily` that contains
`UserTheme`s. Rather than being an entire theme definition on their own,
a `UserTheme` just contains optional overrides for the values in a
`Theme`.
When resolving a `UserTheme`, we apply it on top of the base theme. Any
values not overridden in the `UserTheme` will fall back to the `Theme`
defaults.
Right now we are just using `UserTheme` to model third-party themes that
we distribute with the Zed binary. However, this same structure can also
be used to import arbitrary user themes (such as from a theme registry,
or even a theme blob from the settings file).
Release Notes:
- N/A
2023-11-07 11:40:07 -05:00
Marshall Bowers
a9db13e190
Rename ThemeVariant to Theme ( #3252 )
...
This PR renames the `ThemeVariant` type to `Theme`.
This better reflects its purpose, as well as matches the same name as we
had before, which should make porting crates slightly easier.
Release Notes:
- N/A
2023-11-07 10:41:36 -05:00
Marshall Bowers
c18888a72b
Add new ThemeColors values to the theme printer
2023-11-07 08:59:37 -05:00
Antonio Scandurra
ccdb5b2857
Merge remote-tracking branch 'origin/main' into editor2-paint
2023-11-07 13:09:48 +01:00
Nate Butler
4e52e68a43
Finish up initial themes
2023-11-06 15:24:36 -05:00
Nate Butler
6c0f5f9965
Add additional themes, update theme importer
2023-11-06 14:54:21 -05:00
Nate Butler
9427239b0d
Add Noctis Theme
2023-11-06 12:43:10 -05:00
Nate Butler
5bee117443
Skip .DS_Store files when scanning themes folder
2023-11-06 11:03:17 -05:00
Nate Butler
3811385132
Remove unused file
2023-11-06 10:57:25 -05:00
Marshall Bowers
f70852c328
Update emitted module import
2023-11-03 10:58:06 -04:00
Marshall Bowers
b37fdcab3d
Account for colors in VS Code theme being optional
2023-11-03 10:54:12 -04:00
Nate Butler
e0a20f1abb
[Not compiling] Continue working on VSCode import
2023-11-02 21:49:26 -04:00
Nate Butler
86aeedd5e6
Update theme importer
2023-11-02 20:15:51 -04:00
Nate Butler
0685483f99
Add terminal colors to ThemeColors, add _background to some color names.
2023-11-02 19:53:52 -04:00
Marshall Bowers
6930e7066d
Clean up unused code
2023-11-02 19:20:21 -04:00
Marshall Bowers
ce9a070d73
Finish up theme printer
2023-11-02 19:14:51 -04:00
Marshall Bowers
8490ac6d58
Start work on theme printer
2023-11-02 18:57:13 -04:00
Marshall Bowers
876d0fc428
Add basic VsCodeThemeConverter
2023-11-02 18:24:38 -04:00
Marshall Bowers
5d2e8aa6fb
Parse VSCode theme files
2023-11-02 18:00:55 -04:00
Nate Butler and Marshall Bowers
538664e784
Scaffold out new theme-importer crate
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-11-02 17:21:11 -04:00
Marshall Bowers