mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 10:40:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8
18379 commits 775 branches 798 tags 252 MiB
Commit graph

433 commits

Author SHA1 Message Date
Mikayla Maki
c3325430ca Fix divide by 0 in terminal 
Fix fail to remove contact in contact list
 2023-03-16 12:31:50 -07:00
Joseph Lyons
0a3f0c5252 Use terminal titles for buttons 2023-03-07 15:04:12 -05:00
Petros Amoiridis
fbd23986e3
Merge pull request #2161 from zed-industries/community/3-reveal-in-finder 
Introduce Reveal in Finder
 2023-02-15 16:11:04 +02:00
Petros Amoiridis
7a667f390b
Use open_url from the platform module 
And remove the open function from the `util` crate.
 2023-02-15 15:58:57 +02:00
Mikayla Maki
8e9d95fefc Fix error where terminal search matches wouldn't be updated when clearing 2023-02-14 09:54:31 -08:00
Petros Amoiridis
5d23aaacc8
Introduce an open function 
And refactor some of the older code to simplify it

Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-02-10 21:11:54 +02:00
Mikayla Maki
d060114f00 Added complete scripts for generating third party license files 2023-01-23 12:47:12 -08:00
Kay Simmons
73e7967a12 working f and t bindings 2023-01-06 14:24:20 -08:00
Mikayla Maki
c42da5c9b9 WIP 2022-12-08 20:21:00 -08:00
Mikayla Maki
2733f91d8c Fix bugs resulting from refactoring the terminal into project and workspace halves 2022-12-08 20:21:00 -08:00
Mikayla Maki
83aefffa38 Rearrange the terminal code to not have a cyclic dependency with the project 2022-12-08 20:21:00 -08:00
Mikayla Maki
1b8763d0cf WIP - move terminal to project as pre-prep for collaboration 2022-12-08 20:21:00 -08:00
Mikayla Maki
5e240f98f0 Reworked thread safe connection be threadsafer,,,, again 
Co-Authored-By: kay@zed.dev
 2022-12-03 16:06:02 -08:00
Kay Simmons
8a48567857 Reactivate the correct item in each pane when deserializing 2022-12-03 16:06:01 -08:00
Kay Simmons
dd9d20be25 Added sql! proc macro which checks syntax errors on sql code and displays them with reasonable underline locations 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-12-03 16:06:01 -08:00
Kay Simmons
359b8aaf47 rename sql_method to query and adjust the syntax to more closely match function definitions 2022-12-03 16:06:01 -08:00
Kay Simmons
1cc3e4820a working serialized writes with panics on failure. Everything seems to be working 2022-12-03 16:06:01 -08:00
Mikayla Maki
3e0f9d27a7 Made dev tools not break everything about the db 
Also improved multi statements to allow out of order parameter binding in statements
Ensured that all statements are run for maybe_row and single, and that of all statements only 1 of them returns only 1 row
Made bind and column calls add useful context to errors

Co-authored-by: kay@zed.dev
 2022-12-03 16:06:01 -08:00
Mikayla Maki
37174f45f0 Touched up sql macro 2022-12-03 16:06:01 -08:00
Mikayla Maki
76c42af62a Finished terminal working directory restoration 2022-12-03 16:06:01 -08:00
Mikayla Maki
e1eff3f4cd WIP: Some bugs switching to database provided IDs, terminal titles don't reload when restored from serialized, workspace tests are no longer passing but should be easy to fix when it isn't 11:44 2022-12-03 16:06:01 -08:00
Mikayla Maki
a47f2ca445 Added UUID based, stable workspace ID for caching on item startup. Completed first sketch of terminal persistence. Still need to debug it though.... 2022-12-03 16:06:01 -08:00
Mikayla Maki
e659823e6c WIP termial implementation. need some way of getting the currently valid workspace ID 2022-12-03 16:06:01 -08:00
Mikayla Maki
a8ed95e1dc Implementing persistence for the terminal working directory, found an issue with my current data model. :( 2022-12-03 16:06:01 -08:00
Mikayla Maki
992b94eef3 Rebased to main 2022-12-03 16:06:01 -08:00
Kay Simmons
75d3d46b1b wip serialize editor 2022-12-03 16:06:01 -08:00
Kay Simmons
d20d21c6a2 Dock persistence working! 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-12-03 16:06:01 -08:00
Kay Simmons
c1f7902309 wip 2022-12-03 16:06:01 -08:00
Mikayla Maki
3451a3c7fe Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :( 
Co-Authored-By: kay@zed.dev
 2022-12-03 16:04:10 -08:00
Mikayla Maki
ce0dfde8ee Check for wakeups correctly 2022-11-17 11:14:31 -08:00
Mikayla Maki
8e6c5dbc3b Fix unscaled scrolling when using an imprecise mouse wheel 2022-11-16 10:44:13 -08:00
Mikayla Maki
01929037f1 fixed clear problem 2022-11-15 12:02:09 -08:00
Mikayla Maki
0dcdd6ea39
Merge pull request #1889 from zed-industries/terminal-bugs 
Refactored rendering to squash all wakeups into 1
 2022-11-14 10:29:00 -08:00
Mikayla Maki
a66aa9c09c Refactored rendering to squash all wakeups into 1 2022-11-14 10:20:55 -08:00
Mikayla Maki
4c2f8406c7 Restored chat_panel, just in case 2022-10-19 11:42:29 -07:00
Nathan Sobo
f8e5a08324
Merge pull request #1764 from zed-industries/gpui-events 
Eliminate dispatch_event on Element trait
 2022-10-18 15:24:13 -06:00
K Simmons
b0ddbeb0ad Merge branch 'main' into elevations 2022-10-18 12:47:15 -07:00
Mikayla Maki
895aeb033f
Merge branch 'main' into breadcrumbs 2022-10-17 16:51:38 -07:00
K Simmons
40c3e925ad Add cursor blink setting and replicate cursor shape to remote collaborators 2022-10-17 16:20:47 -07:00
Mikayla Maki
5ef5147780
Merge branch 'main' into gpui-events 2022-10-17 15:43:41 -07:00
Mikayla Maki
1789dfb8b1 Fixed tests 2022-10-17 14:53:52 -07:00
Mikayla Maki
f1ff557a25 Rearranged mouse handling 2022-10-16 17:31:19 -07:00
Nathan Sobo
12eab6551f Remove dispatch_event from Element trait 2022-10-16 13:08:25 -06:00
Nathan Sobo
d25c6b15a6 Move Terminal key down event handling from element to View::key_down method 2022-10-16 12:55:02 -06:00
Nathan Sobo
6e363e464c Start on view-level dispatch approach for keyboard events 2022-10-16 11:46:31 -06:00
Nathan Sobo
6e53deb1b2 Refine mouse event naming 2022-10-16 11:18:58 -06:00
Mikayla Maki
d301a215f7 Finished implementing vscode, emacs, and mac style pageup/down. Added keybindings ctrl-v, alt-v for emacs up/down and shift-pageup, shift-pagedown for vscode style. Also improved incorporated pageup/down into context menus 2022-10-14 13:52:30 -07:00
Antonio Scandurra
a5a60eb854 Log view name alongside error in ChildView 2022-10-13 15:44:01 +02:00
Mikayla Maki
aac24938f5 Fix a bug in how I parse alacritty's styles 2022-10-12 09:34:17 -07:00
Antonio Scandurra
a656047c15
Merge pull request #1700 from zed-industries/room 
Introduce call-based collaboration
 2022-10-11 17:40:44 +01:00
Antonio Scandurra
45d118f96f Decide whether to clip to visible bounds on a per-element basis 
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
 2022-10-11 17:05:13 +02:00
Julia
7d6690335f
Merge pull request #1712 from zed-industries/dont-select-on-copy-by-default-terminal 
Don't select on copy by default in the terminal
 2022-10-10 14:15:20 -04:00
Julia
2f96a09c46 Don't select on copy by default in the terminal 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-10-10 13:48:56 -04:00
Mikayla Maki
15595a67fa Added a horrible hacky way of doing cmd-k correctly. 2022-10-07 12:04:26 -07:00
Mikayla Maki
bf50a8ad8e Implemented a simplistic version of correct cmd-k behavior 2022-10-07 11:37:39 -07:00
Mikayla Maki
188b775fa6 Fixed non-block terminal cursors being displayed incorrectly 2022-10-07 10:03:09 -07:00
Mikayla Maki
9b32678b05 Fixed terminal stealing focus 2022-09-27 16:43:32 -07:00
Mikayla Maki
9a59603065 Added a SendKeystroke action and rewrote terminal actions to remove duplication 2022-09-26 20:39:40 -07:00
Mikayla Maki
24cc9859c7 Added terminal::SendText command, for sending text to the terminal 2022-09-26 20:01:05 -07:00
Mikayla Maki
2ae3fbd6b2 Improved terminal selection ergonomics 2022-09-26 19:37:55 -07:00
Mikayla Maki
a8e05c946e Fixed bug where hyperlinks would not be refreshed when the page scrolled 2022-09-26 17:46:19 -07:00
Mikayla Maki
550ae40ff5 Slightly improved left click handling 2022-09-26 16:36:08 -07:00
Mikayla Maki
4bc0afdafa Finished terminal hyperlinks for now 2022-09-26 16:33:29 -07:00
Mikayla Maki
d2d49633f1 WIP, almost done with tooltips 2022-09-24 08:32:06 -07:00
Mikayla Maki
a686a9f1d2
Merge branch 'main' into terminal-hyperlinks 2022-09-22 23:06:07 -07:00
Mikayla Maki
0584b2f5f0 added the fields for drawing the hyperlinks 2022-09-22 23:04:49 -07:00
Mikayla Maki
5cd56584b4 Completed terminal hyperlink clicking functionality. Just need to display it now 2022-09-22 22:40:22 -07:00
K Simmons
db5c83eb36 add theme testbench command 2022-09-21 16:32:44 -07:00
K Simmons
56f9543a95 reworked style tree to use colorScheme instead of old theme. Very limited style for now 2022-09-21 16:32:42 -07:00
Mikayla Maki
f706cbe143 WIP hyperlink searching 2022-09-20 11:20:57 -07:00
Mikayla Maki
b3202c382d WI{ 2022-09-19 17:21:24 -07:00
Mikayla Maki
ba32dcbb88 Reworking hyperlink events 2022-09-19 17:19:03 -07:00
Mikayla Maki
b8f362fd84 WIP hyperlink detection 2022-09-19 13:41:35 -07:00
Mikayla Maki
9f81f39f51 WIP Hyperlinks 2022-09-19 09:07:41 -07:00
Mikayla Maki
1993a870e1 Hyperlink clicking is working 2022-09-18 23:33:06 -07:00
Mikayla Maki
ac390745a7 WIP hyperlinks 2022-09-16 19:35:18 -07:00
K Simmons
1ce48f4a94 Minor improvements to dock visuals, rework dock keybindings, and fix panic on split when dock is active 2022-09-16 12:55:36 -07:00
Mikayla Maki
4dbded3f02 Implemented cell for mouse pointer 2022-09-14 15:41:55 -07:00
Kay Simmons
29f46539f0
Merge pull request #1614 from zed-industries/dock 
Dock
 2022-09-14 12:40:59 -07:00
K Simmons
ad77bb7b92 Fix mouse scroll in terminal items 2022-09-13 17:37:24 -07:00
K Simmons
0b5952e1bd Fix incorrect rendering of toolbar in right anchored dock 
Make dock keybinding activate the dock if it wasn't hidden, and hide it if it was already active
Make clicking the expanded dock wash, hide the dock
Fix some issues with programmatically activating other panes, not hiding the dock
Tweak dock anchor menu text
Swap dock hide button for thin variant
Fix dock sidebar interactions
Add clicked state to search button and fix presenter issue sending clicked events when mouse not overlapping MouseRegion

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-13 15:17:27 -07:00
Mikayla Maki
b45d5e83bb Added tests for alt->meta behavior 2022-09-13 09:39:29 -07:00
Mikayla Maki
9c42b92663 added alt as meta setting 2022-09-12 23:22:55 -07:00
K Simmons
6b26965074 Permanent fix to repeat MouseRegion Tag failure in Workspace 
Polish tab bar buttons

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-11 15:34:10 -07:00
K Simmons
69ecbb644d DOCK WORKING! 
Update editor element to use mouse regions instead of dispatch event for mouse events
Fix bug in presenter where mouse region handlers were stored on click and called instead of more up to date handlers from subsequent renders
Changed MouseRegion to require discriminants in all cases
Add scroll wheel event to MouseRegion
Polished a bunch of dock inconsistencies

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-11 15:32:20 -07:00
K Simmons
b88abcacac WIP dock split button and default item 2022-09-11 15:31:44 -07:00
Mikayla Maki
b9a6336995 Initial explorations into docks 2022-09-11 15:31:44 -07:00
Mikayla Maki
39d219c898 Start moving terminal modal into dock UI 2022-09-11 15:31:44 -07:00
K Simmons
31ecb2f7bc Introduced ItemEvent and to_item_events function to Item trait which converts the Item's events into a standard ItemEvent similar to how SearchableItems work. 
Add breadcrumb_location and breadcrumbs functions to item trait which handles rendering of the breadcrumb elements
Change breadcrumb toolbar to use these new functions rather than having hard coded breadcrumb logic
Add breadcrumb support to the terminal tabs

Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-06 16:05:36 -07:00
K Simmons
ab81093ef5 WIP pull breadcrumb rendering out into item trait 2022-09-06 14:39:58 -07:00
Mikayla Maki
6e6f37a84f updated wez term dependency 2022-09-06 10:33:40 -07:00
Mikayla Maki
68cf91de32 Problem with alacritty's handling of selections when the terminal resizes 2022-09-03 20:52:40 -07:00
Mikayla Maki
acc1950ab4 Fixed tiny resize bug 2022-09-03 19:59:56 -07:00
Mikayla Maki
7f7ec68427 Improved formatting of tab title 2022-09-03 14:45:45 -07:00
Mikayla Maki
cefc6e8705 fixed tab content crash, discovered a giant nest of new issues re: resizing 2022-09-03 14:23:49 -07:00
Mikayla Maki
93d31e4152 Fixed search to read entire back buffer 2022-09-03 13:54:18 -07:00
Mikayla Maki
ec8876bb40 Fixed the easy search bugs 2022-09-03 13:46:36 -07:00
Mikayla Maki
08b6fd09f9 Changed bel to use dirty indicator, took away the 'has new content' indicator 2022-09-02 23:23:33 -07:00
Mikayla Maki
a100956fbf removed test proc info, put fix in wezterm, just need to link them together now 2022-09-02 23:15:12 -07:00
Mikayla Maki
90bae80bb2 WIP fixing arguments in title bug, need to validate fix, add to wezterm, push to our copy, refresh our cargo, and make a PR for wezterm. TODO: Learn how to do c-style buffer munging. 2022-09-02 19:48:34 -07:00
Mikayla Maki
aabc6ce8bd Fixed terminal title showing program, WIP showing exe arguments 2022-09-02 18:22:53 -07:00
Mikayla Maki
1375c5f1a1 Began program manager, made terminal modals per-window 2022-09-02 16:45:58 -07:00
Mikayla Maki
d189972a0d Merge branch 'terminal-scrolling-sensitivity' into terminal-polishing 2022-09-02 15:48:49 -07:00
Mikayla Maki
1502c19208 Polished scrolling significantly 2022-09-02 15:47:35 -07:00
Mikayla Maki
7730039e31 Sketched out program manager API 2022-09-01 20:07:30 -07:00
Mikayla Maki
4779eebdce fix shift-enter 2022-09-01 17:56:22 -07:00
K Simmons
7497edaec2 Add process info to terminal so that we can show the active process in the terminal tab title 
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
 2022-09-01 17:46:11 -07:00
Max Brunsfeld
f87e7d3bed Avoid subtraction underflow when searching terminal 
Co-authored-by: Keith Simmons <keith@zed.dev>
 2022-09-01 14:06:16 -07:00
Mikayla Maki
ebae991cb2 Finished terminal search 2022-09-01 13:45:46 -07:00
Mikayla Maki
25aae1107b Added cursor I-Beam 2022-09-01 11:55:15 -07:00
Mikayla Maki
faad24542f Improved performance of terminal rendering further 2022-09-01 11:43:27 -07:00
Mikayla Maki
a8b8003980 ?? 2022-08-31 18:27:25 -07:00
Mikayla Maki
3f11fd3b8b Terminal implements important half of search protocol 2022-08-31 17:41:53 -07:00
Mikayla Maki
63d9d29762 Search rendering and basic regex stuff complete 2022-08-31 16:17:46 -07:00
Mikayla Maki
8e7d9cf22e search stuff 2022-08-31 16:17:46 -07:00
Mikayla Maki
f62b69adb4 Checkpoint commit, almost have the initial search research done. Don't forget to remove test keymap 2022-08-31 16:17:46 -07:00
Mikayla Maki
5a0f106005 restore modal terminal 2022-08-31 13:06:15 -07:00
K Simmons
8591c3f46d Merge branch 'main' into drag-and-drop 2022-08-25 16:32:11 -07:00
Mikayla Maki
c0db1ad5ef finished drag and scrolling 2022-08-23 15:26:08 -07:00
Mikayla Maki
fa10b44673 fixed scrolling and dragging now 2022-08-23 14:42:29 -07:00
Mikayla Maki
77670cbc7c Added scroll-to-edge. 2022-08-22 18:24:58 -07:00
K Simmons
9d20b66f2e Merge branch 'main' into drag-and-drop 2022-08-22 17:24:36 -07:00
K Simmons
13e9336049 Merge branch 'main' into drag-and-drop 2022-08-22 17:18:29 -07:00
Mikayla Maki
24155d3b27 Renamed all the terminal files 2022-08-22 16:49:01 -07:00
K Simmons
ab9f073443 fixed merge errors 2022-08-22 16:16:39 -07:00
K Simmons
133c194f4a wip tab drag and drop 2022-08-22 16:16:39 -07:00
Mikayla Maki
0a40cc0370 Added experimental keymaps support 2022-08-22 14:49:01 -07:00
Mikayla Maki
b6785c5624
Revert "Basic feature flag implementation" 2022-08-22 13:54:18 -07:00
Mikayla Maki
7efeb0662a Changed name to experiments 2022-08-22 13:27:36 -07:00
Mikayla Maki
9b6116e1e2 Basic feature flag implementation 2022-08-22 13:11:23 -07:00
Mikayla Maki
3ffe760ed3 Removed extra todos 2022-08-19 17:20:54 -07:00
Mikayla Maki
c42bf1c50b Fixed bug in mouse handler attaching 2022-08-19 17:19:35 -07:00
Mikayla Maki
399de91f55 Removed debugs, added keymap contexts to terminal 2022-08-19 16:27:27 -07:00
Mikayla Maki
1de68a724c Debugged mouse reporting for now. Remaining bugs are GPUI level bugs 2022-08-19 15:11:49 -07:00
Mikayla Maki
cfbda00cc4 Finished mouse compatability 2022-08-19 13:54:25 -07:00
Mikayla Maki
a279f83cd6 Finished majority of mouse work. Need to add a setting and change up mouse handlers, and it'll be done. 2022-08-19 13:03:29 -07:00
Mikayla Maki
efd3247ce4 Added modifiers to scroll wheel eevent 2022-08-19 12:10:12 -07:00
Mikayla Maki
a806634b82 Handlers attached, things are looking good 2 go 2022-08-19 11:41:17 -07:00
Mikayla Maki
04600d73fc Moved back to the drag handler, selections work again 2022-08-19 09:50:26 -07:00
Mikayla Maki
37ca7a6658 Half way done with mouse reporting 2022-08-18 17:37:24 -07:00
Mikayla Maki
a0d0c84eee Begin mouse mode 2022-08-18 13:28:55 -07:00
Mikayla Maki
2c4ea7f01d Remove todo 2022-08-18 13:24:00 -07:00
Mikayla Maki
aa98e5c3f7 Fixed scrolling on text input 2022-08-18 13:22:48 -07:00
Mikayla Maki
d545e59b49 Finished IME for now 2022-08-18 12:57:19 -07:00
Mikayla Maki
6652d41864 Fixed cursor blinking, added other cursor shape rendering 2022-08-18 11:28:18 -07:00
Mikayla Maki
acce0042f9 Fixed blink problems 2022-08-17 14:41:28 -07:00
Mikayla Maki
5ad746e53f Added alt screen mode check 2022-08-16 23:10:49 -07:00
Mikayla Maki
bf7b3150e4 Added show character palette. Need to position correctly. 2022-08-16 23:10:05 -07:00
Mikayla Maki
b9c73127b4 Added a hollow mode to the cursor rendering code, for terminal lost focus 2022-08-15 18:27:26 -07:00
Mikayla Maki
bba51c3ae6 Added cursor blink and settings 2022-08-15 18:05:07 -07:00