Commit Graph
39175 Commits
Author SHA1 Message Date
Mikayla Maki 8b6d8f9528 Add a dependency on rustfmt to the CI tests 2023-05-17 14:17:10 -07:00
Mikayla Maki 98d789f8fc fmt 2023-05-17 14:12:04 -07:00
Mikayla Maki 9d15fa8ab1 Add scrollbars setting 2023-05-17 14:09:26 -07:00
Mikayla Maki 42e302954b Merge pull request #2482 from zed-industries/add-hunks-to-scrollbar
Add diff hunks to the scroll bar
2023-05-17 11:51:01 -07:00
Mikayla Maki 14b2ed1532 Add diff hunks to the scroll bar 2023-05-17 11:40:30 -07:00
Max Brunsfeld 460d6d652a Define base keymap setting in welcome crate 2023-05-17 11:23:09 -07:00
Julia 20f4908b3a Merge pull request #2481 from zed-industries/update-font-kit
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:57:39 -04:00
Julia b636bab434 Update font-kit to resolve panics when loading malformed fonts 2023-05-17 13:38:54 -04:00
Max Brunsfeld ca02b558c8 Merge branch 'main' into setting-store 2023-05-17 09:55:24 -07:00
Joseph Lyons 609d65c5a8 v0.88.x dev 2023-05-17 12:39:08 -04:00
Max Brunsfeld beda62739e Customize language settings JSON schema in language crate 2023-05-17 09:26:36 -07:00
94c5c17a02 Drop foreign key constraint from workspaces.dock_pane to panes table
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-05-17 18:21:35 +02:00
Antonio ScandurraandMikayla Maki 0d9c78ddc2 Store whether a panel is zoomed in the panel itself
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-05-17 17:51:11 +02:00
Antonio ScandurraandMikayla Maki 7105ecbb5b Rebind ctrl-` to toggle terminal panel focus
Also, add `ctrl-~` to create new terminals.

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2023-05-17 17:35:10 +02:00
Antonio Scandurra 3b3c5bb637 Notify old/new ancestors of the focused view when they change 2023-05-17 17:12:12 +02:00
Antonio Scandurra 4995d3c947 Show a panel/pane as zoomed only if it's the active item in workspace 2023-05-17 15:06:58 +02:00
Max Brunsfeld 09f37a2fe9 Define workspace settings in workspace crate 2023-05-16 20:25:18 -07:00
Max Brunsfeld 2f05e3d502 Define project settings in project crate 2023-05-16 17:45:04 -07:00
Max Brunsfeld a802da9dae Define editor settings in editor crate 2023-05-16 17:30:29 -07:00
Max Brunsfeld 56f2ff64ed Define language settings in the language crate 2023-05-16 17:29:53 -07:00
Julia 6530e40859 Merge pull request #2479 from zed-industries/dont-use-svg-text-feature
Disable usvg's text feature flags to include less dependency code
2023-05-16 18:48:12 -04:00
Julia f0108a9b30 Disable usvg's text feature flags to include less dependency code 2023-05-16 18:44:16 -04:00
Joseph T. Lyons 7b950dea56 Merge pull request #2478 from zed-industries/Fix-telemetry-bugs
Send editor event when saving a new file
2023-05-16 18:18:07 -04:00
Joseph Lyons a9cc8412af Send editor event when saving a new file 2023-05-16 18:16:09 -04:00
Joseph T. Lyons d75cfe1472 Merge pull request #2475 from zed-industries/add-copilot-events
Add events for copilot suggestion accepting and discarding
2023-05-16 17:25:54 -04:00
Joseph Lyons ad7f42d0b9 Don't make events for every rejected suggestion 2023-05-16 17:19:05 -04:00
Kirill Bulatov 62c6f7bb7c Remove extra dbg! 2023-05-16 22:15:56 +03:00
Kirill Bulatov 8a6ec3e2f5 Merge pull request #2462 from zed-industries/kb/go-to-line-column-numbers
Support go to file_query:row:column syntax in Find File, Go To Line dialogs and CLI

Deals slightly differently with zed-industries/community#557
Deals with zed-industries/community#1184

    Fixes Go To Line not respecting column number when navigating to a place
    Changes a line-row separator from , to : to show it more uniformly with other tools
    Adjusts file finder dialogue to allow file_query:row:column syntax and opens the buffer at the lines given
    Extends CLI with file_path:row_column syntax and opens these files similarly
2023-05-16 21:24:57 +03:00
Kirill Bulatov 01d344aaf4 Unit test file:row:column parsing 2023-05-16 21:07:48 +03:00
Kirill Bulatov f2038312ea Finalize the CLI opening part 2023-05-16 21:07:48 +03:00
Kirill BulatovandMikayla 7c4da86cfa Return proper items on workspace restoration.
co-authored-by: Mikayla <mikayla@zed.dev>
2023-05-16 21:07:48 +03:00
Kirill Bulatov 1508c39e5f Do not break Zed & Zed CLI compatibility 2023-05-16 21:07:47 +03:00
Kirill Bulatov a9d441ae5f Attempt to open rows and columns from CLI input 2023-05-16 21:07:26 +03:00
Kirill Bulatov 0708442690 Unify path:row:column parsing, use it in CLI 2023-05-16 21:07:26 +03:00
Kirill BulatovandMax d378829d11 Test caret selection in file finder
co-authored-by: Max <max@zed.dev>
2023-05-16 21:07:26 +03:00
Kirill Bulatov ad4d375f0b Make Go To Line to respect column numbers 2023-05-16 21:07:26 +03:00
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
Joseph Lyons 61f87e38b6 Send copilot events even if file_extension is not known at the time 2023-05-16 14:02:36 -04:00
Joseph Lyons 4736fe39c7 Rework code to contain submitting of copilot events within editor 2023-05-16 13:26:05 -04: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
Antonio ScandurraandAntonio Scandurra be876f0825 Don't rely on action propagation for zooming in and out
Co-Authored-By: Antonio Scandurra <antonio@zed.dev>
2023-05-16 10:34:50 -06:00
Joseph Lyons edaa17a979 Fix compile error 2023-05-16 11:51:20 -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