oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,234 Commits 1 Branch 0 Tags
dffe323e735a8d3dc5065bfa3ffa57b2b6b65d9e
Commit Graph
592 Commits
Author SHA1 Message Date
Marshall Bowers 4cb4033a36 Merge branch 'main' into editor2_tests 2023-12-04 14:09:23 -05:00
Marshall Bowers b212aab00d Add support for copying diagnostic messages to the clipboard (#3489) 
This PR adds support for copying diagnostics messages to the clipboard.

This was already working, but we were missing implementations
clipboard-related methods in the `TestPlatform` that were causing the
tests to fail when the copying functionality was added.

Release Notes:

- N/A
 2023-12-04 14:08:05 -05:00
Nate ButlerandMarshall Bowers 50fe683305 Fix typos 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:28:22 -05:00
Piotr OsiewiczandAntonio b5924d6b11 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 80ae640060 Add additional cursors to gpui2 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:20:41 -05:00
Piotr OsiewiczandAntonio 2108ddf621 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
Piotr OsiewiczandAntonio b9a917f42a 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
Piotr Osiewicz 24b08921fe Revert "fix display map tests" 
This reverts commit 0f7fc8c1a0.
 2023-12-04 15:22:29 +01:00
Piotr Osiewicz 0f7fc8c1a0 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
Conrad Irwin 63b65b2b2e 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
Piotr Osiewicz be509a5ce0 test_clipboard 2023-12-01 20:50:30 +01:00
Piotr Osiewicz 1c52b936bc Uncomment flaky tests 2023-12-01 19:21:30 +01:00
Piotr OsiewiczandAntonio e0ccaa60ff editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:24:47 +01:00
Piotr Osiewicz a40a5fb212 Revert "editor tests: Reintroduce block_on_ticks." 
This reverts commit aed11ee8cb.
 2023-12-01 17:24:20 +01:00
Piotr OsiewiczandAntonio aed11ee8cb editor tests: Reintroduce block_on_ticks. 
Co-authored-by: Antonio <antonio@zed.dev>
 2023-12-01 17:22:12 +01:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Antonio Scandurra f0bc4a04bd Uncomment git gutter painting 2023-12-01 13:45:14 +01:00
Antonio Scandurra c9be637b6b Re-introduce auto-height in editor2 (#3471) 
Release Notes:

- N/A
 2023-12-01 12:02:45 +01:00
Conrad Irwin 0441b4805a Show cursor position in status bar (#3464) 
Passes the compiler so it must work!

(though it doesn't show up until we fix pane focus)

Release Notes:

- N/A
 2023-11-30 16:40:42 -07:00
Max Brunsfeld cb11c1282c Re-introduce active path tracking in workspace 2023-11-30 14:58:14 -08:00
Max Brunsfeld a003a91212 Restore auto-save on focus change, re-enable workspace tests 2023-11-30 14:45:27 -08:00
Conrad Irwin 75afb65b26 Show cursor position in status bar 2023-11-30 10:16:24 -07:00
Julia 428c517693 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05:00
Antonio ScandurraandNathan Sobo 5243401afa Pass a WindowContext in request_measured_layout 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2023-11-30 17:12:40 +01:00
Antonio Scandurra d9b8c07b1e Lift Send and Sync restriction for measurements 2023-11-30 16:37:57 +01:00
Antonio Scandurra fac029b808 Fix errors in theme2 2023-11-30 12:08:00 +01:00
Antonio Scandurra 624ea58f2e Polish screen sharing 2023-11-30 11:22:01 +01:00
Antonio Scandurra cc0bc444b1 Merge remote-tracking branch 'origin/main' into surfaces 
# Conflicts:
#	crates/ui2/src/components/avatar.rs
 2023-11-30 10:48:20 +01:00
Conrad Irwin 02174084ca Collab panel2: Now with scrolling and keyboard (#3455) 
Also introducing: .track_scroll() for non-uniform lists.

Release Notes:

- N/A
 2023-11-30 00:13:52 -07:00
Conrad Irwin 4fbbb28da2 Restore logical offset preservation behaviour 2023-11-29 23:51:31 -07:00
Conrad Irwin 54cfcef0aa Keybaord shortcut context menu 2023-11-29 23:04:33 -07:00
Conrad Irwin a37f86f294 Scroll the collab panel when keyboard focusing 2023-11-29 22:39:15 -07:00
Conrad Irwin 8638fc4149 Add a ScrollHandle to gpui2 for the collab panel 2023-11-29 22:20:06 -07:00
Max Brunsfeld e49325080c Implement activity indicator in zed2 2023-11-29 17:18:21 -08:00
Max Brunsfeld c95a7c7387 Address some TODOs in editor2 crate (#3445) 
* Fix crash when jumping to definition
* Enabling resolution of completions
* Make links in interactive text clickable
* Enable code paths that use `select_anchors`
 2023-11-29 16:32:02 -08:00
Conrad Irwin 3bdd51cb2a Availability indicators 2023-11-29 15:06:58 -07:00
Max Brunsfeld 2bd428102b Use pointer cursor style for clickable ranges in InteractiveText 2023-11-29 12:42:09 -08:00
Conrad IrwinandMax 7e5aa5ce77 More drag'n'drop fixes 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:35:25 -07:00
Conrad IrwinandMax e377bd805b Add channel drag'n'drop 
Co-Authored-By: Max <max@zed.dev>
 2023-11-29 12:24:04 -07:00
Max Brunsfeld dbfc7d3555 Merge branch 'main' into project-panel-context-menu 2023-11-29 09:45:31 -08:00
Max BrunsfeldandConrad 233aac5573 Make DismissEvent a unit struct 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:42:54 -08:00
Max BrunsfeldandConrad ac34229118 Add keyboard control over context menus 
Co-authored-by: Conrad <conrad@zed.dev>
 2023-11-29 09:39:20 -08:00
Antonio Scandurra a4035f15af WIP 2023-11-29 18:18:15 +01:00
Conrad Irwin 35481e2c79 Move padding on uniform list inside the scrollable area 2023-11-29 10:05:31 -07:00
Conrad Irwin db5ded0252 Remove useless method 
We need to move state from layout to paint in any case
 2023-11-28 20:53:46 -07:00
Conrad Irwin 8d1518d70c Fix stateful elements in Components 
Previously a component assumed its element was stateless, this was
incorrect!
 2023-11-28 20:47:11 -07:00
Mikayla a41c857855 Merge branch 'main' into welcome2 2023-11-28 15:38:51 -08:00
Conrad Irwin a761e6ca0e More mouse occlusion work 2023-11-28 09:59:58 -07:00
Antonio Scandurra 3ac545088a WIP: preserve aspect ratio of images 2023-11-28 17:33:11 +01:00
Antonio ScandurraandJulia 600b564bbf Introduce surface rendering 
Co-Authored-By: Julia <julia@zed.dev>
 2023-11-28 16:47:31 +01:00