yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
39175 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Butler 349d40f800 Add some comments 2023-02-26 15:01:18 -05:00
Nate Butler 6cea2e445d WIP need to finish default styles 2023-02-26 14:57:43 -05:00
Nate Butler 222025f01c Start on syntax organization 2023-02-26 14:15:06 -05:00
Nate Butler e15a05a99e WIP 2023-02-26 13:24:41 -05:00
Joseph T. Lyons 5af4f2c4d2 Merge pull request #2222 from zed-industries/update-app-icons 
Update app icons
 2023-02-26 11:07:07 -05:00
Joseph Lyons 1c4962610a Update app-icon@2x.png 2023-02-26 11:03:43 -05:00
Joseph Lyons 724c0ed35d Update app-icon.png 2023-02-26 11:03:31 -05:00
Joseph Lyons 25e261c62e Update app-icon-preview@2x.png 2023-02-26 11:03:22 -05:00
Joseph Lyons d986b64ea9 Update app-icon-preview.png 2023-02-26 11:03:03 -05:00
Nate Butler ccf31dc402 Merge pull request #2221 from zed-industries/theme-syntax-overrides 
Theme syntax overrides 🎉
 2023-02-26 10:56:45 -05:00
Nate Butler 71c4a97d34 Format 2023-02-26 10:31:19 -05:00
Nate Butler c393877289 Add syntax overrides for One Light 2023-02-26 10:09:16 -05:00
Nate Butler e0cea30edb Use syntax as merged name instead of mergedSyntax 
This lets us retain the existing uses of syntax, and fixes colors that were being assigned incorrectly.
 2023-02-26 01:20:44 -05:00
Nate Butler 3280ddc755 Add a syntax override style for One Dark 2023-02-26 01:07:45 -05:00
Nate Butler 629e56bf99 Add the ability to override the system syntax config 2023-02-26 01:07:21 -05:00
Kay Simmons d651a0c7ae Merge pull request #2218 from zed-industries/file-finder-distance-sorting 
Sort matches in file finder by distance to active item after score
 2023-02-25 14:26:05 -08:00
Kay Simmons 25a567c13a fixup poor utility naming 2023-02-25 14:12:25 -08:00
Kay Simmons 0c2b3468b3 Add test for new sorting behavior 2023-02-25 14:06:54 -08:00
Nate Butler bb35790af8 Merge pull request #2219 from zed-industries/nate/theme-tidying 
Tidy `styles` app
 2023-02-25 12:07:02 -05:00
Nate Butler 784666e69c Update packages 
Tested post update.
 2023-02-25 11:53:01 -05:00
Nate Butler 8a75b4c725 Remove unused/old base16 theme code 
Neither of these files have anything in them that is used anywhere else in the styles app.

Tested both `build` and `build-licenses` after removing these.
 2023-02-25 11:50:22 -05:00
Nate Butler 3d07163d94 Don't format package or package-lock 2023-02-25 11:47:27 -05:00
Nate Butler 231f558f59 Format styles with updated prettier config 
In the system color PR I updated the prettier config to match what we use on zed.dev. I didn't want to format all of styles as it would add a lot of unrelated line changes to that PR.

Doing that format now.
 2023-02-25 11:46:33 -05:00
Nate Butler 8891ab52dc Merge pull request #2150 from zed-industries/nate/system-colors 
Add system color palette
 2023-02-25 11:43:02 -05:00
Nate Butler a729d46364 Format using new prettier config 2023-02-25 11:33:57 -05:00
Nate Butler 6904b59136 Add the same prettier config as zed.dev 2023-02-25 11:33:16 -05:00
Nate Butler 887befd611 Add missing dep 2023-02-25 11:32:04 -05:00
Nate Butler f8c662efce Remove theme tool for now 
This is likely the biggest thing I'm unsure about for this PR, so I'm going to pull it into a seperate branch so I can merge the system color library in.

I think a better approach for this will be one of two things:
- Have a single next app that covers everything to do with themes (previewing ramps, generated themes, components etc.)
- Create a mono or turborepo that splits things up into packages (system, theme, themes, theme-tool, etc)
 2023-02-25 11:27:18 -05:00
Kay Simmons 63469e3726 Sort file finder matches by distance to the active item after match score 2023-02-24 18:13:26 -08:00
Max Brunsfeld cea27bc70d Merge pull request #2217 from zed-industries/format-on-save-trigger 
Pass the 'Save' format trigger when formatting on save
 2023-02-24 17:29:52 -08:00
Max BrunsfeldandMikayla Maki 52776f2594 Pass the 'Save' format trigger when formatting on save 
In an earlier refactor, I accidentally caused the 'Manual'
trigger to *always* be passed.

Co-authored-by: Mikayla Maki <mikayla@zed.dev>
 2023-02-24 17:11:35 -08:00
Mikayla Maki 8784d92bb0 Merge pull request #2216 from zed-industries/update-bromberg 
Update bromberg dependency to have alloc
 2023-02-24 14:41:32 -08:00
Mikayla Maki 8ea951a42a Update bromberg dependency to have alloc 2023-02-24 14:34:24 -08:00
Max Brunsfeld 332a63b96a collab 0.6.1 2023-02-24 09:44:23 -08:00
Mikayla Maki cc32d93938 Merge pull request #2215 from zed-industries/revert-2214-fix-reveal-path-panic 
Revert "Remove borrow from reveal_path()"
 2023-02-24 09:40:03 -08:00
Mikayla Maki fdca0282d8 Revert "Remove borrow from reveal_path()" 2023-02-24 09:39:52 -08:00
Joseph Lyons 1f72b31b1d Tweak code to remove duplication 2023-02-24 08:53:58 -05:00
Joseph Lyons 9e52137a63 Unify text style names 2023-02-24 08:46:28 -05:00
Mikayla Maki 558c178dbf Merge pull request #2214 from zed-industries/fix-reveal-path-panic 
Remove borrow from reveal_path()
 2023-02-23 21:48:09 -08:00
Mikayla Maki 11b9b201cf Remove borrow from reveal_path() 2023-02-23 21:36:17 -08:00
Julia 127877d219 Merge pull request #2213 from zed-industries/per-project-follow-status 
Differentiate between follow state on a per-project basis
 2023-02-24 00:26:41 -05:00
Julia aae083923c Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Max Brunsfeld 7345ad2d41 Merge pull request #2212 from zed-industries/initial-traffic-light-position 
Adjust window's traffic light position when setting its title
 2023-02-23 15:02:05 -08:00
Max Brunsfeld 7983912b72 Adjust window's traffic light position when setting its title 2023-02-23 14:44:45 -08:00
Mikayla Maki 1cbe0990e4 Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki b0c603ecc3 Remove comment 2023-02-23 14:24:53 -08:00
Mikayla Maki 70f0950c9a Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 730ea83ee0 Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage 2023-02-23 14:10:55 -08:00
Kay Simmons 62e09b83a2 Merge pull request #2211 from zed-industries/hover-binding 
add hover binding from vscode
 2023-02-23 14:05:28 -08:00
Kay Simmons cbe703a44b add hover binding from vscode 2023-02-23 13:50:43 -08:00