Commit Graph
9042 Commits
Author SHA1 Message Date
Mikayla Maki da07fa114d Add branch name into title 2023-05-08 14:33:58 -07:00
Petros AmoiridisandMikayla Maki b45856e137 Display branch information per worktree root
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
2023-05-08 14:33:58 -07:00
Mikayla Maki bb5f30a58b Fix bug in repo detection 2023-05-08 14:33:58 -07:00
Mikayla Maki 8403c589d5 Add API for accessing git branch 2023-05-08 14:33:58 -07:00
Mikayla Maki d9afcb71e7 Wire in the branch name 2023-05-08 14:33:58 -07:00
Mikayla Maki cf830b1c0e Fix repo_for and clean up repository_entries 2023-05-08 14:33:58 -07:00
Mikayla Maki c1dcd83835 Fix TreeMap retain 2023-05-08 14:33:58 -07:00
Mikayla Maki f2dadb0dc9 Restored a lost API and got everything compiling 2023-05-08 14:33:58 -07:00
Mikayla Makiandpetros 0fb2dbfda6 WIP: Refactor existing git code to use new representation.
co-authored-by: petros <petros@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan 627994ab94 WIP: Convert old git repository vec to new treemap based approach.
co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla MakiandNathan b84f88b61a Add a data driven representation of the current git repository state to the worktree snapshots
WIP: Switch git repositories to use SumTrees

Co-authored-by: Nathan <nathan@zed.dev>
2023-05-08 14:33:58 -07:00
Mikayla Maki d56568792a Merge pull request #2453 from zed-industries/fix-click-fallthrough
Fixed clicks falling through the modal terminal
2023-05-08 13:59:57 -04:00
Mikayla MakiandAntonio f6b2e7f596 Fixed clicks falling through the modal terminal
co-authored-by: Antonio <antonio@zed.dev>
2023-05-08 10:54:12 -07:00
Kirill Bulatov d7f97a2a2d Only allow invisbles in local and leader selections 2023-05-08 19:36:51 +03:00
Kirill Bulatov bb78d10859 Code review fixes 2023-05-08 19:36:51 +03:00
Kirill Bulatov 16293ef907 Add invisibles wrapping test 2023-05-08 19:36:51 +03:00
Kirill Bulatov af7ba36856 Do not print invisibles in non-full mode editors 2023-05-08 19:36:51 +03:00
a89d1c939e Add a theme entry for whitespace, use it to style whitespaces
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
Co-Authored-By: Kirill Bulatov <mail4score@gmail.com>
2023-05-08 19:36:51 +03:00
Kirill Bulatov 820bc9b5b7 Fix wrapped line detection 2023-05-08 19:36:51 +03:00
Kirill Bulatov 9f008a5a69 Use more convntional name for the settings 2023-05-08 19:36:51 +03:00
Kirill Bulatov 21d1d2ec4c Add a test 2023-05-08 19:36:51 +03:00
Kirill Bulatov f670a9fac6 Do not print extra invisibles on line wraps 2023-05-08 19:36:51 +03:00
Kirill Bulatov 7530a10c4e Refactor line glyphs drawing methods 2023-05-08 19:36:51 +03:00
Kirill Bulatov e3ff9ad822 Support invisibles in the selection 2023-05-08 19:36:51 +03:00
Kirill BulatovandMax Brunsfeld b9856ce0e8 Use cached standard glyphs for invisible symbols
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
2023-05-08 19:36:51 +03:00
Kirill Bulatov 7762f0fdef Add whitespaces rendering 2023-05-08 19:36:51 +03:00
Kirill Bulatov ac1ba279c2 Draw tabs with svg icons in editor code only 2023-05-08 19:36:51 +03:00
Kirill Bulatov 23ef5d3f14 Make invisibles display configurable 2023-05-08 19:36:51 +03:00
Kirill Bulatov f5f2f2ccb6 Draft invisibles' tabs display 2023-05-08 19:36:51 +03:00
Max BrunsfeldandAntonio Scandurra 6708c6cd01 Add is_tab field to chunks
Co-authored-by: Antonio Scandurra <antonio@zed.dev>
2023-05-08 19:36:51 +03:00
Julia a8b9401c36 Merge pull request #2452 from zed-industries/prevent-some-rounding-clipping
Prevent some cases of clipping icons due to pixel coord rounding
2023-05-08 11:48:33 -04:00
Julia f79cfd3b61 Prevent some cases of clipping icons due to pixel coord rounding 2023-05-08 11:42:00 -04:00
Antonio Scandurra a77336c009 Merge pull request #2451 from zed-industries/kb/extra-deps
Remove unused dependencies
2023-05-08 14:46:27 +02:00
Kirill Bulatov 903078b060 Remove unused dependencies 2023-05-07 21:07:55 +03:00
Antonio Scandurra cbf84f3795 Merge pull request #2441 from zed-industries/implicit-ancestry
Determine view ancestry during layout
2023-05-05 10:58:00 +02:00
Antonio Scandurra 95deccdf8a 💄 2023-05-05 10:53:15 +02:00
Antonio Scandurra 84c00a71a1 Delay focus_in event for window activation till after layout 2023-05-05 10:47:42 +02:00
Antonio Scandurra 32a698689f Replace usages of is_parent_view_focused with is_self_focused
Previously, this was used because we didn't have access to the current
view and `EventContext` was an element-only abstraction. Now that the
`EventContext` wraps the current view's `ViewContext` we can simply check
for the view's focus and avoid querying ancestors.
2023-05-05 10:08:22 +02:00
Antonio Scandurra 4277027223 Make focusing the parent an effect to avoid querying ancestors 2023-05-05 10:04:54 +02:00
Joseph T. Lyons 3a125b2a44 Merge pull request #2447 from zed-industries/fix-auto-update
Do not use post_json() to auto update
2023-05-04 17:15:09 -04:00
Mikayla Maki 474b51492e Merge pull request #2446 from zed-industries/fix-copilot-logged-out
Fix copilot stuck in logged out state
2023-05-04 16:52:04 -04:00
Mikayla Maki 637a3f37c6 Rearrange the state machine 2023-05-04 13:45:31 -07:00
Julia 56b4fcc305 Merge pull request #2445 from zed-industries/construct-text-buffer-in-background
Construct text buffer in background
2023-05-04 16:01:39 -04:00
Julia cac502638d Fixup cases using buffer model handle id as buffer id 2023-05-04 12:32:31 -04:00
JuliaandAntonio Scandurra 99d1c15ccc Offload text::Buffer construction to background worker
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-04 12:32:31 -04:00
JuliaandAntonio Scandurra 03e9b764b1 Store history base text as rope
Co-Authored-By: Antonio Scandurra <me@as-cii.com>
2023-05-04 12:32:31 -04:00
Joseph Lyons 6aefd6a391 Do not use post_json() to auto update 2023-05-04 12:12:36 -04:00
Antonio Scandurra 206e64d67d Merge branch 'main' into implicit-ancestry 2023-05-04 17:19:06 +02:00
Antonio Scandurra fd3f4bf10f Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons
Use `Workspace::toggle_sidebar_item` when clicking on sidebar button
2023-05-04 17:14:40 +02:00
Antonio Scandurra 0b9c6ad77d Use Workspace::toggle_sidebar_item when clicking on sidebar button
Previously, we were mistakenly using `Sidebar::toggle_item`, which only
performs part of the toggle operation.
2023-05-04 17:06:37 +02:00