oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,731 Commits 1 Branch 0 Tags
292d075f81d79c685dc13ce8c920342f2ba581cf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Sobo 6985d360c8 Merge pull request #811 from zed-industries/font-fallback-3 
Implement font fallback and emoji rendering
 2022-04-13 14:08:57 -06:00
Nathan Sobo e9214dc05d Merge pull request #785 from zed-industries/collab-renames 
Rename zed-server to collab
 2022-04-11 20:56:37 -06:00
Nathan Sobo d8e4e924cc Merge branch 'main' into collab-renames 2022-04-11 19:07:07 -06:00
Nathan Sobo 5a5506ae1d Update certificate 2022-04-11 18:33:55 -06:00
Nathan Sobo 72ea71ca52 Update paths to renamed collab crate 2022-04-11 18:18:12 -06:00
Nathan Sobo 3b852ee2bd Update Kubernetes manifest to refer to "collab" instead of "zed" 2022-04-11 18:15:41 -06:00
Nathan Sobo ab8204368c Rename zed-server to collab 
Over time, I think we may end up having multiple services, so it seems like a good opportunity to name this one more specifically while the cost is low. It just seems like naming it "zed" and "zed-server" leaves it a bit open ended.
 2022-04-09 08:30:42 -06:00
Nathan Sobo af674e1c00 Merge pull request #770 from zed-industries/better-settings-schema 
Improve Settings Completions
 2022-04-09 08:23:58 -06:00
Nathan Sobo 56fcffb634 Remove unused imports 2022-04-09 07:55:23 -06:00
Nathan Sobo 17195e615e Merge pull request #781 from zed-industries/structured-logging 
Introduce structured logging
 2022-04-09 07:40:24 -06:00
Nathan Sobo 8a7d3ea82a Merge pull request #778 from zed-industries/test-random-disconnect 
Introduce host disconnection in randomized collaboration test
 2022-04-08 11:36:39 -06:00
Nathan SoboandAntonio Scandurra b507e21831 Enable JSON logging at the trace log level in K8s 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-08 10:08:52 -06:00
Nathan SoboandAntonio Scandurra 7e5a3f9f6b Introduce structured logging 
We're enabling the log crate feature everywhere, but only using it on the server for now.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-08 10:06:51 -06:00
Nathan Sobo 717f53e3d2 WIP 2022-04-07 09:29:47 -06:00
Nathan SoboandAntonio Scandurra 80d55fd3d8 Don't starve UI thread when rapidly receiving LSP messages 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-04-07 08:30:42 -06:00
Nathan Sobo 7a151ffc75 Merge pull request #764 from zed-industries/refine-event-handlers-behavior 
Calculate hit-box based on visible bounds in `{Mouse}EventHandler`
 2022-04-07 08:16:14 -06:00
Nathan Sobo 0214bec7f4 Don't dispatch events to flex children outside of parent flex's bounds 2022-04-06 10:59:03 -06:00
Nathan Sobo e21f90fec5 Merge pull request #747 from zed-industries/styles-in-typescript 
Style the Zed app using Typescript styleTrees and Design Tokens
 2022-04-06 10:39:10 -06:00
Nathan Sobo ca64b081fe Don't assume there are always matches in outline view 2022-04-06 09:33:47 -06:00
Nathan Sobo c289cdcac8 💄 2022-04-06 09:28:56 -06:00
Nathan Sobo 36fede7522 💄 token-building script and output destinations 
Just some organization here.
 2022-04-06 09:26:51 -06:00
Nathan Sobo eb99588368 Remove stray dbg! expressions 2022-04-05 20:02:45 -06:00
Nathan Sobo ab3bbe1e17 Make the tabs scrollable when they overflow 
This adds the ability to make a Flex element scrollable by passing a type tag and instance id, which we use to store the scroll position in an ElementStateHandle.

Still need to allow the element to auto-scroll.
 2022-04-05 19:58:15 -06:00
Nathan Sobo 025d857be8 Make UniformListState an Rc<RefCell<>> instead of an Arc<Mutex<>> 
We don't need to support multiple threads.
 2022-04-05 18:40:25 -06:00
Nathan Sobo 0cbcc81ed9 Merge pull request #742 from zed-industries/better-atlas-panics 
Report more information when we panic due to an atlas allocation failure
 2022-04-05 17:08:04 -06:00
Nathan Sobo aeb0b42c7a Report more information when we panic due to an allocation failure 2022-04-05 13:53:13 -06:00
Nathan Sobo 133d9f947b Merge pull request #740 from zed-industries/prompt-only-on-last-dirty-item 
Show unsaved/conflict prompt only when closing the last tab for an item
 2022-04-05 13:12:08 -06:00
Nathan Sobo 4f4364d510 Ensure we drop the last pane item 
Previously, we weren't updating the toolbar's active item when emptying out a pane. This enhances an integration test to ensure that we don't hold references to any editors or buffers once we close everything.
 2022-04-05 13:05:14 -06:00
Nathan Sobo 41a27e6925 💄 2022-04-05 12:09:40 -06:00
Nathan Sobo e2bf89b1e8 Don't require a path in TestAppContext::dispatch_action 
Instead, derive it from the presenter. This makes tests easier to write and more reliable since we'll be accurately simulating the actual relationship between parent and child views.
 2022-04-05 12:08:25 -06:00
Nathan Sobo 3da8f7f944 Fix dispatch path in test 2022-04-05 11:55:29 -06:00
Nathan Sobo 6daefc467a Merge pull request #734 from zed-industries/fix-prompt-panic 
Drop borrow to window state before calling beginSheetModalForWindow
 2022-04-04 17:50:09 -06:00
Nathan SoboandKeith Simmons 66544d54f2 Drop borrow to window state before calling beginSheetModalForWindow 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-04-04 16:18:28 -06:00
Nathan Sobo b060fb0f67 Merge pull request #732 from zed-industries/fix-impersonation-in-api 
In API, wait to create access token until after we impersonate a user
 2022-04-04 15:16:35 -06:00
Nathan Sobo 6a1be11aa6 Wait to create access token until we impersonate a user 
We need to wait to create the token until we decide on whether we're impersonating a different user, otherwise we'll create the token for the original user and the impersonated user won't be able to authenticate.
 2022-04-04 15:07:55 -06:00
Nathan Sobo 391aed3d66 Start loading new theme JSON format instead of TOML 
Replaced remaining extends with javascript object extension.
Moved tokens/core.ts to tokens.ts and massaged the types to make it more
obvious when types don't match up.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-04 12:13:59 -07:00
Nathan SoboandNate Butler 371ea7c552 Update style tree based on changes to _base.toml from main 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan SoboandNate Butler d2a070c345 Write theme JSON files from buildThemes script 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan Sobo 70a783c8d1 Fix TS compile error 2022-04-04 12:13:59 -07:00
Nathan Sobo 70b15e4c90 Convert chat panel 2022-04-04 12:13:59 -07:00
Nathan Sobo 189db6311c Convert project panel styles 2022-04-04 12:13:59 -07:00
Nathan Sobo cb3c111401 Convert editor styles to TypeScript 2022-04-04 12:13:59 -07:00
Nathan SoboandNate Butler 8b33a58076 Express workspace in terms of new components 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan SoboandNate Butler 2aebb04a84 Start on TypeScript-based styling system 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-04 12:13:59 -07:00
Nathan Sobo 9702ab0075 Merge pull request #719 from zed-industries/misc-breadcrumbs-bugs 
Fix miscellaneous breadcrumbs bugs
 2022-04-04 05:42:55 -06:00
Nathan Sobo 9ce19a2ea1 Merge pull request #723 from zed-industries/save-as-on-close 
Prompt to save untitled buffers when closing them if they are dirty
 2022-04-04 05:38:53 -06:00
Nathan Sobo 909b365ed8 Merge pull request #725 from zed-industries/fn-input 
Avoid text insertion when holding down the `fn` key
 2022-04-04 05:37:33 -06:00
Nathan Sobo 93c0c2af0a Start loading new theme JSON format instead of TOML 
Replaced remaining extends with javascript object extension.
Moved tokens/core.ts to tokens.ts and massaged the types to make it more
obvious when types don't match up.

Co-authored-by: Nathan Sobo <nathan@zed.dev>
 2022-04-01 13:34:39 -07:00
Nathan SoboandNate Butler 9147a19522 Update style tree based on changes to _base.toml from main 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-01 09:56:50 -06:00
Nathan Sobo b35fafc8e3 Merge branch 'main' into styles-in-typescript 2022-04-01 09:46:51 -06:00
Nathan SoboandNate Butler 6734a0e69d Write theme JSON files from buildThemes script 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-04-01 09:45:11 -06:00
Nathan Sobo 99738db8a5 Fix TS compile error 2022-04-01 08:25:58 -06:00
Nathan SoboAntonio ScandurraMax Brunsfeld
 		903810f22e Style search in buffer below breadcrumbs 
We still have issues with project search styling.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-31 11:44:16 -06:00
Nathan SoboAntonio ScandurraMax Brunsfeld
 		8bfac63e0d Render the search UI on a separate row from the breadcrumbs 
- In project search, render it above the breadcrumbs
- In buffer search, render it below

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-31 10:36:39 -06:00
Nathan Sobo b8118ee50e Convert chat panel 2022-03-30 18:45:34 -06:00
Nathan Sobo 4a728bb3d3 Convert project panel styles 2022-03-30 18:26:47 -06:00
Nathan Sobo 89eb34209f Convert editor styles to TypeScript 2022-03-30 17:59:35 -06:00
Nathan SoboandNate Butler 32b6c3d3d4 Express workspace in terms of new components 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-03-29 16:28:19 -06:00
Nathan SoboandNate Butler 1615c6150a Start on TypeScript-based styling system 
Co-Authored-By: Nate Butler <1714999+iamnbutler@users.noreply.github.com>
 2022-03-29 13:08:00 -06:00
Nathan Sobo 3ae5fc74c9 Merge pull request #686 from zed-industries/disable-vim-on-start 
Fully disable vim mode on start unless it's enabled
 2022-03-26 19:23:46 -06:00
Nathan Sobo c6ad667d49 Assign normal mode when re-enabling 2022-03-26 19:19:12 -06:00
Nathan Sobo daf999c3be Fully disable vim mode on start unless it's enabled 
Also: Make some structural adjustments to remove the need for defer. Instead of accessing the global in associated VimState functions, have a single method that allows us to call update instance methods.
 2022-03-26 19:19:12 -06:00
Nathan Sobo 30e31f6561 Test that vim mode can be disabled on startup 2022-03-26 19:19:12 -06:00
Nathan Sobo 2837125098 0.23.0 2022-03-26 07:22:01 -06:00
Nathan Sobo fe1f857e84 Merge pull request #684 from zed-industries/subword 
Add bindings for subword movement and deletion
 2022-03-26 07:18:29 -06:00
Nathan Sobo d4436277ee Merge pull request #682 from zed-industries/vim-hjkl 
Vim hjkl
 2022-03-26 07:11:46 -06:00
Nathan Sobo 2dc76a2b58 Add bindings for subword movement and deletion 2022-03-26 07:10:16 -06:00
Nathan Sobo d74221829c Merge pull request #680 from zed-industries/unregister-on-disconnect 
Properly clear out registration and sharing state when a host loses their connection
 2022-03-25 11:52:25 -06:00
Nathan SoboandAntonio Scandurra 62b4eb5efc Add integration test for dropping host connections while sharing 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-25 10:32:31 -06:00
Nathan SoboandAntonio Scandurra a3e9a3afbf Clear out project registration and sharing state on disconnect 
Previously, we weren't fully clearing the state associated with projects and worktrees when losing connection. This caused us to not see guest avatars disappear and not be able to re-share upon reconnect.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-25 10:15:08 -06:00
Nathan Sobo 2c232d585a Merge branch 'main' into unfold-on-select-match 2022-03-24 14:13:27 -06:00
Nathan Sobo ccc276da7a Merge pull request #672 from zed-industries/fix-unfollowing-on-edit 
Automatically unfollow leader only for edits that originate from the follower editor
 2022-03-24 13:26:28 -06:00
Nathan SoboandMax Brunsfeld 4a42025c28 Authenticate on startup if ZED_IMPERSONATE is assigned 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-23 12:25:06 -06:00
Nathan SoboandMax Brunsfeld 657b92b020 Don't prompt for keychain access when launching from a pty 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-23 12:18:17 -06:00
Nathan SoboandMax Brunsfeld ee9ed936e4 Don't try keychain after authentication fails 
Previously, we were achieving this by deleting the keychain item, but this can sometimes fail which leads to an infinite loop. Now, we explicitly never try the keychain when reattempting authentication after authentication fails.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-23 12:15:36 -06:00
Nathan Sobo 097bbe3e07 Update follow binding, remove unfollow binding 
The previous binding to follow had ergonomics issues for the frequency that I think we'll want to use it. It would also conflict with the sub-word selection binding.

Now that moving the cursor etc unfollows, I don't think we need the follow binding.
 2022-03-23 06:19:35 -06:00
Nathan Sobo da15669e17 Merge pull request #656 from zed-industries/add-editor-lifetime-events 
Add editor lifetime events
 2022-03-23 05:59:22 -06:00
Nathan Sobo ee3e6049a3 Make boundary-finding methods wrap across newlines 
This requires word and subword methods to explicitly acknowledge that they want to stop at newlines, which I think actually increases clarity. It makes the boundary finding method more general and useful for external callers such as the forthcoming vim crate.
 2022-03-21 21:25:02 -06:00
Nathan Sobo f70f4c7729 Improve DisplayPoint Debug impl 2022-03-21 21:07:56 -06:00
Nathan Sobo e5a00d72f8 Implement next_subword_end 2022-03-21 20:02:08 -06:00
Nathan SoboMax BrunsfeldKeith Simmons
 		c0d05c82b7 WIP: Start on previous_subword_start 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-21 19:53:01 -06:00
Nathan Sobo 5b54874705 Extract logic for scanning over character boundaries 2022-03-21 16:01:22 -06:00
Nathan Sobo 0c89ad3ac0 Make multi-byte and surrounding_word tests more readable 
Just merge multi-byte tests into the main word movement tests
 2022-03-21 15:41:42 -06:00
Nathan SoboandKeith Simmons 210fa4c443 Remove CharKind::Newline 
This is just a character, and so it seems clearer to refer to it specifically when we want to know if a character is a newline. There was only one case where we relied on Newline being different from Whitespace, and we special-cased that instance. Changing this actually makes us match the behavior of VS Code when double-clicking runs of multiple newlines.

/cc @as-cii

Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-21 15:17:32 -06:00
Nathan SoboandKeith Simmons baeb7d27b8 Clarify word movement function names and improve test coverage 
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-21 15:17:25 -06:00
Nathan Sobo 05ddd26d75 Merge pull request #648 from zed-industries/update-fonts-to-1-2-1 
Update Zed fonts to 1.2.1
 2022-03-21 12:19:33 -06:00
Nathan Sobo c03eec019c Merge pull request #647 from zed-industries/fix-reopening-project-items 
Pass project entry id to Pane when opening a project item
 2022-03-20 11:01:23 -06:00
Nathan Sobo 7cb8935ff5 Pass project entry id to Pane when opening a project items 
This fixes an oversight where we were failing to associate project items with their project entry ids, which broke the logic that prevented the same project entry from being opened twice in the same pane.
 2022-03-20 08:54:20 -06:00
Nathan SoboandMax Brunsfeld 728c708150 WIP: Massage opening of editors 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2022-03-16 17:40:09 -06:00
Nathan SoboMax BrunsfeldKeith Simmons
 		1f9885ec42 Remove open_item_in_pane 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-16 16:08:13 -06:00
Nathan SoboMax BrunsfeldKeith Simmons
 		0036e5c86c Replace ProjectEntry struct with ProjectEntryId 
Previously, we tracked the worktree_id and entry_id separately, but now that entry ids are unique across all worktrees this is unnecessary.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Keith Simmons <keith@the-simmons.net>
 2022-03-16 15:59:47 -06:00
Nathan Sobo 7c6fe56347 Merge pull request #624 from zed-industries/fix-broken-syntax-highlighting 
Make all `HighlightStyle` properties optional
 2022-03-15 06:05:35 -06:00
Nathan SoboandAntonio Scandurra 992fc07133 Hide selections in original editor when renaming 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:45:11 -07:00
Nathan SoboandAntonio Scandurra 308cead8a8 🙊 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:44:11 -07:00
Nathan SoboandAntonio Scandurra 9f629fa307 Improve selection handling when pending rename is taken 
- Set selection to the intuitive cursor position when moving up rather than restoring the full selection of the rename editor.
- When cancelling, restore the original selection.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:30:57 -07:00
Nathan Sobo 33bcd6d904 Merge remote-tracking branch 'origin/main' into select-on-rename 2022-03-12 10:10:23 -07:00
Nathan SoboandAntonio Scandurra 4f086b8d7a Refresh document highlight after rename, but not during 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2022-03-12 10:10:06 -07:00
Nathan Sobo c35a96c425 On rename, replace background highlights with transparent text highlights 2022-03-11 15:54:17 -07:00
Nathan Sobo 951fd1ab36 Merge branch 'main' into select-on-rename 2022-03-11 15:30:07 -07:00
Nathan Sobo fd36b25db1 Merge pull request #587 from zed-industries/lsp-progress 
Show language server progress in the status bar
 2022-03-11 10:57:24 -07:00