Commit Graph
25009 Commits
Author SHA1 Message Date
Mikayla Maki 0c34c073ec Add randomized test for git statuses 2023-05-10 19:21:27 -07:00
Mikayla Maki f86853d3c9 Remove some external context from git status test 2023-05-10 17:59:33 -07:00
Mikayla Maki 54e85ca80e Fix incorrect import 2023-05-10 17:52:23 -07:00
Mikayla Maki 732949181b Add postgres migration 2023-05-10 17:50:35 -07:00
Max Brunsfeld 22a7b8e227 Define terminal settings in terminal crate 2023-05-10 17:43:10 -07:00
Mikayla Maki f42c88aa0a Bump protocol version 2023-05-10 17:38:29 -07:00
Mikayla Maki d0c4ee38de Add integration test for git status 2023-05-10 17:37:36 -07:00
Mikayla Maki d2ce29f171 Got basic replication working :) 2023-05-10 17:37:36 -07:00
Mikayla Maki e487896125 Update protos 2023-05-10 17:37:36 -07:00
Mikayla Maki 970bdb1ee1 Use sum tree traversal to remove paths 2023-05-10 17:37:36 -07:00
Mikayla Maki c2c9c36e95 Fix bug in status detection when removing a directory 2023-05-10 17:37:36 -07:00
Mikayla Maki e920ede88c Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths"
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
2023-05-10 17:37:36 -07:00
Petros Amoiridis b22d0fc4fa Fix yellow to be yellow 2023-05-10 17:37:36 -07:00
Petros Amoiridis 57d45f60c5 Use theme.editor.diff for the colors 2023-05-10 17:37:36 -07:00
Mikayla Maki ea28af0c6a Convert git status calculation to use Entry IDs as the key instead of repo relative paths 2023-05-10 17:37:36 -07:00
Mikayla Maki c1839b2ba2 Fix compile errors 2023-05-10 17:37:36 -07:00
Mikayla Maki ac8f4d47f8 WIP: integrate status with collab 2023-05-10 17:37:36 -07:00
Mikayla Maki 36d98d60f3 Format 2023-05-10 17:37:36 -07:00
Mikayla Maki 50e99845ca Added git status to the project panel, added worktree test 2023-05-10 17:37:36 -07:00
Mikayla Maki f4e09c47c6 Track live entry status in repository 2023-05-10 17:37:36 -07:00
Mikayla Maki 1bbcc63d01 Fix compile error 2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 5ab87cd95c WIP: Track live entry status in repository
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Mikayla Makiandpetros 94ec496577 Add git status to the file system abstraction
co-authored-by: petros <petros@zed.dev>
2023-05-10 17:37:36 -07:00
Max Brunsfeld 876d8b3e09 Ensure the SettingsStore global is added in tests 2023-05-10 16:39:59 -07:00
Joseph Lyons 9f1015be60 collab 0.12.1 2023-05-10 18:16:20 -04:00
Joseph Lyons d6e43c6160 v0.87.x dev 2023-05-10 16:47:09 -04:00
Max Brunsfeld 8abefb23c5 Define journal settings in journal crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld fe610e556f Define telemetry settings in the client crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld 47c3504d22 Define vim_mode setting in vim crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld d3220c752a Define auto_update setting in the auto_update crate 2023-05-10 12:59:24 -07:00
Max Brunsfeld 78ec1bd1c8 Generalize settings JSON schema logic to work w/ arbitrary setting types 2023-05-10 12:59:24 -07:00
Max Brunsfeld 2c7b3dcb92 Start using the SettingsStore in the app 2023-05-10 12:59:24 -07:00
Max Brunsfeld e1705d73ca Add generic update method to SettingsStore 2023-05-10 12:59:24 -07:00
Max Brunsfeld 4325af4681 Allow registering additional settings after loading global settings 2023-05-10 12:59:24 -07:00
Max Brunsfeld 054ad5aeb6 Create proof-of-concept SettingStore struct 2023-05-10 12:59:22 -07:00
Nathan SoboandJulia Risley ca30c55829 Test moving panels
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-05-10 10:41:03 -06:00
Mikayla Maki ef74b4ca07 Merge pull request #2460 from zed-industries/show-dock-on-activate
Fix bug with terminal button
2023-05-10 09:08:45 -07:00
Nathan Sobo 289d3df5bf Rename item to panel in various locations 2023-05-10 09:54:20 -06:00
Mikayla Maki e22271d773 Fix bug with terminal button 2023-05-10 08:15:20 -07:00
Antonio Scandurra c516f3676a Create more specific dock position settings associated with each panel 2023-05-10 16:52:10 +02:00
Antonio Scandurra a38b160a8b Rely on root getting re-focused when panel isn't rendered
This achieves two things:

- When a panel like `TerminalPanel` closes its last tab, the focus
is returned to the root view (the `Workspace`)
- When a panel is moved from a dock to another, it will get rendered
in another spot but the focus will be kept on the panel

This also ensures the focus is not lost when a panel is moved from
a dock to another because that view
2023-05-10 15:43:44 +02:00
Antonio Scandurra 879447e0a6 Focus the root view if the previously-focused view isn't rendered 2023-05-10 15:40:46 +02:00
Antonio Scandurra f1363f8f70 Merge branch 'main' into panels 2023-05-10 15:23:37 +02:00
Antonio Scandurra bf41cfaa4d Add context menu to change panel position 2023-05-10 14:05:48 +02:00
Antonio Scandurra b830f3edf3 Maintain panel visibility when changing its position 2023-05-10 11:06:37 +02:00
Antonio Scandurra 782a1e7c69 Fix panic when not specifying a project_panel setting 2023-05-10 10:43:42 +02:00
Kirill Bulatov 9f9526be5d Highlight include/exclude inputs when errors happen there 2023-05-10 11:11:31 +03:00
Kirill Bulatov 5291e79ecb Test the search inclusions/exclusions 2023-05-10 11:11:31 +03:00
Kirill Bulatov bbe2bd57c0 Use placeholder in include/exclude editors 2023-05-10 11:11:31 +03:00
Kirill BulatovandJulia 75ff55bad5 Rework tab and escape key handling in search panel
Fixes
https://linear.app/zed-industries/issue/Z-1238/focus-the-results-multibuffer-in-project-search-on-esc

and adds a tab shortcut for project search inputs

co-authored-by: Julia <julia@zed.dev>
2023-05-10 11:11:31 +03:00