oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,605 Commits 1 Branch 0 Tags
a884bd77e11970b6094de04aa1774e9d672a55c0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Petros Amoiridis 21e1bdc8cd Fix yellow to be yellow 2023-05-10 17:37:36 -07:00
Petros Amoiridis 6b4242cded Use theme.editor.diff for the colors 2023-05-10 17:37:36 -07:00
Petros Amoiridis 5302c256a4 Rebase main and fix error 2023-05-08 14:33:59 -07:00
Petros Amoiridis ca4da52e39 Remove unused functions 2023-05-08 14:33:59 -07:00
Petros AmoiridisandMikayla Maki e057b0193f Introduce BrancesButton in title bar 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-05-08 14:33:58 -07:00
Petros Amoiridis 797d47a08c Render title root names without branches 2023-05-08 14:33:58 -07:00
Petros Amoiridis 92a222aba8 Introduce a version control branch icon 2023-05-08 14:33:58 -07:00
Petros AmoiridisandMikayla Maki d34ec462f8 Display branch information per worktree root 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-05-08 14:33:58 -07:00
Petros Amoiridis c9048b54c1 Merge pull request #2399 from zed-industries/petros/z-827-copy-the-newline-shortcuts-to-zed 
Add newline shortcuts for popular editors
 2023-04-21 19:09:10 +03:00
Petros Amoiridis 3992e95109 Add newline shortcuts for popular editors 2023-04-21 18:29:35 +03:00
Petros Amoiridis c3231047ad Merge pull request #2396 from zed-industries/petros/z-77-the-start-local-collaboration-script-no 
Fix script/start-local-collaboration
 2023-04-21 17:36:22 +03:00
Petros Amoiridis 65c5605e68 Look for the main display always 2023-04-21 17:18:01 +03:00
Petros Amoiridis 3c54b14c5b Remove debugging information 2023-04-21 17:17:04 +03:00
Petros Amoiridis 7b4b1d6312 Use regex to make extraction bulletproof 2023-04-20 20:06:33 +03:00
Petros Amoiridis dcc804783c Install jq if it's missing 2023-04-20 19:06:23 +03:00
Petros Amoiridis 460ea8e16c Increase reliability and support multiple monitors 2023-04-20 19:06:23 +03:00
Petros Amoiridis b11e239779 Make the script more reliable 2023-04-20 19:06:22 +03:00
Petros Amoiridis 21e39e7523 Merge pull request #2394 from zed-industries/petros/z-804-change-default-settings-for-json-to-2 
Set default tab_size for JSON to 2 and apply new formatting
 2023-04-20 14:45:52 +03:00
Petros Amoiridis eca93c124a Apply the tab_size change to keymaps and settings 2023-04-20 14:08:30 +03:00
Petros Amoiridis bed76462e2 Define tab_size equal to 2 in default settings 2023-04-20 14:06:43 +03:00
Petros Amoiridis 699b2060b3 Merge pull request #2390 from zed-industries/petros/z-66-command-to-add-a-new-line-on-the 
Add newline above and improve newline below
 2023-04-19 21:02:55 +03:00
Petros AmoiridisandMax Brunsfeld b3b8f8532d Assert the editor and unmarked texts are the same 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-04-19 20:52:01 +03:00
Petros AmoiridisandJulia f9c60b98c0 Add newline above and improve newline below 
Add a new action for inserting a new line above the current line. @ForLoveOfCats  also helped fix a bug among other things. When two collaborators had their cursors at the end of a line, and one collaborator performed a newline below action, the second collaborator's cursor would be dragged to the new line. This is also fixing that.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-04-19 19:57:23 +03:00
Petros Amoiridis 69557655ee Merge pull request #2346 from zed-industries/petros/z-360-dragging-file-from-tree-to-split-results 
Fix dragging file from tree to split results in empty pane
 2023-04-03 16:43:12 +03:00
Petros AmoiridisandAntonio Scandurra 5a397726d2 Do not drop the task 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-04-03 16:36:08 +03:00
Petros Amoiridis 007aa92581 Merge pull request #2323 from zed-industries/petros/z-402-recent-projects-replace-expanded-home 
Replace home directory with the tilde substitution
 2023-03-30 18:12:39 +03:00
Petros Amoiridis dc51735112 Fix doctests 2023-03-30 17:57:14 +03:00
Petros AmoiridisandAntonio Scandurra adc5ef911f Remove the Errors section from rust docs 
The section does not add anything that we don't already know.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-30 14:04:37 +03:00
Petros Amoiridis 18c6c7ebb7 Fix error 2023-03-30 14:03:59 +03:00
Petros AmoiridisandAntonio Scandurra 9ef3e45bcd Update crates/recent_projects/src/highlighted_workspace_location.rs 
Co-authored-by: Antonio Scandurra <me@as-cii.com>
 2023-03-30 11:35:17 +03:00
Petros Amoiridis b15632bd45 Remove convert_to_shortened_path from gpui platform 2023-03-29 17:41:01 +03:00
Petros Amoiridis b4593cd90b Use util::paths::compact 2023-03-29 17:40:39 +03:00
Petros Amoiridis 69989d0463 Introduce compact function in util create 2023-03-29 17:32:27 +03:00
Petros Amoiridis d5f53111e8 Enable doctests in util crate 2023-03-29 17:31:55 +03:00
Petros AmoiridisandJoseph T. Lyons a128439699 Move code into the platform 
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com>
 2023-03-29 16:25:13 +03:00
Petros Amoiridis 87c1b190a8 Replace home directory with the tilde substitution 2023-03-29 16:25:10 +03:00
Petros Amoiridis eb7c6028f4 Merge pull request #2320 from zed-industries/petros/z-349-make-restart-to-update-zed-look 
Make "Restart to update Zed" look clickable
 2023-03-27 20:19:06 +03:00
Petros Amoiridis b153bf7118 Add a hovered style to lspStatus background 2023-03-27 14:26:56 +03:00
Petros Amoiridis 374b284a3d Run prettier on TS files 2023-03-27 14:26:05 +03:00
Petros Amoiridis 566a04ebca Merge pull request #2311 from zed-industries/petros/z-279-add-terminals-count 
Add terminals count
 2023-03-23 10:52:01 +02:00
Petros Amoiridis fd9eff3a78 Remove struct 2023-03-22 19:28:06 +02:00
Petros AmoiridisandMikayla Maki bd1515cdd2 Only show count when we have terminals 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-03-22 18:23:41 +02:00
Petros Amoiridis 15406ff2d9 Remove comment 2023-03-22 16:31:42 +02:00
Petros AmoiridisandAntonio Scandurra d5bb2d13b8 Introduce terminal button count 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-03-22 16:13:58 +02:00
Petros Amoiridis aa7254167a Fix typo 2023-03-22 15:31:21 +02:00
Petros Amoiridis 98ae69a61f Merge pull request #2282 from zed-industries/petros/z-283-make-pop-up-positioning-consistent 
Consistent pop-up menu positions
 2023-03-20 17:55:40 +02:00
Petros AmoiridisandJulia 24bbca7326 Position pane new, split, and dock context menus 
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-03-20 17:49:33 +02:00
Petros Amoiridis 3bddf01962 Run prettier to format things 2023-03-17 14:05:49 +02:00
Petros Amoiridis 86ed5b8b83 Position contacts and user menus 
Using the new approach for consistency
 2023-03-17 14:05:46 +02:00
Petros Amoiridis e7f78c4f74 Merge pull request #2281 from zed-industries/petros/z-298-the-terminal-button-is-not-shown-for 
Remove check for staffmode
 2023-03-14 00:12:13 -07:00
Petros Amoiridis 8980df1f5d Remove feature flag 
It wasn't working in production anyway
 2023-03-14 09:05:04 +02: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
Petros AmoiridisandAntonio Scandurra 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 d2411a6c86 Merge pull request #2253 from zed-industries/joseph/z-226-add-terminal-popup-menu 
Add terminal pop up menu
 2023-03-13 02:47:44 -07:00
Petros AmoiridisandAntonio Scandurra 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
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 AmoiridisandMikayla Maki 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
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
Petros AmoiridisandMax Brunsfeld ad7e49ed06 Give focus to the selected terminal 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-03-08 19:47:57 +02:00
Petros Amoiridis baa9e271d5 Make pop up open on the side of the button 2023-03-08 11:00:30 +02:00
Petros Amoiridis a2f75eb031 Merge pull request #2240 from zed-industries/petros/update-setup-instructions 
Add missing steps to the setup instructions
 2023-03-03 11:47:38 -08:00
Petros Amoiridis 6194c5df16 Add missing steps to the setup instructions 2023-03-03 11:36:26 -08: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
Petros AmoiridisandJulia 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 AmoiridisandJulia 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
Petros AmoiridisandJulia 2ec5c88f98 Make icon width match other areas 
This was 8 but we've seen areas where this was 14, like the project search tab icon. We want to match this.

Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com>
 2023-02-22 20:25:39 +02:00
Petros Amoiridis 6551742c58 Merge pull request #2191 from zed-industries/petros/z-53-reveal-in-finder-crashes-zed 
Move reveal_path to ForegroundPlatform
 2023-02-20 19:09:54 +02:00
Petros AmoiridisandAntonio Scandurra 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
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
Petros Amoiridis 015b8db1c3 Introduce reveal_path in Platform 
And implement it for MacPlatform, and instead of using an external process to run `open`, use the NSWorkspace selectFile instance method.
 2023-02-14 15:14:15 +02:00
Petros AmoiridisandMikayla Maki 9143790602 Include code only on macOS 
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-02-11 11:12:46 +02:00
Petros AmoiridisandMikayla Maki 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
Petros AmoiridisandMikayla Maki a789476c95 Introduce reveal_in_finder function 
And use this function in a new Reveal in Finder option of the project panel context menu.

Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
 2023-02-10 21:11:05 +02:00
Petros AmoiridisandMax Brunsfeld e15ffc8560 Make truncate_and_trailoff a bit more clear 
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
 2023-02-07 20:06:20 +02:00
Petros Amoiridis 9bff82f161 Use truncate_and_trailoff function 
A function that already works with unicode characters.
 2023-02-07 19:25:57 +02:00
Petros Amoiridis be0241bab1 Add test for string with unicode characters 2023-02-07 19:25:07 +02:00
Petros Amoiridis 3014cc5299 Do not capitalize prepositions in title case 
This also match the app menu
 2023-02-03 12:16:09 +02:00
Petros Amoiridis d6b728409f Be consistent in the app & context menus 2023-02-03 12:14:13 +02:00
Petros Amoiridis 433f284571 Merge pull request #2126 from zed-industries/731-make-cursor-visible-immediately 
Focus the editor when activating previous pane
 2023-02-03 10:12:34 +02:00
Petros AmoiridisandAntonio Scandurra 2b0592da21 Guard against tab_bar_context_menu 
We don't want to have the tab_bar_context_menu as the active item of the pane where the split started from

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-02 20:15:43 +02:00
Petros AmoiridisandAntonio Scandurra 8f61134e7e Allow comparing ViewHandle to AnyViewHandle 
Since they both have a window_id and a view_id.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-02-02 20:15:40 +02:00
Petros Amoiridis 489be5e77b Merge pull request #2077 from zed-industries/2064-remove-contacts 
Remove contact from contact list
 2023-01-26 20:04:15 +02:00
Petros AmoiridisandAntonio Scandurra 73af155dd6 Refactor Database::remove_contact 
Refactor it to avoid sending irrelevant messages to update the UI.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-26 19:01:51 +02:00
Petros Amoiridis 2f26fcd889 Merge branch 'main' into 2064-remove-contacts 2023-01-26 16:34:17 +02:00
Petros Amoiridis 160870c9de Improve user notification 
The message is not really true. When one declines, the other person can notice that the contact request  is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
 2023-01-25 19:46:51 +02:00
Petros AmoiridisandAntonio Scandurra 35524db136 Add a confirmation prompt 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 18:55:08 +02:00
Petros AmoiridisandAntonio Scandurra e928c1c61e Test removing a contact 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 17:31:42 +02:00
Petros AmoiridisandAntonio Scandurra 5d4eb2b7ae Push responder and requester to remove_contacts 
When we ask the server to remove a contact we need to push the requester and responder ids to `remove_contacts` so that when the UI updates, the correct contacts will disappear from the list.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Petros AmoiridisandAntonio Scandurra db978fcb6c Add an x mark icon to the list of contacts 
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.

Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-25 13:10:29 +02:00
Petros Amoiridis 6c9422808a Merge pull request #2048 from zed-industries/408-add-date-to-zedlog 
Add date to the log format
 2023-01-19 20:26:01 +02:00
Petros AmoiridisandMikayla d30e129d63 Create files passed as args to CLI 
Co-Authored-by: Mikayla <mikayla@zed.dev>
 2023-01-19 19:38:05 +02:00
Petros AmoiridisandMikayla f088de5947 Add date to the log format 
Co-Authored-By: Mikayla <mikayla@zed.dev>
 2023-01-19 19:05:17 +02:00
Petros Amoiridis 6cc84a77c8 Merge pull request #2042 from zed-industries/fix-pasting-files 
Allow pasting the same entry more than once in project panel
 2023-01-18 18:37:31 +02:00
Petros AmoiridisandAntonio Scandurra 27a6951403 Allow pasting the same entry more than once in project panel 
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
 2023-01-18 17:35:21 +02:00