Commit Graph
9335 Commits
Author SHA1 Message Date
Mikayla Maki 2a904640c8 Revert "Touch up git in project panel and scroll bar styling" 2023-05-22 15:31:14 -07:00
Mikayla Maki 3b10631e92 WIP: Touch up git in project panel and scroll bar styling (#2504)
This makes the different git locations individually style-able

Release Notes:

* Improve git contrast (preview only)
2023-05-22 15:11:10 -07:00
Mikayla Maki c627091f51 fmt 2023-05-22 15:04:51 -07:00
Mikayla Maki 1e309017ec Merge branch 'main' into git-project-panel-and-scrollbar-styling 2023-05-22 15:02:28 -07:00
Mikayla Maki 9ac11de5f6 remove border from thumb 2023-05-22 14:56:55 -07:00
Nate Butler 2b2cbe8c04 Update project panel & scroll bar git colors 2023-05-22 17:47:52 -04:00
Mikayla Maki f267663b57 Only fire update diff base when the dot repo is scanned (#2510)
This PR fixes a bug in the firing of the UpdatedRepositories event which
caused it to flood collaboration with new messages on every file save.

Release Notes:

* Fixed a bug in repository detection that caused it to fire
over-eagerly (preview only)
2023-05-22 14:11:19 -07:00
Mikayla Maki 3052891543 Only fire update diff base when the dot repo is scanned 2023-05-22 13:57:07 -07:00
Max Brunsfeld 7a6deb9cba Clear old diagnostics when restarting a language server (#2509)
Previously, restarting a language server did not clear out the
diagnostics that were published by that server. Those diagnostics would
stick around forever.

Release Notes:

* Fixed a bug where restarting a language server would sometimes leave
buffers with stale diagnostics associated with that server.
2023-05-22 13:06:32 -07:00
Max Brunsfeld 9dd6826cbc Clear old diagnostics when restarting a language server 2023-05-22 12:53:22 -07:00
Mikayla Maki ae90297ff9 Adjust scrollbar settings to be expandable (#2507)
Note that this PR cannot be cherrypicked into preview, as it relies on
the new settings infrastructure.

Switches settings from `show_scrollbars: "auto"` to `scrollbar: {show:
"auto", git_diffs: true}`.

fixes
https://linear.app/zed-industries/issue/Z-1650/scroll-bar-feature-settings

Release Notes:

- Changed scrollbar settings from `show_scrollbars: "auto"` to
`scrollbar: {show: "auto", git_diffs: true}`. (preview only)
2023-05-22 12:51:21 -07:00
Mikayla Maki a0ff26b029 Diagnostics pane was not focusable with the mouse (#2506)
fixes
https://linear.app/zed-industries/issue/Z-1432/cant-cmd-w-an-empty-diagnostics-in-a-split-pane

Release Notes:

* Fixed a bug where the diagnostics pane could not be focused or closed
in certain circumstances.
2023-05-22 12:44:39 -07:00
Mikayla Maki 430d0ad098 Switch back to 2023-05-22 12:16:47 -07:00
Mikayla Maki 05abea12f0 fmt 2023-05-22 12:13:23 -07:00
Mikayla Maki 571b6ba990 Adjust scrollbar settings to be expandable 2023-05-22 12:12:56 -07:00
Joseph Lyons 89b5c89e17 Update pull_request_template.md 2023-05-22 15:00:57 -04:00
Joseph Lyons 55f765d07b Add example of changelog line in PR template 2023-05-22 14:53:07 -04:00
Mikayla Maki d60fbbc3d8 fmt 2023-05-22 11:46:52 -07:00
Mikayla Maki dce5088f27 Fix diagnostic pane not being closeable 2023-05-22 11:44:23 -07:00
Max Brunsfeld 34eda434c9 Fix spurious setting error log messages (#2498)
Fixes a bug introduced in
https://github.com/zed-industries/zed/pull/2448, where error messages
would be logged if the user config didn't specify certain fields like
`journal` or `telemetry`.
2023-05-22 11:44:21 -07:00
Joseph Lyons 0452ebf652 Indent all release note lines for each PR 2023-05-22 14:44:05 -04:00
Julia cf6fba36ac Add paragraph based vertical movements (#2502)
Very selfish patch I worked on yesterday, I kept saying I wanted these
and finally decided to just add them. Feedback on the keybindings
welcome

Release Notes:

* Added `MoveToStartOfParagraph` and `MoveToEndOfParagraph` movements
for paragraph based vertical navigation
2023-05-22 14:31:34 -04:00
Mikayla Maki 56585cfbce Fix perf problem with scrollbars in large multibuffers (#2505)
Remove scrollbars from multibuffers

Release Notes:

* Removes git scrollbar highlights from multibuffers (preview only)
2023-05-22 11:11:27 -07:00
Mikayla Maki 4d9078ac3a Diagnostics pane was not focusable with the mouse 2023-05-22 11:10:13 -07:00
Mikayla Maki 741c63a247 fmt 2023-05-22 11:04:36 -07:00
Mikayla Makiandmax b9fb1b649a Make scrollbar content detection cheaper
Remove scrollbars from multibuffers

co-authored-by: max <max@zed.dev>
2023-05-22 10:55:44 -07:00
Mikayla Maki ec9d869ac9 Wire in conflict styling 2023-05-22 10:10:47 -07:00
Mikayla Maki 90b48be8e7 Add conflict styles to project panel 2023-05-22 10:09:55 -07:00
Mikayla Maki a2f0cf5851 Add seperate scrollbar styling 2023-05-22 10:03:02 -07:00
Kirill Bulatov 15c3165cd1 Do not refocus project search query on ESC press (#2494)
Closes
https://linear.app/zed-industries/issue/Z-1471/escape-should-not-move-focus-to-project-search

Makes ESC more predictable as a shortcut that cancels/roll backs the
state in project search panel.

Release Notes:

* Fixes ESC making focus to jump in project search panel
2023-05-22 19:56:10 +03:00
Mikayla Maki a98f93f7c0 Wire project panel themes into rust 2023-05-22 09:55:59 -07:00
Nate Butler 720f3348e1 Add git to project panel in theme, use different values for dark and light 2023-05-22 12:09:54 -04:00
Max Brunsfeld 7572455cb7 Remove assertions about behavior on invalid settings file 2023-05-22 08:48:37 -07:00
Julia b1f85d20dd Add test for paragraph vertical movements 2023-05-22 11:48:07 -04:00
Julia 36ab9cb62e Add paragraph based vertical movements 2023-05-22 09:12:36 -04:00
Joseph Lyons 3268bac5e4 Fix up formatting for get preview channel changes script 2023-05-22 00:02:19 -04:00
Joseph T. Lyons ad666c7520 Fix get preview channel changes script (#2501)
Fixes the text we match on to get PR commits and also prints the release
notes of each PR

Release Notes:

* Skip
2023-05-21 23:47:07 -04:00
Joseph Lyons d05a3a6abd Fix get preview channel changes script 2023-05-21 23:40:07 -04:00
Nathan Sobo 63bf4a93d7 Enable "test-support" feature on editor dependencies for tests (#2499)
Enable the `"test-support"` feature whenever we depend on the `editor`
crate in tests.

If we don't do this, we end up depending on `livekit_client` without
enabling `"test-support"`, and this causes us to link against
`WebRTC.framework` in its build script, which causes a dynamic linker
error when starting the tests.

Fixes
https://linear.app/zed-industries/issue/Z-1646/cant-run-package-tests-for-activity-monitor-and-auto-update

Release Notes:

* No notes
2023-05-20 10:19:59 -06:00
Nathan Sobo ef566cacd2 Enable test-support on editor in tests 2023-05-20 09:54:38 -06:00
Mikayla Maki acf41088b5 Fix bugs in git implementation (#2495)
fixes
https://linear.app/zed-industries/issue/Z-1593/clean-up-git-integration

- Fixes calculation of git offsets in the scrollbar:

fixes
https://linear.app/zed-industries/issue/Z-1608/fix-scrollbar-diffs-sliding-out-of-sync-with-gutter-diffs-in

fixes
https://linear.app/zed-industries/issue/Z-1629/project-search-panel-has-git-marks-on-the-scrollbar-misaligned

fixes
https://linear.app/zed-industries/issue/Z-1625/soft-wrap-affects-diff-locations-in-scrollbar

- Improves the performance of scrollbar hunks:

fixes
https://linear.app/zed-industries/issue/Z-1640/double-check-performance-of-scrollbar-hunks

- Fixes a long standing bug with how git gutters interact with soft
wraps:

fixes
https://linear.app/zed-industries/issue/Z-1442/make-hunks-grow-to-the-end-of-softwraps-when-ending-on-a-softwrapped

- Allows work directories to be renamed

fixes
https://linear.app/zed-industries/issue/Z-1577/fix-stale-git-repositories-when-directory-is-renamed

Release Notes:

* Fix the offsets of the git diffs in the scrollbar when there are
folds, wraps, or excerpts (preview only)
* Allow the work directory of a repository to be renamed (preview only)
* Extend git gutter to cover the entirety of a wrapped line
(https://github.com/zed-industries/community/issues/937)
2023-05-19 18:15:11 -07:00
Mikayla Maki b72cdb7362 Refactored apart the forward and the backwards iterator for diff hunks 2023-05-19 18:09:47 -07:00
Max Brunsfeld 9eb9a3cb71 Fix spurious setting error logs on non-existent setting keys 2023-05-19 17:15:05 -07:00
Mikayla Makiandmax c9a3283048 refine batched anchor conversions
co-authored-by: max <max@zed.dev>
2023-05-19 16:52:57 -07:00
Max Brunsfeld 24feb5c56b Remove stray prints 2023-05-19 16:52:30 -07:00
Mikayla Maki 7786d9506a fmt 2023-05-19 16:32:07 -07:00
Mikayla Maki fac2510950 Rearrange git tests in worktree
Add support for renaming work directories
2023-05-19 16:30:00 -07:00
Mikayla Maki 23c223e09c Fix bug where git diff hunks would not extend through a soft wrap 2023-05-19 16:23:45 -07:00
Mikayla Maki 3c35f275b4 Batch anchor conversions in git hunk iterator 2023-05-19 16:23:45 -07:00
Mikayla Maki b4c4a9e56c Calculate y offsets correctly 2023-05-19 16:23:45 -07:00