yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,181 Commits 5 Branches 0 Tags
25da16247bc5f6455fe653ef5b3ffdc232aef59e
Commit Graph
9181 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kirill Bulatov 25da16247b Simplify file-row-column parsing 2023-05-16 21:07:26 +03:00
Kirill Bulatov 792aa717b1 Use ':' instead of ',' to separate files, rows and columns 2023-05-16 21:07:26 +03:00
Kirill BulatovandMikayla Maki 83f4c3dc46 Properly place the caret into the window of the file opened 
co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-05-16 21:07:26 +03:00
Kirill Bulatov ad05aaebbc Move the caret to the opened file 2023-05-16 21:07:26 +03:00
Kirill Bulatov 097116477c Parse file find queries with extra data 2023-05-16 21:07:26 +03:00
Kirill Bulatov 6e5e798aeb Merge pull request #2476 from zed-industries/kb/faster-dev-cli 
Allow CLI to start Zed from local sources
 2023-05-16 21:06:40 +03:00
Julia c6ae7d0e3d Merge pull request #2477 from zed-industries/fixup-some-more-worktree-bugs 
Fixup some more worktree bugs
 2023-05-16 13:13:22 -04:00
JuliaandAntonio Scandurra 9f47d22f04 Fix worktree refresh request causing gitignore to not update 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-05-16 13:01:29 -04:00
JuliaandAntonio Scandurra 73f16b1aa1 Avoid removing fake fs entry when rename fails later in the process 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-05-16 13:00:39 -04:00
Kirill Bulatov 4103a3084f Allow CLI to start Zed from local sources 
Zed now is able to behave as if it's being started from CLI
(`ZED_FORCE_CLI_MODE` env var)

Zed CLI accepts regular binary file path into `-b` parameter (only *.app before),
and tries to start it as Zed editor with `ZED_FORCE_CLI_MODE` env var
and other params needed.
 2023-05-16 17:41:32 +03:00
Kirill Bulatov 7f1fa93d00 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 23bc33633d Merge pull request #2473 from zed-industries/fix-styling-feedback 
Fix git status issues
 2023-05-15 16:28:57 -07:00
Mikayla Maki 6e32cf9a97 fmt 2023-05-15 16:22:52 -07:00
Mikayla Makiandmax 80627ff41b Restore trickle up git status to folder 
co-authored-by: max <max@zed.dev>
 2023-05-15 16:22:00 -07:00
Mikayla Makiandmax 686b607b8e 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 Makiandmax 2b770e4bac Made status tracking resilient to folder renames 
co-authored-by: max <max@zed.dev>
 2023-05-15 16:21:58 -07:00
Mikayla Maki ee2b629435 Update proto names to reflect new status info 2023-05-15 16:20:01 -07:00
Mikayla Maki ccdc38eec2 Add index tracking to status 2023-05-15 16:20:01 -07:00
Mikayla Maki 89f70241ae Fixed formatting 2023-05-15 16:20:01 -07:00
Mikayla Maki 85b6218bb3 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 10ba4e1e55 Merge pull request #2474 from zed-industries/update-jetbrains-keymap 
Update jetbrains keymap
 2023-05-15 14:17:36 -04:00
Joseph Lyons 0fa5245426 Update jetbrains keymap 2023-05-15 14:12:02 -04:00
Julia 4921ba7ee6 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 BulatovandAntonio 36e4876e07 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 8d60a514d8 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 5e26ea61d0 Build Zed dmg 2023-05-15 11:26:41 +03:00
Kirill Bulatov bb42d3a370 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 dc8bff3a6c Fixup more, tests finally pass 2023-05-14 12:06:00 -04:00
Mikayla Maki 3e76b8664d 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 31b8222455 fmt 2023-05-13 10:43:16 -07:00
Mikayla Maki c3198925e9 Fix repository initialization bug 2023-05-13 10:38:24 -07:00
Mikayla Maki ac3087f6ea Merge pull request #2468 from zed-industries/touch-up-status 
Improve status integration
 2023-05-13 09:38:02 -07:00
Mikayla Maki 0dc95b0368 Fixed bug with failing to clear git file status 2023-05-13 02:40:22 -07:00
Mikayla Maki 7bbe0b3f90 Match priority of folder highlights to vscode 2023-05-13 02:30:59 -07:00
Mikayla Maki 8e263a30c6 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 50a67ec51b Merge pull request #2466 from zed-industries/update-release-links 
Update release links
 2023-05-12 14:08:10 -04:00
Joseph Lyons f33ccf81e3 Update release links 2023-05-12 14:04:36 -04:00
Mikayla Maki ba0c8b528e Delete pull_request_template.md 2023-05-12 10:15:13 -07:00
Mikayla Maki 3e130d4cac Create pull_request_template.md 2023-05-12 10:14:54 -07:00
Mikayla Maki 78f8d1b741 Create pull_request_template.md 2023-05-12 10:12:47 -07:00
Mikayla Maki 0e82fc526c 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 420e895c6d Send the root branch along with it's entry 2023-05-12 09:37:02 -07:00
Mikayla Maki c7dd6e5d8d 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 MakiandNathan bdf7e377f8 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 fa0fa1075e 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 cab363efba 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 060caa6d32 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 51cc2de736 compile error 😅 2023-05-11 16:07:41 -07:00
Mikayla Maki 2430c6b9eb fmt 2023-05-11 16:06:56 -07:00
Mikayla MakiandNathan aa69083b7f 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