Commit Graph
31406 Commits
Author SHA1 Message Date
Keith Simmons 63d78fd444 Make global type more resilient, and fix modal keymap context 2022-07-08 16:29:29 -07:00
Keith Simmonsand cb158777b9 Move terminal scripts to scripts folder, and remove parking_lot from terminal crate
Co-authored-by: mikayla.c.maki@gmail.com
2022-07-08 16:16:57 -07:00
Keith Simmons a7ff7ba068 remove temporary debug print statements
Co-authored-by: mikayla.c.maki@gmail.com
2022-07-08 16:14:41 -07:00
Max Brunsfeld ed31f9fe28 Run code action's commands if their edits are empty 2022-07-08 16:12:20 -07:00
Keith Simmonsand d1086b6152 Refactor terminal connection into a model which can be copied between terminal views
Refactor terminal modal code to use TerminalConnection model handle so we aren't storing TerminalViews in the globals
Adjust INSTANCE_BUFFER_SIZE in renderer to handle pathological terminal renders

Co-authored-by: mikayla.c.maki@gmail.com
2022-07-08 16:10:09 -07:00
Max Brunsfeld 7bacb9b156 0.46.0 2022-07-08 14:22:36 -07:00
Max Brunsfeld 559f6854d0 Upgrade Tree-sitter and limit query cursors' concurrently-buffered matches 2022-07-08 14:09:34 -07:00
Isaac Clayton ce8898acf1 Remove debug statements 2022-07-08 21:28:35 +02:00
Isaac Clayton bf71eb0ae0 Highlight languages as languages load 2022-07-08 21:19:07 +02:00
Keith Simmons ebbcd0cd27 Merge pull request #1294 from zed-industries/terminal-modal
Proposal: Terminal modal
2022-07-08 11:11:03 -07:00
Keith Simmons 368cfcaf3c fix pasting at the end of the line in normal mode 2022-07-08 10:57:02 -07:00
Antonio ScandurraandMax Brunsfeld d8e346f0e9 Fix spurious borrow checker error
Co-Authored-By: Max Brunsfeld <max@zed.dev>
2022-07-08 19:03:25 +02:00
Isaac Clayton 3a4657614f Added theme to language 2022-07-08 18:11:28 +02:00
Isaac Clayton 5a48e0fa2a Require theme directly when creating language 2022-07-08 16:08:40 +02:00
Isaac Clayton 2140c81501 Add channel to notify project when languages are added 2022-07-08 14:37:27 +02:00
Antonio Scandurra 5ae954b9d6 Add unit test for ignored files in file finder 2022-07-08 12:16:42 +02:00
Antonio Scandurra f2b8f45ac3 Include ignored files in fuzzy search when root entry is ignored 2022-07-08 11:54:45 +02:00
Antonio Scandurra 005bba6203 🎨 2022-07-08 11:42:59 +02:00
Antonio Scandurra b1b78dac12 Honor gitignores above worktree root 2022-07-08 11:19:46 +02:00
Antonio Scandurra a90bf45522 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 355a214454 Make build_gitignore async 2022-07-08 08:50:21 +02:00
Mikayla Maki ab8c2b1fe1 Properly fixed merge issues 2022-07-07 18:05:37 -07:00
Mikayla Maki 7df371ae53 Merge branch 'main' into terminal-modal 2022-07-07 17:48:58 -07:00
Mikayla Maki 3e2e8e1cef First pass at selections complete 2022-07-07 17:31:38 -07:00
Mikayla Maki 4fe9dc3362 fix merge conflicr 2022-07-07 17:24:55 -07:00
Mikayla Maki 36e3a74ca6 Fixed panic / bug around scrolling and selections in termainl 2022-07-07 17:19:53 -07:00
Mikayla Maki 415b0adb96 Finished merge of drag update 2022-07-07 16:12:24 -07:00
Mikayla Maki b34849c6dd Merge branch 'main' into gpui-changes 2022-07-07 16:08:32 -07:00
Mikayla Maki 68b468482f Updated drag API to pass old,new, instead of delta,new 2022-07-07 16:07:24 -07:00
Nathan Sobo 244909a44b Merge pull request #1298 from zed-industries/mouse-region-refactor
Mouse Event Refactor
2022-07-07 16:43:36 -06:00
Mikayla Maki 6896b75403 Fixed a bug around selecting a single cell 2022-07-07 15:24:06 -07:00
Mikayla Maki d989ad09f3 Finished selections for now 2022-07-07 15:10:08 -07:00
Mikayla Maki ba9dac8889 Fixing merge conflicts 2022-07-07 14:56:38 -07:00
Mikayla Maki 4d4b147f2e Fixed integration test 2022-07-07 14:55:25 -07:00
Mikayla Maki e401c8937e Added another minor test 2022-07-07 14:55:25 -07:00
Mikayla Maki 70cdc92b3d tidied up magic constants 2022-07-07 14:55:25 -07:00
Mikayla Maki fda6f4f44e Added a small integration test 2022-07-07 14:55:25 -07:00
Mikayla Maki 37687c5c97 Hoisted assert clipboard into TestAppContext 2022-07-07 14:55:25 -07:00
Mikayla Maki ee8c47ee74 Fixed merge conflict 2022-07-07 14:55:22 -07:00
Mikayla Maki 403c53bd6c Added copying 2022-07-07 14:55:03 -07:00
Mikayla Maki f14c5fed88 Fixed merge conflict 2022-07-07 14:54:58 -07:00
Mikayla Maki 81bda2af63 Fixed merge conflict 2022-07-07 14:54:36 -07:00
Mikayla Maki 99f5b358f0 Fixed merge conflict 2022-07-07 14:54:13 -07:00
Mikayla Maki 4e14248bdc Added basic selections 2022-07-07 14:52:04 -07:00
Mikayla Maki 45e8cbdc0c Rebasing onto main 2022-07-07 14:51:59 -07:00
Mikayla Maki c61cbc72c3 added inline hint 2022-07-07 14:51:34 -07:00
Mikayla Maki d58746ee13 GPUI change proposals 2022-07-07 14:51:34 -07:00
Mikayla Maki cfa06351ed Fixed integration test 2022-07-07 14:38:21 -07:00
Mikayla Maki 3f9285a8c5 Added another minor test 2022-07-07 13:55:58 -07:00
Mikayla Maki 4fcb0457dc tidied up magic constants 2022-07-07 13:45:27 -07:00