yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,175 Commits 5 Branches 0 Tags
fbda4f862a2fb03b854636b17bd04be3db3d94de
Commit Graph
2855 Commits
Author SHA1 Message Date
Conrad Irwin 21b6d69d61 Rewrite paste 
- vim: support P for paste before
- vim: support P in visual mode for paste without overriding clipboard
- vim: fix position when using `p` on text copied outside zed
- vim: fix indentation when using `p` on text copied from zed
 2023-08-22 13:27:57 -06:00
Joseph T. Lyons 07a815a3bc Add default bindings for new file and directory 2023-08-22 11:33:40 -04:00
Joseph T. LyonsandMikayla 12462785e9 Add a default_open_ai_model setting for the assistant (#2876) 
[This PR has been sitting around for a
bit](https://github.com/zed-industries/zed/pull/2845). I received a bit
of mixed opinions from the team on how this setting should work, if it
should use the full model names or some simpler form of it, etc. I went
ahead and made the decision to do the following:

- Use the full model names in settings - ex: `gpt-4-0613`
- Default to `gpt-4-0613` when no setting is present
- Save the full model names in the conversation history files (this is
how it was prior) - ex: `gpt-4-0613`
- Display the shortened model names in the assistant - ex: `gpt-4`
- Not worry about adding an option to add custom models (can add in a
follow-up PR)
- Not query what models are available to the user via their api key (can
add in a follow-up PR)

Release Notes:

- Added a `default_open_ai_model` setting for the assistant (defaults to
`gpt-4-0613`).

---------

Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-22 02:55:27 -04:00
Mikayla Maki 8473085b77 Move the collab panel to the left by default (#2864) 
Increase the indent size on channels
Switch font UI mono

Release Notes:

- Switch the collaboration panel font to Zed's sans-mono (preview only)
- Switch the default dock side to the left (preview-only)
- Increase the indent size on the channels panel (preview-only)
 2023-08-18 16:06:10 -07:00
Mikayla ac4dfa6c16 Move the collab panel to the left by default 
Increase the indent size on channels
Switch font UI mono
 2023-08-18 15:04:22 -07:00
Joseph T. Lyons 398eefff02 Add more file icons (#2861) 
Release Notes:

- Added file icons for Python and Elixir
 2023-08-18 15:27:04 -04:00
Joseph T. Lyons 7ff77a3625 Add elixir icons 2023-08-18 14:54:53 -04:00
Joseph T. Lyons 6c6c75a6e1 Alphabetize list 2023-08-18 14:07:55 -04:00
Joseph T. Lyons 0bab64bc59 Add python file icon 2023-08-18 14:07:17 -04:00
Conrad Irwin 299d529795 Add ctrl-q as an alias for ctrl-v 
Fixes: zed-industries/community#871
 2023-08-18 11:39:48 -06:00
Conrad Irwin b855d248bd vim visual block (#2849) 
Release notes:

- vim: add Visual Block mode
([#984](https://github.com/zed-industries/community/issues/984)),
([#1415](https://github.com/zed-industries/community/issues/1415)).
- vim: add support for `a<object>` and `i<object>` in visual modes
- vim: fix scroll shortcuts (`ctrl-{f,b,d,u,e,y}`) in visual modes
- allow `shift-enter` to type a newline.
 2023-08-18 09:55:40 -06:00
Conrad Irwin 9f6567f2a9 Fix visual objects 
Adds 'a'/'i' in visual mode
 2023-08-17 17:13:23 -06:00
Conrad Irwin ec0934dac1 shift-enter should also give a newline 
(reported as vim feedback, but really true of the editor too)
 2023-08-17 16:01:19 -06:00
Conrad Irwin ec731cfee9 Scrolling should work in visual mode 2023-08-17 15:58:10 -06:00
Conrad Irwin acac81693e Add I and A in visual block mode 2023-08-17 11:21:58 -06:00
Mikayla a37da1b636 Merge branch 'main' into project_search_design 2023-08-17 01:56:05 -07:00
Nate Butler a00b6a640f Update inlay_hint icon 2023-08-16 23:38:11 +03:00
Nate Butler 213ef710bd Add inlay_hint icon, update search icon, update tooltips 2023-08-16 23:38:11 +03:00
Nate ButlerandMax Brunsfeld dd531145c2 Update modal icon styles 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-08-16 13:48:12 -04:00
KCaverly 4e3526b616 Merge branch 'main' of github.com:zed-industries/zed into project_search_design 2023-08-16 12:43:04 +01:00
Nate Butler 3783ca1eed Update assistant status bar icon 2023-08-15 18:36:30 -04:00
Conrad Irwin d37246dee7 Vim visual block mode 
This isn't quite an exact emulation, as instead of using one selection
that is magically in "column mode", we emulate it with a bunch of zed
multi-selections (one per line).

I think this is better, as it requires fewer changes to the codebase,
and lets you see the impact of any changes immediately on all lines.

Fixes: zed-industries/community#984
 2023-08-15 16:00:50 -06:00
Nate Butler f201875d07 Additional status bar styles 2023-08-15 15:32:14 -04:00
Max Brunsfeld 90e9db99ab Merge branch 'main' into collab-panel 2023-08-15 09:09:50 -07:00
Conrad Irwin 3aec608f60 Fix vim selection to include entire range (#2787) 
Update vim mode to have vim selection and editor selections match.
Before this we had to adjust between vim selections and real selections
when making changes; now we have to adjust when making selections.

Release Notes:

- vim: Ensure editor selection matches the vim selection
([#1796](https://github.com/zed-industries/community/issues/1796)).
- vim: Fix `s` in visual line mode
- vim: Add `o` and `shift-o` to toggle direction of visual selection
- vim: Fix `v` and `shift-v` to toggle back to normal mode
- vim: Fix block selections like `vi}` to contain correct whitespace
 2023-08-15 08:36:17 -06:00
Conrad Irwin 8e909670cd Fix vim escape in normal mode 
Fixes: zed-industries/community#1857
 2023-08-14 16:05:41 -06:00
Conrad Irwin ff42104392 Merge branch 'main' into vim-visual-selection 2023-08-14 15:29:33 -06:00
Nate Butler a4661e4e16 Use new icons in channel panel 2023-08-14 15:57:31 -04:00
Nate Butler 363c7b2b1d Add new icons 2023-08-14 15:50:42 -04:00
Mikayla f0e7bbeb34 Move default collab panel to the right 2023-08-14 10:47:29 -07:00
Piotr Osiewicz 6d1ca22f57 Merge branch 'main' into project_search_design 2023-08-12 21:57:21 +02:00
Mikayla 8b73737072 Merge branch 'main' into collab-panel 2023-08-09 10:37:22 -07:00
Piotr Osiewicz d131cc0324 Add cycle mode command for buffer search 2023-08-09 18:02:21 +02:00
Nate Butler 28c56c1f81 Add IBM Plex license 2023-08-09 11:39:15 -04:00
Nate ButlerandJulia 8a4340c85e 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 f3741bcfeb 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 647f724c30 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
Piotr Osiewicz 3c71113730 Update keybinds to use new names 2023-08-08 14:33:51 +02:00
Mikaylaandmax 8a7d078eaf 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 247d6c9dc5 Push focus and fix keybindings 2023-08-07 13:31:58 -07:00
Conrad Irwin 66e4046734 Fix selection background too 
Refactor code to centralize the logic too
 2023-08-07 19:01:04 +01:00
Max BrunsfeldandMikayla e93fc31525 Fix joining descendant channels, style channel invites 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 16:21:43 -07:00
Max BrunsfeldandMikayla acce8aba4a Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Piotr OsiewiczandKyle c23dbfe986 Remove reference to pane from a toolbar. 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-03 16:09:26 +02:00
KCaverly 599c7e814c catch up with main 2023-08-02 16:48:11 -04:00
KCaverly ef34de3b11 update keymaps for cycle search mode and toggle filters 2023-08-02 15:08:54 -04:00
Max Brunsfeld 076649aae1 Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Piotr OsiewiczandKyle 8109916aea Scale down the case insensitive icon 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-01 18:02:19 +02:00
Piotr OsiewiczandKyle 22441950ae Update case insensitive button. 
Co-authored-by: Kyle <kyle@zed.dev>
 2023-08-01 17:56:09 +02:00
Piotr Osiewicz 55f26f858c Use icons instead of text in toggles 2023-08-01 11:20:23 +02:00