Commit Graph
4924 Commits
Author SHA1 Message Date
Mikayla Maki e628b49dfd First pass at selections complete 2022-07-07 17:31:38 -07:00
Mikayla Maki be94f614a7 fix merge conflicr 2022-07-07 17:24:55 -07:00
Mikayla Maki a564f34d3a Merge pull request #1300 from zed-industries/gpui-changes
GPUI change proposals
2022-07-07 17:21:58 -07:00
Mikayla Maki 8cb6e476f0 Fixed panic / bug around scrolling and selections in termainl 2022-07-07 17:19:53 -07:00
Mikayla Maki ca877245be Finished merge of drag update 2022-07-07 16:12:24 -07:00
Mikayla Maki bbd0c0d44d Merge branch 'main' into gpui-changes 2022-07-07 16:08:32 -07:00
Mikayla Maki 9fd2bf2fa1 Updated drag API to pass old,new, instead of delta,new 2022-07-07 16:07:24 -07:00
Nathan Sobo 805c06ee76 Merge pull request #1298 from zed-industries/mouse-region-refactor
Mouse Event Refactor
2022-07-07 16:43:36 -06:00
Mikayla Maki f86106a07e Fixed a bug around selecting a single cell 2022-07-07 15:24:06 -07:00
Mikayla Maki 1fab7be4b5 Finished selections for now 2022-07-07 15:10:08 -07:00
Mikayla Maki 5a1797cb21 Fixing merge conflicts 2022-07-07 14:56:38 -07:00
Mikayla Maki 59c8e8bdad Fixed integration test 2022-07-07 14:55:25 -07:00
Mikayla Maki ab0ca7d42a Added another minor test 2022-07-07 14:55:25 -07:00
Mikayla Maki 102f502c26 tidied up magic constants 2022-07-07 14:55:25 -07:00
Mikayla Maki cc985721c6 Added a small integration test 2022-07-07 14:55:25 -07:00
Mikayla Maki 2a6e23ff28 Hoisted assert clipboard into TestAppContext 2022-07-07 14:55:25 -07:00
Mikayla Maki 9209c0dfeb Fixed merge conflict 2022-07-07 14:55:22 -07:00
Mikayla Maki 7c0d9f411a Added copying 2022-07-07 14:55:03 -07:00
Mikayla Maki 8c1054fbb6 Fixed merge conflict 2022-07-07 14:54:58 -07:00
Mikayla Maki b5919c0555 Fixed merge conflict 2022-07-07 14:54:36 -07:00
Mikayla Maki 415e28e2d3 Fixed merge conflict 2022-07-07 14:54:13 -07:00
Mikayla Maki a8237858bc Added basic selections 2022-07-07 14:52:04 -07:00
Mikayla Maki 86d5794040 Rebasing onto main 2022-07-07 14:51:59 -07:00
Mikayla Maki 9b6167aad8 added inline hint 2022-07-07 14:51:34 -07:00
Mikayla Maki 2c6dcb82ef GPUI change proposals 2022-07-07 14:51:34 -07:00
Mikayla Maki 49bd51c7c1 Fixed integration test 2022-07-07 14:38:21 -07:00
Mikayla Maki 28fd1ccbc6 Added another minor test 2022-07-07 13:55:58 -07:00
Mikayla Maki d981f4a3f4 tidied up magic constants 2022-07-07 13:45:27 -07:00
Mikayla Maki 4bd1111115 Added a small integration test 2022-07-07 13:43:28 -07:00
Max Brunsfeld 304ea2d574 Merge pull request #1307 from zed-industries/nav-button-tweak
Add tooltips to pane nav buttons and make them trigger on click
2022-07-07 13:43:01 -07:00
Max Brunsfeld 6642b78331 Add tooltips to pane nav buttons and make them trigger on click 2022-07-07 13:36:08 -07:00
Mikayla Maki e3f492e13a Hoisted assert clipboard into TestAppContext 2022-07-07 13:29:58 -07:00
Mikayla Maki c0c2297deb Merge branch 'main' into terminal-selections 2022-07-07 13:20:23 -07:00
Mikayla Maki 4e3c32c277 Added copying 2022-07-07 13:19:38 -07:00
Mikayla Maki 49859d8f94 Merge pull request #1306 from zed-industries/fix-open-pane
Fixed terminal clone on split
2022-07-07 13:05:24 -07:00
Mikayla Maki 98f6dccd43 Fixed terminal clone on split 2022-07-07 13:01:16 -07:00
Mikayla Maki ad5e4e7c6c Merge pull request #1305 from zed-industries/fix-default-shell
Now defaults to using user's shell
2022-07-07 12:41:37 -07:00
Mikayla Maki ec4082695b Now defaults to using user's shell 2022-07-07 12:31:21 -07:00
Mikayla Maki 240f3d8754 Fixed default shell 2022-07-07 12:29:49 -07:00
Mikayla Maki bc306ef8ed Merge branch 'main' into terminal-selections 2022-07-07 12:17:58 -07:00
Mikayla Maki 1cfe8688ca Merge pull request #1304 from zed-industries/deploy-panic
Fixed working directory issues, added tests.
2022-07-07 12:14:57 -07:00
Mikayla Maki 02525c5bbe Added a way to change the timeout with state 2022-07-07 12:04:17 -07:00
Mikayla Maki 9c518085ae Fixed working directory issues, added tests. Working on regression 2022-07-07 11:01:26 -07:00
Antonio Scandurra 627d067e57 Merge pull request #1302 from zed-industries/external-formatting
Introduce support for formatting via an external command
2022-07-07 14:31:17 +02:00
Antonio Scandurra 52b8efca1b Add integration test to exercise formatting via external command 2022-07-07 11:53:32 +02:00
Antonio Scandurra b91d44b448 Respond with a debug version of the error in rpc Client 2022-07-07 11:52:56 +02:00
Antonio Scandurra c6254247c3 Allow providing an external format in format_on_save setting 2022-07-07 11:04:03 +02:00
Mikayla Maki baa011ccf4 added inline hint 2022-07-06 17:57:32 -07:00
Mikayla Maki b2fa511acd GPUI change proposals 2022-07-06 17:52:20 -07:00
Mikayla Maki 778cfd94d8 Added basic selections 2022-07-06 17:37:12 -07:00