Commit Graph
15149 Commits
Author SHA1 Message Date
Max Brunsfeld 199740902a Fix possibility of infinite loop in selections_with_autoclose_regions (#3138)
Previously, that method could loop forever if the editor's autoclose
regions had unexpected selection ids.

Something must have changed recently that allowed this invariant to be
violated, but regardless, this code should not have relied on that
invariant to terminate like this.
2023-10-18 11:34:35 -07:00
Marshall Bowers 549e78d7b3 Use SharedString for Inputs 2023-10-18 14:28:28 -04:00
KCaverly aa1825681c update the assistant panel to use new prompt templates 2023-10-18 14:20:12 -04:00
Marshall Bowers 5a42ca6772 Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 14:19:29 -04:00
Marshall Bowers 8dad3ad8ea Use SharedString for Lists 2023-10-18 14:19:26 -04:00
Max BrunsfeldandPiotr 655c9ece2d Fix possibility of infinite loop in selections_with_autoclose_regions
Previously, that method could loop forever if the editor's autoclose
regions had unexpected selection ids.

Co-authored-by: Piotr <piotr@zed.dev>
2023-10-18 11:16:14 -07:00
Antonio Scandurra 159d798c34 Checkpoint 2023-10-18 20:13:19 +02:00
Marshall Bowers 856d23626f Use SharedString for Palette and PaletteItems 2023-10-18 14:03:13 -04:00
Antonio Scandurra 8890636a56 Checkpoint 2023-10-18 19:30:53 +02:00
Joseph T. Lyons 4e68b588be collab 0.25.0 2023-10-18 13:17:17 -04:00
KCaverly b9bb27512c fix template ordering during prompt chain generation 2023-10-18 13:10:31 -04:00
KCaverly fa61c1b9c1 add prompt template for generate inline content 2023-10-18 13:03:11 -04:00
Antonio Scandurra a0634fa79e Checkpoint 2023-10-18 18:39:47 +02:00
Antonio Scandurra 03937a9f89 WIP 2023-10-18 18:39:47 +02:00
Marshall Bowers 24086191af Split Label and HighlightedLabel 2023-10-18 12:37:47 -04:00
Joseph T. Lyons cf429ba284 v0.110.x dev 2023-10-18 12:31:12 -04:00
KCaverly 178a79fc47 added prompt template for file context without truncation 2023-10-18 12:29:10 -04:00
Marshall Bowers f0b9e9a89d Use SharedString for Keybindings 2023-10-18 12:26:51 -04:00
Piotr Osiewicz 99121ad5cd buffer_search: Discard empty search suggestions. (#3136)
Now when buffer_search::Deploy action is triggered (with cmd-f), we'll
keep the previous query in query_editor (if there was one) instead of
replacing it with empty query.

This addresses this bit of feedback from Jose:
> If no text is selected, `cmd + f` should not delete the text in the
search bar when refocusing

Release Notes:
- Improved buffer search by not clearing out query editor when no text
is selected and "buffer search: deploy" (default keybind: cmd-f) is
triggered.
2023-10-18 18:05:13 +02:00
Marshall Bowers 6e3393c93f Use SharedString for Buttons 2023-10-18 10:59:42 -04:00
Marshall Bowers aa41f97e38 Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 10:58:54 -04:00
Marshall Bowers 2b53c67789 Use SharedString for Labels 2023-10-18 10:58:50 -04:00
Antonio Scandurra 731ce1721a Checkpoint 2023-10-18 16:55:55 +02:00
Marshall Bowers 8321b9430e Wire up hover styles on Buttons 2023-10-18 10:53:42 -04:00
Marshall Bowers 7f69350e4d Fix typo in doc comment 2023-10-18 10:45:20 -04:00
Marshall Bowers 1a156c1060 Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 10:44:43 -04:00
Antonio Scandurra 7149f99f02 Checkpoint 2023-10-18 16:43:20 +02:00
Marshall Bowers 5491398a64 Merge branch 'gpui2' into gpui2-ui 2023-10-18 10:43:15 -04:00
KCaverly 4b8771f3e2 Merge branch 'main' of github.com:zed-industries/zed into prompt_template 2023-10-18 10:42:16 -04:00
Kyle Caverly fea6d70d4d return code inside a markdown block during inline assist (#3137)
Reverted prior small change in inline prompting.
We should now only return code in a markdown block during inline
assists.
2023-10-18 10:40:53 -04:00
Antonio Scandurra 0e4bd485e0 Checkpoint 2023-10-18 16:36:48 +02:00
KCaverly ed8a2c8793 revert change to return only the text and inside return all text inside markdown blocks 2023-10-18 10:35:11 -04:00
Antonio Scandurra fecb27232e Checkpoint 2023-10-18 16:30:48 +02:00
Antonio Scandurra f58a9bad42 Checkpoint 2023-10-18 16:30:03 +02:00
Antonio Scandurra f4d50c4dca Checkpoint 2023-10-18 16:27:58 +02:00
Antonio Scandurra 036e266bae Checkpoint 2023-10-18 16:21:52 +02:00
Antonio Scandurra d98c347902 Checkpoint 2023-10-18 16:13:36 +02:00
Antonio Scandurra 1270bcc6ed Checkpoint 2023-10-18 16:10:58 +02:00
Antonio Scandurra 8914b94577 Checkpoint 2023-10-18 15:46:17 +02:00
Antonio Scandurra acca8ea786 Checkpoint 2023-10-18 15:24:35 +02:00
Antonio Scandurra eaef1c8b8e Checkpoint 2023-10-18 15:17:22 +02:00
Antonio Scandurra 0dfe70125b Checkpoint 2023-10-18 14:41:46 +02:00
Antonio Scandurra 5afd83c883 Checkpoint 2023-10-18 14:36:16 +02:00
Mikayla 0ce1ec5d15 Restrict DAG-related functionality, but retain infrastructure for implementing symlinks 2023-10-18 05:28:05 -07:00
Antonio Scandurra a61b34cab5 Checkpoint 2023-10-18 14:12:50 +02:00
Antonio Scandurra ad1b96720a Checkpoint 2023-10-18 13:36:26 +02:00
Antonio Scandurra 296a2b8e5d Rename fill to bg 2023-10-18 09:39:23 +02:00
Antonio Scandurra 597a9f9548 Use text color to paint SVGs 2023-10-18 09:39:20 +02:00
Antonio Scandurra e031718747 Checkpoint 2023-10-18 09:22:49 +02:00
Antonio Scandurra 6452ff203e Checkpoint 2023-10-18 09:15:44 +02:00