Commit Graph
6075 Commits
Author SHA1 Message Date
Julia dff1e15608 Merge pull request #1712 from zed-industries/dont-select-on-copy-by-default-terminal
Don't select on copy by default in the terminal
2022-10-10 14:15:20 -04:00
JuliaandMikayla Maki b8e48894b5 Don't select on copy by default in the terminal
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-10 13:48:56 -04:00
Max Brunsfeld b5febeb3d9 0.59.0 2022-10-07 14:51:18 -07:00
Mikayla Maki fc4340ff19 Merge pull request #1693 from zed-industries/terminal-tidying
Terminal Tidying
2022-10-07 13:11:43 -07:00
Max Brunsfeld 66bc545a2f Merge pull request #1697 from zed-industries/css-highlighting-fixes
Highlighting fixes
2022-10-07 12:56:31 -07:00
Julia dbe9534f09 Merge pull request #1696 from zed-industries/reset-diff-on-set-none-diff-base
Reset buffer git diff when setting diff base to None
2022-10-07 15:48:18 -04:00
Max Brunsfeld 34a42ca25a Tweak SCREAMING_SNAKE_CASE regexes in highlight queries 2022-10-07 12:46:49 -07:00
Max Brunsfeld 0bad41cf69 Collapse variant and type into the same color 2022-10-07 12:44:55 -07:00
Max Brunsfeld 366fe44eba CSS: color '#' the same as the rest of the color 2022-10-07 12:44:39 -07:00
Max Brunsfeld 01edfebd8e Add color for 'variable.special' and use it in highlight queries 2022-10-07 12:44:20 -07:00
JuliaandJoseph Lyons 9905d9833c Reset buffer git diff when setting diff base to None
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2022-10-07 15:37:37 -04:00
Mikayla Maki 76e2fbfe31 Added a horrible hacky way of doing cmd-k correctly. 2022-10-07 12:04:26 -07:00
Mikayla Maki 4bcbeef605 Implemented a simplistic version of correct cmd-k behavior 2022-10-07 11:37:39 -07:00
Mikayla Maki ed30bd57a9 Fixed non-block terminal cursors being displayed incorrectly 2022-10-07 10:03:09 -07:00
Max Brunsfeld d77aa013a9 Merge pull request #1692 from zed-industries/avoid-duplicate-autoformat-edits
Avoid duplicate autoformat edits
2022-10-07 09:35:10 -07:00
Julia 26f308f6e4 Merge pull request #1682 from zed-industries/load-diff-base-from-correct-relative-path
Fix some git gutter bugs
2022-10-06 22:28:52 -04:00
Julia 8b93d084ea Extend a test to cover repos not at worktree root 2022-10-06 22:20:10 -04:00
Max BrunsfeldandNathan Sobo e6fe6c8122 Don't allow multiple concurrent formatting requests for the same buffer
Co-authored-by: Nathan Sobo <nathan@zed.dev>
2022-10-06 17:03:38 -07:00
Max Brunsfeld 26e1715699 In deterministic executor, ensure fake timers are ordered by wake time
Previously, advancing the clock would fail to wake a timer that was
set *after* another time whose wake time had not yet arrived.
2022-10-06 17:03:23 -07:00
Max Brunsfeld b4bd9c3f6d Fix multi-line string formatting in editor_test.rs 2022-10-06 15:13:29 -07:00
Max Brunsfeld 3d54c58852 Merge pull request #1691 from zed-industries/move-tests
Organize buffer and editor tests
2022-10-06 13:39:54 -07:00
Max Brunsfeld 20f22f78e4 Rename language::tests -> language::buffer_tests 2022-10-06 13:32:49 -07:00
Max Brunsfeld 8df69c8613 Extract editor tests to their own file 2022-10-06 13:32:34 -07:00
Max Brunsfeld 01db1a2d05 Merge pull request #1689 from zed-industries/optimize-buffer-diff
Apply buffer diff edits as a single batch
2022-10-06 12:28:42 -07:00
Max Brunsfeld 260e5e66e8 Apply buffer diff edits as a single batch 2022-10-06 11:54:28 -07:00
Max Brunsfeld 428e05a5fa Merge pull request #1404 from zed-industries/html-support
Basic html support
2022-10-06 10:32:44 -07:00
Julia 981253213d Reload git index on file events to catch new contents 2022-10-06 12:01:21 -04:00
Joseph T. Lyons 0fb441a1f3 Add Discord webhook for published releases (#1684) 2022-10-05 21:22:53 -04:00
Max Brunsfeld 62b9331c6f Add a test for multi-language auto-indent 2022-10-05 17:59:31 -07:00
Max Brunsfeld 225f341f0a Derive indent size from the language at the cursor when auto-indenting 2022-10-05 17:07:35 -07:00
Max Brunsfeld fb39256ee5 Remove last usages of MultiBufferSnapshot::language 2022-10-05 14:44:34 -07:00
Julia 581c7bfad6 Load diff base from correct relative path 2022-10-05 16:04:55 -04:00
Max Brunsfeld 30cf42d108 Finish generalizing ToggleComments to support block comments 2022-10-05 12:25:32 -07:00
Max Brunsfeld 2a70aa2499 Start work on toggling block comments for HTML 2022-10-04 17:27:03 -07:00
Julia 0158d09e1b Merge pull request #1632 from zed-industries/git-gutter
Tracking PR: Git gutter
2022-10-04 15:12:28 -04:00
JuliaandJoseph Lyons fe44ccb7fb Use correct start row for hunk retrieval & correct paint offset
Co-Authored-By: Joseph Lyons <joseph@zed.dev>
2022-10-04 15:04:42 -04:00
Max Brunsfeld 5cd57b40e5 0.58.0 2022-10-04 11:43:52 -07:00
Max Brunsfeld 9d35b3a73c Fix autoclose error when cursor was at column 0 2022-10-03 17:44:18 -07:00
Mikayla Maki bb80bd45bf Removed debugs, simplified settings 2022-10-03 17:43:05 -07:00
Mikayla Maki b49d0e782c Fixed a couple bugs in tests and worktree path handling 2022-10-03 17:18:38 -07:00
Max Brunsfeld b2af17d4e6 Add assertions to test for autoclose with embedded languages 2022-10-03 13:24:37 -07:00
Max Brunsfeld be8a57a454 Merge pull request #1680 from zed-industries/telemetry-tweaks
Telemetry tweaks
2022-10-03 13:08:05 -07:00
JuliaandMikayla Maki c680a6ebbc Once again respect user settings for git gutter
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 15:42:30 -04:00
Max Brunsfeld 013b9e5e49 Remove unnecessary min_id_length option from amplitude requests 2022-10-03 12:13:27 -07:00
JuliaandMikayla Maki 0615592f81 Rename head text to indicate that it's not always going to be from head
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 15:11:06 -04:00
JuliaandMikayla Maki fb3c69db37 Move git gutter settings out of editor settings
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:53:33 -04:00
Max BrunsfeldandJoseph Lyons 5d0a51773f Mark platform as "Zed" for telemetry events from the app
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-10-03 11:05:45 -07:00
JuliaandMikayla Maki 20cff89bed Store repo content path as absolute
Co-Authored-By: Mikayla Maki <mikayla@zed.dev>
2022-10-03 14:00:58 -04:00
Max BrunsfeldandJoseph Lyons 401558bd8b Set staff user property in telemetry
Co-authored-by: Joseph Lyons <joseph@zed.dev>
2022-10-03 10:52:57 -07:00
Julia aaa4984ffe Be clearer about using GitFilesIncluded setting 2022-10-03 11:58:48 -04:00