oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,335 Commits 1 Branch 0 Tags
14def2a1a30aedacca2a7efc6eea413bf67a1ee9
Commit Graph
186 Commits
Author SHA1 Message Date
Antonio Scandurra 14def2a1a3 Merge remote-tracking branch 'origin/main' into assistant-2 
# Conflicts:
#	crates/ui2/src/components/icon.rs
 2023-12-06 18:18:58 +01:00
Antonio Scandurra 9eb98122ec Merge remote-tracking branch 'origin/main' into assistant-2 2023-12-06 12:53:02 +01:00
Marshall Bowers 5660c8f655 Add missing semicolon 2023-12-05 20:24:43 -05:00
Marshall Bowers ed31d36ac1 Wire up NewWindow action 2023-12-05 20:24:01 -05:00
Marshall Bowers d8757845a9 Wire up NewFile action 2023-12-05 20:21:35 -05:00
Max Brunsfeld 863222edc5 Get following working 
Restore a single event type on Item trait, so that the workspace can
subscribe to it and handle following events.
 2023-12-05 12:57:23 -08:00
Antonio Scandurra d86da04584 WIP 2023-12-05 19:27:15 +01:00
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
Marshall Bowers 26c797c358 Format code 2023-12-04 11:57:10 -05:00
Marshall Bowers fb352af35c Merge branch 'main' into diagnostics-style-2 2023-12-04 11:56:55 -05:00
Nate ButlerandMarshall Bowers e928ed44a0 Mark copy button as incomplete 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:53:46 -05:00
Nate ButlerandMarshall Bowers 23626aa902 Update diagnostic style 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:50:26 -05:00
Nate ButlerandMarshall Bowers 4ee4e4e8d8 Fix ci error – Copy to clipboard isn't implemented in tests 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
 2023-12-04 11:41:31 -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
Piotr OsiewiczandAntonio 68d309e79c 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
Conrad Irwin 6a5b5f022d Language Selector 2 working! 2023-12-01 21:23:20 -07:00
Nate Butler 89aa6a3726 Re-add diagnostic headers 2023-12-01 15:30:01 -05:00
Julia 13f4cc563c Merge branch 'main' into zed2-breadcrumbs 2023-12-01 11:02:34 -05:00
Antonio ScandurraandPiotr 5fefc121bf Add mouse context menu to editor2 
Co-Authored-By: Piotr <piotr@zed.dev>
 2023-12-01 16:01:56 +01:00
Antonio Scandurra f0c205be5d Respond to modifiers changed event in editor2 and set cursor 2023-12-01 14:26:49 +01:00
Antonio Scandurra 8e4f2fb25a Remove all todos in Editor's Item implementation 2023-12-01 12:32:30 +01:00
Antonio Scandurra faa896343b Register NewFile and NewFileInDirection from Editor 2023-12-01 12:11:54 +01:00
Antonio Scandurra a8a5785ec5 Re-enable opening excerpts in Editor 2023-12-01 12:03:21 +01:00
Antonio Scandurra 0b7e324d86 🔥 2023-12-01 11:53:47 +01:00
Antonio Scandurra 0e1597d385 WIP 2023-11-30 18:00:41 +01:00
Julia 428c517693 Merge branch 'main' into zed2-breadcrumbs 2023-11-30 11:38:29 -05: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
Marshall Bowers b357ae4dc3 Add new Button and IconButton components (#3448) 
This PR adds new `Button` and `IconButton` components built on top of
our new button abstractions.

Both of these buttons are built from the common `ButtonLike` base, and
implement the `ButtonCommon` (name TBD) trait in order to provide a
common interface.

There are still some visual tweaks that we'll need to make to the new
buttons, but those should be straightforward to make after we land this.

Release Notes:

- N/A
 2023-11-29 17:41:44 -05:00
Max Brunsfeld 9451bd605d Implement completion-resolution in editor2 
Enable the completion tests in editor2.
 2023-11-29 14:20:47 -08:00
Max Brunsfeld 2bd428102b Use pointer cursor style for clickable ranges in InteractiveText 2023-11-29 12:42:09 -08:00
Nate Butler ca2052b0c1 Merge branch 'main' into completions-styles 2023-11-27 19:22:07 -05:00
Conrad Irwin 107c3d7f67 Fix esc in command palette 
Also: add editor.register_action
 2023-11-27 14:32:22 -07:00
JuliaandMax Brunsfeld d551b41aae zed2: Mostly port breadcrumbs & improve StyledText api 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
 2023-11-27 16:09:31 -05:00
Conrad Irwin 82f6f77117 Use editor's overlay implementation 2023-11-27 11:49:51 -07:00
Conrad Irwin 212d9254e1 Merge branch 'main' into completions-styles 2023-11-27 11:49:39 -07:00
Antonio Scandurra a5951df21f Start on hover popover 2023-11-27 18:56:37 +01:00
Nate Butler 8a35a02863 Checkpoint - try using overlay for completions popover 
[no ci]
 2023-11-27 11:22:19 -05:00
Nate Butler 1acc6b462f Start on completions styles 2023-11-27 10:29:29 -05:00
Antonio Scandurra 3ba5dbb9e8 Prevent mousedown on docs from being propagated to the editor 2023-11-27 15:15:57 +01:00
Antonio Scandurra eb647be685 Pass max height manually 2023-11-27 14:56:46 +01:00
Antonio Scandurra 0baa9a782b Start on wiring up render_parsed_markdown 2023-11-24 17:28:59 +01:00
Antonio Scandurra d31b53b912 Extract a gpui::combine_highlights function 2023-11-24 16:31:38 +01:00
Antonio Scandurra e5b6b0ee9e WIP 2023-11-24 15:05:04 +01:00
Antonio Scandurra 19bfed165b Show single-line docs in autocomplete and apply completion on mousedown 2023-11-24 13:22:25 +01:00
Antonio Scandurra 54357d6553 Syntax highlight completions 2023-11-24 13:10:56 +01:00
Antonio Scandurra bf39968105 Return TextRuns in combine_syntax_and_fuzzy_match_highlights 2023-11-24 13:00:20 +01:00
Antonio Scandurra 510320bb47 Introduce InteractiveText (#3397) 
This new element will let us react to click events on arbitrary ranges
of some rendered text, e.g.:

```rs
InteractiveText::new(
    "element-id",
    StyledText::new("Hello world, how is it going?").with_runs(vec![
        cx.text_style().to_run(6),
        TextRun {
            background_color: Some(green()),
            ..cx.text_style().to_run(5)
        },
        cx.text_style().to_run(18),
    ]),
)
.on_click(vec![2..4, 1..3, 7..9], |range_ix, cx| {
    println!("Clicked range {range_ix}");
})
```

As part of this, I also added the ability to give text runs a background
color.

Release Notes:

- N/A
 2023-11-23 19:35:03 +01:00
Antonio Scandurra 7eeb8078f6 Allow setting text background color via TextStyle 2023-11-23 19:22:18 +01:00
Kirill Bulatov df7b89b6cb Allow to include gitignored files into project search (#3394) 2023-11-23 19:28:11 +02:00