oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,687 Commits 1 Branch 0 Tags
024dfd760cb7af29db09cfae365ec3c83cdcd729
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Simmons 755636d10e Use NonZeroU32 to ensure settings tabsize cannot be zero 2022-06-23 12:55:38 -07:00
Keith Simmons 484e98c0bb Merge pull request #1216 from zed-industries/hover-context-menu-fix 
Don't trigger hover popover action when mouse is over context menu
 2022-06-21 13:43:24 -07:00
Keith Simmons 19feb627d8 Add comment linking to long term plan 2022-06-21 12:38:27 -07:00
Keith Simmons 057a7ec989 Don't trigger hover popover action when mouse is over context menu 2022-06-21 11:23:25 -07:00
Keith Simmons e88f115467 Merge pull request #1213 from zed-industries/hover-dismiss-fix 
hide hover on editor blur
 2022-06-21 10:47:52 -07:00
Keith Simmons fb881b2eda hide hover on editor blur 2022-06-21 10:37:59 -07:00
Keith Simmons 8e440bf7ca Merge pull request #1166 from zed-industries/hover-fixes 
Always delay hover display
 2022-06-09 18:18:01 -07:00
Keith Simmons 02f0fee6ae Always delay hover display 2022-06-09 18:08:23 -07:00
Keith Simmons 699f14ff73 Merge pull request #1144 from zed-industries/hover-fixes 
Hover fixes. Addresses delay issues with current hover implementation, shrinks the hover popover, and tweaks the display of markdown data
 2022-06-09 17:18:26 -07:00
Keith Simmons e21d1b1acb Merge fix 2022-06-09 17:07:32 -07:00
Keith Simmons 3cec157335 fix compile error in EditorLspTestContext 2022-06-09 17:03:45 -07:00
Keith Simmons 8378590d57 Test fixes 2022-06-09 17:03:45 -07:00
Keith Simmons 93158bfcff Fix delayed lsp request 2022-06-09 17:03:45 -07:00
Keith Simmons 722023e347 test and build fixes 2022-06-09 17:03:45 -07:00
Keith Simmons dddfc7beae Add hover test and tweak dismiss logic 2022-06-09 17:03:45 -07:00
Keith Simmons 1da1853a76 Hide hover when font changes, and handle case where delay was preventing hover with large symbol range 2022-06-09 17:03:44 -07:00
Keith Simmons b51bd87c10 Rework hover delay, respect editor font size, and enable hover in multibuffers 2022-06-09 17:03:44 -07:00
Keith Simmons ee33fb03f2 wip 2022-06-09 17:03:44 -07:00
Keith Simmons 9d5111e86a Merge pull request #1078 from zed-industries/lsp-hover 
LSP Hover Information
 2022-06-07 14:45:43 -07:00
Keith Simmons 1b66e1e185 Add integration test and fix hovering over the wire 2022-06-07 14:22:02 -07:00
Keith Simmons a6c0ee472c Add vim bindings for hover 
Allow scrolling in hover popover
 2022-06-07 13:07:53 -07:00
Keith Simmons 67d9abc00f Move highlighting to editor code and implement proto message types for hover response 2022-06-07 11:54:52 -07:00
Keith Simmons c7cc07aafb working markdown rendering 2022-06-07 11:54:51 -07:00
Keith Simmons b014352740 Syntax highlighting working. Getting started on markdown support 2022-06-07 11:54:33 -07:00
Keith Simmons 560dff7329 Pull hover popover out of context menu 2022-06-07 11:54:00 -07:00
Keith Simmons 0ed8a42bb4 WIP 2022-06-07 11:49:28 -07:00
Keith Simmons 02249dc2e8 Rework darkest color in base16, shadows, and add hoverPopover styleTree 2022-06-07 11:47:38 -07:00
Keith Simmons 0c4f798a2d WIP jump to definition with mouse 2022-06-07 11:47:23 -07:00
Keith Simmons 4a5317b6e4 Remove unused context_menu file in rust crate 2022-05-27 11:32:15 -07:00
Keith Simmons 48abbb7e63 Merge pull request #1019 from zed-industries/vim-visual-line-mode 
Vim visual line mode
 2022-05-27 11:22:56 -07:00
Keith Simmons 8e7c6871db Track selection changes in mutable selections collection 2022-05-26 17:02:05 -07:00
Keith Simmons d11bc2a4b7 Fixup paste locations 2022-05-26 17:02:05 -07:00
Keith Simmons e104cb94e7 fix bug in marked_range utils 2022-05-26 17:02:05 -07:00
Keith Simmons 98f9575653 WIP 2022-05-26 17:02:05 -07:00
Keith Simmons e93c49f4f0 Unify visual line_mode and non line_mode operators 2022-05-26 17:02:05 -07:00
Keith Simmons 11569a869a in progress working on aborting operators on unhandled editor input 2022-05-26 17:02:05 -07:00
Keith Simmons 61f0daa5c5 Visual line mode handles soft wraps 2022-05-26 17:02:05 -07:00
Keith Simmons 33940b5dd9 Add visual line mode operator tests 2022-05-26 17:02:05 -07:00
Keith Simmons 082036161f Enable copy and paste in vim mode 2022-05-26 17:02:05 -07:00
Keith Simmons d094d1d891 WIP copy on delete 2022-05-26 17:02:05 -07:00
Keith Simmons f8f316cc64 Working change and delete in line mode 2022-05-26 17:02:05 -07:00
Keith Simmons d7d17b2148 WIP line mode operations 2022-05-26 17:02:05 -07:00
Keith Simmons 8044586296 Merge pull request #1070 from zed-industries/fix-seed-script 
Fix failing seed bin build and add bin builds to ci pipeline
 2022-05-26 17:01:31 -07:00
Keith Simmons 125d83b3ec Fix failing seed bin build and add bin builds to ci pipeline 2022-05-26 15:41:24 -07:00
Keith Simmons 42e88c43a4 Use npm install rather than ci and only run build.rs when styles/src is changed rather than all styles 2022-05-25 11:08:40 -07:00
Keith Simmons e05695c4a6 Add onMedia text color for use in disconnect overlay text 2022-05-23 14:34:34 -07:00
Keith Simmons 1bf5f361d3 Merge pull request #1022 from zed-industries/editor-clone-selections 
Clone selections on editor split
 2022-05-19 12:49:43 -07:00
Keith Simmons bacfed37b7 Clone selections on editor split 2022-05-19 11:22:53 -07:00
Keith Simmons 25427f0ff8 Merge pull request #999 from zed-industries/update-theme-system 
Rework color schemes
 2022-05-16 15:28:18 -07:00
Keith Simmons a7937f2d48 Merge pull request #997 from zed-industries/fix-outline-panic 
Make multibuffer read pub(crate) and replace with accessors
 2022-05-13 17:07:43 -07:00
Keith Simmons a2fd41174f Reduce accessibility of multibuffer read to reduce risk of borrowing snapshot and buffer refcells twice 2022-05-13 16:58:30 -07:00
Keith Simmons 2f7eb6dbc5 Merge pull request #973 from zed-industries/selections-refactor 
Pull selections out of editor into selections collection
 2022-05-13 16:07:26 -07:00
Keith Simmons 45ea3d4c38 Review fixes 2022-05-13 15:55:27 -07:00
Keith Simmons 20c97637a4 minor tweaks to selections collection api 2022-05-13 15:55:27 -07:00
Keith Simmons c3a36e6d8a Rename selected_ranges and selected_display_ranges to remove redundant selected 2022-05-13 15:55:27 -07:00
Keith Simmons de9dc27980 store buffer and display_map model handles on selections collection 2022-05-13 15:55:27 -07:00
Keith Simmons db0a9114c2 Passing tests and removed local argument. Also pulled autoscroll argument out to change_selections 2022-05-13 15:55:27 -07:00
Keith Simmons c9dcfff607 Move selection helpers to SelectionCollection, add update_anchor_selections, add a number of invariant preserving mutation functions to the MutableSelectionCollection 2022-05-13 15:55:17 -07:00
Keith Simmons 61b4a4202f Merge pull request #984 from zed-industries/deterministic-marked-text-ranges 
Order returned ranges from marked_text_ranges by start index
 2022-05-11 10:31:33 -07:00
Keith Simmons a33ef65f57 Order returned ranges from marked_text_ranges by start index 2022-05-11 10:18:40 -07:00
Keith Simmons 93f8f47cc0 Merge pull request #980 from zed-industries/coerce-multibuffer-changes 
Filter overlapping multibuffer edits
 2022-05-10 14:45:35 -07:00
Keith Simmons c4738d7316 Add test coverage for same cursor in multiple excerpts of the same buffer 2022-05-10 14:30:27 -07:00
Keith Simmons 68de51ba8a Fix multiple cursors inserting repeated text in multibuffers 2022-05-10 13:32:27 -07:00
Keith Simmons 6c57fcf9be Merge pull request #968 from zed-industries/vim-visual-mode 
Vim visual mode
 2022-05-10 12:51:58 -07:00
Keith Simmons 3f1640a9a0 Fix up assertion errors in set_eq and visual tests 2022-05-10 11:12:34 -07:00
Keith Simmons 37c921f972 Initial visual mode 2022-05-10 11:12:28 -07:00
Keith Simmons 5e2e859413 Merge pull request #947 from zed-industries/misc-normal-commands 
Misc vim normal commands
 2022-05-03 10:29:29 -07:00
Keith Simmons 797aecf7c1 Don't reset vim mode on editor focus 2022-05-02 11:49:10 -07:00
Keith Simmons b2138f5935 Add insert line above and below 2022-05-02 11:49:10 -07:00
Keith Simmons 833a7b6e76 WIP just missing insert line above and below 2022-05-02 11:49:10 -07:00
Keith Simmons d4bef67cf2 Merge pull request #929 from zed-industries/non-uniform-batched-edits 
Allow batched edits where each range is associated with different insertion text
 2022-04-29 16:14:38 -07:00
Keith Simmons 2eb1c107ce Convert common edit strings to Arc<str> and simplify duplicate line 2022-04-29 14:57:20 -07:00
Keith Simmons b4b61b4bbc Consolidate edit and edit_batched functions 2022-04-28 16:52:04 -07:00
Keith Simmons 74b467aaa8 tweak editor selection mutating functions 2022-04-28 13:46:06 -07:00
Keith Simmons 42b900774e add anchor to selection fixup info in newline 2022-04-28 13:10:31 -07:00
Keith Simmons 4c860dc82f Removed unnecessary debug statements 2022-04-28 09:20:56 -07:00
Keith Simmons 04fc1d5982 Building, but failing test WIP 2022-04-27 17:25:38 -07:00
Keith Simmons 5ab21cc0fd Merge pull request #891 from zed-industries/solarized 
Add solarized dark and light syntax themes
 2022-04-22 15:13:52 -07:00
Keith Simmons 50b5b56f60 Update solarized theme to match main 2022-04-22 15:04:45 -07:00
Keith Simmons a1576b7dca fix solarized element backgrounds 2022-04-22 14:58:45 -07:00
Keith Simmons d0ee686e09 add solarized dark and light syntax themes 2022-04-22 14:58:45 -07:00
Keith Simmons c61ae6f31f Merge pull request #877 from zed-industries/misc-normal-commands 
Add inclusive vs exclusive motions to vim mode
 2022-04-22 14:25:56 -07:00
Keith Simmons 5ea782de21 Add inclusive vs exclusive motions to vim mode 2022-04-21 16:50:23 -07:00
Keith Simmons b1f9d9d8ba Merge pull request #851 from zed-industries/vim-delete-jk-fix 
Linewise motions fix
 2022-04-20 14:34:05 -07:00
Keith Simmons 8ff0277103 Handle linewise motions correctly and fix panic when executing invalid actions 2022-04-19 11:36:44 -07:00
Keith Simmons 5c6a2ac7e6 Merge pull request #812 from zed-industries/js-jsx-language 
Add javascript and jsx specific languages
 2022-04-18 16:19:54 -07:00
Keith Simmons 26f2aa4d69 Swap to parsing javascript as jsx 2022-04-18 15:26:57 -07:00
Keith Simmons eb77976c9f Merge pull request #825 from zed-industries/vim-change-delete 
Add c and d operators to vim normal mode
 2022-04-18 15:21:58 -07:00
Keith Simmons dd25ab5798 Revert d/c j and k binding special casing 2022-04-18 14:44:11 -07:00
Keith Simmons 63278041e1 Add c and d operators to vim normal mode 
Extracted motions from normal mode
Changed vim_submode to be vim_operator to enable better composition of operators
 2022-04-15 16:05:50 -07:00
Keith Simmons 292d075f81 Store accessors for editor highlight colors not colors themselves 2022-04-13 15:30:57 -07:00
Keith Simmons 4b55b578b2 Don't panic when allocating tiny_skia pixmap 2022-04-13 14:57:16 -07:00
Keith Simmons b893cb6d82 rename NavigationData anchor and offset to cursor_anchor and cursor_offset 2022-04-13 14:53:47 -07:00
Keith Simmons 8cde15cb72 Notify when buffer search matches change 2022-04-13 14:49:18 -07:00
Keith Simmons 9cec6d8d65 add comment explaining offsets 2022-04-13 13:30:07 -07:00
Keith Simmons f20e3f35a1 Record scroll position in nav history 2022-04-13 12:30:33 -07:00
Keith Simmons 544ca443e3 Add javascript and jsx specific languages 2022-04-13 10:58:42 -07:00
Keith SimmonsandMax Brunsfeld 4249b5687e Implement font fallback in layout_line 
Co-authored-by: Max Brunsfeld <max@zed.dev>
 2022-04-13 11:42:19 +02:00
Keith Simmons 1d8afdff80 Set tsx default indent to 2 and remove js from extension list in tsx config.toml 2022-04-11 17:34:44 -07:00
Keith Simmons 28da5b4afc Don't focus active editor when deploying project search and focus query editor on project search focus 2022-04-11 17:05:24 -07:00