zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity
11,097 Commits 699 Branches 767 Tags 282 MiB
b6f3dd51a0
Commit Graph

560 Commits

Author SHA1 Message Date
Mikayla
b6f3dd51a0
Move default collab panel to the right 2023-08-14 10:47:29 -07:00
Mikayla
99daa73325
Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Nate Butler
85af025d82 Add IBM Plex license 2023-08-09 11:39:15 -04:00
Nate Butler
183c292a5c Remove license causing unwrap error 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-08-09 11:11:57 -04:00
Nate Butler
b23f1c809a WIP add IBM Plex Sans 
(base) natebutler@Nate16 zed % cargo run
   Compiling zed v0.99.0 (/Users/natebutler/Code/zed/zed/crates/zed)
    Finished dev [unoptimized + debuginfo] target(s) in 9.15s
     Running `target/debug/Zed`
Thread "main" panicked with "called `Result::unwrap()` on an `Err` value: parse error" at crates/zed/src/main.rs:667:10
   0: backtrace::backtrace::libunwind::trace
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/libunwind.rs:93:5
      backtrace::backtrace::trace_unsynchronized
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/mod.rs:66:5
   1: backtrace::backtrace::trace
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/backtrace/mod.rs:53:14
   2: backtrace::capture::Backtrace::create
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/capture.rs:176:9
   3: backtrace::capture::Backtrace::new
             at /Users/natebutler/.cargo/registry/src/index.crates.io-6f17d22bba15001f/backtrace-0.3.68/src/capture.rs:140:22
   4: Zed::init_panic_hook::{{closure}}
             at crates/zed/src/main.rs:436:29
   5: std::panicking::rust_panic_with_hook
   6: std::panicking::begin_panic_handler::{{closure}}
   7: std::sys_common::backtrace::__rust_end_short_backtrace
   8: _rust_begin_unwind
   9: core::panicking::panic_fmt
  10: core::result::unwrap_failed
  11: core::result::Result<T,E>::unwrap
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/core/src/result.rs:1089:23
  12: Zed::load_embedded_fonts
             at crates/zed/src/main.rs:664:5
  13: Zed::main
             at crates/zed/src/main.rs:80:5
  14: core::ops::function::FnOnce::call_once
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/core/src/ops/function.rs:250:5
  15: std::sys_common::backtrace::__rust_begin_short_backtrace
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/sys_common/backtrace.rs:134:18
  16: std::rt::lang_start::{{closure}}
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/rt.rs:166:18
  17: std::panicking::try
  18: std::rt::lang_start_internal
  19: std::rt::lang_start
             at /private/tmp/rust-20230613-7622-103lepv/rustc-1.70.0-src/library/std/src/rt.rs:165:17
  20: _mai
 2023-08-09 11:01:20 -04:00
Mikayla
bbe4a9b388
Position and style the channel editor correctly 
Fix a bug where some channel updates would be lost
Add channel name sanitization before storing in the database
 2023-08-08 14:06:29 -07:00
Mikayla
8980a9f1c1
Add settings for removing the assistant and collaboration panel buttons 
Add a not-logged-in state to the collaboration panel

co-authored-by: max <max@zed.dev>
 2023-08-07 16:27:47 -07:00
Mikayla
f1957b1737
Push focus and fix keybindings 2023-08-07 13:31:58 -07:00
Max Brunsfeld
2ccd153233 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max Brunsfeld
87b2d599c1 Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Max Brunsfeld
a555fa1ada Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Kirill Bulatov
634baeedb4 Add project search history 2023-08-01 01:31:28 +03:00
Kirill Bulatov
646dabe113 Add buffer search history 2023-08-01 01:31:28 +03:00
Nate Butler
c4709418d1 Format 2023-07-31 12:50:30 -04:00
Nate Butler
e07a81b225 Add additional storage filetypes 2023-07-31 12:49:55 -04:00
Mikayla Maki
7f9df6dd24
Move channels panel into collab and rename to collab panel 
remove contacts popover and add to collab panel
 2023-07-28 13:24:42 -07:00
Mikayla Maki
ac35dae66e
Add channels panel with stubbed out information 
co-authored-by: nate <nate@zed.dev>
 2023-07-28 13:21:39 -07:00
Mikayla Maki
e945b3c0e1
feat(workspace): add action for closing inactive editors on all panes (#2771) 
using zed more and more to develop zed itself I'm finding some small qol
features missing, this is one of them
I'm very used to open two or three splits, and sometimes I want to close
everything except for the active editor, but that wasn't supported, as
the `pane::CloseInactiveItems` action only closes inactive items on the
active pane

so I've implemented it really quick, although I'm not sure it's the
right way to do this

note: I really don't like the default keybinding I've set it to, I have
this action bound to `cmd-shift-w` on all editors, but in zed is taken,
so I chose something that's free but without thinking too much about it

Release Notes:

- Added action for closing inactive editors from all panes
 2023-07-27 18:11:11 -07:00
Mikayla Maki
a0fc515cfc
Rework close_inactive_items to await all tasks 
Update action name to be more accurate
 2023-07-27 17:58:48 -07:00
KCaverly
06167889c3 remove default keymap for semantic search modal 2023-07-26 16:59:19 -04:00
Derek Briggs
9fc1ebcb5b
icon updates 2023-07-26 11:19:34 -06:00
KCaverly
0ac919f6e0 catchup with main 2023-07-26 09:50:38 -04:00
Joseph T. Lyons
bdd0b9f387
Add open file in project finder via space (#2785) 
@mikayla-maki for 👀 

[This PR added in the ability to rename a file via
`enter`](https://github.com/zed-industries/zed/pull/2784). Previously,
`enter` was used to both open a file and confirm a rename, so this PR
changes the opening of a file to use `space`, which is what VS Code
uses. It also makes a bit more sense because now `enter` is just used to
start a rename and confirm the rename, vs being used for 2 different
actions.

N/A on the release notes, as I adjusted the release note in the
previously-tagged PR.

Release Notes:

- N/A
 2023-07-24 16:35:01 -04:00
Mikayla Maki
41105136a4
Add MacOS standard key binding for file renames 2023-07-24 10:20:10 -07:00
Kirill Bulatov
595bc16749 Add search in directory action in the project panel 2023-07-21 22:47:57 +03:00
Conrad Irwin
56c657fe79
Vim shortcuts (#2760) 
Refactors some of the vim bindings to make the vim.json file less
obtuse.

Release Notes:

- vim: add `;` and `,` to repeat last `{f,F,t,T}`
- vim: add zed-specific shortcuts for common IDE actions:
- - `g A` to find all references
- - `g .` to open the code actions menu.
- - `c d` for rename
 2023-07-21 10:31:18 -06:00
Conrad Irwin
4772e4ccee vim: add , and ; 2023-07-21 09:50:22 -06:00
Conrad Irwin
a50d30bf8e Quality of life shortcuts for code actions 2023-07-21 09:47:15 -06:00
Conrad Irwin
8ba69c15d1 refactor: Remove G/Z Namespace support 
This previously enabled things like `d g g` to work, but we can
fix that instead by not clearing out pending vim state on change.

Either way, it is unnecessary and causes some user-confusion
(zed-industries/community#176), so remove this code for now; and use
comments to organize the file a bit instead.
 2023-07-21 09:47:14 -06:00
Conrad Irwin
bf2583414b
Fix shift-enter in search (#2772) 
Fixes shift-enter to go to previous result.

Release Notes:

- To type a newline in search use `ctrl-enter` (or `ctrl-shift-enter`
for a newline below).
 2023-07-21 09:23:04 -06:00
Conrad Irwin
807279208d Fix shift-enter in search 
If you want to type a newline in an auto_height editor, ctrl and
ctrl-shift are your friends.
 2023-07-21 09:10:12 -06:00
Alex Viscreanu
1610e270d6
feat(workspace): add action for closing inactive editors on all panes 2023-07-21 13:16:00 +02:00
Joseph T. Lyons
d98fcc4402 Add key binding to close all docks 2023-07-21 02:44:44 -04:00
Conrad Irwin
57b6e25278
Fix enter in search (#2768) 
Fixes a regression in non-vim search caused by my changes to vim search.

Release Notes:

- N/A
 2023-07-20 20:53:31 -06:00
Conrad Irwin
7337910034 Fix enter in search 2023-07-20 20:48:36 -06:00
Mikayla Maki
a9bfe97361
Add wrap guides and associated settings 2023-07-20 16:39:13 -07:00
Derek Briggs
1d1da74d72
Adjustment 2023-07-20 15:05:26 -06:00
Derek Briggs
0769458ae4
Detail adjustments 2023-07-20 15:04:23 -06:00
Mikayla Maki
a85af79892
Folder icons (#2764) 
- Updates icons and adds more
- Adds ability to choose folders or chevrons in user settings
- Adds ability to set indent size in user settings
 2023-07-20 13:59:21 -07:00
Derek Briggs
1242b5b4a2
Solid tab on folder icon 2023-07-20 13:13:44 -06:00
Derek Briggs
abb145da70
add indent size to project panel settings 2023-07-20 12:30:35 -06:00
Derek Briggs
95947f6d3a
icon adjustment 2023-07-20 12:29:57 -06:00
Derek Briggs
c56d62fd84
gitmodules to git icon 2023-07-20 12:29:50 -06:00
Derek Briggs
a7695c47bf
Update default settings 2023-07-20 12:03:07 -06:00
Derek Briggs
8f0b24b264
Add moar icons 2023-07-20 12:01:41 -06:00
Derek Briggs
f051e66231
code icon adjustment 2023-07-20 10:15:20 -06:00
Derek Briggs
a90b151d52
Updated icons with additions 2023-07-20 10:07:32 -06:00
Conrad Irwin
15dc8b43c4 Default keybindings for activating pane by direction 
Breaking change: previously cmd-k cmd-{left,right} moved to the
{previous,next} pane; now they will move in the specified direction.
 2023-07-19 18:33:08 -06:00
Conrad Irwin
2762f9b1c6 vim: Add support for ctrl-w commands 
Primarily {h,j,k,l,left,right,up,down} for moving to a pane by
direction; but also {w,W,p} for going forward/back, and {v,s} for
splitting a pane vertically/horizontally, and {c,q} to close a pane.

There are a large number of ctrl-w commands that are not supported, and
which fall into three buckets:

* switch this pane with that one (VScode also has this, and it's a
  requested feature)
* move to top/bottom/leftmost/rightmost
* counts on any of these
* jump to "definition/file-under-cursor/etc.etc." in a new pane.
 2023-07-19 18:29:13 -06:00
Conrad Irwin
b13e86aba6
Make tab non-functional in vim mode (#2753) 
Make tab do nothing (a surprisingly common vim request).

- Fixes
([#988](https://github.com/zed-industries/community/issues/988)).
- Fixes
([#897](https://github.com/zed-industries/community/issues/897)).
 2023-07-19 16:26:32 -06:00