Commit Graph
39175 Commits
Author SHA1 Message Date
Joseph T. Lyons df84b9d94e Remove remnants from conflict resolution (#3528)
Fixes a couple of things that slipped through when going through the
last merge conflict

Release Notes:

- N/A
2023-12-06 23:44:49 -05:00
Nate Butler 6f5d8dbc4a Update pickers to have a consistently larger size 2023-12-06 23:38:47 -05:00
Joseph T. Lyons e02c56d636 Feedback 2 (#3527)
Ports feedback crate over to zed2. Introduces modal feedback. Feedback
submission works, but there are some TODOs in the code for things that
need to be done (needs a UI pass, dismissing the modal in certain cases,
etc), but I might merge this to reduce chances of conflicts (aleady had
to deal with a few).

<img width="1378" alt="SCR-20231206-udgp"
src="https://github.com/zed-industries/zed/assets/19867440/99f9e843-ac9c-4df1-b600-2522863e6459">

Release Notes:

- N/A
2023-12-06 23:25:45 -05:00
Nate Butler facda33434 Merge branch 'main' into update-pickers 2023-12-06 23:21:42 -05:00
Joseph T. Lyons 263b79c047 Merge branch 'main' into feedback-2 2023-12-06 23:16:54 -05:00
Joseph T. Lyons 853da8eaa6 WIP 2023-12-06 23:15:04 -05:00
Joseph T. Lyons 5ecc231919 Use when_else() 2023-12-06 22:34:28 -05:00
Joseph T. Lyons 91bda75cb3 Introduce when_else() 2023-12-06 22:34:14 -05:00
Joseph T. Lyons 582f01ef1d Renove unused code 2023-12-06 21:32:33 -05:00
Joseph T. Lyons 2a3a77d254 Improve character limit bounds indicator 2023-12-06 21:23:51 -05:00
Mikayla Maki 4de80c8b70 Terminal2 (#3449)
Release Notes:

-
2023-12-06 16:49:46 -08:00
Joseph T. Lyons f1831d0e6d Highlight whole modal as needing UI tweaks 2023-12-06 19:35:41 -05:00
Mikayla 21b244b391 Fix selection backgrounds 2023-12-06 16:31:28 -08:00
Joseph T. Lyons 149a82ff94 Remove email address from local database if user removes it 2023-12-06 19:26:25 -05:00
Mikayla 4c4adf271e Tear out drag event listener 2023-12-06 16:22:25 -08:00
Joseph T. Lyons fa713eba9b Start work to add a confirmation when exiting feedback containing text 2023-12-06 19:13:38 -05:00
Joseph T. Lyons b5dc5f9086 Switch to if let statement 2023-12-06 19:11:24 -05:00
Joseph T. Lyons cc94cfdb30 Hook up community repo button 2023-12-06 19:11:03 -05:00
Joseph T. Lyons 6e7755aa07 Hook up submit 2023-12-06 19:10:45 -05:00
Marshall Bowers a174ee50a9 Clean up how we open the recent projects picker (#3526)
This PR performs some light cleanup of how we open the recent projects
picker, to bring it more in-line with our other picker code.

Release Notes:

- N/A
2023-12-06 19:10:15 -05:00
Mikaylaandnathan 34d8125961 Fix bug with IME
Adjust how IME works in the terminal

co-authored-by: nathan <nathan@zed.dev>
2023-12-06 15:54:08 -08:00
Marshall Bowers d910bd55d4 Port recent_projects to Zed2 (#3525)
This PR ports the `recent_projects` crate to Zed2 (`recent_projects2`).

Absent from this PR is wiring up the "Recent Projects" item in the title
bar. We'll come back to that soon.

Release Notes:

- N/A
2023-12-06 18:41:50 -05:00
Joseph T. Lyons a7ec17fe7f Reduce amount of state being stored 2023-12-06 18:36:17 -05:00
Mikayla 8d491f7e44 Merge branch 'main' into terminal-element 2023-12-06 15:20:04 -08:00
MikaylaandNathan b945e33e53 Fix a porting bugs for terminal2
co-authored-by: Nathan <nathan@zed.dev>
2023-12-06 15:11:49 -08:00
Max Brunsfeld ed4304a26a Upgrade async-compression dep (#3524)
Fixes a build failure on CI:


https://github.com/zed-industries/zed/actions/runs/7120057787/job/19387718091

```
2023-12-06 21:26:40.468791 +00:00:00 [ERROR] `cargo metadata` exited with an error:     Updating crates.io index
error: failed to select a version for `async-compression`.
    ... required by package `zed2 v2.0.0-nightly (/Users/administrator/actions-runner-2/_work/zed/zed/crates/zed2)`
versions that meet the requirements `^0.3` (locked to 0.3.15) are: 0.3.15

the package `zed2` depends on `async-compression`, with features: `futures-bufread-nightly` but `async-compression` does not have these features.
```
2023-12-06 14:45:28 -08:00
Max Brunsfeld 1be1e3b5b5 Upgrade async-compression dep 2023-12-06 14:29:09 -08:00
Joseph T. Lyons a364c9ed70 WIP 2023-12-06 17:27:10 -05:00
Max Brunsfeld 2b4494f086 Enable buffer font size adjustment in zed2 (#3523) 2023-12-06 14:15:25 -08:00
Marshall Bowers 4b98a53c72 Don't load the Vim keymap temporarily (#3522)
This PR removes the loading of the Vim keymap temporarily.

This cuts down on the noise from all of the Vim-related action warnings.

We can resume loading the Vim keymap once we're ready to add Vim
support.

Release Notes:

- N/A
2023-12-06 16:59:24 -05:00
Max BrunsfeldandNathan 5392e6ca24 Enable buffer font size adjustment in zed2
Co-authored-by: Nathan <nathan@zed.dev>
2023-12-06 13:52:33 -08:00
Marshall Bowers 0f767d5bf2 Always show tooltips on buttons (#3521)
This PR fixes an issue where tooltips weren't being shown on selected
buttons.

We now always show tooltips on buttons that have one.

Release Notes:

- N/A
2023-12-06 16:29:35 -05:00
Joseph T. Lyons f9bc8c2511 temp 2023-12-06 16:15:44 -05:00
Marshall Bowers fa7109322a Add "Toggle Inlay Hints" quick action (#3520)
This PR adds the "Toggle Inlay Hints" quick action to the toolbar.

Release Notes:

- N/A
2023-12-06 16:14:39 -05:00
Marshall Bowers acf39c2f89 Wire up inline assist quick action (#3519)
This PR wires up the inline assist quick action in the toolbar.

Release Notes:

- N/A
2023-12-06 15:52:51 -05:00
Max Brunsfeld 6658543f3c Bring back channel notes (#3506) 2023-12-06 12:45:46 -08:00
Marshall Bowers e4265ff0b4 Add gap between label and keybinding in Tooltip 2023-12-06 15:45:03 -05:00
Marshall Bowers 591fc7e3af Wire up inline assist quick action 2023-12-06 15:44:50 -05:00
Kirill Bulatov 075667dd9c Do not run the same workflow concurrently on non-main branches (#3518)
<img width="1376" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/681cca85-e1b9-4a99-8363-60c931ba1393">

For any push (or force-push) into a branch, a separate CI workflow is
run.
This is rather worker-consuming, esp. given the fact that GitHub will
wait for the last job to update PR's status.
So cancel every old job for the same branch if it's not `main`.
CI run on `main` might catch a regression brought in by specific PR
merged, so run CI on every commit due to that.


Release Notes:

- N/A
2023-12-06 22:35:02 +02:00
Kirill Bulatov 1bbffa53b9 Use distinct version for zed2, append git hash to its nightly version (#3507)
Current panic reports are now harder to tell apart by the following
criteria:
* nightly or preview or stable
* zed2 or zed1
 

![image](https://github.com/zed-industries/zed/assets/2690773/d12c8272-9f78-403c-ba49-e5f05982c0f5)

Current PR adds uses a different version for zed2 (2.0.0, selected
relatively arbitrary as zed2 is nothing officially released now) and
adds a `-nightly` suffix to the version number of the nightly bundle.

Release Notes:

- N/A
2023-12-06 22:23:12 +02:00
Kirill Bulatov 006279fada Do not run the same workflow concurrently on non-main branches 2023-12-06 22:19:48 +02:00
Max Brunsfeld c247a87491 Fix propagation of active item to followers
Enable channel buffer integration tests.
2023-12-06 12:18:48 -08:00
Max Brunsfeld 9cbecfd534 Initialize channel notes to register the view as followable 2023-12-06 12:09:29 -08:00
Max Brunsfeld 7d02e1b34a Allow opening channel notes from the channel list 2023-12-06 12:09:29 -08:00
Max Brunsfeld 0573c35281 Bring back channel notes 2023-12-06 12:09:27 -08:00
Kirill Bulatov 15bdf7622d Use a better name for zed2 inlay style field 2023-12-06 22:06:30 +02:00
Kirill Bulatov eeba1715d8 Use distinct version for zed2, append git hash to its nightly version 2023-12-06 22:04:45 +02:00
Kirill Bulatov 98a9733d16 Pass proper theme colors for inlays and suggestions (#3517)
<img width="1728" alt="image"
src="https://github.com/zed-industries/zed/assets/2690773/f6f1e24f-71fe-4a2e-9bcf-9e98861c0da4">


![image](https://github.com/zed-industries/zed/assets/2690773/8434d8a1-ee7e-49c1-9e88-362363225d96)

Now inlays are visible in all zed2 themes, but 
* always have a blue color which is the same as some theme colors
* not other hint-related style changes like font width, background, etc.
seem to exist in the theme, ergo not propagated.

In general though, people want those style changes applied to their
hints, so we might want to do something about it later.
I've left a `// todo!("what about the rest of the highlight style parts
for inlays and suggestions?")` in the corresponding places for that.

Release Notes:

- N/A
2023-12-06 21:54:41 +02:00
Nathan Sobo 8b0a073611 Document geometry module and replace zero method with default (#3515)
Nothing earth-shattering here, but all our geometry types are now fully
documented.

Release Notes:

- N/A
2023-12-06 12:52:41 -07:00
Max Brunsfeld 762f8eb0de Put ToggleZoom key binding back into the block with no context (#3516)
Fixes a regression in zed1 from
https://github.com/zed-industries/zed/pull/3491
2023-12-06 11:52:24 -08:00