Conrad Irwin
fbbf36d152
Merge branch 'main' into pixel-columns
2023-10-18 23:00:56 -06:00
Conrad Irwin
3d5cbcaad1
Refactor TextLayoutDetails construction
2023-10-18 22:56:11 -06:00
Conrad Irwin
1d49ff70f7
recert config change
2023-10-18 22:23:38 -06:00
Conrad Irwin
7436ed4d45
Make vim visual block work better
2023-10-18 22:23:06 -06:00
Conrad Irwin
331d334bae
Refactor to avoid some (mostly hypothetical) races
...
Tidy up added code to reduce duplicity of X and X_internals.
2023-10-18 21:42:10 -06:00
Max Brunsfeld
07e0674f68
Fix compile error in db seed executable
2023-10-18 18:05:51 -07:00
Max Brunsfeld
f0434bfebc
Fix possibility of extra mention insertion on nonce collision
2023-10-18 18:04:56 -07:00
Nate Butler
b652c4047b
WIP
2023-10-18 20:58:24 -04:00
Max Brunsfeld
256ef99284
Merge branch 'main' into notifications
2023-10-18 17:20:04 -07:00
Max Brunsfeld
d286c4441d
Persist chat mentions
2023-10-18 16:56:03 -07:00
Nate Butler
00b613e945
Remove debugs
2023-10-18 19:15:17 -04:00
Nate Butler
c6804b7ede
Use ui_size to build icon button
2023-10-18 19:12:02 -04:00
KCaverly
aa2df626a7
progress on smarter truncation strategy for file context
2023-10-18 17:56:59 -04:00
Conrad Irwin
8d9c9c16d4
Fix notifications on channel changes
2023-10-18 15:56:33 -06:00
Nate Butler and Marshall Bowers
5e571293c0
Update line heights, buttons to respond to UI scale
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-10-18 17:55:17 -04:00
Nate Butler and Marshall Bowers
47e23fbbce
Use ui_size to set relative font sizes
...
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com >
2023-10-18 17:02:57 -04:00
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 Butler and Marshall 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 Butler and Marshall 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 Butler and Marshall 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 Brunsfeld and Piotr
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
Conrad Irwin