Commit Graph
39175 Commits
Author SHA1 Message Date
Nate ButlerandMarshall Bowers 5f90f74a45 Remove debug
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-04 11:32:14 -05:00
Nate ButlerandMarshall Bowers f765757bc5 Fix typos
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-04 11:28:22 -05:00
Piotr OsiewiczandAntonio 23167550d9 Add simulate_window_resize.
Fixes up tests for movement in editor/scrolling.

Co-authored-by: Antonio <antonio@zed.dev>
2023-12-04 17:27:48 +01:00
Nate ButlerandMarshall Bowers 6bff060364 Add additional cursors to gpui2
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-04 11:20:41 -05:00
Nate Butler 66e53df7df Update toolbar left tool group 2023-12-04 11:14:59 -05:00
Piotr OsiewiczandAntonio cee41d0c23 Fix disparity between editor2 and edito1 wrt copilot completions.
Fixes test test_copilot.

Co-authored-by: Antonio <antonio@zed.dev>
2023-12-04 16:39:40 +01:00
Piotr OsiewiczandAntonio d36e1e9a42 Fix up copilot2 test
Co-authored-by: Antonio <antonio@zed.dev>
2023-12-04 16:26:34 +01:00
Piotr OsiewiczandAntonio f726c36d2a Defer activating Subscriptions that are invoked as a part of an effect.
Fixes test test_edit_events.

Co-authored-by: Antonio <antonio@zed.dev>
2023-12-04 16:17:33 +01:00
Julia 9a434cfe87 Disable instance handshake in dev builds (#3485)
It feels like every week or two someone hits this and is confused about
why the app isn't launch, been meaning to disable this in dev builds for
a while. This does mean that it'll be possible to hit the local DB lock
panic in a dev build if you run it multiple times but that is so rare
that it seems preferable

Release Notes:

- N/A
2023-12-04 09:43:24 -05:00
Nate Butler 0767dae65a Ensure disabled buttons don't have interaction styles 2023-12-04 09:37:56 -05:00
Piotr OsiewiczandAntonio 1bff6b666c Fix up condition not checking the condition at the start.
Co-authored-by: Antonio <antonio@zed.dev>
2023-12-04 15:31:35 +01:00
Nate Butler 1a4d8f1826 Prevent tab bar from growing in height when a tab is added 2023-12-04 09:24:08 -05:00
Piotr Osiewicz b570d1d4df Revert "fix display map tests"
This reverts commit cf2ab18bcd.
2023-12-04 15:22:29 +01:00
Julia 04ccadad7f Disable instance handshake in dev builds 2023-12-04 09:16:04 -05:00
Nate Butler a7f3f63463 Update empty pane state 2023-12-04 09:13:00 -05:00
Piotr Osiewicz 869d43e636 uncomment and augment mouse_context_menu tests 2023-12-04 15:06:56 +01:00
Piotr OsiewiczandKirill 54cd433d28 inlay hints: Relax the test condition.
We've investigated another spurious failure, this time with test_multiple_excerpts_large_multibuffer; sadly it didn't really get us anywhere, so for now we're relaxing an assert.

Co-authored-by: Kirill <kirill@zed.dev>
2023-12-04 14:50:10 +01:00
Piotr Osiewicz 740dfaaa30 Fix up test_highlighted_ranges
Returned highlights were okay, but the test was trying to normalize the output by sorting the highlights by color. The ordering is different between gpui1 Color and gpui2 Hsla.
2023-12-04 13:47:50 +01:00
Piotr Osiewicz 8257739333 Uncomment & fix up test_transpose 2023-12-04 13:42:48 +01:00
Piotr Osiewicz cf2ab18bcd fix display map tests
These tests failed due to an indefinite hang in buffer.condition in the following code:
\`\`\`rust
    let buffer = cx
        .add_model(|cx| Buffer::new(0, cx.model_id() as u64, text).with_language(language, cx));
    buffer.condition(cx, |buf, _| !buf.is_parsing()).await;
`\`\`
In both gpui1 and gpui2 \`.with_language\` spawns a task that notifies the context once it's done. The \`condition\` waits for notifications to be raised. The gist of the problem was that in gpui2, the spawned task was scheduled straight away, so we never really saw the notification with \`condition\`, causing us to wait indefinitely. This is probably a difference in test between schedulers in gpui1 and gpui2, but I kind of sidestepped the issue by spawning a condition before firing off a parsing task with \`set_language\`.
2023-12-04 13:14:03 +01:00
Piotr Osiewicz 4765a7d189 Fix up random wrap map test 2023-12-04 12:10:01 +01:00
Kirill Bulatov 03361b4a58 Log project path that was no open due to no project entry found 2023-12-04 12:45:57 +02:00
Conrad Irwin b74b17c4f5 In-flight entertainment (#3484)
- +language_selector2
- Language Selector 2 working!
- Prevent languages showing in wrong order first
- copilot_menu2 (though only tested offling, which is insufficient)
- Dismiss tooltips at capture
- Get ChannelModal opening

[[PR Description]]

Release Notes:

-  N/A
2023-12-03 13:06:29 -07:00
Conrad Irwin 0b142a2b3b Get ChannelModal opening 2023-12-02 00:57:41 -07:00
Conrad Irwin b597e4346f Dismiss tooltips at capture
(Otherwise they stay open when you hover over the editor, which
stops mouse move events propagating)
2023-12-01 23:51:06 -07:00
Conrad Irwin 3d93aa7421 copilot_menu2 (though only tested offling, which is insufficient) 2023-12-01 23:43:02 -07:00
Conrad Irwin 6025c88b72 Prevent languages showing in wrong order first 2023-12-01 21:26:23 -07:00
Conrad Irwin 94e188da8f Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Conrad Irwin 89bbc801d0 +language_selector2 2023-12-01 21:23:20 -07:00
Mikayla e8bfadf51b Get terminal turning on 2023-12-01 17:01:57 -08:00
Mikayla b75765051a Merge branch 'main' into terminal-element 2023-12-01 16:21:38 -08:00
MikaylaandMax b6c5271e4f Compiling layout!
co-authored-by: Max <max@zed.dev>
2023-12-01 16:21:12 -08:00
Nathan SoboandMax 6f7fe43d6f Bind CloseWindow and Open actions on workspace
Co-Authored-By: Max <max@zed.dev>
2023-12-01 16:17:48 -07:00
Nathan Sobo 908027088f Enable workspace::Open global action 2023-12-01 16:08:57 -07:00
Nathan SoboandMax 57afaa0ebc Move workspace bindings to workspace context
Without this, hitting cmd-n on the context menu in the project browser
invokes the workspace::NewFile action instead of the project::NewFile
action. We're considering changing the behavior so that bindings with no
context can only invoke global actions.

Co-Authored-By: Max <max@zed.dev>
2023-12-01 15:59:40 -07:00
Nate ButlerandMarshall Bowers ccb0db693c Progress on diagnostic multibuffer
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-01 16:53:09 -05:00
Nate ButlerandMarshall Bowers d271ef7527 Implement FixedWidth for all button types
[no-ci]

Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-01 16:20:39 -05:00
Max Brunsfeld 18d2c02a93 Bump RPC protocol version in zed2 to match zed1 (#3482) 2023-12-01 13:14:49 -08:00
Max Brunsfeld 422d5df194 Bump RPC protocol version in zed2 to match zed1 2023-12-01 13:08:45 -08:00
Piotr Osiewicz f1cca04fa6 Uncomment copilot2 tests 2023-12-01 22:04:43 +01:00
Max Brunsfeld 65f0bf8802 Fix retrieval of app version in auto_update2 (#3481)
With this fix, auto-updates should work on nightly.
2023-12-01 12:59:02 -08:00
Nate ButlerandMarshall Bowers 116d574ba0 Update path header style
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-12-01 15:53:17 -05:00
Max Brunsfeld 8799532ef8 Fix retrieval of app version in auto_update2 2023-12-01 12:52:26 -08:00
Nate Butler 45b93a6903 Re-add diagnostic headers 2023-12-01 15:30:01 -05:00
Nate Butler f6b225459d Update diagnostics style 2023-12-01 14:52:17 -05:00
Piotr Osiewicz cbf045a085 test_clipboard 2023-12-01 20:50:30 +01:00
Max Brunsfeld 3ae0ceaed8 collab 0.29.1 2023-12-01 11:50:05 -08:00
Max Brunsfeld 863c7600b0 Prevent moving a channel into its descendant (#3480)
This fixes a bug where it was possible to put the channel tree into a
bad state by accidentally dragging a channel into itself or one of its
descendants.
2023-12-01 11:47:39 -08:00
Max Brunsfeld 27b62e0898 Prevent moving a channel into its descendant 2023-12-01 11:41:38 -08:00
Piotr Osiewicz d5a969d225 test_following_with_multiple_excerpts (passes) 2023-12-01 20:32:12 +01:00