9172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mikayla Maki	ffa038571c	Add rename directory to randomized test ... Adjust timing of removed entry ids co-authored-by: Max <max@zed.dev>	2023-05-16 17:11:25 -07:00
Kirill Bulatov	421db9225a	Merge pull request #2470 from zed-industries/kb/fix-project-search-esc ... In project search on ESC, reduce multiple carets to one first	2023-05-16 15:16:34 +03:00
Mikayla Maki	790223f23a	Merge pull request #2473 from zed-industries/fix-styling-feedback ... Fix git status issues	2023-05-15 16:28:57 -07:00
Mikayla Maki	e4d509adf4	fmt	2023-05-15 16:22:52 -07:00
Mikayla Maki	4d40aa5d6f	Restore trickle up git status to folder ... co-authored-by: max <max@zed.dev>	2023-05-15 16:22:00 -07:00
Mikayla Maki	f59256f761	Update git repositories to be streamed with their entries ... co-authored-by: max <max@zed.dev>	2023-05-15 16:22:00 -07:00
Mikayla Maki	68078853b7	Made status tracking resilient to folder renames ... co-authored-by: max <max@zed.dev>	2023-05-15 16:21:58 -07:00
Mikayla Maki	307dd2b83e	Update proto names to reflect new status info	2023-05-15 16:20:01 -07:00
Mikayla Maki	1e4ab6cd75	Add index tracking to status	2023-05-15 16:20:01 -07:00
Mikayla Maki	6c26f3d0e4	Fixed formatting	2023-05-15 16:20:01 -07:00
Mikayla Maki	2b18975cdc	Change folder styling from a reduce over all child files to a simple 'always modified' ... Remove git status from tab titles	2023-05-15 16:20:01 -07:00
Joseph T. Lyons	17f138906e	Merge pull request #2474 from zed-industries/update-jetbrains-keymap ... Update jetbrains keymap	2023-05-15 14:17:36 -04:00
Joseph Lyons	6a7d718381	Update jetbrains keymap	2023-05-15 14:12:02 -04:00
Julia	cf53b2ca87	Merge pull request #2471 from zed-industries/optimize-update-local-worktree-buffers ... Optimize update local worktree buffers	2023-05-15 13:13:09 -04:00
Kirill Bulatov	18e0ee44a6	Remove redundant scopes and actions to fix the focus toggle on ESC ... co-authored-by: Antonio <antonio@zed.dev>	2023-05-15 13:10:15 +03:00
Kirill Bulatov	93705cbe55	Merge pull request #2472 from zed-industries/kb/zed-main-builds ... Build Zed for main and labeled PR commits Add a job to build Zed images marked with the SHA of the commit it was built from. The job triggers on every commit to main or every PR with run-build-dmg label and produces an install-ready *.dmg artifact attached to the corresponding CI run.	2023-05-15 11:30:26 +03:00
Kirill Bulatov	5465948f20	Build Zed dmg	2023-05-15 11:26:41 +03:00
Kirill Bulatov	4f36ba3b1e	Add a job to build Zed images from current main ... The job triggers on every commit to `main` or every PR with `run-build-dmg` label and produces an install-ready *.dmg artifact attached to the corresponding CI run.	2023-05-14 22:06:33 +03:00
Julia	fa32adecd5	Fixup more, tests finally pass	2023-05-14 12:06:00 -04:00
Mikayla Maki	db87e83bad	Merge pull request #2469 from zed-industries/fix-git-init-bug ... Fix repository initialization bug	2023-05-13 10:47:55 -07:00
Mikayla Maki	a6a4b846bc	fmt	2023-05-13 10:43:16 -07:00
Mikayla Maki	5e2aaf45a0	Fix repository initialization bug	2023-05-13 10:38:24 -07:00
Mikayla Maki	3534665e2b	Merge pull request #2468 from zed-industries/touch-up-status ... Improve status integration	2023-05-13 09:38:02 -07:00
Mikayla Maki	04041af78b	Fixed bug with failing to clear git file status	2023-05-13 02:40:22 -07:00
Mikayla Maki	62c445da57	Match priority of folder highlights to vscode	2023-05-13 02:30:59 -07:00
Mikayla Maki	41bef2e444	Refactor out git status into FileName component ... Integrate file name component into the editor's tab content	2023-05-13 02:26:45 -07:00
Joseph T. Lyons	e1c1100c7b	Merge pull request #2466 from zed-industries/update-release-links ... Update release links	2023-05-12 14:08:10 -04:00
Joseph Lyons	b70c874a0e	Update release links	2023-05-12 14:04:36 -04:00
Mikayla Maki	ad7ed56e6b	Delete pull_request_template.md	2023-05-12 10:15:13 -07:00
Mikayla Maki	4663ac8abf	Create pull_request_template.md	2023-05-12 10:14:54 -07:00
Mikayla Maki	e71846c653	Create pull_request_template.md	2023-05-12 10:12:47 -07:00
Mikayla Maki	deac8a6ff9	Merge pull request #2465 from zed-industries/stream-branch-first ... Send the root branch along with it's entry	2023-05-12 09:45:40 -07:00
Mikayla Maki	60320c6b09	Send the root branch along with it's entry	2023-05-12 09:37:02 -07:00
Mikayla Maki	54e9e7c35b	Merge pull request #2464 from zed-industries/remove-between ... Add TreeMap::remove_between that can take abstract start and end points	2023-05-12 08:59:56 -07:00
Mikayla Maki	6ef0f70528	Made the map seek target a publicly implementable interface ... Integrated remove_range with the existing git code co-authored-by: Nathan <nathan@zed.dev>	2023-05-12 08:37:32 -07:00
Nathan Sobo	ee3637216e	Add TreeMap::remove_between that can take abstract start and end points ... This commit introduces a new adaptor trait for SeekTarget that works around frustrating issues with lifetimes. It wraps the arguments in a newtype wrapper that lives on the stack to avoid the lifetime getting extended to the caller of the method. This allows us to introduce a PathSuccessor object that can be passed as the end argument of remove_between to remove a whole subtree.	2023-05-12 08:21:01 -07:00
Kirill Bulatov	89352a2bdc	Merge pull request #2463 from zed-industries/kb/reapply-modal-accessibility ... Reintroduce more accesible modal keybindings	2023-05-12 06:11:04 +03:00
Mikayla Maki	defc9c8591	Merge pull request #2455 from zed-industries/git-status-viewer ... Add Git Status to the project panel	2023-05-11 16:13:34 -07:00
Mikayla Maki	5fe8b73f04	compile error 😅	2023-05-11 16:07:41 -07:00
Mikayla Maki	d526fa6f1f	fmt	2023-05-11 16:06:56 -07:00
Mikayla Maki	d538994c7f	Use more efficient sum tree traversals for removal and improve ergonomics with iter_from ... co-authored-by: Nathan <nathan@zed.dev>	2023-05-11 16:06:25 -07:00
Mikayla Maki	72655fc41d	fmt	2023-05-11 13:25:57 -07:00
Mikayla Maki	6f87f9c51f	Don't scan for statuses in files that are ignored	2023-05-11 13:25:07 -07:00
Mikayla Maki	1bb34e08bb	Fix test	2023-05-11 12:03:39 -07:00
Mikayla Maki	dfb6a2f7fc	fmt	2023-05-11 12:02:25 -07:00
Mikayla Maki	5b2ee63f80	Added status trickle up	2023-05-11 12:01:42 -07:00
Kirill Bulatov	f12dffa60c	Reintroduce more accesible modal keybindings ... Brings commit 475fc40923 back	2023-05-11 20:59:10 +03:00
Mikayla Maki	5accf7cf4e	Update is_deleted when sending new repositories	2023-05-11 10:21:25 -07:00
Max Brunsfeld	bebb5456c7	Merge pull request #2461 from zed-industries/ci-target-dir-size ... During CI, clear the target directory if it gets larger than a maximum size	2023-05-11 09:57:36 -07:00
Max Brunsfeld	3550110e57	ci: clear the target dir if it gets too big	2023-05-11 09:43:13 -07:00