Max Brunsfeld
e60dea7049
collab 0.7.2
2023-03-13 10:11:44 -07:00
Antonio Scandurra
f6f09e8661
Merge pull request #2274 from zed-industries/leave-on-quit
...
Leave room on quit
2023-03-13 18:08:01 +01:00
Antonio Scandurra
bca1acf6d3
Leave room on quit
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-03-13 17:52:10 +01:00
Mikayla Maki
097a768725
Remove panic in recent projects picker
2023-03-13 09:44:42 -07:00
Mikayla Maki
404dd43c30
Fix dock opening on collaboration
2023-03-13 09:36:45 -07:00
Petros Amoiridis
c6f27903cc
Merge pull request #2271 from zed-industries/petros/z-278-lock-pop-up-to-the-terminal-button
...
A new approach for positioning pop-up menus tied to an icon/button
2023-03-13 08:46:44 -07:00
Antonio Scandurra
f6b0c56a47
Merge pull request #2268 from zed-industries/mention-username-of-user-in-prompt-when-removing-a-contact
...
Mention username of user in prompt when removing a contact
2023-03-13 14:28:11 +01:00
Antonio Scandurra
e45d680126
Merge pull request #2272 from zed-industries/add-textmate-keymap
...
Add TextMate keymap
2023-03-13 14:26:32 +01:00
Antonio Scandurra
09911d43bc
Merge pull request #2269 from zed-industries/unify-action-names-with-keybinding-names
...
Unify action names with keybinding name
2023-03-13 14:24:42 +01:00
Joseph Lyons
c8696149b8
Add TextMate keymap
2023-03-13 08:27:04 -04:00
Petros Amoiridis
db73d831c7
Use local overlay position mode and alignment
...
When we show the context menu, we don't specify an explicit position other than the default one which is equal to the origin in the context of a local overlay position mode. We then rely on `AnchorCorner` and aligning the context menu child view in the stack with `top().right()` for pop-ups that need to appear at the top of the icon/button.
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-13 12:50:12 +02:00
Petros Amoiridis
726c8eb43f
Use type_id to determine what has the focus
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-13 11:42:40 +02:00
Joseph Lyons
c59dafab7e
Update method names to match action names
2023-03-12 06:08:12 -04:00
Joseph Lyons
e272a1a18f
Switch github_login to String
...
One of our macros, `impl_actions!`, didn't like that `RemoveContact` had a lifetime.
2023-03-12 05:03:31 -04:00
Joseph Lyons
06ad3a7f7b
Unify action names with keybinding name
2023-03-12 04:37:39 -04:00
Joseph Lyons
c18f1b6246
Mention username of user in prompt when removing a contact
2023-03-11 19:28:35 -05:00
Joseph Lyons
46efb844af
Remove hardcoding of "Terminal" string
2023-03-11 16:27:00 -05:00
Petros Amoiridis
29f0078084
Show tooltip for Give Feedback icon
2023-03-11 17:40:47 +02:00
Petros Amoiridis
432aeeac56
Remove comment
...
I know @JosephTLyons you had added that, but I am not entirely sure this is how the view should be called. Let's discuss this further if you fill strong about it.
2023-03-11 17:22:21 +02:00
Petros Amoiridis
8440a98850
Activate terminal button when a terminal is focus
...
This is code I brought over from https://github.com/zed-industries/zed/pull/2267 by @mikayla-maki after fixing the conflicts.
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-11 16:45:28 +02:00
Petros Amoiridis
bccc34c61a
Merge branch 'main' into joseph/z-226-add-terminal-popup-menu
2023-03-11 16:42:42 +02:00
Max Brunsfeld
e8b3d4e0fa
Encode db-max-connections env var as a string in k8s manifest
2023-03-10 17:19:16 -08:00
Max Brunsfeld
ff1c7db38f
collab 0.7.1
2023-03-10 16:36:03 -08:00
Mikayla Maki
30a08467b0
Merge pull request #2263 from zed-industries/language-status-bar
...
Language status bar
2023-03-10 16:26:42 -08:00
Mikayla Maki
c8de738972
Align feedback button styles with other sidebar buttons
...
Make feedback button reflect whether you're in a feedback buffer
2023-03-10 16:19:33 -08:00
Mikayla Maki
87ac409e51
Merge pull request #2265 from zed-industries/fix-menu-bar-greying-out
...
Fix too-agressive menu bar greying
2023-03-10 16:05:07 -08:00
Mikayla Maki
badfe70a93
Merge pull request #2267 from zed-industries/fix-terminal-icon-active-state
...
Activate and deactivate the terminal icon based on focused view
2023-03-10 16:02:34 -08:00
Mikayla Maki
11d8394af2
Fix the terminal icon button to only be active when a terminal is focused
2023-03-10 15:54:42 -08:00
Mikayla Maki
c24194156e
Merge pull request #2257 from zed-industries/check-all-contexts
...
Fix keyboard shortcuts not showing
2023-03-10 15:52:56 -08:00
Mikayla Maki
ece2af1e22
Fix a corner case in available action resolution
...
Add tests for new keybinding resolution behavior
co-authored-by: max <max@zed.dev>
2023-03-10 15:36:20 -08:00
Mikayla Maki
adf94a1681
Switch from using the key window to the main window mac platform API
...
When the help menu is open, the help menu's search field is the key window, and this was causing menu item action resolution to fail
co-authored-by: Max <max@zed.dev>
2023-03-10 14:43:28 -08:00
Julia
09d306df85
Merge pull request #2266 from zed-industries/avoid-panic
...
Avoid panic scanning recursive symlink before gitignore is encountered
2023-03-10 17:19:55 -05:00
Julia
0a5cf4b831
Avoid panic scanning recursive symlink before gitignore is encountered
2023-03-10 16:54:57 -05:00
Mikayla Maki
9398de6a57
Add feedback for telemetry item when there's no data
2023-03-10 13:15:36 -08:00
Mikayla Maki
e45104a1c0
Move feedback to overflow menu and help menu
2023-03-10 12:48:11 -08:00
Mikayla Maki
ddbffd2c41
Make terminal fallback correctly when unable to deserialize your cwd
2023-03-10 12:23:29 -08:00
Mikayla Maki
00a38e4c3b
Bound the search range for the keybindings by the highest handler path
2023-03-10 12:12:32 -08:00
Mikayla Maki
37d01c7fb3
Merge pull request #2199 from zed-industries/welcome-experience
...
Welcome experience
2023-03-10 10:48:30 -08:00
Mikayla Maki
281ff92236
Stub out blank pane experience
2023-03-10 09:58:11 -08:00
Antonio Scandurra
bb721a08f5
💄
2023-03-10 17:43:48 +01:00
Antonio Scandurra
f50b51bdad
Adjust styling
2023-03-10 17:37:45 +01:00
Antonio Scandurra
693172854c
Show active buffer's language on the right in the status bar
2023-03-10 17:37:34 +01:00
Antonio Scandurra
b3c7526fb5
Return last excerpt in MultiBuffer::excerpt_containing if overshooting
2023-03-10 17:28:08 +01:00
Antonio Scandurra
6e37ff880f
Replace "Give Feedback" with an icon and move it to the left
...
This is so we can show the current language in the status bar on
the right, and having two pieces of text sitting next to each other
felt too busy.
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-03-10 17:02:52 +01:00
Antonio Scandurra
f28806d09b
Emphasize currently-selected language
2023-03-10 15:48:39 +01:00
Antonio Scandurra
686f5439ad
Set buffer language when confirming selection in language selector
...
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-03-10 15:34:26 +01:00
Antonio Scandurra
b402f27d50
Introduce a new language picker that displays available languages
...
Right now this panics when trying to select a language, so that's
what we're going to implement next.
Co-Authored-By: Julia Risley <julia@zed.dev>
2023-03-10 15:28:10 +01:00
Antonio Scandurra
7a600e7a65
Allow waiting for language to be loaded in LanguageRegistry
APIs
2023-03-10 12:17:47 +01:00
Antonio Scandurra
221bb54e48
Introduce a new TryFutureExt::unwrap
method
2023-03-10 11:41:13 +01:00
Antonio Scandurra
8b7273e46e
Increase the amount of max connections to the database
2023-03-10 10:10:59 +01:00
Mikayla Maki
9dc608dc4b
Switch from changing the meaning of the predicate to adding an additional match_dispatch_path_context API for UI elements
2023-03-09 19:32:09 -08:00
Julia
01e3173ed0
Preserve contacts popover editor contents when switching to search mode
2023-03-09 22:05:32 -05:00
Nate Butler
8ee25be7b9
Update empty pane styling
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-09 20:18:29 -05:00
Mikayla Maki
0384456e7d
Change context matcher to search the entire stack
2023-03-09 16:18:37 -08:00
Mikayla Maki
20064b5629
Add welcome to menu
...
remove debug
2023-03-09 15:38:28 -08:00
Mikayla Maki
daed75096e
Fix editor test to clearly show trailing whitespace
...
Adjsut default dock size to be a multiple of 16
2023-03-09 13:18:03 -08:00
Mikayla Maki
4eb75f058f
Fix bug with wrong view ids being passed
2023-03-09 12:00:58 -08:00
Petros Amoiridis
6c68a3e709
Remove unneeded code
2023-03-09 20:02:40 +02:00
Petros Amoiridis
d53c18cc57
Open menu relative to the mouse cursor
2023-03-09 16:57:38 +02:00
Petros Amoiridis
5b7d0ee6fe
Show button in a normal state
2023-03-09 16:54:47 +02:00
Petros Amoiridis
e2bdd261a1
Remove debugging statement
2023-03-09 16:53:34 +02:00
Mikayla Maki
9187863d0e
re-add spaces removed by new setting
2023-03-09 00:45:05 -08:00
Antonio Scandurra
3daeabc1d6
collab 0.7.0
2023-03-09 09:30:04 +01:00
Antonio Scandurra
9328bb0153
Introduce Kubernetes liveness probe to ensure database works
2023-03-09 09:17:55 +01:00
Antonio Scandurra
89c283ecf0
Merge pull request #2252 from zed-industries/limit-messages-processed-in-parallel
...
Prevent collab server from being overwhelmed with messages
2023-03-09 08:51:48 +01:00
Antonio Scandurra
a00ce3f286
Add randomized test to remove active selections from buffer
2023-03-09 07:47:05 +01:00
Antonio Scandurra
4ce51c8138
Limit dirty buffer save optimization to multi-buffers
2023-03-09 07:26:22 +01:00
Mikayla Maki
f626920af1
Remove permanent Zed stateless
2023-03-08 19:03:50 -08:00
Mikayla Maki
943ea61452
Add a note on how to check the telemetry
2023-03-08 18:47:52 -08:00
Julia
981b3a459f
Sort collaborators in titlebar alphabetically instead of by replica id
2023-03-08 21:38:30 -05:00
Mikayla Maki
a65dd0fd98
Restore correct checkbox text
2023-03-08 18:15:29 -08:00
Mikayla Maki
cf6ea6d698
Fix bug with action keybindings not being resolved
2023-03-08 18:11:11 -08:00
Mikayla Maki
152755b043
Add blank pane experience
2023-03-08 17:56:39 -08:00
Mikayla Maki
dad66eb3fb
Make the workspace always open the dock
2023-03-08 14:49:52 -08:00
Mikayla Maki
f62e0b502a
Remove welcome experience action
...
Make logo switch between light and dark
co-authored-by: Nathan <nathan@zed.dev>
2023-03-08 14:49:48 -08:00
Nate Butler
344f59adf7
Tweak welcome design
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-08 17:14:15 -05:00
Nate Butler
9842b7ad1a
WIP
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-08 16:34:27 -05:00
Max Brunsfeld
14497027d4
collab 0.6.2
2023-03-08 12:22:16 -08:00
Joseph Lyons
ae510c80db
v0.77.x dev
2023-03-08 13:25:32 -05:00
Petros Amoiridis
ad7e49ed06
Give focus to the selected terminal
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-03-08 19:47:57 +02:00
Antonio Scandurra
b687aec9d9
Avoid saving buffer if it's neither dirty nor in conflict
...
However, keep emitting `Saved` events so that the language server
is notified and can perform tasks related to saving (e.g., running
`cargo check` in the case of rust-analyzer).
2023-03-08 17:04:01 +01:00
Antonio Scandurra
a435dc1339
Clear selections on buffer only if they hadn't been cleared already
2023-03-08 17:04:01 +01:00
Antonio Scandurra
b4561b848d
Limit the number of parallel messages handled for any given connection
2023-03-08 17:04:01 +01:00
Petros Amoiridis
baa9e271d5
Make pop up open on the side of the button
2023-03-08 11:00:30 +02:00
Mikayla Maki
350ddf2025
Add keymap picker UI
...
Co-authored-by: Max <max@zed.dev>
2023-03-07 17:29:08 -08:00
Mikayla Maki
3594243644
Fix bug where open would offer to hang up a remote call
...
Co-authored-by: max <max@zed.dev>
2023-03-07 17:29:08 -08:00
Mikayla Maki
904993dfc9
Change open paths to replace the existing window if dispatched from a window
...
co-authored-by: Max <max@zed.dev>
2023-03-07 17:28:52 -08:00
Julia
d173b1d412
Update db followers table when user leaves a project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-03-07 18:56:03 -05:00
Mikayla Maki
ab4b3293d1
Fix project panel button and style it
...
Co-authored-by: max <max@zed.dev>
2023-03-07 14:49:13 -08:00
Mikayla Maki
5892f16602
Add test for base keymap setting
2023-03-07 14:02:42 -08:00
Mikayla Maki
19fc143209
Add base keymap setting
...
Format all files
Co-Authored-by: Nathan <nathan@zed.dev>
2023-03-07 12:19:51 -08:00
Joseph Lyons
ca03d871a6
Add a separator between the New Terminal button and existing terminal buttons
2023-03-07 15:09:06 -05:00
Joseph Lyons
0a3f0c5252
Use terminal titles for buttons
2023-03-07 15:04:12 -05:00
Joseph Lyons
c80942ea00
Begin work to dynamically add terminal names to menu
2023-03-07 14:41:18 -05:00
Joseph Lyons
caa6a75238
Show a pop up menu for terminals
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-07 20:16:08 +02:00
Julia
4f4af55329
Merge pull request #2248 from zed-industries/increase-reconnect-timeout
...
Increase room reconnect timeout
2023-03-07 12:30:20 -05:00
Julia
1e5aff9e51
Update collab integration test to new reconnect timeout
2023-03-07 12:23:18 -05:00
Mikayla Maki
3b31f10c6f
Made the theme picker sort from dark to light
...
Added a layer into 'ConstrainedBox' to clip it
's children
Made the welcome experience responsive to small and large sizes
2023-03-06 18:36:18 -08:00
Mikayla Maki
8db7e17ac5
Move install_cli function to a seperate crate
...
Add install cli button to welcome experience
Add toast pop ups for CLI installation status
2023-03-06 17:55:58 -08:00
Mikayla Maki
1f6bd0ea77
Fix edge case where the welcome page might open in the dock if the user's actions race the welcome experience action
2023-03-06 16:35:15 -08:00
Mikayla Maki
ba652fc033
Finish basic welcome experience
2023-03-06 16:28:23 -08:00
Max Brunsfeld
515724821e
Make racket highlight query more consistent with other langs
2023-03-06 15:56:20 -08:00
Max Brunsfeld
0867162c87
Fix lua highlight query
...
* Fix regex predicate on constants.
* Remove 'function.call' highlight name. In other languages, we
differentiate calls from definitions with the 'function.definition'
highlight name. We actually don't use this in any themes though.
2023-03-06 15:54:17 -08:00
Max Brunsfeld
aba2914a31
Fix constant highlighting in JS, TypeScript
...
Previously, SCREAMING_SNAKE_CASE identifiers were highlighted as
types due to a mistake in the order of patterns in the highlight
queries.
2023-03-06 15:38:12 -08:00
Mikayla Maki
020a0965b0
WIP
2023-03-06 14:26:32 -08:00
Mikayla Maki
b74553455f
Add an element to pane to take care of wiring initial mouse handlers
2023-03-06 14:26:32 -08:00
Mikayla Maki
4a8527478d
Add child item alignment to flex implementation
...
Fix checkbox styling
co-authored-by: Nathan <nathan@zed.dev>
2023-03-06 14:26:32 -08:00
Mikayla Maki
4c179875ab
Add png image loading to gpui
...
add zed logo into welcome experience
Co-authored-by: Nathan <nathan@zed.dev>
2023-03-06 14:26:32 -08:00
Mikayla Maki
f89f33347d
Added CTA buttons to welcome experience
...
Co-authored-by: Nathan <nathan@zed.dev>
2023-03-06 14:26:32 -08:00
Mikayla Maki
9dee2ca2be
WIP
2023-03-06 14:26:32 -08:00
Mikayla Maki
62aeb6b8b3
Added background to welcome page
2023-03-06 14:26:32 -08:00
Mikayla Maki
5210be95fe
Added welcome experience sketch
...
Made toolbar hideable
2023-03-06 14:26:32 -08:00
Mikayla Maki
7d7053b990
Move to using stateless
2023-03-06 14:26:31 -08:00
Mikayla Maki
118435a348
Added basic styling for checkboxes, yay
...
Co-authored-by: Max <max@zed.dev>
2023-03-06 14:25:10 -08:00
Mikayla Maki
86e2101592
Added the ability to nested values to the settings file, while preserving user formatting
...
co-authored-by: max <max@zed.dev>
2023-03-06 14:25:10 -08:00
Mikayla Maki
416c793076
Start on welcome experience settings
2023-03-06 14:25:10 -08:00
Mikayla Maki
a0637a769c
WIP
2023-03-06 14:25:10 -08:00
Mikayla Maki
9401ef223d
Add welcome crate and associated types
2023-03-06 14:25:10 -08:00
Antonio Scandurra
0ec984f924
Tidy up SpriteCache::render_glyph
2023-03-06 17:08:35 +01:00
Max Brunsfeld
01bbf20962
Merge pull request #2235 from zed-industries/no-panic-uploads-in-debug
...
Don't upload panic files when running in a PTY
2023-03-04 09:42:46 -08:00
Mikayla Maki
996294ba67
Merge pull request #2246 from zed-industries/fix-lsp-derive-error
...
Make diagnostic processing order independent
2023-03-04 02:25:47 -08:00
Mikayla Maki
ddf2f2cb0a
Update test to use new group ids and new ordering of diagnostics.
2023-03-04 02:21:55 -08:00
Mikayla Maki
bd4d7551a5
Make diagnostic processing order independent
...
Co-authored-by: max <max@zed.dev>
2023-03-03 16:35:12 -08:00
Julia
13212d274e
Confirm restart if prompt-quit is enabled or there are unsaved changes
2023-03-03 16:06:03 -08:00
Julia
b9110c9268
Increase reconnect timeout
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-03 13:10:08 -08:00
Joseph T. Lyons
b9573872e1
Merge pull request #2243 from zed-industries/joseph/z-225-track-open-terminals
...
Keep track of open terminals
2023-03-03 12:55:28 -08:00
Joseph Lyons
3ec71a742d
Keep track of open terminals
...
Co-Authored-By: Petros Amoiridis <petros@hey.com>
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-03-03 12:50:08 -08:00
Mikayla Maki
50682dc685
Merge pull request #2233 from zed-industries/fix-code-folding-initialization
...
Initialize code fold indicators on buffer startup
2023-03-03 12:30:53 -08:00
Julia
2bca64f13b
Merge pull request #2242 from zed-industries/mouse-event-handlers-yes
...
Fix surprising mouse propagation & avoid focusing tab while closing
2023-03-03 12:29:50 -08:00
Mikayla Maki
606d683f29
Add interactable fold markers
...
Change fold handlers to be driven by the fold map
Switch to a mouse region based implementation for click regions
Co-authored-by: Max <max@zed.dev>
2023-03-03 12:26:36 -08:00
Julia
ff2e6bc3bd
Fix surprising mouse propagation & avoid focusing tab while closing
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-03 12:22:58 -08:00
Joseph T. Lyons
218f2fd0fe
Merge pull request #2241 from zed-industries/joseph/z-223-add-terminal-button-to-status-bar
...
Add a terminal button to status bar
2023-03-03 12:15:59 -08:00
Max Brunsfeld
bb0257bbac
Merge branch 'main' into no-panic-uploads-in-debug
2023-03-03 12:02:44 -08:00
Joseph Lyons
929ebd7175
Add a terminal button to status bar
...
Co-Authored-By: Petros Amoiridis <petros@hey.com>
2023-03-03 12:00:41 -08:00
Max Brunsfeld
124aa74b03
Merge pull request #2234 from zed-industries/error-on-combined-injections-in-injections
...
Fix range relativization when combined injections occur inside of other injections
2023-03-03 11:58:13 -08:00
Max Brunsfeld
d14b684237
Merge pull request #2236 from zed-industries/avoid-clobbering-panic-file
...
Avoid clobbering panic files when they happen at the same time
2023-03-03 11:15:48 -08:00
Max Brunsfeld
7a8cba0544
Merge pull request #2227 from zed-industries/strip-trailing-whitespace
...
Add settings to normalize whitespace on save
2023-03-03 11:15:32 -08:00
Julia
3b6f66791f
Merge pull request #2238 from zed-industries/subpixel-variant-incorrectly-wrapping
...
Avoid wrapping to the 0th glyph variant when the 4th should be used
2023-03-03 13:13:34 -05:00
Julia
9311e01271
Avoid wrapping to the 0th glyph variant when the 4th should be used
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-03-03 10:04:44 -08:00
Nate Butler
6854063d0b
Revert "Avoid tab bar background activating an item at the end of a tab drag"
2023-03-03 09:47:58 -08:00
Mikayla Maki
7ca0b38048
Made fold inline styles be driven by the fold map
...
co-authored-by: Max <max@zed.dev>
2023-03-03 09:32:58 -08:00
Max Brunsfeld
a598f0b13c
Avoid clobbering panic files when they happen at the same time
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2023-03-02 20:51:29 -08:00
Max Brunsfeld
eb6088701e
Don't upload panic files when running in a PTY
2023-03-02 20:32:49 -08:00
Mikayla Maki
24ba47e75d
Merge pull request #2230 from zed-industries/fix-tab-x
...
Fix tab bar x
2023-03-02 19:48:08 -08:00
Mikayla Maki
3dd5b3f426
Attempted to initialize code-fold indicators, does not work
2023-03-02 19:42:59 -08:00
Julia
b343e8056a
Avoid tab bar background activating an item at the end of a tab drag
2023-03-02 13:06:58 -08:00
Max Brunsfeld
a366ba19af
Fix range relativization when combined injections occur inside of other injections
...
For example, ERB template inside of a markdown code block
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2023-03-01 14:38:35 -08:00
Max Brunsfeld
70cb2fa8d7
Apply external command formatting if buffer has changed while computing it
2023-03-01 10:17:04 -08:00
Mikayla Maki
8734bd8435
Seperate out x-mark width
2023-03-01 00:18:45 -08:00
Max Brunsfeld
368d2a73ea
Perform whitespace formatting regardless of whether buffer has a language server or path
2023-02-28 21:52:00 -08:00
Max Brunsfeld
e7b56f6342
adjust buffer-formatting assertion to reflect final newline addition
2023-02-28 21:52:00 -08:00
Max Brunsfeld
1deff43639
Avoid calling edits_since in apply_diff
2023-02-28 21:52:00 -08:00
Max Brunsfeld
a890b8f3b7
Add a setting for ensuring a single final newline on save
2023-02-28 21:52:00 -08:00
Max Brunsfeld
7faa0da5c7
Avoid finalizing transactions inside Buffer::apply_diff
2023-02-28 21:52:00 -08:00
Max Brunsfeld
ff85bc6d42
Add setting for removing trailing whitespace on save
2023-02-28 21:52:00 -08:00
Max Brunsfeld
b00e467ede
Add APIs for stripping trailing whitespace from a buffer
2023-02-28 21:52:00 -08:00
Mikayla Maki
269df10a16
Fix off by one error in click ranges
2023-02-28 20:27:34 -08:00
Mikayla Maki
dc11d2726e
Made code fold indicators show up on active line indicators
2023-02-28 19:53:53 -08:00
Mikayla Maki
2198c295b3
Fix comments
2023-02-28 17:25:35 -08:00
Mikayla Maki
6cf62a5b02
Update tests to use new fold indicator
2023-02-28 17:17:29 -08:00
Mikayla Maki
f8401394f5
Removed DisplayRow abstraction
2023-02-28 17:12:48 -08:00
Mikayla Maki
b53d1eef71
Added background styling of the ...
2023-02-28 16:35:44 -08:00
Mikayla Maki
c397fd9a71
Added click regions and cursor styles
2023-02-28 16:34:28 -08:00
Mikayla Maki
9b8adecf05
Adjusted code-folding behavior
2023-02-28 16:34:28 -08:00
Mikayla Maki
e0f553c0f5
WIp
2023-02-28 16:34:28 -08:00
Mikayla Maki
37a2ef9d41
Make chevrons and lightning bolt interactive
2023-02-28 16:34:28 -08:00
Mikayla Maki
89b93d4f6f
Added fold changes on gutter hover
2023-02-28 16:34:28 -08:00
Mikayla Maki
2036fc48b5
moved code action indicator to the left
2023-02-28 16:34:28 -08:00
Mikayla Maki
cb3e873a67
Fixed autoscroll timing
2023-02-28 16:34:28 -08:00
Mikayla Maki
da78abd99f
Added DisplayRow abstraction to make folding code more readable
2023-02-28 16:34:28 -08:00
Mikayla Maki
637e8ada42
Fix bugs in code folding
2023-02-28 16:34:28 -08:00
Mikayla Maki
e3061066c9
Add code folding indicators into the gutter.
2023-02-28 16:34:28 -08:00
Nate Butler
fb69611568
Fix order of template_substitution
in highlights.scm
2023-02-28 11:19:55 -05:00
Nate Butler
a8a045e8bf
Merge branch 'main' into nate/extend-syntax
2023-02-28 11:07:35 -05:00
Joseph T. Lyons
3fb426e8b2
Merge pull request #2209 from zed-industries/add-link-to-community-repo-in-feedback-editor
...
Add link to community repo in feedback editor text
2023-02-28 09:03:21 -05:00
Kay Simmons
f0a31f86c7
remove commented line
2023-02-27 12:06:10 -08:00
Kay Simmons
b3dffeaf2a
fix infinite loop in path distance for fuzzy finder
2023-02-27 11:57:21 -08:00
Joseph Lyons
4f9a07cffc
Merge branch 'main' into add-link-to-community-repo-in-feedback-editor
2023-02-27 13:56:01 -05:00
Nate Butler
f84046b74f
use @boolean
in all flavors of js
2023-02-27 10:40:01 -05:00
Nate Butler
8c51a62a8d
Unify regex highlight style under @string.regex
2023-02-27 10:08:24 -05:00
Joseph Lyons
36ada13966
Update app-icon@2x.png
2023-02-26 11:03:43 -05:00
Joseph Lyons
2c61eeb56d
Update app-icon.png
2023-02-26 11:03:31 -05:00
Joseph Lyons
ccae9448d4
Update app-icon-preview@2x.png
2023-02-26 11:03:22 -05:00
Joseph Lyons
bb46b26494
Update app-icon-preview.png
2023-02-26 11:03:03 -05:00
Kay Simmons
0b1334b8c5
Merge pull request #2218 from zed-industries/file-finder-distance-sorting
...
Sort matches in file finder by distance to active item after score
2023-02-25 14:26:05 -08:00
Kay Simmons
cdc6566d87
fixup poor utility naming
2023-02-25 14:12:25 -08:00
Kay Simmons
36f3d3d738
Add test for new sorting behavior
2023-02-25 14:06:54 -08:00
Kay Simmons
0b48e238f2
Sort file finder matches by distance to the active item after match score
2023-02-24 18:13:26 -08:00
Max Brunsfeld
5fea49e639
Pass the 'Save' format trigger when formatting on save
...
In an earlier refactor, I accidentally caused the 'Manual'
trigger to *always* be passed.
Co-authored-by: Mikayla Maki <mikayla@zed.dev>
2023-02-24 17:11:35 -08:00
Mikayla Maki
0704d9dcdb
Merge pull request #2216 from zed-industries/update-bromberg
...
Update bromberg dependency to have alloc
2023-02-24 14:41:32 -08:00
Mikayla Maki
a57fcf5afc
Update bromberg dependency to have alloc
2023-02-24 14:34:24 -08:00
Max Brunsfeld
e910fd8493
collab 0.6.1
2023-02-24 09:44:23 -08:00
Mikayla Maki
8656708de4
Revert "Remove borrow from reveal_path()"
2023-02-24 09:39:52 -08:00
Joseph Lyons
72197802a2
Tweak code to remove duplication
2023-02-24 08:53:58 -05:00
Joseph Lyons
f8f1a3f86e
Unify text style names
2023-02-24 08:46:28 -05:00
Mikayla Maki
89ddf14b0e
Remove borrow from reveal_path()
2023-02-23 21:36:17 -08:00
Julia
be86cb35ba
Merge pull request #2213 from zed-industries/per-project-follow-status
...
Differentiate between follow state on a per-project basis
2023-02-24 00:26:41 -05:00
Julia
465d8cc2ff
Differentiate between follow state on a per-project basis
2023-02-24 00:07:17 -05:00
Max Brunsfeld
93b9e762ec
Merge pull request #2212 from zed-industries/initial-traffic-light-position
...
Adjust window's traffic light position when setting its title
2023-02-23 15:02:05 -08:00
Max Brunsfeld
fbc934b884
Adjust window's traffic light position when setting its title
2023-02-23 14:44:45 -08:00
Mikayla Maki
350b7b82f7
Merge pull request #2207 from zed-industries/project-panel-actions
...
Fix project panel actions
2023-02-23 14:31:29 -08:00
Mikayla Maki
b179fc2b99
Remove comment
2023-02-23 14:24:53 -08:00
Mikayla Maki
8860346324
Fix broken dock command
2023-02-23 14:15:29 -08:00
Mikayla Maki
9004640586
Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage
2023-02-23 14:10:55 -08:00
Kay Simmons
3f9405f8f1
Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode
...
Fix enter in normal mode acting incorrectly
2023-02-23 13:46:15 -08:00
Kay Simmons
2276d25bdf
Fix enter in normal mode acting incorrectly
2023-02-23 13:40:31 -08:00
Mikayla Maki
ffe53bed87
Reverts keymap precedence order change
2023-02-23 13:32:45 -08:00
Joseph Lyons
37f910949d
Add link to community repo in feedback editor
2023-02-23 16:30:00 -05:00
Julia
e1df85e86d
Add same grayscale logic to followers which leaders have
2023-02-23 15:59:37 -05:00
Antonio Scandurra
bbeb33bc7e
Fix error when deleting rooms containing projects on refresh
...
A foreign key violation was causing the server to never delete stale
rooms during `Database::refresh_room` due to having one or more project
records referencing the room.
2023-02-23 15:54:35 +01:00
Antonio Scandurra
74e0bed38f
Fix compilation errors after restructuring room_transaction
2023-02-23 15:17:22 +01:00
Antonio Scandurra
832549f1a3
Merge branch 'main' into call-ui-follow-up
2023-02-23 15:15:46 +01:00
Antonio Scandurra
b965333325
Show avatar in user menu
2023-02-23 15:09:32 +01:00
Antonio Scandurra
59a66190e5
Avoid trying to reconnect to a room if client is signed out
2023-02-23 14:53:10 +01:00
Antonio Scandurra
9334267bd0
Tear down peer when signing out
2023-02-23 14:47:02 +01:00
Antonio Scandurra
a0daf47134
Don't panic when rendering collab titlebar item while signed out
2023-02-23 14:46:02 +01:00
Petros Amoiridis
9a729a2e64
Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon
...
Replace terminal tab title with an icon
2023-02-23 11:04:43 +02:00
Antonio Scandurra
1c636500de
Merge pull request #2200 from zed-industries/fix-slow-project-join
...
Hold room lock through the entirety of a `room_transaction`
2023-02-23 09:11:58 +01:00
Max Brunsfeld
65a9ac449f
Remove leave button from the title bar
2023-02-22 23:30:32 -08:00
Max Brunsfeld
bf5c3d963a
Rearrange collab titlebar items to avoid movement of the toggle contacts button
...
* Replace username in titelbar with a `...` user menu that shows
the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
2023-02-22 22:56:11 -08:00
Max Brunsfeld
40aee8d7bc
Add missing tooltip for contacts menu button
...
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2023-02-22 14:18:17 -08:00
Max Brunsfeld
46ead28971
Bump RPC protocol version number
2023-02-22 13:40:14 -08:00
Max Brunsfeld
111aff29cc
collab 0.6.0
2023-02-22 12:35:15 -08:00
Max Brunsfeld
e2a2e40599
v0.76.x dev
2023-02-22 12:34:29 -08:00
Max Brunsfeld
b73423daaa
Merge pull request #2114 from zed-industries/new-collaboration-ui
...
New collaboration UI part 1/N
2023-02-22 12:32:41 -08:00
Julia
0324ca3b08
Be more specific about clearing (leader, follower) row
...
Previously anyone unfollowing someone would clear all other rows for
other followers leading to an incorrect state, fix and test
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 15:29:20 -05:00
Julia
36040cd0e1
Add top level leave call button
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:44:23 -05:00
Julia
a07867d628
Fiddle with titlebar item spacing
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 14:13:29 -05:00
Julia
812145f9ab
Only show in-call share/unshare button if own project
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 13:40:43 -05:00
Julia
dbe5b0205c
Add style leader selection container
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 13:36:06 -05:00
Petros Amoiridis
3d6c81584f
Add an icon to the terminal view tab
...
The terminal icon already existed in `assets/icons`
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-02-22 20:30:44 +02:00
Petros Amoiridis
81ece4fd44
Deduplicate tab theme related code
...
We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.
We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-02-22 20:28:57 +02:00
Mikayla Maki
7b559176f1
Merge pull request #2201 from zed-industries/save-shortcuts
...
Add OS UI Keybindings
2023-02-22 09:16:19 -08:00
Mikayla Maki
d7305077bf
Merge pull request #2198 from zed-industries/more-item-defaults
...
Add more default impls to the item trait
2023-02-22 09:14:12 -08:00
Mikayla Maki
4798b72cb8
Fixed keyboard shortcuts in mac os native panels
...
co-authored-by: Antonio <antonio@zed.dev>
2023-02-22 09:10:16 -08:00
Mikayla Maki
71d8ead318
Introduce an OSAction that can be associated with menu items for mac platform compatibility.
...
Co-authored-by: Antonio <antonio@zed.dev>
2023-02-22 09:02:31 -08:00
Julia
9b92a8e3fe
Add mockup accurate avatar background
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
Julia
7f4da80386
Initial dedicated face pile element
...
Rather than overload Flex with yet another special case, add a dedicated
element to handle this overlap instead
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
Julia
6a731233c5
Remove Flex::with_reversed_pain_order
2023-02-22 11:34:55 -05:00
Max Brunsfeld
b7cf426908
Start work on styling of follower avatars in facepiles
...
* Make follower avatars smaller than top-level avatars
* Make avatars in facepiles overlap
* Render an opaque background behind avatars in facepiles.
2023-02-22 11:34:55 -05:00
Max Brunsfeld
0dc92bec5c
Retrieve room id from the project when following/unfollowing
...
Previously, we were accidentally using the project id as the room id.
2023-02-22 11:34:55 -05:00
Julia
c75aca25b6
Remove left side collaborator list
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:34:55 -05:00
Julia
ae87961a77
Close contacts popover when call ends
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-02-22 11:34:55 -05:00
Julia
e9464815e0
Make tooltip lie less
2023-02-22 11:34:55 -05:00
Julia
1ed47663ef
Avoid moving contacts popover during call start & add button style state
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-02-22 11:34:55 -05:00
Julia
dd02bc7748
Initial adding of contact menu to call-less share button
2023-02-22 11:22:37 -05:00
Julia
e403b868b7
Add followers table to sqlite scheme for tests
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:22:37 -05:00
Julia
3105ecd0bd
Shuffle share/unshare button back to the right side
2023-02-22 11:22:37 -05:00
Julia
05e9615507
Highlight face pile which local user is following
2023-02-22 11:22:37 -05:00
Julia
1abb7794cb
Handle case where follower is local user
2023-02-22 11:22:37 -05:00
Julia
50e681bbb1
Add username to right side
2023-02-22 11:22:37 -05:00
Julia
3fb8395085
Make things a bit more infallible
2023-02-22 11:22:37 -05:00
Julia
4513c40993
Following face piles finally take their first breath
2023-02-22 11:21:23 -05:00
Julia
4ffc8cd9fd
Fix deadlock in db get_room
...
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2023-02-22 11:21:23 -05:00
Julia
33c265d3cf
Abuse a closure instead of abusing options/iterators quite so much
2023-02-22 11:21:23 -05:00
Julia
58c41778e7
Absolute pain of the iterator kind (start laying out a user's followers)
2023-02-22 11:21:23 -05:00
Julia
2592ec7265
Initial tracking of unfollows on collab server
2023-02-22 11:21:23 -05:00
Julia
d6462c611c
Begin tracking follow states on collab server
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Julia
28786a3c18
Add Flex with_reversed_paint_order
& initially move face piles to left
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
Julia
a5fd0250ab
Start fleshing out layout of collaborator list entries
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
Julia
f68eda97fb
Tell project when it has been unshared
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev>
2023-02-22 11:21:23 -05:00
Julia
99236f1875
Add collaborators to collaborator list, including self user
2023-02-22 11:21:23 -05:00
Julia
bf8658067f
Add collaborator count to collaborator list button
2023-02-22 11:21:23 -05:00
Julia
c697c1a96a
Switch collaborator list to using own style
2023-02-22 11:21:23 -05:00
Julia
2b6aa3f5d1
Begin adding collaborator list popover
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-22 11:21:23 -05:00
Julia
e96d52f35a
Move share button and support unsharing
2023-02-22 11:21:23 -05:00
Julia
ed2f1ddd2d
Move workspace title into collaboration titlebar item render
2023-02-22 11:21:11 -05:00
Antonio Scandurra
8dd249a7cd
Hold room lock through the entirety of a room_transaction
...
Previously, when the host repeatedly sent `UpdateWorktree` messages,
new guests attempting to join a project would observe a severe slowdown
caused by a database serialization error (e.g., the coherence of the data
would get violated midway through `Database::join_project` due to worktree
entries being mutated as the user joined). Writing entries is pretty fast,
whereas reading all of them for a project can take more than 100ms.
Transactions that failed due to a serialization error are retried, but the guest
would keep retrying until the host finished writing because the guest's read
was slow.
This commit changes the semantics of `room_transaction` to acquire a room
lock before even starting the transaction and holding it all the way after
commit (storing it, as before, in the `RoomGuard`). This ensures that a fast
writer (the host) can't starve a slow reader (the guest), allowing the latter
to make progress by temporarily pausing writes by the former.
2023-02-22 16:04:29 +01:00
Kay Simmons
24fcad3fa2
Merge pull request #2189 from zed-industries/labeled-tasks
...
Labeled Tasks
2023-02-21 21:31:47 -08:00
Kay Simmons
46af9a90ce
fix test warning
2023-02-21 21:13:03 -08:00
Kay Simmons
1c69e289b7
Fix formatting
2023-02-21 21:07:45 -08:00
Mikayla Maki
9d782be4c8
Remove now-default stubs
2023-02-21 17:51:49 -08:00
Mikayla Maki
cae9e733a1
Add more default impls to the item trait
...
Change pane to not split if the underlying item cannot be cloned
2023-02-21 17:29:39 -08:00
Mikayla Maki
77c396a0ab
Merge pull request #2197 from zed-industries/label-text-cow
...
Changed label and text to be generic over static and owned strings
2023-02-21 17:05:57 -08:00
Mikayla Maki
b500ed3171
Changed label and text to be generic over static strings and owned strings
2023-02-21 16:47:29 -08:00
Kay Simmons
6b6e4e3bfe
Add basic test for labeled tasks
2023-02-21 16:14:22 -08:00
Joseph T. Lyons
1683a54698
Merge pull request #2195 from zed-industries/add-reveal-in-finder-to-additional-locations
2023-02-21 18:48:16 -05:00
Mikayla Maki
14488619a3
Merge pull request #2196 from zed-industries/open_urls
...
Fix open URLs, restarts, and make bundling easier to use
2023-02-21 15:36:50 -08:00
Mikayla Maki
cf4e719484
Fixes a race condition in the restart implementation
...
Fixes open_urls racing workspace initialization and causing a double-open (community#927)
Adds a -d flag to the bundle script to compile in debug mode
Co-Authored-by: Max <max@zed.dev>
2023-02-21 15:28:16 -08:00
Joseph Lyons
8c3232bb9b
Add reveal in finder
to additional locations
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
2023-02-21 16:09:11 -05:00
Joseph Lyons
ebf1da1de8
Remove print macros
2023-02-21 10:46:12 -05:00
Kay Simmons
3564e95f27
Add labeled tasks to gpui and observe them in the activity status to give feedback when we are still waiting for the language server
2023-02-20 20:28:48 -08:00
Max Brunsfeld
ecf77a510a
Merge pull request #2194 from zed-industries/window-position-env-vars
...
Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
2023-02-20 15:29:51 -08:00
Max Brunsfeld
927f7b3363
Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
...
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2023-02-20 15:11:20 -08:00
Max Brunsfeld
a11165ad0a
Add unit test for auto-closing quotation marks with overrides
2023-02-20 13:46:17 -08:00
Max Brunsfeld
ab82e13167
Run cargo fmt
2023-02-20 11:10:30 -08:00
Max Brunsfeld
8be844a13f
Add test that loads all bundled languages
2023-02-20 10:53:37 -08:00
Max Brunsfeld
7c98395e77
Add missing comment pattern to TSX overrides query
2023-02-20 10:53:37 -08:00
Max Brunsfeld
8922156923
Restructure how bracket pairs are overridden to unify lists
...
This way, a bracket pair that is disabled in a given scope can still be skipped, if
it was auto-closed before that scope existed.
2023-02-20 10:53:37 -08:00
Max Brunsfeld
2982a98d1c
Merge pull request #2187 from zed-industries/save-untitled-buffer-bugs
...
Fix newly-discovered bugs in saving untitled buffers
2023-02-20 10:05:58 -08:00
Max Brunsfeld
010eba509c
Make Project::save_buffer and ::save_buffers into methods
2023-02-20 09:42:44 -08:00
Max Brunsfeld
56b7eb6b6f
Only send UpdateBufferFile messages for buffers whose files have changed
...
Send that message when saving a buffer as a new path.
2023-02-20 09:41:59 -08:00
Petros Amoiridis
4bb986b3be
Move reveal_path to ForegroundPlatform
...
So that we can use spawn to use the OS API call.
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-02-20 18:57:37 +02:00
Kay Simmons
0981244797
further tweak comment
2023-02-18 13:53:13 -08:00
Kay Simmons
159d3ab00c
Add comment explaining push_keystroke
2023-02-18 13:49:08 -08:00
Kay Simmons
3fb6e31b92
revert for loop change and store matched actions in a sorted set instead
2023-02-18 13:42:28 -08:00
Kay Simmons
04df00b221
Iterate over keymap then dispatch path when matching keybindings to make precedence more intuitive
...
Rename action which adds the active tab to the dock to be more intuitive
Add action which moves the active tab out of the dock and bind it to the same keybinding
2023-02-18 13:10:01 -08:00
Kay Simmons
dc6f7fd577
pull toggle button into its own file
2023-02-18 12:32:19 -08:00
Kay Simmons
ac3e8f61ef
Merge pull request #2186 from zed-industries/better-vim-matching-motion
...
Better vim matching motion
2023-02-17 22:10:28 -08:00
Kay Simmons
fc811d14b1
Fix failing test
2023-02-17 22:00:39 -08:00