Commit Graph
25009 Commits
Author SHA1 Message Date
KCaverly 302dfb35fb added smarter error handling for file_context prompts without provided buffers 2023-10-18 16:40:09 -04:00
KCaverly 8c124dc0cc added dumb truncation strategies to file_context and generate 2023-10-18 16:32:14 -04:00
KCaverly 59d5ae33aa fix for error when truncating a length less than the string length 2023-10-18 16:31:29 -04:00
Nate ButlerandMarshall Bowers b30385dc83 Remove unused code from storybook 2
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-10-18 16:27:34 -04:00
KCaverly 769125d07d added initial placeholder for truncation without a valid strategy 2023-10-18 16:23:53 -04:00
Nate ButlerandMarshall Bowers 8674f54ef1 Update storybook2 to run the workspace by default
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-10-18 16:21:04 -04:00
Nate Butler 59435b13c1 Merge branch 'n/gpui2ui-settings' into gpui2 2023-10-18 16:17:57 -04:00
Nate ButlerandMarshall Bowers aa6a2fb860 Update approach to settings
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
2023-10-18 16:16:58 -04:00
KCaverly b6e471b9df update PromptPriority to accomodate for both Mandatory and Ordered prompts 2023-10-18 15:56:39 -04:00
Nate Butler 7b4c977c75 Update UI elements and implement user settings for customization 2023-10-18 15:42:10 -04:00
Max Brunsfeld 2ea9668872 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 2bbcc560f7 Use SharedString for Inputs 2023-10-18 14:28:28 -04:00
KCaverly fb774eba24 update the assistant panel to use new prompt templates 2023-10-18 14:20:12 -04:00
Marshall Bowers a5dd1e9052 Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 14:19:29 -04:00
Marshall Bowers d9147566a1 Use SharedString for Lists 2023-10-18 14:19:26 -04:00
Max BrunsfeldandPiotr 80b1b6be22 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 bdf4a56bea Checkpoint 2023-10-18 20:13:19 +02:00
Marshall Bowers 57c7e145b4 Use SharedString for Palette and PaletteItems 2023-10-18 14:03:13 -04:00
Antonio Scandurra d2f1f4d959 Checkpoint 2023-10-18 19:30:53 +02:00
Joseph T. Lyons b4911dcea8 collab 0.25.0 2023-10-18 13:17:17 -04:00
KCaverly 55e04578b7 fix template ordering during prompt chain generation 2023-10-18 13:10:31 -04:00
KCaverly 0c836c3326 add prompt template for generate inline content 2023-10-18 13:03:11 -04:00
Antonio Scandurra dda747f414 Checkpoint 2023-10-18 18:39:47 +02:00
Antonio Scandurra 02f26253d6 WIP 2023-10-18 18:39:47 +02:00
Marshall Bowers 2529b92917 Split Label and HighlightedLabel 2023-10-18 12:37:47 -04:00
Joseph T. Lyons 99e2e5733c v0.110.x dev 2023-10-18 12:31:12 -04:00
KCaverly db5bd62891 added prompt template for file context without truncation 2023-10-18 12:29:10 -04:00
Marshall Bowers ffdf32d566 Use SharedString for Keybindings 2023-10-18 12:26:51 -04:00
Piotr Osiewicz 36ea6531a4 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 65414abf1d Use SharedString for Buttons 2023-10-18 10:59:42 -04:00
Marshall Bowers e773d04a85 Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 10:58:54 -04:00
Marshall Bowers ff16564fe7 Use SharedString for Labels 2023-10-18 10:58:50 -04:00
Antonio Scandurra 0c66966cf0 Checkpoint 2023-10-18 16:55:55 +02:00
Marshall Bowers b4beeffa46 Wire up hover styles on Buttons 2023-10-18 10:53:42 -04:00
Marshall Bowers d01f521b1f Fix typo in doc comment 2023-10-18 10:45:20 -04:00
Marshall Bowers fddef3145a Merge branch 'gpui2' of github.com:zed-industries/zed into gpui2 2023-10-18 10:44:43 -04:00
Antonio Scandurra 84ff327ab5 Checkpoint 2023-10-18 16:43:20 +02:00
Marshall Bowers 438cf790ed Merge branch 'gpui2' into gpui2-ui 2023-10-18 10:43:15 -04:00
KCaverly aad3f7f9e8 Merge branch 'main' of github.com:zed-industries/zed into prompt_template 2023-10-18 10:42:16 -04:00
Kyle Caverly c8590ff675 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 fdd67b5563 Checkpoint 2023-10-18 16:36:48 +02:00
KCaverly d268fb71f5 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 9a2323cb81 Checkpoint 2023-10-18 16:30:48 +02:00
Antonio Scandurra abef35d5c9 Checkpoint 2023-10-18 16:30:03 +02:00
Antonio Scandurra 56294aed26 Checkpoint 2023-10-18 16:27:58 +02:00
Antonio Scandurra dc123a9788 Checkpoint 2023-10-18 16:21:52 +02:00
Antonio Scandurra 72772ae616 Checkpoint 2023-10-18 16:13:36 +02:00
Antonio Scandurra 19e38a41e8 Checkpoint 2023-10-18 16:10:58 +02:00
Antonio Scandurra 46a71d5c72 Checkpoint 2023-10-18 15:46:17 +02:00
Antonio Scandurra bc979e5fd5 Checkpoint 2023-10-18 15:24:35 +02:00