Commit Graph
16839 Commits
Author SHA1 Message Date
Julia 48cdefe6cf Re-understand that the line just below git deletion is "inside" hunk
Fixes "go to previous hunk" getting stuck on a deletion, never going
further up
2023-10-24 11:17:42 +02:00
Conrad Irwin 3358420f6a fix format 2023-10-24 11:17:17 +02:00
Conrad Irwin 2b95db087b Fix infinite loop in select all (#3154)
[[PR Description]]

Release Notes:

- Fixed an infinite loop in select all matches
([#2170](https://github.com/zed-industries/community/issues/2170)).
2023-10-24 02:58:48 -06:00
Conrad Irwin aa6990bb6b Fix set_channel_visibility for public channels 2023-10-24 10:55:10 +02:00
Conrad Irwin 0e035c1a95 Fix character selection 2023-10-24 10:50:08 +02:00
Antonio Scandurra 953857f8e3 WIP 2023-10-24 10:31:35 +02:00
Antonio Scandurra 18eb4a7292 WIP 2023-10-24 10:01:19 +02:00
Conrad Irwin e6087e0ed9 Fix tests 2023-10-24 09:46:46 +02:00
Conrad Irwin 67e590202a vim surround (#3152)
- Fix some bugs with vim objects
- Add | as a bracket and a motion
- Fix neovim tests with angle brackets

Release Notes:

- vim: Fixed `i` and `a` objects with softwrap, and a few other edge
cases
- vim: Added support for `ci"` to find the next quoted string on the
line
- vim: Added support for `|` as a bracket (for languages like ruby and
rust)
- vim: Added support for `<count>|` to jump to a specific column
2023-10-24 01:33:34 -06:00
Piotr Osiewicz 97a0864134 grammars: Update Bash grammar (#3155)
Fixes zed-industries/community#2168

Release Notes:
- Updated Bash (Shell script) Tree-sitter grammar (fixes
zed-industries/community#2168)
2023-10-24 09:16:06 +02:00
Piotr Osiewicz 6c163afb84 bash: Add highlighting of ANSI c string (#3153)
Fixes zed-industries/community#2169

Release Notes:

- Fixed highlighting of ANSI C strings ($'foo') in "Shell script"
language buffers.
2023-10-24 09:15:35 +02:00
Nate Butler e99d862f3f WIP Button Refactor 2023-10-23 14:50:53 -04:00
Nate Butler c1c9db2ae2 Add elevation enums + docs 2023-10-23 13:50:39 -04:00
Conrad Irwin ea4e67fb76 Merge branch 'main' into guest-exp 2023-10-23 17:47:21 +02:00
Antonio Scandurra 4d621f355d WIP 2023-10-23 17:41:22 +02:00
Antonio Scandurra 05cbceec24 WIP 2023-10-23 17:36:49 +02:00
Nate Butler 297cef14ed WIP add Elevation Docs 2023-10-23 11:21:48 -04:00
KCaverly 0dfbfdd164 catchup with main 2023-10-23 17:21:37 +02:00
Nathan Sobo 192b3512fd Merge branch 'gpui2-drag-drop' into zed2 2023-10-23 17:18:07 +02:00
Nate Butler 3a326bfa7e 🤦 Remove references to system_color 2023-10-23 11:05:17 -04:00
Nate Butler dd55ccef34 Merge branch 'n/d' into zed2 2023-10-23 11:01:36 -04:00
Nate Butler 1e13e273d2 Add ThemeColor interface for UI coloring and remove redundancy 2023-10-23 11:01:04 -04:00
Nate Butler 438cf529bb Remove duplicate ThemeColor defs 2023-10-23 11:00:45 -04:00
Nathan Sobo ec0b2e5430 Add on_drop listeners 2023-10-23 16:59:16 +02:00
Antonio Scandurra 21d4546a86 WIP 2023-10-23 16:39:30 +02:00
Antonio Scandurra 7832120a4c WIP 2023-10-23 16:38:34 +02:00
Antonio Scandurra efbf0c828d WIP 2023-10-23 16:38:34 +02:00
Nate Butler c9d214e8ef Start crate doc 2023-10-23 10:21:30 -04:00
Nathan Sobo 38a7b39070 Don't start dragging until you move to 2px 2023-10-23 16:20:01 +02:00
Nathan Sobo 239b0c2f71 Clear active state when drag starts 2023-10-23 16:10:04 +02:00
Conrad Irwin 6e4e19d8fc Fix infinite loop in select all 2023-10-23 16:08:12 +02:00
Nate ButlerandMikayla Maki cc445f7cef Start scaffolding out the Copilot Modal UI
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-10-23 10:00:02 -04:00
Nathan Sobo 258fcaea94 Position drag handle relative to cursor 2023-10-23 15:20:33 +02:00
Nathan Sobo fc927f7406 Checkpoint 2023-10-23 15:14:10 +02:00
Nathan Sobo d1adce5890 Show red box when dragging 2023-10-23 15:09:22 +02:00
Max Brunsfeld a5836b0337 Add chat mentions and a notifications panel (#3121)
### Todo

* Displaying notifications
    * [x] show them in panel
    * [x] indicate read/unread status
    * [x] allow requesting more by scrolling down
    * [ ] style the panel
    * [x] style the status bar icon
* Chat mentions
    * [x] highlight mentions when editing message
    * [x] persist mentions
    * [x] highlight mentions when rendering saved messages
* Creating notifications
    * [x] contact request received
    * [x] contact request accepted
    * [x] channel invitation received
    * [x] mentioned in a chat message
* [x] Indicate responses to notifications
* Mark notifications as read
* [x] when viewing a contact request acceptance in the notification
panel
    * [x] responding to contact invite
    * [x] responding to channel invite
    * [x] viewing a channel message mention
* [x] Replace previous notifications with auto-dismissing,
non-interactive toasts

### Release Notes:

- Added a notification panel, which displays notifications about contact
requests and channel invitations.
- Added the ability to `@`-mention users in the chat, so that they will
be notified of your message.
2023-10-23 15:05:05 +02:00
Antonio Scandurra 4e6fb9034d WIP 2023-10-23 14:59:57 +02:00
Max BrunsfeldandPiotr 4d491ca3a1 Tweak styling of notifications
Co-authored-by: Piotr <piotr@zed.dev>
2023-10-23 14:58:03 +02:00
Max BrunsfeldandPiotr 2f0eaafc39 Format timestamps more tersely in the notification panel
Co-authored-by: Piotr <piotr@zed.dev>
2023-10-23 14:34:38 +02:00
Nathan Sobo 96f2c4a9de Checkpoint 2023-10-23 14:15:12 +02:00
KCaverly 4e90e45999 move embedding truncation to base model 2023-10-23 14:07:45 +02:00
Max BrunsfeldandPiotr 8766e5f0d0 Avoid flickering toast when mentioned in already-visible chat channel
Co-authored-by: Piotr <piotr@zed.dev>
2023-10-23 13:48:49 +02:00
Piotr OsiewiczandMax 812ff9a97d Account for markdown styling in mentions offset calculation.
This also means that we can support smart punctuation.

Co-authored-by: Max <max@zed.dev>
2023-10-23 12:50:57 +02:00
Antonio Scandurra a72434f67b WIP 2023-10-23 12:16:33 +02:00
Antonio Scandurra c0e8ae5dfa WIP 2023-10-23 11:53:24 +02:00
Antonio Scandurra 0de4a93ec7 WIP 2023-10-23 11:43:08 +02:00
Nathan Sobo da8919002f Fix runtime errors 2023-10-23 11:34:35 +02:00
Antonio Scandurra 5247f217fd Checkpoint 2023-10-23 11:06:58 +02:00
Antonio Scandurra 56462ef793 Checkpoint 2023-10-23 10:59:29 +02:00
Conrad Irwin b495669c86 Fix neovim tests with angle brackets 2023-10-22 22:24:35 -06:00