Commit log

c757b3f Allow a longer timeout in buffer conflict test

Max Brunsfeld created

4910bc5 Merge branch 'master' into file-changed-on-disk

Max Brunsfeld created

36163f7 Merge pull request #56 from zed-industries/async-ctx

Click to expand commit body
Simplify spawning and asynchronous code

Max Brunsfeld created

d6c8952 Remove commented-out tests for spawn and spawn_stream

Max Brunsfeld created

a3be559 Pass a handle to the current view model when spawning

Click to expand commit body
Most of the time, we'll want a way to get a reference back to the current view or model, so this facilitates that common case.

Nathan Sobo created

fa6bd1f Introduce AsyncAppContext and simplify spawning

Click to expand commit body
Now when you call spawn in various context, you pass an FnOnce that is called with an AsyncAppContext and returns a static future. This allows you to write async code similar to how our tests work, borrowing the guts of the AsyncAppContext when needed to interact, but using normal async await semantics instead of callbacks.

Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>

Nathan Sobo and Max Brunsfeld created

d0f69c7 Merge pull request #55 from zed-industries/test-macros

Click to expand commit body
Introduce a `gpui::test` macro for less ceremony when writing tests

Max Brunsfeld created

2326ac3 Use `gpui::test` for tests in gpui

Click to expand commit body
Co-Authored-By: Max Brunsfeld <max@zed.dev>

Antonio Scandurra and Max Brunsfeld created

ab04d71 Use `gpui::test` in async tests in zed

Click to expand commit body
Co-Authored-By: Max Brunsfeld <max@zed.dev>

Antonio Scandurra and Max Brunsfeld created

1c2b381 Use `gpui::test` macro for synchronous tests in zed

Antonio Scandurra created

c7d97ad Introduce a `gpui::test` macro

Antonio Scandurra created

048bbc9 Test prompting when saving while there's a conflict

Antonio Scandurra created

ac2168f Update `mtime` and `is_deleted` when saving/loading a file

Antonio Scandurra created

2eff936 Make `MutableAppContext::prompt` private

Click to expand commit body
...as we're supposed to call this method only via ViewContext.

Antonio Scandurra created

6240334 Display prompt when trying to save a conflicting file

Antonio Scandurra created

c54a49e Use a different tab icon color for buffers with conflicts

Max Brunsfeld created

040189d Add basic handling for buffer's files changing on disk

Max Brunsfeld created

d5218fb Add failing test for buffer detecting on-disk changes

Max Brunsfeld created

de6376c Mark `FileHandle` as not deleted right after saving it

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

e72a309 Add a basic `tab` keybinding

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

e076c2c Merge pull request #48 from zed-industries/file-deletion

Click to expand commit body
Fix management of buffers' dirty state

Antonio Scandurra created

45b4146 Don't consider scan as being complete until its state is Idle

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

d8f7054 Fix saving files in single-file worktrees

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

d8eed53 Emit `Dirtied` event when a clean buffer's file is deleted

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

02bd9c8 Make sure `next_scan_complete` resolves

Click to expand commit body
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>

Antonio Scandurra and Nathan Sobo created

ff5561d Fix management of buffers' dirty state

Click to expand commit body
* 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>

Max Brunsfeld and Nathan Sobo created

01b20d5 Merge pull request #51 from zed-industries/add-cursors-and-cancel-selections

Click to expand commit body
Implement `add_selection_above`, `add_selection_below` and `cancel`

Antonio Scandurra created

d9e7547 :lipstick:

Antonio Scandurra created

07ef0d4 Bind `add_selection_{above,below}` to `cmd-alt-{up,down}`

Antonio Scandurra created

17258d4 Add test for `add_selection_above` and `add_selection_below`

Antonio Scandurra created

6f5e47d Add test for `BufferView::cancel`

Antonio Scandurra created

0622722 Split multi-line selection when starting a new columnar selection

Antonio Scandurra created

951aa0e Keep only one selection when starting to add selections above/below

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

3fe6440 Rename `add_cursor_{above,below}` to `add_selection_{above, below}`

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

b6449b3 Support undo of adding cursor above by adding cursor below and viceversa

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

acbda91 Empty last selection on cancel

Click to expand commit body
Co-Authored-By: Nathan Sobo <nathan@zed.dev>

Antonio Scandurra and Nathan Sobo created

143c50f Implement `cancel` for buffer

Antonio Scandurra created

0baff0c Implement `add_cursor_above` and `add_cursor_below` for buffer

Antonio Scandurra created

af6ab27 Merge pull request #47 from zed-industries/macos-10-compat

Click to expand commit body
Ensure that the bundle runs on macOS versions < 11.0

Max Brunsfeld created

f2b009e Ensure that the bundle runs on macOS versions < 11.0

Max Brunsfeld created

76d9a40 Merge pull request #40 from zed-industries/close-window

Click to expand commit body
Correctly handle closing windows and removing entities

Nathan Sobo created

2c74d75 Fix double borrow error in Window::on_close callbacks when quitting app

Click to expand commit body
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.

Nathan Sobo created

f3d7aa5 Merge pull request #46 from zed-industries/keyup-keystrokes

Click to expand commit body
Ignore events for held-down keys after a key combo is partially released

Max Brunsfeld created

9dbda45 Ignore events for held-down keys after a key combo is partially released

Max Brunsfeld created

b292baf Remove logging of retained views

Max Brunsfeld created

3120906 Merge branch 'master' into close-window

Max Brunsfeld created

83a844f Fix the Clone impl for AnyViewHandle

Max Brunsfeld created

318e8ab Avoid redundant entity refcount operations

Click to expand commit body
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com>
Co-Authored-By: Antonio Scandurra <me@as-cii.com>

Nathan Sobo , Max Brunsfeld , and Antonio Scandurra created

d8d36a3 Add emacs key bindings for up/down/left/right

Max Brunsfeld created

1c50059 Merge pull request #38 from zed-industries/new-file

Click to expand commit body
Allow creating untitled buffers and saving them to new files

Nathan Sobo created