yenru0/zed
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,999 Commits 5 Branches 0 Tags
8a7d078eaf694faeb7d8318e4dc4f7a8aec28257
Commit Graph
10999 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MikaylaandMax 9f1d025937 Add context menu controls to the channel member management 
co-authored-by: Max <max@zed.dev>
 2023-08-07 15:29:30 -07:00
MikaylaandMax 06f40c814a Remove admin and member button 
Fix bug with invites in the member list
Fix bug when there are network errors in the member related RPC calls

co-authored-by: Max <max@zed.dev>
 2023-08-07 14:32:13 -07:00
Mikayla f267c1358b Fix modal click throughs and adjust height for channel modal 2023-08-07 13:39:05 -07:00
Mikayla 247d6c9dc5 Push focus and fix keybindings 2023-08-07 13:31:58 -07:00
Max Brunsfeld d51cac5ab2 Merge branch 'main' into collab-panel 2023-08-07 11:50:40 -07:00
Joseph T. Lyons 007090f21e Fix bash path_suffixes and add cmd-/ line comment support (#2827) 
<img width="1608" alt="SCR-20230806-cyrg"
src="https://github.com/zed-industries/zed/assets/19867440/2491c4bc-5797-4417-9633-08c136b4e8fe">

I noticed we weren't highlghting bash files if the shebang line didn't
exist. After checking, it looks like the `.` were accidentally added to
the `path_suffixes` list. This PR fixes that and adds in support for
`cmd-/` to trigger line comments.

<img width="1608" alt="SCR-20230806-czxh"
src="https://github.com/zed-industries/zed/assets/19867440/37dd0c8e-c4e7-49e2-9997-9dd8145f460e">


Release Notes:

- Fixed a bug where shell files weren't syntax highlighted if a shebang
didn't exist.
- Added support for `cmd-/` to add line comments to shell files.
 2023-08-06 02:35:00 -04:00
Joseph T. Lyons 2c278b6149 Fix bash path_suffixes and add line_comment 2023-08-06 02:20:31 -04:00
Joseph T. Lyons 5502e17e7a Expand empty selections to cover full word when doing case conversions and fix bugs (#2826) 
When doing case conversions, specifically in the case of an empty
selection, in both VS Code and Sublime, the cursor winds up being in a
different place relative to where it started.

In VS Code, the cursor maintains it position in the text, no matter if
the text expands or shrinks


https://github.com/zed-industries/zed/assets/19867440/b24f5d86-c315-4a72-9ed4-3732b490ea9a

In Sublime, I have no idea what is going on:


https://github.com/zed-industries/zed/assets/19867440/05f21303-6e42-47b2-b844-7accd0bf05d7

I thought it would be a better experience if, when doing an empty
selection transformation, we simply expand the selection and park the
cursor at the end of the newly-transformed text.


https://github.com/zed-industries/zed/assets/19867440/833619ef-04e2-47b6-ad4e-e2b43d54fb2b

This feels similar to us expanding the selection when doing line
manipulations:


https://github.com/zed-industries/zed/assets/19867440/c30c5332-787d-4cf0-a9ee-e66c3c159956

Selections are adjusted to match however each word expands and shrinks,
even when there are multiple:


https://github.com/zed-industries/zed/assets/19867440/d7073aac-8a59-4f2c-b0e5-1df37be1694c

Release Notes:

- Improved behavior of empty-selection case transformations by selecting
resulting word.
- Fixed some bugs with overflow
 2023-08-05 12:16:46 -04:00
Joseph T. Lyons 5ca419bd55 Expand empty selections to cover full word and fix bugs 2023-08-05 11:31:21 -04:00
Joseph T. Lyons 4e8025826c Add more convert to case commands (#2825) 
I'm using [convert_case](https://crates.io/crates/convert_case)
underneath the hood, which has over 35 million downloads and feels
solid.

Release Notes:

- Added commands to convert between variable name styles
([#1821](https://github.com/zed-industries/community/issues/1821)).
    - `convert to kebab case`
    - `convert to snake case`
    - `convert to upper camel case`
    - `convert to lower camel case`
    - `convert to title case`
 2023-08-04 22:51:32 -04:00
Joseph T. Lyons ad2c456b9a Add more convert to case commands 
ConvertToTitleCase
ConvertToSnakeCase
ConvertToKebabCase
ConvertToUpperCamelCase
ConvertToLowerCamelCase
 2023-08-04 22:45:26 -04: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
Joseph T. Lyons 8c701e909a Add convert to {upper,lower} case commands (#2824) 
Release Notes:

- Added `convert to upper case` and `convert to lower case` commands
([#1011](https://github.com/zed-industries/community/issues/1011)).
 2023-08-04 18:12:55 -04:00
Max BrunsfeldandMikayla acce8aba4a Flesh out channel member management 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-04 14:12:08 -07:00
Joseph T. LyonsandJulia 4907349c6f Add convert to {upper,lower} case commands 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-08-04 15:10:33 -04:00
Max Brunsfeld f89a7be963 Don't expose channel admin actions in UI if user isn't admin 2023-08-04 10:24:46 -07:00
Max Brunsfeld c0c1398223 Add test assertion where user is not admin of channel 2023-08-04 09:51:37 -07:00
Max Brunsfeld 9bc96ab5c5 Start work on exposing which channels the user has admin rights to 2023-08-03 18:31:00 -07:00
Max Brunsfeld aba42b1b60 Implement channel member removal, permission check for member retrieval 2023-08-03 18:03:40 -07:00
Nathan Sobo 1d54e24f21 WIP: Return WindowHandle<V: View> from AppContext::add_window (#2820) 
Instead of returning a usize for the window id, I'm instead returning a
`WindowHandle<V: View>` where `V` is the type of the window's root view.
@as-cii helped me with a cool technique using generic associated types
where methods on `WindowHandle` can return either T or Option<T>
depending on the `BorrowWindowContext::Result` associated type.

Some example usage...

```rs
let window = cx.add_window(|cx| MyView::new(cx));
let my_view = window.root(cx); // If cx is TestAppContext, returns MyView. Otherwise returns Option<MyView>, because the window could be closed.
```


This isn't insanely beneficial on its own, but I think it will help
clean up our testing story. I'm planning on making `window` more useful
in tests for laying out elements, etc.

- [x] Rework tests that call `add_window` 😅 to expect only a window in
return.
- [x] Get tests passing
- [x] 🚬  test
 2023-08-03 18:45:51 -06:00
Nathan Sobo a5ffc9f916 Use WindowHandles in a couple places 2023-08-03 17:46:34 -06:00
Max BrunsfeldandMikayla 9f70e37022 Lay-out channel modal with picker beneath channel name and mode buttons 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 16:15:29 -07:00
Nathan Sobo 40f28de681 Don't refcount window handles 2023-08-03 17:11:47 -06:00
Nathan Sobo aaa63b400b WIP 2023-08-03 17:03:39 -06:00
Joseph T. Lyons 6cd508c88b Add PathExt trait (#2823) 
This PR adds a `PathExt` trait. It pulls in our existing `compact()`
function, as a method, and then adds a method, and testing, for
`icon_suffix()`. A test was added to fix:

- https://github.com/zed-industries/community/issues/1877

Release Notes:

- Fixed a bug where file icons would not be registered for files with
with `.` characters in their name
([#1877](https://github.com/zed-industries/community/issues/1877)).
 2023-08-03 18:57:43 -04:00
Max BrunsfeldandMikayla 20f804d1b9 Implement basic channel member management UI 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-03 14:49:01 -07:00
Mikayla Maki dbcdcd43c5 simplify server implementation 2023-08-03 13:27:00 -07:00
Max Brunsfeld 157050fcf6 Fetch channel members before constructing channel mgmt modal 2023-08-03 12:10:53 -07:00
Mikayla Maki 88fb1b89f2 WIP: continue channel management modal and rename panel to collab_panel 2023-08-03 11:40:55 -07:00
Mikayla Maki a7bcdeebac WIP: add custom channel modal 2023-08-03 10:59:09 -07:00
Nathan Sobo 47b907c4f9 WIP 2023-08-03 08:10:16 -06:00
Mikayla Maki cca30c8481 Add the ability to jump between channels while in a channel 2023-08-02 17:13:09 -07:00
Max Brunsfeld 71a1a3904f wip 2023-08-02 15:52:56 -07:00
Max BrunsfeldandMikayla cd2a7330a2 Restore seeding of random GH users in seed-db 
Co-authored-by: Mikayla <mikayla@zed.dev>
 2023-08-02 15:45:22 -07:00
Julia ca9f08de85 Use the same font size for hovered state of LSP status (#2821) 
This element is used for the update state as well for some reason so
while we don't normally ever see this state, it is used when the status
is acting as the restart to update button

Release Notes:

- Fixed an inconsistency in the status bar update button font size.
 2023-08-02 18:16:39 -04:00
Max Brunsfeldandmikayla 45c92ae784 Start work on rendering channel participants in collab panel 
Co-authored-by: mikayla <mikayla@zed.dev>
 2023-08-02 15:09:37 -07:00
Julia 14c0daa74a Use the same font size for hovered state of LSP status 
This element is used for the update state as well for some reason so
while we don't normally ever see this state, it is used when the status
is acting as the restart to update button
 2023-08-02 17:33:56 -04:00
Nathan Sobo 94ff1d09e2 Get tests passing 2023-08-02 15:02:55 -06:00
Nathan Sobo 680c0185e4 Get tests compiling returning WindowHandle<V: View> from add_window 2023-08-02 14:05:03 -06:00
Max Brunsfeld def8c215ff Revert "Extract syntax highlighting properties from tree-sitter highlight queries (#2797)" 
This reverts commit 20d5589876, reversing
changes made to 48a9b3e1e9.
 2023-08-02 12:15:39 -07:00
Max Brunsfeld e12e58c413 WIP 2023-08-02 12:15:06 -07:00
Nathan Sobo 2697fce807 WIP 2023-08-02 12:08:56 -06:00
Joseph T. Lyons 9d55727278 v0.99.x dev 2023-08-02 13:50:30 -04:00
Mikayla Maki a4055fd370 WIP: Broadcast room updates to channel members 2023-08-02 09:21:30 -07:00
Max Brunsfeld ec8d26cf15 Merge branch 'main' into collab-panel 2023-08-02 09:20:53 -07:00
Max Brunsfeld a318f5465e Fix warnings surfaced in Rust 1.71 2023-08-02 09:19:23 -07:00
Max Brunsfeld 076649aae1 Merge branch 'main' into collab-panel 2023-08-02 09:08:50 -07:00
Max Brunsfeld 08eb3b371a Upgrade to rust 1.71 2023-08-02 09:08:08 -07:00
Nathan Sobo b74b8efdb4 WIP 2023-08-02 08:25:40 -06:00