Antonio Scandurra
472b53db01
Ignore carriage returns when reloading buffer
2022-07-04 17:40:35 +02:00
Antonio Scandurra
f356219cd2
Detect buffer newline style and honor it when saving
2022-07-04 17:40:26 +02:00
Antonio Scandurra
c24e1a36ca
Replace \r and \r\n with \n when indexing text into the rope
2022-07-04 15:37:40 +02:00
Antonio Scandurra
559f205a94
Merge pull request #1274 from zed-industries/fix-enter-numpad
...
Support hitting enter on numpad
2022-07-04 10:08:47 +02:00
Antonio Scandurra
24c9be0b07
Support hitting enter on numpad
2022-07-04 10:01:56 +02:00
Antonio Scandurra
85a67bf75e
Merge pull request #1262 from zed-industries/user-timeline
...
Improve user activity tracking
2022-07-04 09:28:40 +02:00
Antonio Scandurra
e8850d498c
Merge branch 'main' into user-timeline
2022-07-04 09:23:16 +02:00
Antonio Scandurra
14c0ee093e
Merge pull request #1265 from zed-industries/worktree-performance
...
Fix problems that arise when large numbers of files change on disk
2022-07-04 09:19:18 +02:00
Antonio Scandurra
59c88c0848
Don't poll snapshot if processing events unless user manually changed fs
2022-07-04 08:10:31 +02:00
Keith Simmons
570d69ee5a
Highlight matching bracket when newest selection head is on a bracket
2022-07-01 15:06:16 -07:00
Mikayla Maki
7c9fe49962
Merge pull request #1269 from zed-industries/terminal-fr
...
Update terminal to use the editor's cursor rendering and fix a couple bugs
2022-07-01 14:59:23 -07:00
Mikayla Maki
975793d8d5
Fixed cursor positioning bugs in multi-byte charcters. Still have at least one though :/
2022-07-01 14:53:19 -07:00
Mikayla Maki
7c8247b147
rendering cursor correctly
2022-07-01 13:03:26 -07:00
Mikayla Maki
d54bba005d
Fixed debug offset I added to terminal
2022-07-01 11:48:50 -07:00
Mikayla Maki
6c77025fae
Cleaned up debugging code
2022-07-01 11:39:43 -07:00
Mikayla Maki
bf0d0d155c
Checkpointing after some debugging
2022-07-01 11:38:12 -07:00
Keith Simmons
c1b3cc8d1f
Merge pull request #1266 from zed-industries/fix-zombie-ra
...
Fix Zombie Language Servers
2022-07-01 10:20:27 -07:00
Antonio Scandurra
6030446b67
Remove redundant calls to poll_snapshot
2022-07-01 14:40:39 +02:00
Antonio Scandurra
a241d82156
Grab latest snapshot when invoking LocalWorktree::poll_snapshot
2022-07-01 14:36:51 +02:00
Antonio Scandurra
a472da27df
🎨
2022-07-01 14:11:21 +02:00
Antonio Scandurra
d9fe8f56bc
Add simulate_random_delay to every implemented method in FakeDb
2022-07-01 12:05:29 +02:00
Antonio Scandurra
08b828696a
Ensure worktrees have been sent before responding with definitions
...
Changing the frequency at which we update worktrees highlighted a
problem in the randomized tests that was causing clients to receive
a definition to a worktree *before* observing the registration of
the worktree itself. This was most likely caused by #1224 because
the scenario that pull request enabled was the following:
- Guest requests a definition pointing to a non-existant worktree
- Server forwards the request to the host
- Host sends an `UpdateProject` message
- Host sends a response to the definition request
- Server observes the `UpdateProject` message and tries to acquire
the store
- Given that we're waiting, the server goes ahead to process the
response for the definition request, responding *before*
`UpdateProject` is forwarded
- Server finally forwards `UpdateProject` to the guest
This commit ensures that, after forwarding a project request and getting a
response, we acquire a lock to the store again to ensure the project still
exists. This has the effect of ordering the forwarded request *after* any
message that was received prior to the response and for which we are still
waiting to acquire a lock to the store.
2022-07-01 11:45:30 +02:00
Mikayla Maki
28d3f08bab
Rebasing onto master
2022-06-30 20:44:51 -07:00
Mikayla Maki
a3d873b15d
Fixed a major bug and now use the same cursor paint logic as the editor
2022-06-30 20:43:51 -07:00
Mikayla Maki
59ab315e6e
Fixed a major bug and now use the same cursor paint logic as the editor
2022-06-30 20:34:06 -07:00
Mikayla Maki
eb9aaac05e
Update terminal.rs
...
Whoopsies
2022-06-30 20:30:52 -07:00
Mikayla Maki
1645b28207
Merge pull request #1267 from zed-industries/terminal-fr
...
This pull request is small and doesn't include many changes to any existing functionality. In the interest of removing blockers ASAP, I will merge.
2022-06-30 20:12:08 -07:00
Mikayla Maki
a44bb3735a
Refactored and commented code to be my expressive
2022-06-30 20:02:16 -07:00
Mikayla Maki
ccf6030e5a
Fully functional background colors :D
2022-06-30 19:21:42 -07:00
Keith Simmons
c5e9c15115
Restart language server using original root path rather than the path of the buffer restarted from
2022-06-30 19:11:21 -07:00
Max Brunsfeld
3e742d4acb
WIP - try representing snapshots_to_send as a watch
2022-06-30 18:04:31 -07:00
Keith Simmons
bc2362e330
Clear language server id for all worktrees when stopping a language server
2022-06-30 17:50:30 -07:00
Keith Simmons
b806797b0a
Fix failing test due to change in stop_language_server function
2022-06-30 17:40:50 -07:00
Keith Simmons
2ded6ce4ff
add assertion to test_definition ensuring no new language servers are created
2022-06-30 17:24:32 -07:00
Keith Simmons
2846accbd0
Minor comment change
2022-06-30 17:18:28 -07:00
Keith Simmons
05fec8cf52
add a comment explaining the three language server collections on project
2022-06-30 17:09:23 -07:00
Keith Simmons
0744db7a9c
Kill starting servers as well as currently running ones
2022-06-30 17:00:29 -07:00
Keith Simmons
d6fdc079a9
Prevent creating extra language server instances if there already exists one for that workspace
2022-06-30 16:46:26 -07:00
Max Brunsfeld
722b4037bf
Don't update worktrees' snapshots in the middle of processing fs events
2022-06-30 15:46:31 -07:00
Max Brunsfeld
8054274a83
Stop waiting for snapshot updates when disconnected from host
2022-06-30 15:07:40 -07:00
Max Brunsfeld
2a30ec4924
Ensure that usernames, user ids, and client ids match in random collaboration test
...
This makes the logs easier to interpret
2022-06-30 14:51:22 -07:00
Keith Simmons
c974f2d149
Merge pull request #1263 from zed-industries/misc-vim-fixes
...
Minor vim fixes
2022-06-30 12:47:08 -07:00
Keith Simmons
49d1b87d94
Fix vim editor focus selection issues, cancel vim operators on escape and unbound keys
2022-06-30 12:36:02 -07:00
Mikayla Maki
0edc045722
Merge pull request #1255 from zed-industries/terminal-fr
...
WIP: Terminal
2022-06-30 11:30:28 -07:00
Antonio Scandurra
5921d5bf0f
Ensure newer snapshots are always detected in wait_for_snapshot
2022-06-30 18:04:19 +02:00
Antonio Scandurra
c18607bf40
Split worktree updates when a peer joins an already-shared project
2022-06-30 16:49:56 +02:00
Antonio Scandurra
632e3eb1cb
Respond to join project request before sharing project completes
...
This ensures the guest doesn't observe a huge delay when joining.
2022-06-30 14:29:06 +02:00
Antonio Scandurra
f174a355bf
Split worktree updates and only send 256 entries at a time
2022-06-30 14:06:41 +02:00
Antonio Scandurra
85986a03d0
Coalesce as many fs events as possible before processing them
2022-06-30 10:20:46 +02:00
Antonio Scandurra
8bfba99e4f
Keep looking for a newer snapshot before broadcasting it
2022-06-30 09:54:14 +02:00
Antonio Scandurra