Commit Graph
5538 Commits
Author SHA1 Message Date
Antonio Scandurra ab236a6008 Fix divergence bug in undo/redo
As part of #1405, we changed the way we performed undo and redo to
support combining transactions that were not temporally adjacent for
IME purposes.

We introduced a bug with that release that caused divergence
when performing undo: the bug was caused by only changing the visibility
of fragments whose insertion id was contained in the undo operation. However,
an undo operation also affects deletions which we were mistakenly not
considering. Randomized tests caught this but I guess we didn't run enough
of them.
2022-08-17 11:30:04 +02:00
Antonio Scandurra da805b3d13 Merge pull request #1526 from zed-industries/crash-on-file-prompt-with-japanese-keyboard-layout
Fix crash when attempting to show file prompt while using Japanese keyboard layout
2022-08-17 09:56:09 +02:00
Mikayla Maki c612dc8a31 Merge pull request #1527 from zed-industries/ime-fix
Fix panic on main
2022-08-16 22:47:02 -07:00
Mikayla Maki aa75fbe56c Fix panic on main 2022-08-16 22:36:24 -07:00
Max Brunsfeld e4eead6477 Fix crash when attempting to show file prompt while using Japanese keyboard layout 2022-08-16 17:44:58 -07:00
Max Brunsfeld 3f50d15f7c Merge pull request #1523 from zed-industries/remove-gpl-dep
Remove unused http-auth-basic dependency
2022-08-16 13:02:17 -07:00
Max Brunsfeld ea09ef2c1a remove http-auth-basic dependency 2022-08-16 12:58:53 -07:00
Mikayla Maki 73cd6b51d8 Merge pull request #1520 from zed-industries/terminal-blink
Terminal cursor blinking
2022-08-15 18:39:23 -07:00
Mikayla Maki b9c73127b4 Added a hollow mode to the cursor rendering code, for terminal lost focus 2022-08-15 18:27:26 -07:00
Mikayla Maki bba51c3ae6 Added cursor blink and settings 2022-08-15 18:05:07 -07:00
Max Brunsfeld 1f00f6c163 Merge pull request #1519 from zed-industries/go-to-def-link-font-size-change
Clear any stale go-to-definition link when resizing the buffer font
2022-08-15 17:40:00 -07:00
Max Brunsfeld 754a130e59 Clear go-to-def link when deactivating the window 2022-08-15 17:30:41 -07:00
Mikayla Maki 7b3a7727c6 Basic cursor blinking :) 2022-08-15 17:00:44 -07:00
Max Brunsfeld 7de8228efd Clear stale go-to-def link when resizing buffer font 2022-08-15 16:15:20 -07:00
Mikayla Maki bb2245ab18 Merge pull request #1518 from zed-industries/add-terminal-focus
Added focus-in and focus-out behavior to terminal
2022-08-15 16:14:05 -07:00
Mikayla Maki a24e5b128c Fixed text rendering color based on focus 2022-08-15 16:05:03 -07:00
Mikayla Maki 761b211e89 Added focus-in and focus-out behavior to terminal 2022-08-15 15:59:17 -07:00
Max Brunsfeld f978ccb18b Merge pull request #1516 from zed-industries/bootstrap-script
Add bootstrap script, avoid hard-coding zed team members
2022-08-15 15:55:50 -07:00
Max Brunsfeld 51b98d548b Ensure a deterministic order to project activity summaries 2022-08-15 15:23:12 -07:00
Mikayla Maki e14f2b3d9f Removed old cargo params 2022-08-15 14:30:16 -07:00
Max Brunsfeld 776095caf0 Add bootstrap script, avoid hard-coding zed team members 2022-08-15 13:25:31 -07:00
Antonio Scandurra dfeb5e010e Merge pull request #1512 from zed-industries/autoscroll-filename-editor
Autoscroll to filename editor when creating or renaming entry
2022-08-15 15:19:33 +02:00
Antonio Scandurra 4fcba083ba Autoscroll to filename editor when creating or renaming entry
Also, autoscroll when a filename editor goes off-screen and the user
types or changes selections.
2022-08-15 15:14:42 +02:00
Antonio Scandurra 119c25dd8d Merge pull request #1511 from zed-industries/rename-sidebar-items-toggle
Rename `{project_panel,contacts_panel}::Toggle` to `ToggleFocus`
2022-08-15 15:02:41 +02:00
Antonio Scandurra 545f12362c Rename {project_panel,contacts_panel}::Toggle to ToggleFocus 2022-08-15 14:53:42 +02:00
Antonio Scandurra 6dc0907745 Merge pull request #1510 from zed-industries/toggle-full-screen
Add `zed::ToggleFullScreen` bound to `ctrl-cmd-f`
2022-08-15 11:57:51 +02:00
Antonio Scandurra b94366ab90 Add zed::ToggleFullScreen bound to ctrl-cmd-f 2022-08-15 11:53:37 +02:00
Julia 61684e693f Merge pull request #1494 from zed-industries/do-not-scroll-when-saving
Don't scroll to cursor when performing file save
2022-08-12 11:28:01 -04:00
ForLoveOfCats 7b71554b58 Don't scroll to cursor when performing file save 2022-08-12 11:20:18 -04:00
Mikayla Maki 9d57f761c5 Merge pull request #1496 from zed-industries/ime-stuff
Remove Clippy from CI
2022-08-11 20:05:56 -07:00
Mikayla Maki 6839530832 remove clippy :( 2022-08-11 19:32:47 -07:00
Mikayla Maki 45c7c32a0a Test 2022-08-11 19:29:52 -07:00
Mikayla Maki e2200109e6 Make clippy happy 2022-08-11 15:47:56 -07:00
Mikayla Maki 804c4c512b Merge branch 'main' into ime-stuff 2022-08-11 15:35:42 -07:00
Mikayla Maki 4b945f5694 Merge pull request #1495 from zed-industries/remove-clippy
Removed clippy from default settings
2022-08-11 11:47:41 -07:00
Mikayla Maki 8cf2ae3b6b Removed clippy from default settings 2022-08-11 11:46:54 -07:00
K Simmons 42c01c5b10 minor rustfmt fix 2022-08-11 11:35:11 -07:00
Mikayla Maki 2de25e0126 Merge pull request #1492 from zed-industries/add-clippy
Add clippy! :D
2022-08-10 17:57:13 -07:00
Mikayla Maki 541783881c prettied up the ci yml 2022-08-10 17:53:15 -07:00
Mikayla Maki 073bd767f2 Fixed build errors in json_language 2022-08-10 17:50:44 -07:00
K Simmons c74d10809e Testing with allow flags 2022-08-10 17:01:13 -07:00
Mikayla Maki c5002d85a9 update clippy 2022-08-10 16:58:08 -07:00
K Simmons 9aa3f2d777 clippy fixes for focus change 2022-08-10 16:51:01 -07:00
ForLoveOfCatsandMikayla 8ba2f77148 One big cleanup pass of clippy lints
Co-authored-by: Mikayla <mikayla@zed.dev>
2022-08-10 16:51:01 -07:00
Mikayla Maki e7540d2833 Changed CI and default.json to run clippy 2022-08-10 16:51:01 -07:00
Keith Simmons ec015d4607 Merge pull request #1422 from zed-industries/workspace-child-focus-pane-activation
Add on_child_focus and on_child_blur to View trait
2022-08-10 16:42:01 -07:00
K Simmons 4d38dcfc54 Fix workspace 2022-08-10 16:27:45 -07:00
K Simmons d68f227ec4 Fix failing tests 2022-08-10 16:26:53 -07:00
Mikayla Maki ee0e6a0109 Added env toml so readme db instructions are correct 2022-08-10 15:07:02 -07:00
Mikayla Maki 3460a24da7 Changed CI and default.json to run clippy 2022-08-10 09:11:06 -07:00