yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,102 Commits 5 Branches 0 Tags
bfcf2ff2d07a0fdfd53f85ad56b2473d673ddf8d
Commit Graph
206 Commits
Author SHA1 Message Date
Marshall Bowers 803ff5b096 Map textLink.activeForeground from VS Code to link_text_hover 2023-12-19 18:29:27 -05:00
Nate Butler 59edaae063 Style wrap guides for imported themes 2023-12-18 11:16:22 -05:00
Nate Butler 5e2e54f3f8 Style One Dark wrap guides 2023-12-18 11:16:00 -05:00
Marshall Bowers 7025944542 Use editor.foreground from VS Code for the editor foreground 2023-12-14 17:30:37 -05:00
Marshall Bowers 5ea31591a7 Emit editor_foreground color from theme converter 2023-12-14 17:28:45 -05:00
Marshall Bowers 147a49d00a theme_importer: Fall back to inactive tab background if no active tab background set (#3598) 
This PR makes it so the `theme_importer` falls back to the inactive tab
background color if the theme doesn't not an active tab background
color.

This fixes the active tab color in the Synthwave 84 theme.

Release Notes:

- N/A
 2023-12-11 17:39:46 -05:00
Marshall Bowers c0abf7e355 Use editorOverviewRuler.border for the scrollbar track border 2023-12-11 16:54:53 -05:00
Marshall Bowers 142e7b60e2 Use the editor background for the scrollbar track background 2023-12-11 16:39:26 -05:00
Marshall Bowers b0f8016aac Use tab.inactiveForeground from VS Code for muted text color (#3593) 
This PR updates the `theme_importer` to pull in the
`tab.inactiveForeground` color from VS Code to use as the muted text
color.

Release Notes:

- N/A
 2023-12-11 15:57:47 -05:00
Marshall Bowers f36490091e Pull more scrollbar colors from VS Code 2023-12-11 12:59:03 -05:00
Marshall Bowers abeca44202 Map scrollbar colors from VS Code themes 2023-12-11 12:49:54 -05:00
Nate ButlerandMarshall Bowers 6e8127cc76 Add new colors to themes 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-11 12:00:12 -05:00
Nate ButlerandMarshall Bowers 15b076cb9f Add new colors to One Dark 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-11 11:43:49 -05:00
Nate Butler dfae7ca733 Add new color defs 2023-12-11 11:30:43 -05:00
Marshall Bowers baec701ba1 Adjust which status colors we import from the VS Code theme (#3570) 
This PR adjusts the status colors we import from the VS Code theme to be
the right ones.

Instead of looking at the Git status colors, we use the
`editorGutter.addedBackground`, `editorGutter.modifiedBackground`, and
`editorGutter.deletedBackground` colors for added, modified, and deleted
status colors, respectively.

Release Notes:

- N/A
 2023-12-08 17:56:25 -05:00
Marshall Bowers ae0fa8f10d Weight scope matches to improve results 2023-12-08 16:35:54 -05:00
Marshall Bowers 65a777ec4e Fix function colors in Gruvbox themes 2023-12-08 16:04:58 -05:00
Marshall Bowers 85e6bbce43 Restore theme sorting in Zed2 (#3563) 
This PR restores the sorting of themes in the theme selector in Zed2.

Release Notes:

- N/A
 2023-12-08 15:08:35 -05:00
Marshall Bowers 1dbaf24e6a Pull in colors for selected ghost elements 2023-12-08 14:19:56 -05:00
Marshall Bowers b0c460aa15 Use dropdown.background from VS Code for elevated surface background 2023-12-08 14:13:50 -05:00
Marshall Bowers 20f91ea9de Use breadcrumb.background from VS Code for toolbar background (#3559) 
This PR changes the color we use for the toolbar background from the VS
Code theme to `breadcrumb.background`.

If this value isn't set then we fall back to the `editor.background`.

Release Notes:

- N/A
 2023-12-08 14:03:18 -05:00
Marshall Bowers 42d216097a Use editorGroupHeader.tabsBackground from VS Code as tab bar background (#3558) 
This PR changes the color we use for the tab bar background from the VS
Code theme to `editorGroupHeader.tabsBackground`.

Release Notes:

- N/A
 2023-12-08 13:50:56 -05:00
Marshall Bowers cebaf1de61 Add fallback to constant tokens for numbers 2023-12-08 13:20:00 -05:00
Marshall Bowers 8a9f4a48b5 Pull Git status colors from VS Code themes 2023-12-08 13:14:22 -05:00
Marshall Bowers 8839f6a686 Re-import Rosé Pine source themes 2023-12-08 11:45:08 -05:00
Marshall Bowers acfb1373f4 Improve matching for constructor tokens 2023-12-08 11:34:39 -05:00
Marshall Bowers 05ea12d638 Improve matching for constant tokens further 2023-12-08 11:23:42 -05:00
Marshall Bowers f295dfac51 Improve matching for constant tokens 2023-12-08 11:21:40 -05:00
Marshall Bowers f30d638416 Improve matching for preprocessor tokens 2023-12-08 11:17:05 -05:00
Marshall Bowers 46fb25a265 Improve matching for string tokens 2023-12-08 11:13:28 -05:00
Marshall Bowers 8ca706f616 Improve matching for punctuation tokens 2023-12-08 11:07:52 -05:00
Marshall Bowers bb5b7f7cbf Don't match support.function for function 2023-12-08 10:48:27 -05:00
Marshall Bowers 3fdcd61162 Add support for theme family-specific syntax mapping overrides (#3551) 
This PR adds support for adding a specific set of mappings from Zed
syntax tokens to VS Code scopes for a particular theme family.

We can use this as a fallback when we aren't otherwise able to rely on
the mappings in the theme importer, as sometimes it isn't possible to
make a specific enough matcher that works across all of the themes.

Release Notes:

- N/A
 2023-12-07 23:37:49 -05:00
Marshall Bowers 04ac9fded7 Set tab bar and toolbar backgrounds 2023-12-07 22:32:41 -05:00
Marshall Bowers 3ec3da015a Set background colors for title and status bars 2023-12-07 22:24:10 -05:00
Marshall Bowers 618a62b35f theme_importer: Improve syntax token matching (#3549) 
This PR improves the approach we use to match syntax tokens between Zed
and VS Code in the `theme_importer`.

We now use the list of scopes assigned to each Zed syntax token to rank
the possible candidates in the VS Code and then pick the candidate with
the highest rank.

So far this has proved to provide better colors across the board, but
we'll continue to refine the matching over time.

Release Notes:

- N/A
 2023-12-07 22:11:31 -05:00
Marshall Bowers f1ac5b11da Emit accurate hex colors in generated themes (#3547) 
This PR fixes an issues where the hex colors in the generated themes
were not correct.

We're using the [`palette`](https://crates.io/crates/palette) crate to
perform the conversions, as this gives us accurate hex codes that match
the VS Code source themes.

Release Notes:

- N/A
 2023-12-07 18:34:03 -05:00
Marshall Bowers 2d053a6413 Pull editor inlay hints from VS Code themes 2023-12-07 15:36:13 -05:00
Nate Butler 9136216071 add color_alpha function 2023-12-07 00:15:43 -05:00
Mikayla 8d491f7e44 Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
Max BrunsfeldandNathan 5392e6ca24 Enable buffer font size adjustment in zed2 
Co-authored-by: Nathan <nathan@zed.dev>
 2023-12-06 13:52:33 -08:00
Kirill Bulatov c5bcd65546 Pass proper theme colors for inlays and suggestions 2023-12-06 21:48:39 +02:00
Marshall Bowers 1b17e89ef1 Format code 2023-12-05 14:17:22 -05:00
Mikayla abe83c8b69 Merge branch 'main' into terminal-element 2023-12-05 09:33:46 -08:00
Nate Butler 7989ec5072 Work on light theme, update tab 2023-12-04 17:54:37 -05:00
Nate Butler 0767dae65a Ensure disabled buttons don't have interaction styles 2023-12-04 09:37:56 -05:00
Mikayla b75765051a Merge branch 'main' into terminal-element 2023-12-01 16:21:38 -08:00
Mikayla 132385aee8 WIP: layout compiling 2023-11-30 11:01:36 -08:00
Antonio Scandurra 418a3e13d1 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Mikayla d6a5f8a3aa Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00