oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,892 Commits 1 Branch 0 Tags
4f307c76019b9e821ca925db84ef5341f23f1d72
Commit Graph
7892 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nate Butler 4f307c7601 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 23c967418a Add a syntax override style for One Dark 2023-02-26 01:07:45 -05:00
Nate Butler 77ed437cda Add the ability to override the system syntax config 2023-02-26 01:07:21 -05:00
Kay Simmons 0b1334b8c5 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 cdc6566d87 fixup poor utility naming 2023-02-25 14:12:25 -08:00
Kay Simmons 36f3d3d738 Add test for new sorting behavior 2023-02-25 14:06:54 -08:00
Nate Butler 27712c25ef Merge pull request #2219 from zed-industries/nate/theme-tidying 
Tidy `styles` app
 2023-02-25 12:07:02 -05:00
Nate Butler 68af726ee4 Update packages 
Tested post update.
 2023-02-25 11:53:01 -05:00
Nate Butler 0ea7959ba4 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 bcb7b80517 Don't format package or package-lock 2023-02-25 11:47:27 -05:00
Nate Butler 10a30cf330 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 06a86162bb Merge pull request #2150 from zed-industries/nate/system-colors 
Add system color palette
 2023-02-25 11:43:02 -05:00
Nate Butler b986c38a31 Format using new prettier config 2023-02-25 11:33:57 -05:00
Nate Butler 69fd273367 Add the same prettier config as zed.dev 2023-02-25 11:33:16 -05:00
Nate Butler 8e828947fb Add missing dep 2023-02-25 11:32:04 -05:00
Nate Butler 2d8adf4c56 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 0b48e238f2 Sort file finder matches by distance to the active item after match score 2023-02-24 18:13:26 -08:00
Max Brunsfeld 04495aa8cd 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 5fea49e639 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 0704d9dcdb 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 a57fcf5afc Update bromberg dependency to have alloc 2023-02-24 14:34:24 -08:00
Max Brunsfeld e910fd8493 collab 0.6.1 2023-02-24 09:44:23 -08:00
Mikayla Maki d5123bc832 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 8656708de4 Revert "Remove borrow from reveal_path()" 2023-02-24 09:39:52 -08:00
Mikayla Maki 2ec25bef84 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 89ddf14b0e Remove borrow from reveal_path() 2023-02-23 21:36:17 -08:00
Julia be86cb35ba 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 465d8cc2ff Differentiate between follow state on a per-project basis 2023-02-24 00:07:17 -05:00
Max Brunsfeld 93b9e762ec 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 fbc934b884 Adjust window's traffic light position when setting its title 2023-02-23 14:44:45 -08:00
Mikayla Maki 350b7b82f7 Merge pull request #2207 from zed-industries/project-panel-actions 
Fix project panel actions
 2023-02-23 14:31:29 -08:00
Mikayla Maki b179fc2b99 Remove comment 2023-02-23 14:24:53 -08:00
Mikayla Maki 8860346324 Fix broken dock command 2023-02-23 14:15:29 -08:00
Mikayla Maki 9004640586 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 03498314fa Merge pull request #2211 from zed-industries/hover-binding 
add hover binding from vscode
 2023-02-23 14:05:28 -08:00
Kay Simmons ce4b672a14 add hover binding from vscode 2023-02-23 13:50:43 -08:00
Kay Simmons 3f9405f8f1 Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode 
Fix enter in normal mode acting incorrectly
 2023-02-23 13:46:15 -08:00
Kay Simmons 2276d25bdf Fix enter in normal mode acting incorrectly 2023-02-23 13:40:31 -08:00
Mikayla Maki ffe53bed87 Reverts keymap precedence order change 2023-02-23 13:32:45 -08:00
Julia 1e3b4f0387 Merge pull request #2208 from zed-industries/new-collab-ui-3 
Add same grayscale logic to followers which leaders have; new call UI [3/N]
 2023-02-23 16:05:42 -05:00
Julia e1df85e86d Add same grayscale logic to followers which leaders have 2023-02-23 15:59:37 -05:00
Mikayla Maki f6601f64e5 Added editor-in-project-panel overrides to the default keymap 2023-02-23 09:36:30 -08:00
Antonio Scandurra 6ccc90327c Merge pull request #2206 from zed-industries/fix-refresh-room 
Fix error when deleting rooms containing projects on refresh
 2023-02-23 16:03:14 +01:00
Antonio Scandurra bbeb33bc7e Fix error when deleting rooms containing projects on refresh 
A foreign key violation was causing the server to never delete stale
rooms during `Database::refresh_room` due to having one or more project
records referencing the room.
 2023-02-23 15:54:35 +01:00
Antonio Scandurra e74db2d180 Merge pull request #2205 from zed-industries/call-ui-follow-up 
Refine new call UI
 2023-02-23 15:39:59 +01:00
Antonio Scandurra 74e0bed38f Fix compilation errors after restructuring room_transaction 2023-02-23 15:17:22 +01:00
Antonio Scandurra 832549f1a3 Merge branch 'main' into call-ui-follow-up 2023-02-23 15:15:46 +01:00
Antonio Scandurra b965333325 Show avatar in user menu 2023-02-23 15:09:32 +01:00
Joseph T. Lyons 2be0283bf2 Merge pull request #2204 from zed-industries/fix-description-of-telemetry-setting 
Fix description of telemetry setting
 2023-02-23 08:59:30 -05:00
Antonio Scandurra 59a66190e5 Avoid trying to reconnect to a room if client is signed out 2023-02-23 14:53:10 +01:00