Antonio Scandurra and Max Brunsfeld
d6002dcc81
Use gpui::test in async tests in zed
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2021-05-12 18:20:49 +02:00
Antonio Scandurra
630049eb8d
Use gpui::test macro for synchronous tests in zed
2021-05-12 17:18:23 +02:00
Antonio Scandurra
ba47eafe25
Introduce a gpui::test macro
2021-05-12 17:05:03 +02:00
Antonio Scandurra
ed49b0ea34
Test prompting when saving while there's a conflict
2021-05-12 15:21:50 +02:00
Antonio Scandurra
6da1aa4dc7
Update mtime and is_deleted when saving/loading a file
2021-05-12 14:34:56 +02:00
Antonio Scandurra
236ffaa1ad
Make MutableAppContext::prompt private
...
...as we're supposed to call this method only via ViewContext.
2021-05-12 11:57:05 +02:00
Antonio Scandurra
aa68b290c4
Display prompt when trying to save a conflicting file
2021-05-12 11:54:48 +02:00
Max Brunsfeld
31242dc757
Use a different tab icon color for buffers with conflicts
2021-05-11 16:59:31 -07:00
Max Brunsfeld
6e72836a3d
Add basic handling for buffer's files changing on disk
2021-05-11 16:18:29 -07:00
Max Brunsfeld
2daa7eadf0
Add failing test for buffer detecting on-disk changes
2021-05-11 11:38:10 -07:00
Antonio Scandurra and Nathan Sobo
f29a2003eb
Mark FileHandle as not deleted right after saving it
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 17:26:26 +02:00
Antonio Scandurra and Nathan Sobo
8de74d3f4a
Add a basic tab keybinding
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 17:10:37 +02:00
Antonio Scandurra
c821419a98
Merge pull request #48 from zed-industries/file-deletion
...
Fix management of buffers' dirty state
2021-05-11 17:00:44 +02:00
Antonio Scandurra and Nathan Sobo
5a1e9adb6d
Don't consider scan as being complete until its state is Idle
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 16:54:01 +02:00
Antonio Scandurra and Nathan Sobo
eb7fc67c42
Fix saving files in single-file worktrees
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 16:46:22 +02:00
Antonio Scandurra and Nathan Sobo
2d56da5259
Emit Dirtied event when a clean buffer's file is deleted
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 16:32:52 +02:00
Antonio Scandurra and Nathan Sobo
7e18d30ac0
Make sure next_scan_complete resolves
...
Sometimes the scan state could change so quickly that the consumer
wouldn't notice that it ever went to a scanning state before going back
to an idle state, hence never resolving.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 16:06:12 +02:00
Max Brunsfeld and Nathan Sobo
d2965909dd
Fix management of buffers' dirty state
...
* Don't consider files deleted if they just haven't been scanned yet.
* Consider a buffer dirty if its file has been deleted.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 15:37:01 +02:00
Antonio Scandurra
f2e9bb741a
Merge pull request #51 from zed-industries/add-cursors-and-cancel-selections
...
Implement `add_selection_above`, `add_selection_below` and `cancel`
2021-05-11 13:02:37 +02:00
Antonio Scandurra
35f3fadbd7
💄
2021-05-11 12:43:24 +02:00
Antonio Scandurra
a05eb7431d
Bind add_selection_{above,below} to cmd-alt-{up,down}
2021-05-11 12:37:30 +02:00
Antonio Scandurra
f31e25988d
Add test for add_selection_above and add_selection_below
2021-05-11 12:35:27 +02:00
Antonio Scandurra
3c064f11b9
Add test for BufferView::cancel
2021-05-11 12:35:27 +02:00
Antonio Scandurra
f90af79a65
Split multi-line selection when starting a new columnar selection
2021-05-11 12:35:27 +02:00
Antonio Scandurra and Nathan Sobo
f96f46f452
Keep only one selection when starting to add selections above/below
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 12:35:27 +02:00
Antonio Scandurra and Nathan Sobo
cc887eba7f
Rename add_cursor_{above,below} to add_selection_{above, below}
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 12:35:27 +02:00
Antonio Scandurra and Nathan Sobo
8d5542de57
Support undo of adding cursor above by adding cursor below and viceversa
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 12:35:27 +02:00
Antonio Scandurra and Nathan Sobo
3abf986823
Empty last selection on cancel
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2021-05-11 12:35:27 +02:00
Antonio Scandurra
9ba791a255
Implement cancel for buffer
2021-05-11 12:35:27 +02:00
Antonio Scandurra
53e62a0fa0
Implement add_cursor_above and add_cursor_below for buffer
2021-05-11 12:35:27 +02:00
Max Brunsfeld
a47ab53ee3
Merge pull request #47 from zed-industries/macos-10-compat
...
Ensure that the bundle runs on macOS versions < 11.0
2021-05-10 14:10:33 -07:00
Max Brunsfeld
e099025466
Ensure that the bundle runs on macOS versions < 11.0
2021-05-10 14:14:04 -06:00
Nathan Sobo
0ea30dca56
Merge pull request #40 from zed-industries/close-window
...
Correctly handle closing windows and removing entities
2021-05-08 09:06:54 -06:00
Nathan Sobo
3dce1af998
Fix double borrow error in Window::on_close callbacks when quitting app
...
The simplest solution I could come up with was to make quitting the app asynchronous. Calling mac::Platform::quit enqueues a request to quit the app and then allows the call stack to fully return. This ensures we aren't holding a borrow when we quit and invoke all the Window::on_close callbacks. Seems like it should be fine to be async on quitting.
2021-05-08 08:49:14 -06:00
Max Brunsfeld
75658fa1c0
Merge pull request #46 from zed-industries/keyup-keystrokes
...
Ignore events for held-down keys after a key combo is partially released
2021-05-07 17:15:29 -07:00
Max Brunsfeld
8ef5af4969
Ignore events for held-down keys after a key combo is partially released
2021-05-07 16:54:55 -07:00
Max Brunsfeld
b878e50277
Remove logging of retained views
2021-05-07 14:51:55 -07:00
Max Brunsfeld
e488eb96bc
Merge branch 'master' into close-window
2021-05-07 14:24:48 -07:00
Max Brunsfeld
8c4a70f7c7
Fix the Clone impl for AnyViewHandle
2021-05-07 14:16:16 -07:00
04dcf1aca6
Avoid redundant entity refcount operations
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-05-07 14:15:43 -07:00
Max Brunsfeld
7d4d21bab6
Add emacs key bindings for up/down/left/right
2021-05-07 13:51:17 -07:00
Nathan Sobo
925585cd36
Merge pull request #38 from zed-industries/new-file
...
Allow creating untitled buffers and saving them to new files
2021-05-07 13:57:09 -06:00
Max Brunsfeld
48bb2e37e0
Clean up Workspace::open_entry
2021-05-07 11:21:49 -07:00
Max Brunsfeld
e020ec6ec7
Merge branch 'master' into new-file
2021-05-07 10:10:20 -07:00
Max Brunsfeld
c2b9877370
Go back to using upstream core-foundation-rs
2021-05-07 09:53:07 -07:00
Max Brunsfeld
76bcbcc72c
Keep weak handles to workspace items
2021-05-07 09:52:15 -07:00
Antonio Scandurra
1292cf63c2
Merge pull request #43 from zed-industries/select-line
...
Implement `select_line` and `split_selection_into_lines`
2021-05-07 18:49:47 +02:00
Antonio Scandurra
dc91f987ec
Merge pull request #44 from zed-industries/emit-symbols-in-release
...
Include debug symbols in release mode
2021-05-07 18:21:09 +02:00
Antonio Scandurra
b3b36ea6c2
Autoscroll when folding an arbitrary range
2021-05-07 18:15:00 +02:00
Nathan Sobo and Antonio Scandurra
9349aeac1a
Fix focus test
...
Call on_focus on the root view when the window is originally created. Test dropping a focused view. Simplify test to avoid relying on emitting events.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2021-05-07 09:43:07 -06:00