Commit Graph
4942 Commits
Author SHA1 Message Date
Max Brunsfeld 25d75feffc Merge pull request #1313 from zed-industries/release-script
Add script for summarizing changes since last release
2022-07-08 16:10:39 -07:00
Max Brunsfeld 55d7e1757c Add script for summarizing changes since last release 2022-07-08 15:51:28 -07:00
Max Brunsfeld 9683db936d 0.46.0 2022-07-08 14:22:36 -07:00
Max Brunsfeld 6c3384b67a Merge pull request #1312 from zed-industries/fix-tree-query-hang
Fix hang due to tree-sitter query
2022-07-08 14:16:38 -07:00
Max Brunsfeld 1f16c68e6b Upgrade Tree-sitter and limit query cursors' concurrently-buffered matches 2022-07-08 14:09:34 -07:00
Keith Simmons a82e56918e Merge pull request #1294 from zed-industries/terminal-modal
Proposal: Terminal modal
2022-07-08 11:11:03 -07:00
Antonio Scandurra d0c9818e8b Merge pull request #1309 from zed-industries/gitignore-traverse-ancestors
Honor `.gitignore` files above worktree's root
2022-07-08 15:49:23 +02:00
Antonio Scandurra 540aa1748a Add unit test for ignored files in file finder 2022-07-08 12:16:42 +02:00
Antonio Scandurra 56f9c7bc1b Include ignored files in fuzzy search when root entry is ignored 2022-07-08 11:54:45 +02:00
Antonio Scandurra 32c6ae3188 🎨 2022-07-08 11:42:59 +02:00
Antonio Scandurra e66144104f Honor gitignores above worktree root 2022-07-08 11:19:46 +02:00
Antonio Scandurra 9328ab121a Use absolute paths to compute ignored status
This lays the groundwork for harvesting gitignores up above the
worktree.
2022-07-08 11:19:21 +02:00
Antonio Scandurra ca225d0765 Make build_gitignore async 2022-07-08 08:50:21 +02:00
Mikayla Maki 4a860d4da4 Properly fixed merge issues 2022-07-07 18:05:37 -07:00
Mikayla Maki d373e4424f Merge branch 'main' into terminal-modal 2022-07-07 17:48:58 -07:00
Mikayla Maki 621fab2da1 Merge pull request #1299 from zed-industries/terminal-selections
Terminal selections first pass
2022-07-07 17:39:46 -07:00
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