Max Brunsfeld
56a4c2afae
Bump tree-sitter-yaml to avoid submodule error during build
2023-06-09 14:58:31 -07:00
Joseph T. Lyons
d8c1ab9c68
Fix formatter comment in default settings ( #2593 )
...
Fix comment related to the `formatter` configuration option in Zed's
default settings.
Release Notes:
- N/A
2023-06-09 15:14:04 -04:00
Max Brunsfeld
c1f1ee6b05
collab 0.14.2
2023-06-09 11:50:35 -07:00
Max Brunsfeld
b2bdca4779
Bump protocol version
2023-06-09 11:50:15 -07:00
Max Brunsfeld
097632467d
collab 0.14.1
2023-06-09 11:37:47 -07:00
Max Brunsfeld
87efd25d42
Avoid dropping the worktree_repository_statuses table for now
2023-06-09 11:37:39 -07:00
Max Brunsfeld
bb65d75798
Enable rust backtraces on kubernetes
2023-06-09 11:15:21 -07:00
Max Brunsfeld
9cbb63d374
collab 0.14.0
2023-06-09 11:12:45 -07:00
Piotr Osiewicz
5bef2f1778
Z-2303 editor: fix comment extension on the start of line ( #2595 )
...
Release Notes:
- Improved comment extension for cases where cursor was placed before
start of comment marker
2023-06-09 20:02:51 +02:00
Max Brunsfeld
fb83ab8e9f
Add outline support for Ruby singleton methods ( #2592 )
...
This pull request add support for Ruby singleton methods in the document
outline.
**Before**
<img width="1490" alt="outline-before"
src="https://github.com/zed-industries/zed/assets/503025/e90afd4c-bcdd-477b-92cf-fe34cec54980 ">
**After**
<img width="1493" alt="outline-after"
src="https://github.com/zed-industries/zed/assets/503025/067cc80b-7718-4395-9079-4677a689b9be ">
Release Notes:
- Added support for singleton methods in Ruby outline view. Fixed
[#1442 ](https://github.com/zed-industries/community/issues/1442 ).
2023-06-09 08:35:34 -07:00
Max Brunsfeld
738b06a778
Update JavaScript outline queries ( #2596 )
...
Add support for exported const declarations in the outline view. Did not
include more context (e.g., whether or not the it's exported or not)
because we're not doing that for TypeScript right now. We could do that
in a follow up pull request, addressing both JavaScript and TypeScript
at once.
**Before**
<img width="1186" alt="outline-before"
src="https://github.com/zed-industries/zed/assets/503025/e72b0ed4-52b0-4a7c-af70-b2f4758e3554 ">
**After**
<img width="1186" alt="outline-after"
src="https://github.com/zed-industries/zed/assets/503025/cd91bc7f-8ce3-485f-9b33-d487ad6c718d ">
Release Notes:
- Added support for exported const declarations in the JavaScript
outline view. Fixed
[#1399 ](https://github.com/zed-industries/community/issues/1399 ).
2023-06-09 08:34:14 -07:00
Kevin Hovsäter
4213cc013c
Update JavaScript outline queries
...
Add support for exported const declarations in the outline view.
2023-06-09 15:33:27 +02:00
Kevin Hovsäter
7deddd1149
Fix formatter comment in default settings
2023-06-09 08:08:07 +02:00
Kevin Hovsäter
57ff173e29
Add outline support for Ruby singleton methods
2023-06-09 07:31:09 +02:00
Nate Butler
85b049f250
Build tokens for each theme ( #2590 )
...
This PR adds the ability to export tokens for each theme.
You can export tokens by:
1. `cd styles`
2. `npm run build-tokens`
3. Tokens will be output in the target folder (`styles/target`)
The tokens match the ColorScheme object. In the future we may also
export tokens for our styleTrees.
Release Notes:
- N/A (No public facing changes)
---
TODO:
- [x] Generate Token Studio theme index file
- [x] ColorScheme
- [x] name:
- [x] isLight
- [x] lowest
- [x] middle
- [x] highest
- [x] popoverShadow
- [x] modalShadow
- [x] players
- [x] syntax
2023-06-08 16:40:46 -04:00
Nate Butler
ddcbc774ab
$tokens.json => $themes.json
2023-06-08 16:36:15 -04:00
Nate Butler
e4cbc29f98
Update buildTokens to export $metadata.json and $themes.json
2023-06-08 16:19:28 -04:00
Max Brunsfeld
6304897abc
Make the LSP log view searchable ( #2591 )
...
Also, I noticed errors in the logs of the Elixir LSP that we were
sending `goToTypeDefinition` requests, which that server does not
support. We now respect that server capability.
Release Notes:
- N/A
2023-06-08 13:15:05 -07:00
Nate Butler
3719c206c9
Only export color tokens for syntax
2023-06-08 15:14:59 -04:00
Nate Butler
91e1bb8fd4
WIP syntax tokens
2023-06-08 15:12:11 -04:00
Max Brunsfeld
a7f06f962b
Enable type definition capability in fake LSPs in tests
2023-06-08 12:09:37 -07:00
Max Brunsfeld
e0dd9e4185
Make the LSP log view searchable
2023-06-08 11:33:20 -07:00
Max Brunsfeld
11dbbcc9dd
Respect LSP goToTypeDefinition server capability
2023-06-08 11:33:09 -07:00
Nate Butler
999b2365a8
Export additional tokens, standardize naming convention
2023-06-08 12:21:51 -04:00
Max Brunsfeld
e3f319467a
Enhance LSP log viewer to show server logs in addition to RPC trace ( #2586 )
...
In debugging what's going on with the Elixir language server, there was
some interesting content in the server's logs (sent to the app via the
`window/logMessage` LSP endpoint). I decided to invest in making
language server issues easier to debug by exposing these `logMessage`
contents in the app.
Also, improve the UI of the view slightly:
* Select one of the servers by default (instead of "no server selected")
* Make it clearer that the menu is clickable
2023-06-08 09:03:52 -07:00
Max Brunsfeld
908de23b72
Tweak LSP log menu styling
2023-06-08 08:58:57 -07:00
Max Brunsfeld
afaff7f9a9
Merge branch 'main' into lsp-log-messages
2023-06-08 08:49:08 -07:00
Max Brunsfeld
817644eb20
Style new lsp log menu, add a test for it
2023-06-08 08:43:25 -07:00
Nate Butler
e2f46d5448
Build layer tokens for each theme
2023-06-08 11:15:59 -04:00
Nate Butler
16e3e04501
Update TSConfig ( #2589 )
...
Based on #2558 . Also fixes errors resulting from the stricter options.
Release Notes:
- N/A (No public facing changes)
2023-06-08 01:31:21 -04:00
Nate Butler
1e43fec1c5
Update buildLicenses to only include the theme url if there is one
2023-06-08 01:23:19 -04:00
Nate Butler
e996a66596
Update TSCondif
...
Based on #2558 . Also fixes errors resulting from the stricter options.
2023-06-08 01:15:57 -04:00
Nate Butler
a75e9faa83
Add foundation for exporting tokens from our color schemes ( #2588 )
...
We removed our Figma Tokens/Tokens Studio export a while back when we
moved to the theme to ColorSchemes. I'd like to get back to exporting
these so we can be working from up to date themes in Figma, especially
with the large amount of UI design work we'll be doing in the next few
weeks on channels.
This PR adds some basic plumbing to start working through the
theme/colorScheme and export the parts as tokens.
I also discovered that Tokens Studio now publishes their types, so we
can use them directly rather than writing our own:
https://github.com/tokens-studio/types
Pulled those in and started connecting them as well.
Running `npm run build-tokens` will export the tokens for each theme to
`styles/target/tokens`.
Currently only a few element's tokens are exported, will expand this
further as time permits.
Release Notes:
- N/A (No public facing changes)
2023-06-08 00:53:16 -04:00
Nate Butler
c8a9d73ea6
Add foundation for exporting tokens
2023-06-08 00:37:00 -04:00
Nate Butler
d4192fc3e9
Organize misc files into theme, themes and styleTrees ( #2587 )
...
We've accumulated a number of miscellaneous folders in the styles
folder. Simplifying these down to `theme`, `themes` and `styleTrees`.
Release Notes:
- N/A (No public facing changes)
2023-06-07 22:47:48 -04:00
Mikayla Maki
8216d26a7a
Switch to attaching git statuses to their associated entries ( #2571 )
...
This rewrites and simplifies the git status system by attaching the git
status to each individual entry. This also improves the git testing
infrastructure to cover more cases and be more accurate to how file
events actually occur. This also fixes several other bugs in the worktree and the buffer, and stops any randomly generated actions from happening inside a `.git` folder. Hopefully, we can undo this change soon once our randomized testing is more robust.
Release Notes:
- Will require a DB migration
TODO:
- [x] Pass randomized tests
- [x] Get ready for merging
2023-06-07 17:11:43 -07:00
Mikayla Maki
fc1f8c5657
Fixed ci
2023-06-07 16:58:55 -07:00
Mikayla Maki
8ca1a7d43d
add scan_complete await
2023-06-07 16:51:54 -07:00
Max Brunsfeld
66f215cd13
Restructure LSP log view to show log messages in addition to RPC trace
2023-06-07 16:51:09 -07:00
Mikayla Maki
9e9d8e3a7b
add mroe dbg
2023-06-07 16:50:15 -07:00
Mikayla Maki
9d58c4526d
Fix warning
2023-06-07 16:45:36 -07:00
Mikayla Maki
5f143f689f
Attempting to debug on ci...
2023-06-07 16:44:13 -07:00
Mikayla Maki
572d40381a
Add track caller
2023-06-07 16:39:10 -07:00
Mikayla Maki
2c5e83bf72
Fixed a bug where buffer saved clocks would desynchronize in rare execution paths
...
co-authored-by: Max <max@zed.dev >
2023-06-07 16:10:45 -07:00
Max Brunsfeld
78f9642ac2
Emit project event when a language server sends a logMessage notification
2023-06-07 14:46:08 -07:00
Mikayla Maki
cd63ec2c7f
fmt
2023-06-07 14:20:01 -07:00
Mikayla Maki
03a96d2793
Feature gate import
2023-06-07 14:15:20 -07:00
Mikayla Maki
0ac7a3bc21
fmt
2023-06-07 14:13:57 -07:00
Mikayla Maki
28ba27c9c5
Merge branch 'main' into stream-git-statuses
2023-06-07 14:12:58 -07:00
Mikayla Maki
34e134fafb
Fix several randomized test failures with the new git status implementation
2023-06-07 14:10:17 -07:00
Max Brunsfeld
351e4863cd
Fix some issues found when testing Elixir-LS ( #2583 )
...
Closes
https://linear.app/zed-industries/issue/Z-2209/popovers-dont-always-have-syntax-highlighted-code
Closes
https://linear.app/zed-industries/issue/Z-2206/highlight-syntax-in-hover-docs
* Fix a ton of errors in our logs due to us not recognizing that
`elixir-ls` does not support code actions.
* Syntax-highlight elixir code blocks in hover popovers
2023-06-07 12:21:48 -07:00
Max Brunsfeld
11ab1a8cc6
collab 0.13.1
2023-06-07 10:54:27 -07:00
Max Brunsfeld
be8d268eb9
Bump tree-sitter-yaml submodule to avoid broken child submodule
2023-06-07 10:50:03 -07:00
Max Brunsfeld
72372ddf0e
Highlight hover code blocks as LSP's own language by default
...
The elixir LSP does not include a language name on its elixir code blocks.
2023-06-07 10:01:19 -07:00
Nate Butler
86ec43c908
Update createColorScheme to accept ThemeConfig ( #2557 )
...
- Added ThemeConfig
- Updated themes use ThemeConfig
- Refactoring
- Fixed TypeScript errors
Release Notes:
- N/A (No public facing changes)
2023-06-07 12:57:34 -04:00
Nate Butler
29de420b59
Organize misc files into theme, themes and styleTrees
2023-06-07 12:50:37 -04:00
Nate Butler
6269cec4f1
Minor updates
2023-06-07 12:40:49 -04:00
Max Brunsfeld
6067575e38
collab 0.13.0
2023-06-07 09:29:58 -07:00
Max Brunsfeld
f56d642b88
Disable scheduled randomized test workflow for now
2023-06-07 09:20:25 -07:00
Joseph Lyons
8882b22c9c
v0.91.x dev
2023-06-07 11:57:41 -04:00
Piotr Osiewicz
e94129446d
Z 1618/extend comments ( #2585 )
...
Fixes Z-1618. In the current state, this only works for line comments
such as `//` (and whatever's set in `{language}.toml` as a
line_comment).
Release Notes:
- Comments are now extended on new line.
2023-06-07 17:37:02 +02:00
Sergii Onufriienko
b1f009cdce
Merge branch 'main' into sergey/z-1768-update-createcolorscheme-to-accept-a-theme-in-the
2023-06-07 16:12:13 +01:00
Sergey Onufrienko
4c405e65a3
feat: use theme index to build licenses
2023-06-07 16:10:16 +01:00
Sergey Onufrienko
0ad76ac92c
feat: use theme index to build themes
2023-06-07 16:10:02 +01:00
Sergey Onufrienko
02c1efc60d
feat: re-export chroma
2023-06-07 16:09:24 +01:00
Sergey Onufrienko
f5d1f314e0
feat: add themes index
2023-06-07 16:08:58 +01:00
Sergey Onufrienko
d2b8501347
feat: change themes to return ThemeConfig
2023-06-07 16:08:48 +01:00
Antonio Scandurra
d5441ba386
Introduce an Assistant Panel ( #2584 )
...
This pull request introduces a new assistant panel to Zed that lets
users interact with OpenAI using their API key:

After setting the key up, it will be saved to the keychain and
automatically loaded the next time the assistant panel is opened. The
key can be reset using `assistant: reset key`.

From there, users can type messages in a multi-buffer and hit
`cmd-enter` (`assistant: assist`) to stream assistant responses using
the OpenAI API. Responses can be canceled by hitting `escape`.

Users can quote a selection from the active editor by hitting `cmd->`
(`assistant: quote selection`), which will embed the selected piece of
text in a Markdown fenced code block. Conversations with the assistant
are ephemeral at the moment, but can be easily copy/pasted:

Release Notes:
- Added a new assistant panel feature that enables interacting with
OpenAI using an API key. This replaces the previous experimental `ai:
assist` command that would work on any buffer. The experience is similar
to the one offered by ChatGPT with the added ability to edit, delete or
enhance previous messages. When hitting `cmd-enter`, the assistant will
start streaming responses from OpenAI. A response stream can be canceled
using `escape`. Moreover, the active editor's selection can be quoted in
the assistant panel using `cmd->`, which will automatically embed the
selected piece of text in a Markdown fenced code block.
2023-06-07 16:05:57 +02:00
Antonio Scandurra
d3e0d38bef
Fix assistant panel tests
2023-06-07 15:24:08 +02:00
Antonio Scandurra
d26cc2c897
Maintain scroll bottom when streaming assistant responses
2023-06-07 15:01:50 +02:00
Antonio Scandurra
43500dbf60
Fix zed tests
2023-06-07 10:02:35 +02:00
Antonio Scandurra
0dae8f2dd8
Merge remote-tracking branch 'origin/main' into assistant-2
2023-06-07 09:34:16 +02:00
Antonio Scandurra
a6feaf1300
Allow search assistant editors
2023-06-07 09:24:18 +02:00
Joseph Lyons
c93b6cc599
Tweak comment wording
2023-06-07 00:23:58 -04:00
Max Brunsfeld
e8479f23f9
Improve log message on invalid LSP message from server's stdout
2023-06-06 17:13:59 -07:00
Max Brunsfeld
6f2726524e
Remove stray println
2023-06-06 17:13:59 -07:00
Max Brunsfeld
fccbac4887
Handle LSP codeActions capability set to false
2023-06-06 17:13:59 -07:00
Max Brunsfeld
0d90c6d02e
Improve syntax highlighting and outline view for Elixir ( #2582 )
...
Fixes
https://linear.app/zed-industries/issue/Z-2208/outline-view-doesnt-differentiate-between-overloaded-functions
Fixes
https://linear.app/zed-industries/issue/Z-2205/elixir-syntax-highlighting-not-working-properly-for-doc-attributes-and
This PR improves syntax highlighting and outline view in Elixir. It's
common to overload elixir functions, with many different versions of the
function for different patterns of parameters, so I updated the outline
view to show functions' parameters in Elixir. But if we showed functions
the same way in the *breadcrumbs*, it would take up too much space.
So I added a new capture in languages' `outline` queries called
`@context.extra`, which is included in the outline view, but not in
breadcrumbs.
Release Notes:
- Improved syntax highlighting of doc attributes and special macros in
Elixir
- Updated the outline view in Elixir to display function parameters, to
allow differentiating between function overloads.
2023-06-06 16:34:33 -07:00
Max Brunsfeld
4b9a3c66e6
Show function parameters in elixir outline view
...
Introduce a new capture in the outline query called 'context.extra', which
causes text to appear in the outline, but not in the breadcrumbs.
2023-06-06 16:27:05 -07:00
Max Brunsfeld
7aeaa84657
Fix the order of some patterns in elixir highlight query
2023-06-06 16:06:16 -07:00
Max Brunsfeld
8dc679e74e
Upgrade tree-sitter-elixir
2023-06-06 16:06:16 -07:00
Max Brunsfeld
6737ee1495
Avoid panic when failing to load a language's queries
2023-06-06 16:06:16 -07:00
Piotr Osiewicz
cc63d3d048
chore: add targets to rust-toolchain.toml ( #2581 )
2023-06-07 00:12:47 +02:00
Max Brunsfeld
a9f865d828
Don't apply the 'literal' color to entire markdown code blocks ( #2579 )
...
### Before

### After

Release Notes:
* Improved the syntax highlighting of fenced code blocks in markdown.
2023-06-06 14:54:24 -07:00
Piotr Osiewicz
dfd72770e7
chore: bump MSRV to 1.70, add rust-toolchain ( #2580 )
...
This time I've added a `components` section to rust-toolchain.toml file
to explicitly require a rustfmt component. Fingers crossed.
2023-06-06 23:49:34 +02:00
Max Brunsfeld
3fc2e0754b
Don't apply the 'literal' color to entire markdown code blocks
2023-06-06 14:34:45 -07:00
Max Brunsfeld
bdd3e77e02
Live-reload tree-sitter queries in development ( #2578 )
...
This PR adds live reloading of Tree-sitter queries when running in debug
mode, similar to what we do for the themes. This way, you can change a
highlighting query or an outline query, and immediately see the result
in the app.
Release Notes:
- N/A
2023-06-06 14:30:28 -07:00
Max Brunsfeld
7bfb51ee76
Live-reload tree-sitter queries in development
2023-06-06 14:20:21 -07:00
Piotr Osiewicz
559a58d737
Revert "chore: bump MSRV to 1.70" ( #2577 )
...
Reverts zed-industries/zed#2573
2023-06-06 22:21:34 +02:00
Piotr Osiewicz
c1c91dc2e3
chore: bump MSRV to 1.70 ( #2573 )
...
Add rust-toolchain.toml
Release Notes:
- N/A
2023-06-06 21:50:27 +02:00
Piotr Osiewicz
572c59eec4
chore: Enable full LTO ( #2548 )
...
Per conversation with Antonio, I've suggested enabling full LTO; right
now we use a crate-local ThinLTO, which does not inline function calls
across crates.
| Configuration | Current main (788f97e ) | Thin LTO | Full LTO |
|------------------|------------------------|-----------|-----------|
| Size in bytes | 158806721 | 155868753 | 111115553 |
| % of `main` size | 100% | 98.14% | 69.96% |
| Size in bytes (no debug info) | 129186657 | 127942929 | 108281345 |
2023-06-06 21:50:08 +02:00
Max Brunsfeld
17560cc5b0
Eliminate assets crate ( #2575 )
...
Previously, all static assets were embedded into Zed using a single
`RustEmbed` struct called `Assets`, which was in a crate of its own,
also called `assets`. Many crates depended on this crate. The problem
with this situation was that changing *any* static asset file caused
almost every crate in the codebase to need recompilation (because of
recursive dependencies on `assets`).
Now, most of the assets are embedded only into the top-level `zed`
crate. A few assets (such as settings JSON files and AI prompts) are
needed in lower-level crates such as `settings` and `ai`. For these,
I've created separate `RustEmbed` structs in those specific crates,
which embed those specific sub-folders of `assets`.
The result is that now, when you change a theme file, the only crate
that needs to recompile is `zed`.
Release Notes:
- N/A
2023-06-06 12:00:44 -07:00
Max Brunsfeld
dbbd0558c3
Eliminate assets crate
2023-06-06 11:46:46 -07:00
Joseph Lyons
2003d3dbe4
Update initial_user_settings.json
2023-06-06 14:39:56 -04:00
Antonio Scandurra
7a78e64831
Merge remote-tracking branch 'origin/main' into assistant-2
2023-06-06 19:18:22 +02:00
Antonio Scandurra
16090c35ae
Insert reply after assistant message when hitting cmd-enter
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-06-06 19:15:06 +02:00
Antonio Scandurra
ef7ec265c8
Cycle message roles on click
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-06-06 18:45:08 +02:00
Max Brunsfeld
53906fd3da
Add an application menu item for creating/opening a project-specific settings file ( #2572 )
...
Previously, project-specific settings were not discoverable. This PR
adds a `Zed > Preferences > Local Settings` application menu command
that creates a `.zed/settings.json` at the root of your current
worktree. This command works in both local and remote projects.
Limitations:
* Currently, if you have an empty project open, the command just shows a
notification that there are no folders open.
* The JSON-schema-based autocomplete is the same in local settings files
as in your main settings, even though not all settings can be locally
customized.
Release Notes:
- Added an application menu command - `Zed > Preferences > Local
Settings` for creating a folder-specific settings file.
2023-06-06 09:27:36 -07:00
Antonio Scandurra
ac7178068f
Include message headers in copied assistant text
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-06-06 18:18:04 +02:00
Max Brunsfeld
cfcfc3bf6b
Show notification when attempting to open local settings in a project w/ no folders
2023-06-06 09:03:57 -07:00
Antonio Scandurra
093ce8a9ac
Simplify prompt
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-06-06 17:45:58 +02:00
Nate Butler
7b066df7e6
Tighten up spacing in the project panel ( #2574 )
...
Following https://github.com/zed-industries/zed/pull/2559 the project
panel entries become pretty wide again. This PR tries to mitigate that
and just make some general improvements to visual density in the project
panel.
- Reduces padding around items
- Removes top margin
- Slightly reduces the height of each item
- Fixes an issue where ignored files had the wrong color chevron
Release Notes:
- Improved density of the project panel and tidied up some visual
issues.
2023-06-06 11:31:53 -04:00
Piotr Osiewicz
a0e2e5db7d
project panel/styles: Align child's chevron with parent path ( #2559 )
...
Z-1012
Release notes:
- Adjust indent of files in subdirectories.
2023-06-06 16:55:38 +02:00
Antonio Scandurra
2b1aeb07bc
Show error message when requests to OpenAI fail
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-06-06 16:53:56 +02:00
Antonio Scandurra
9c59146026
Set assistant editor's title based on the first question/answer pair
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-06-06 15:59:10 +02:00
Antonio Scandurra
69b8267b6b
Show the current model and allow clicking on it to change it
2023-06-06 13:13:44 +02:00
Antonio Scandurra
ada222078c
Insert a user reply when hitting cmd-enter in an assistant message
2023-06-06 13:13:41 +02:00
Antonio Scandurra
f4f060667e
Add assertion to pinpoint how deletion works across excerpts
2023-06-06 12:36:26 +02:00
Antonio Scandurra
337dda8e3a
Only remove excerpts when an edit touches them
2023-06-06 12:27:05 +02:00
Antonio Scandurra
8032324470
Prevent moving across excerpts on Editor::delete
2023-06-06 12:26:53 +02:00
Antonio Scandurra
e46d1549d6
Retain selection's head (as opposed to its end) on insertion
...
This makes a difference when an edit spans two excerpts and the selection
start won't necessarily be the same as the selection end after the edit.
2023-06-06 10:12:15 +02:00
Nathan Sobo
23836eb251
Not working yet: Remove empty messages unless they contain the cursor
...
Problem is, I'm trying to trust the excerpt id of the selection head,
but it's a sentinel value and not the actual excerpt id of the message.
I think we probably need to resolve to offsets instead.
2023-06-05 22:58:08 -06:00
Max Brunsfeld
296a0bf510
Populate created local settings file with an empty JSON object and comments
2023-06-05 18:20:02 -07:00
Max Brunsfeld
cb975f1252
Add Zed > Preferences > Local Settings to application menu
2023-06-05 17:45:42 -07:00
Max Brunsfeld
0949ee84d8
🎨 Move OpenSettings action back to the zed crate
2023-06-05 17:43:05 -07:00
Mikayla Maki
a2d58068a7
Improve test generation and implement status propogation
...
co-authored-by: max <max@zed.dev >
2023-06-05 17:30:12 -07:00
Mikayla Maki
c12bdc894a
Silence not found errors
2023-06-05 15:19:59 -07:00
Max Brunsfeld
398b0f303c
Apply bounds to all windows when using start-local-collaboration script ( #2570 )
...
The `start-local-collaboration` script opens two instances of Zed, each
logged in as a different user, and each one taking up half of the
screen. But previously, when joining a remote project as one of the
collaborators, that newly-opened window would be full screen.
Now, each instance of Zed keeps *all* of its windows on its half of the
screen. This is implemented by respecting the `ZED_WINDOW_{SIZE,BOUNDS}`
env vars, even when joining *remote* projects.
Release Notes:
- N/A
2023-06-05 14:49:39 -07:00
Max Brunsfeld
3d1ba1b363
Apply bounds to all windows when using start-local-collaboration script
2023-06-05 14:36:21 -07:00
Max Brunsfeld
571151173c
Fix copilot state corruption when there are multiple buffers with the same remote id in different projects ( #2569 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1511/thread-main-panicked-at-assertion-failed-left-==-right-left-local-0-1
Previously, when exchanging messages about buffers with a copilot
language server, we identified buffers using their **remote id**. This
caused problems when there were multiple projects open, where one or
more were remote, because buffers' remote ids are only unique within a
given project.
When you have multiple projects open, and one or more of the projects is
remote, it's pretty easy to have two buffers open with the same remote
id. In my testing, when this happened, copilot would stop working in
both buffers. But I believe that depending on the editing patterns that
occur in the two buffers, it could cause the crash reported in the
Linear issue above.
This PR changes our copilot logic to use buffers' local handle ids for
identifying them. This fixed the problems I was able to reproduce when
using copilot in both remote and local projects.
Release Notes:
- Fixed a crash that would sometimes occur when editing buffers after
having collaborated on a remote project.
2023-06-05 14:33:56 -07:00
Max Brunsfeld
12dd91c89c
Use local ids, not remote ids, to identify buffers to copilot
2023-06-05 14:12:19 -07:00
Mikayla Maki
5e4da6433f
Add file and line number information to logs ( #2568 )
...
This PR adds codegen from rustc to track the file and line number of
calls to `log_err()`. I haven't noticed much longer compile times on my
machine, and looking at the
[implementation](https://rustc-dev-guide.rust-lang.org/backend/implicit-caller-location.html )
it essentially adds an extra argument and secret reference pass.
However, this will show a lot more data in our logs on user machines.
Requesting review from @ForLoveOfCats, who usually knows a bunch about
this kind of thing :)
2023-06-05 13:24:07 -07:00
Mikayla Maki
624467ebca
Add file and line number information to logs
2023-06-05 12:53:37 -07:00
Mikayla Maki
9a13a2ba2c
WIP: Add status bubbling to project panel
2023-06-05 12:53:04 -07:00
Joseph T. Lyons
7fbafc8030
Remove code sending zed events to mixpanel ( #2567 )
...
Release Notes:
- N/A
2023-06-05 15:40:27 -04:00
Joseph Lyons
311074e397
Remove code sending zed events to mixpanel
2023-06-05 15:33:17 -04:00
Mikayla Maki
49c5a3fa86
Add postgres migration
2023-06-05 12:17:21 -07:00
Joseph T. Lyons
2190a27dff
Stop sending editor events to mixpanel ( #2566 )
...
Release Notes:
- N/A
2023-06-05 15:15:30 -04:00
Joseph Lyons
70c5489c13
Stop sending editor events to mixpanel
2023-06-05 15:09:47 -04:00
Mikayla Maki
4ac5f7b14e
Add statuses to test integration
2023-06-05 12:06:23 -07:00
Mikayla Maki
e56fcd69b5
Track git status changes with the changed_paths system
2023-06-05 11:50:23 -07:00
Joseph T. Lyons
4f3165692f
Move app version into panic object ( #2565 )
...
Final tweaks to clean up how we structure our panic data
Release Notes:
- N/A
2023-06-05 14:40:28 -04:00
Joseph Lyons
917d8949b7
Move app version into panic object
2023-06-05 14:17:48 -04:00
Julia
6b89243902
Update rust-bindgen dev-dependencies ( #2563 )
...
I did \*something\* Friday afternoon which changed something about my
system SDK to break the `media` crate's bindings generation. Some of the
types and consts were not being generated despite being able to prove
that they exist in the source, such as when running the header through
the preprocessor myself and feeding that through the generator. Updating
my OS, XCode, command line tools, and reinstalling Rust as well as
working from fresh clones of the repo had no effect.
Updating rust-bindgen resolved the issue and downgrading the version
back to the original version caused the issue to reappear. I'm still not
sure what happened to change the SDK but at this point with being able
to build the project again I'm not going to look a gift horse in the
mouth.
Release Notes:
- N/A
2023-06-05 09:21:07 -04:00
Antonio Scandurra
0ed8bbc818
Query rect_for_text_range on focused view instead of root element ( #2564 )
...
This was causing IME input to be drawn in the wrong place when there
were splits or panels in the window.
Release Notes:
- Fixed a bug that was causing IME input to sometimes be rendered in the
wrong position.
2023-06-05 12:11:35 +02:00
Antonio Scandurra
c872f581d1
Query rect_for_text_range on focused view instead of root element
...
This was causing IME input to be drawn in the wrong place when there
were splits or panels in the window.
2023-06-05 12:00:40 +02:00
Antonio Scandurra
bef6932da7
Avoid accidentally taking the api_key when requesting an assist
2023-06-05 11:25:21 +02:00
Julia
5790d6993e
Update rust-bindgen dev-dependencies
2023-06-04 23:34:22 -04:00
Joseph T. Lyons
a89f3ed445
Fix typos ( #2562 )
...
Quite literally just ran `typos --write-changes` from
https://crates.io/crates/typos . Its pretty impressive - wonder if we
should run it on CI.
Release Notes:
- N/A
2023-06-02 22:08:45 -04:00
Joseph Lyons
7c60f636d5
Fix typos
2023-06-02 22:02:19 -04:00
Mikayla Maki
ca077408d7
Fix bug where git statuses would not be initialized on startup
...
move git status queries to be on entry creation
co-authored-by: max <max@zed.dev >
2023-06-02 17:38:39 -07:00
Mikayla Maki
2f97c7a4f1
Remove stale comments
...
Implement status bubbling query with sum tree traversals
co-authored-by: max <max@zed.dev >
2023-06-02 16:41:01 -07:00
Mikayla Maki
e377459948
Remove stateful bubbling
...
co-authored-by: max <max@zed.dev >
2023-06-02 15:07:49 -07:00
Mikayla Maki
99a0e11e70
Abandoning stateful bubbling approach
...
co-authored-by: max <max@zed.dev >
2023-06-02 14:51:40 -07:00
Max Brunsfeld
46d2cbaa4c
Improve panic reports ( #2560 )
...
* Add an `identifying_backtrace` field that only contains symbols in
*our* own codebase, which can be used for better deduplication.
* In the main backtrace, include file and line numbers for all symbols
in our codebase
* Exclude any stack frames within the panic handling/hooking system
itself, so that the top line of the backtrace is where the panic
originated in our codebase.
This should improve our panic deduplication, and also make panic reports
a bit more readable.
example:
```
{
"thread": "main",
"payload": "wtf",
"location_data": {
"file": "crates/zed/src/zed.rs",
"line": 459
},
"backtrace": [
"zed::open_log_file::{{closure}}::{{closure}}::{{closure}}",
" crates/zed/src/zed.rs:459",
"gpui::app::AppContext::spawn_internal::{{closure}}",
" crates/gpui/src/app.rs:2073",
"gpui::executor::any_local_future::{{closure}}",
" crates/gpui/src/executor.rs:1026",
"<core::pin::Pin<P> as core::future::future::Future>::poll",
"<async_task::runnable::spawn_local::Checked<F> as core::future::future::Future>::poll",
"async_task::raw::RawTask<F,T,S>::run",
"async_task::runnable::Runnable::run",
"<gpui::platform::mac::dispatcher::Dispatcher as gpui::platform::Dispatcher>::run_on_main_thread::trampoline",
" crates/gpui/src/platform/mac/dispatcher.rs:40",
"<() as objc::message::MessageArguments>::invoke",
"objc::message::platform::send_unverified",
"objc::message::send_message",
"<gpui::platform::mac::platform::MacForegroundPlatform as gpui::platform::ForegroundPlatform>::run",
" crates/gpui/src/platform/mac/platform.rs:366",
"gpui::app::App::run",
" crates/gpui/src/app.rs:251",
"Zed::main",
" crates/zed/src/main.rs:118",
"core::ops::function::FnOnce::call_once",
"std::sys_common::backtrace::__rust_begin_short_backtrace",
"std::rt::lang_start::{{closure}}",
"core::ops::function::impls::<impl core::ops::function::FnOnce<A> for &F>::call_once",
"std::rt::lang_start"
],
"release_channel": "dev",
"os_name": "macOS",
"os_version": "12.6.1",
"architecture": "aarch64",
"panicked_on": 1685734744050,
"identifying_backtrace": [
"zed::open_log_file::{{closure}}::{{closure}}::{{closure}}",
"gpui::app::AppContext::spawn_internal::{{closure}}",
"gpui::executor::any_local_future::{{closure}}",
"<gpui::platform::mac::dispatcher::Dispatcher as gpui::platform::Dispatcher>::run_on_main_thread::trampoline",
"<gpui::platform::mac::platform::MacForegroundPlatform as gpui::platform::ForegroundPlatform>::run",
"gpui::app::App::run",
"Zed::main"
]
}
```
Release Notes:
N/A
2023-06-02 13:11:57 -07:00
Max Brunsfeld
33c4c32196
Avoid writing spurious nulls to the settings file when updating it programatically ( #2561 )
...
Thanks for catching this @iamnbutler.
2023-06-02 13:11:35 -07:00
Max Brunsfeld
7417835f06
Avoid writing spurious nulls to settings file when updating it programatically
2023-06-02 13:02:17 -07:00
Max Brunsfeld
f6a4706410
Improve panic reports
...
* Add an 'identifying_backtrace' field that only contains symbols in our
codebase, which can be used for better deduplication.
* In the main backtrace, include file and line numbers for all symbols
in our codebase
2023-06-02 12:37:39 -07:00
Joseph T. Lyons
00265c19a0
Add additional panic information to panic events ( #2555 )
...
Adds the following to the panic event
release_channel
os_name
os_version
architecture
Merge first: https://github.com/zed-industries/zed.dev/pull/322
Release Notes:
- N/A
2023-06-02 14:30:16 -04:00
Piotr Osiewicz
345fad3e9d
editor: add select previous command ( #2556 )
...
Added a `select previous` command to complement `select next`.
Release Notes:
- Added "Select previous" editor command, mirroring `Select next`.
Ticket number: Z-366
2023-06-02 17:32:34 +02:00
Antonio Scandurra
f00f16fe37
Show remaining tokens
2023-06-02 17:27:21 +02:00
Sergey Onufrienko
f97999d97f
feat: update themes to use ThemeConfig
2023-06-02 14:11:11 +02:00
Sergey Onufrienko
5fbbc1936f
fix: typescript errors
2023-06-02 14:10:44 +02:00
Sergey Onufrienko
b38f760fcd
feat: add index export
2023-06-02 14:10:19 +02:00
Sergey Onufrienko
d3ed958308
chore: make SyntaxHighlightStyle.color optional
2023-06-02 14:10:02 +02:00
Sergey Onufrienko
6b00db75ad
feat: update and refactor colorScheme
2023-06-02 14:08:35 +02:00
Sergey Onufrienko
56ecfaf2f0
feat: add themeConfig types
2023-06-02 14:07:43 +02:00
Antonio Scandurra
3750e64d9f
Save OpenAI API key in the keychain
2023-06-02 12:15:25 +02:00
Piotr Osiewicz
571d2f4966
Z-1074/search default label ( #2547 )
...
This commit adds a default "Project search" tooltip for empty search
panes. Fixes Linear ticket Z-1074
Release Notes:
- Added default tooltip to empty search panes.
([#1533 ](https://github.com/zed-industries/community/issues/1533 )).
2023-06-02 11:42:40 +02:00
Antonio Scandurra
a81d164ea6
Allow saving the OpenAI API key in the assistant panel
2023-06-02 11:38:02 +02:00
Antonio Scandurra
d0aff65b1c
Allow moving the assistant panel to other docks
2023-06-02 10:55:19 +02:00
Antonio Scandurra
55c8c6d3fb
Allow adding new contexts
2023-06-02 10:29:22 +02:00
Antonio Scandurra
cf934ab696
Fix compile errors
2023-06-02 10:08:06 +02:00
Antonio Scandurra
20e65a533c
Merge remote-tracking branch 'origin/main' into assistant-2
2023-06-02 09:32:11 +02:00
Mikayla Maki
3768851799
WIP: Git statuses
2023-06-01 23:27:49 -07:00
Joseph Lyons
c55aee84d3
Rename field to panicked_on
2023-06-02 01:33:25 -04:00
Joseph Lyons
cc055901e1
Add additional panic information to panic events
2023-06-01 23:34:39 -04:00
Mikayla Maki
5e43dcaab8
WIP: Add stateful status bubbling to worktree
2023-06-01 16:51:34 -07:00
Max Brunsfeld
0bd9d5b1fa
Zoom out all panes when opening a dock ( #2554 )
...
Fixes
https://linear.app/zed-industries/issue/Z-2051/center-zoom-isnt-unset-when-opening-project-panel
Release Notes:
- Fixed a bug where opening the project panel did not reset the zoom
state of a pane.
2023-06-01 15:26:46 -07:00
Max Brunsfeld
585d13d3db
Unzoom all panes when opening a dock
2023-06-01 15:20:15 -07:00
Max Brunsfeld
a55eafa726
Fix ambiguous glob export warnings in rust 1.70 ( #2553 )
...
This fixes a warning that is introduced when upgrading to Rust 1.70.
Release Notes:
- N/A
2023-06-01 14:37:36 -07:00
Max Brunsfeld
e67e6e6f70
Fix ambiguous glob export warnings in rust 1.70
2023-06-01 14:07:59 -07:00
Joseph T. Lyons
6d24a8a763
Add panic events ( #2552 )
...
Adds a time field to support panic events. See
https://github.com/zed-industries/zed.dev/pull/321
Release Notes:
- N/A
2023-06-01 16:47:29 -04:00
Joseph Lyons
0065f5715c
Add panic events
2023-06-01 16:40:54 -04:00
Mikayla Maki
9d6b3744f7
Redraw the terminal on every wakeup ( #2551 )
...
For whatever reason, the optimizations of panes and workspace have
caused the terminal to notify less often then it should. This PR fixes
that oversight.
2023-06-01 10:56:13 -07:00
Mikayla Maki
40c6baf7cb
Redraw the terminal on every wakeup
...
co-authored-by: max <max@zed.dev >
2023-06-01 10:49:31 -07:00
Mikayla Maki
d64dc3960d
Make settings store handle no user settings ( #2550 )
...
This fixes the crash users have been reporting with the theme selector
2023-06-01 10:25:30 -07:00
Mikayla Maki
2390815d67
Make settings store handle no user settings
...
co-authored-by: max <max@zed.dev >
2023-06-01 10:09:04 -07:00
Julia
2ffbeca7dd
Avoid blocking forever on startup if config files do not exist ( #2549 )
...
The files will still get created if the user opens their settings and
saves, otherwise everything will transparently work
Release Notes:
- Fixed an issue where a missing settings file would cause a hang on
startup
([#1590 ](https://github.com/zed-industries/community/issues/1590 )).
2023-06-01 12:13:22 -04:00
Julia
51c82da840
Avoid blocking forever on startup if config files do not exist
...
The files will still get created if the user opens their settings and
saves, otherwise everything will transparently work
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-06-01 12:04:45 -04:00
Kirill Bulatov
d8ce333cf8
Remove wrong assertion
2023-06-01 16:51:29 +03:00
Piotr Osiewicz
01621972c5
Change "Project search" to "Project Search"
2023-06-01 12:31:37 +02:00
Piotr Osiewicz
e1a6dc9077
search: Add a default tooltip for empty searches
...
Z-1074
2023-06-01 11:17:33 +02:00
Max Brunsfeld
788f97ec68
Add support for folder-specific settings ( #2537 )
...
This PR allows you to customize Zed's settings within a particular
folder by creating a `.zed/settings.json` file within that folder.
Todo
* [x] respect folder-specific settings for local projects
* [x] respect folder-specific settings in remote projects
* [x] pass a path when retrieving editor/language settings
* [x] pass a path when retrieving copilot settings
* [ ] update the `Setting` trait to make it clear which types of
settings are locally overridable
Release Notes:
* Added support for folder-specific settings. You can customize Zed's
settings within a particular folder by creating a `.zed` directory and a
`.zed/settings.json` file within that folder.
2023-05-31 16:27:08 -07:00
Max Brunsfeld
ae7606ce21
collab 0.12.5
2023-05-31 15:38:26 -07:00
Max Brunsfeld
0d281c1b89
🎨
2023-05-31 15:13:01 -07:00
Max Brunsfeld
0dd7694ff5
Make language_settings take a language, not a language name
2023-05-31 15:10:30 -07:00
Max Brunsfeld
03a351fb26
Make language settings accessors take an arc dyn file
2023-05-31 14:57:04 -07:00
Max Brunsfeld
38078b93cc
v0.90.x dev
2023-05-31 14:44:48 -07:00
Max Brunsfeld
a2ab7c9eb9
Respect project-specific settings for copilot
2023-05-31 14:42:15 -07:00
Mikayla Maki
6f4fd74f43
Add a dock-keybinding-changed one-time notification ( #2546 )
...
This code is intended to be removed at a later date.
Release Notes:
- N/A
2023-05-31 14:28:12 -07:00
Mikayla Maki
bf2016adf5
Remove version check
2023-05-31 14:23:56 -07:00
Mikayla Maki
27ef0e2b52
De-morgans properly
2023-05-31 14:21:38 -07:00
Mikayla Maki
45b42c512d
fmt
2023-05-31 14:17:27 -07:00
Mikayla Maki
705e36827c
add version check
2023-05-31 14:16:37 -07:00
Mikayla Maki
b875d4ed40
Remove silly panic
2023-05-31 14:10:50 -07:00
Mikayla Maki
ed0b9acb0a
Add panic if version is 0.91
2023-05-31 14:06:36 -07:00
Mikayla Maki
ef80b539d1
Fix notification styling, minimize database reads
2023-05-31 13:56:41 -07:00
Max Brunsfeld
62660f2766
Fix more issues with panels and zoom ( #2545 )
...
Release Notes:
* Fixed the behavior of panel buttons when their panel is open. Show the
key binding for closing the containing dock (preview only).
* Improved the styling of zoomed panels and panes, giving them a
stronger border, and color the zoom button with an "active" style
(preview only).
* Improved the stability of panels' zoom state. Close their dock instead
of resetting their zoom state when dismissing panels to reveal other
items (preview only).
2023-05-31 13:17:12 -07:00
Max Brunsfeld
193474a346
🎨
2023-05-31 13:07:20 -07:00
Max Brunsfeld
c48fed26bd
When revealing items, zoom-out any inactive panes
2023-05-31 13:05:50 -07:00
Mikayla Maki
4717ce1da3
WIP: Move statuses to entries
...
co-authored-by: julia <julia@zed.dev >
2023-05-31 12:55:31 -07:00
Max Brunsfeld
3f6aa94a5f
Use active color for zoom button in a zoomed pane
2023-05-31 12:51:57 -07:00
Max Brunsfeld
893615236d
Only include one border edge for zoomed panels
2023-05-31 12:45:55 -07:00
Nate Butler
1f72f9e18b
Add un-hooked up zoomIcon styles
2023-05-31 12:45:55 -07:00
Nate Butler
a10933c063
Update pane/panel zoom styling
2023-05-31 12:45:55 -07:00
Max Brunsfeld
ac41564a8f
Dismiss zoomed panels by closing their dock, not zooming them out
2023-05-31 12:45:55 -07:00
Mikayla Maki
22e4086658
WIP: Move statuses to be on their associated file entries in worktree
...
co-authored-by: Julia <julia@zed.dev >
2023-05-31 11:03:11 -07:00
Sergii Onufriienko
c6672dbac2
Update theme license logic ( #2541 )
...
Use new theme file structure
```
themes/
[theme_name]
[theme_name]-common.ts
[theme_name]-light.ts
[theme_name]-dark.ts
LICENSE
```
Release Notes:
- N/A
2023-05-31 18:36:13 +01:00
Max Brunsfeld
76927b6d95
Make active panel's button close its dock
2023-05-31 10:29:59 -07:00
Max Brunsfeld
eeba72d775
Bump protocol version
2023-05-31 09:03:45 -07:00
Max Brunsfeld
8f95435548
Replicate project-specific settings when collaborating
2023-05-30 18:08:03 -07:00
Mikayla Maki
c9820fde61
WIP: Add toast when users attempt to use shift-escape for the first time
2023-05-30 17:48:41 -07:00
Mikayla Maki
584e5f7958
Fix usability issues with new panel system. ( #2544 )
...
This PR updates the dock key bindings according to the following model:
There are three bits:
Visible: Opened / closed.
Focus: Panel focused / center focused.
Zoom: Zoomed / Not zoomed.
Each of these variables is 'sticky' in that they won't effect each other
unless they need to. 'Zooming' a panel conceptually merges the visible
and focus bits.
cmd-shift-j/b/r have all been removed.
cmd-j/b/r have been updated to mean 'toggle visibility of a certain
dock', firing them should *always* reveal the panel to you (where you
last left it), or hide it, without moving focus (unless the focused
element is invisible). This means that, when the terminal panel is
zoomed, cmd-j has the same effect as ctrl-`
ctrl-` and cmd-shift-e now toggle a panel's focus, without updating the
zoom state of a panel. Toggling the focus of a zoomed panel causes it to
automatically hide itself, without losing the zoom bit.
When focused or made visible, panels which cannot be zoomed
automatically unzoom everything else so as to preserve user intent of
'show me this panel' and 'everything stays where it is if I don't take
an action'
Release Notes:
- cmd-shift-j/b/r have been removed. (preview only)
- cmd-j/b/r unconditionally show or hide their associated dock,
respecting zoom settings. (preview only)
- ctrl-` and cmd-shift-e now retain zoom state. (preview only)
- Fixed a bug where terminal dock tab would always be in the active
state (preview only)
- Fixed a bug where terminals would not always open in the terminal
panel
- Changed the look of zoomed panels to fill more of the screen (preview
only)
2023-05-30 16:39:06 -07:00
Mikayla Maki
0122cd61c5
fmt
2023-05-30 16:33:42 -07:00
Mikayla Maki
685e8d7007
Seperate pane and panel styling
...
co-authored-by: max <max@zed.dev >
2023-05-30 16:23:16 -07:00
Mikayla Maki
9c707eff27
Rework new terminal actions
2023-05-30 16:10:07 -07:00
Mikayla Maki
e80ab5f096
Fix focus bug with new docks
...
co-authored-by: max <max@zed.dev >
2023-05-30 15:40:30 -07:00
Mikayla Maki
5e4a9abd09
Fix bug in panel button dispatch
2023-05-30 15:17:42 -07:00
Mikayla Maki
5065804388
WIP: iron out bugs in interaction between toggle and toggle focus key bindings
...
co-authored-by: max <max@zed.dev >
2023-05-30 14:55:49 -07:00
Julia
8f0fc918e9
TextStyle::default() ask system for known existing font family (#2542 )
...
Rather than assuming a specific family exists, try a set of specific
names and if they fail, just grab any old font that the system reports
as existing
Closes
https://linear.app/zed-industries/issue/Z-445/thread-main-panicked-at-called-resultunwrap-on-an-err-value-could-not
Release Notes:
* Fixed crash that could happen if system did not have a specific
fallback font
2023-05-30 16:25:07 -04:00
Mikayla Maki
9c9af5ed94
Remove focus side effects from toggle dock commands
...
co-authored-by: max <max@zed.dev >
2023-05-30 12:32:00 -07:00
Joseph Lyons
efcf78cbe9
Update pull_request_template.md
2023-05-30 15:15:20 -04:00
Joseph T. Lyons
e9ce85ebc0
Scrape email from feedback editor ( #2543 )
...
Add release note lines here:
N/A
2023-05-30 15:13:35 -04:00
Joseph Lyons
501f9ab2c6
Scrape email from feedback editor
2023-05-30 15:06:35 -04:00
Mikayla Maki
1a23fe91b4
WIP: Remove focus side effects from toggle dock commands
...
co-authored-by: max <max@zed.dev >
2023-05-30 12:00:15 -07:00
Mikayla Maki
84f98f13c4
Seperate open and zoom bits conceptually for new panels
...
co-authored-by: max <max@zed.dev >
2023-05-30 11:52:14 -07:00
Julia
31516b7863
TextStyle::default() ask system for known existing font family
...
Rather than assuming a specific family exists, try a set of specific
names and if they fail, just grab any old font that the system reports
as existing
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-30 14:46:27 -04:00
Sergey Onufrienko
51c7078f47
chore: remove license_text
2023-05-30 18:16:50 +02:00
Sergey Onufrienko
4568f80f2e
feat: read from LICENSE file
2023-05-30 18:12:31 +02:00
Sergey Onufrienko
14efc18eca
refactor: add license file and check it exists
2023-05-30 18:11:54 +02:00
Sergey Onufrienko
05d1dd6b11
refactor: move common to theme folder
2023-05-30 16:53:12 +02:00
Sergey Onufrienko
ac63043c27
chore: move similar themes to one folder
2023-05-30 16:52:28 +02:00
Sergey Onufrienko
0d62e76cd6
refactor: colorSchemes
2023-05-30 15:52:32 +02:00
Antonio Scandurra
69e8a166e4
Start on assistant::QuoteSelection
2023-05-30 15:25:53 +02:00
Antonio Scandurra
dc365472a6
Merge remote-tracking branch 'origin/main' into assistant-2
2023-05-30 15:11:06 +02:00
Antonio Scandurra
1fc9103b61
Remove methods taking &mut Workspace from Pane ( #2540 )
...
This pull request simplifies the `Pane` struct by replacing methods like
`Pane::add_item` that would previously take a `&mut Workspace` with
methods that take a `&mut self`. When access to the workspace is needed,
we now either emit an event from the `Pane` or directly move the method
to the `Workspace` struct.
2023-05-30 15:01:35 +02:00
Antonio Scandurra
bd494037bb
Call ItemHandle::added_to_pane when an item is added to a pane
2023-05-30 14:46:41 +02:00
Sergey Onufrienko
2269c19169
chore: add LICENSE files
2023-05-30 14:06:19 +02:00
Nathan Sobo
8a851ad7f8
Fix annoying system prompt ( #2538 )
...
I was having fun, but it was too much. It makes the assistant too
annoying to be useful.
Release Notes:
Use `N/A` in this section if this item should be skipped in the release
notes.
Add release note lines here:
* Dialed back the system prompt on the assistant.
2023-05-29 22:05:40 -06:00
Nathan Sobo
063613bf4e
Fix annoying system prompt
...
I was having fun, but it was too much. It makes the assistant too annoying to be useful.
2023-05-29 21:47:59 -06:00
Max Brunsfeld
ed0fa2404c
Use settings JSON schema when editing local settings files
2023-05-29 14:31:54 -07:00
Max Brunsfeld
89446c7fd4
Start work on respecting project-specific settings
2023-05-29 14:25:49 -07:00
Antonio Scandurra
88eb2b2163
Move history navigation logic to Workspace
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-29 19:47:59 +02:00
Antonio Scandurra
6d3464fd1f
Make Pane::add_item a proper Pane method
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-29 19:16:22 +02:00
Antonio Scandurra
890c42a75a
Show time in assistant messages
2023-05-29 16:23:16 +02:00
Kirill Bulatov
edf8e276af
Improves project search panel shortcut handling ( #2536 )
...
* ESC (project_search::ToggleFocus) toggles focus from include/exclude
fields to the editor
* Cmd+Shift+F (workspace::NewSearch) can be triggered from the editor,
and moves focus to the query editor
Release Notes:
* Improved project search panel shortcut handling, allowing more actions
to trigger from panel elements
2023-05-29 17:06:38 +03:00
Kirill Bulatov
d593377e45
Improves project search panel shortcut handling
...
* ESC (project_search::ToggleFocus) toggles focus from
include/exclude fields to the editor
* Cmd+Shift+F (workspace::NewSearch) can be triggered from the editor,
and moves focus to the query editor
2023-05-29 16:58:06 +03:00
Antonio Scandurra
52e8bf2928
Show custom header for assistant messages
2023-05-29 15:57:55 +02:00
Sergey Onufrienko
cf75b090d3
feat: organize themes by folders with LICENSE
2023-05-29 15:45:13 +02:00
Kirill Bulatov
986b02e217
Update LSP to the newest version ( #2535 )
...
Current `lsp-types:0.91.1` crate lacks inlay hints' definitions. Crate's
changelog is not very descriptive, but it appears that `0.92.1` could be
used:
https://github.com/gluon-lang/lsp-types/blob/master/CHANGELOG.md#v0921-2022-03-21
The latest is crate version is `0.94.0` (2023-02-08), the PR updates Zed
to the latest version.
Notable changes:
* workspace symbols may arrive unresolved if the corresponding client
capability is enabled:
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#partialResults
Zed has this capability disabled, forcing all symbols to arrive
synchronously (?).
Resolve capabilities are important for inlay hints too, but I've not
found any code in Zed for that outside tests, so I'd love to learn more
and implement the resolution for workspace symbols separately.
* since LSP `3.17` (current), watch file changes can use relative glob
patterns:
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#workspace_didChangeWatchedFiles
That seemed just a straightforward extra `match` to use the same Ruse
`Glob` to handle the relative path one.
Release Notes:
N/A
2023-05-29 12:49:37 +03:00
Antonio Scandurra
404bebab63
Set markdown as the assistant's buffer languages
2023-05-29 11:34:26 +02:00
Kirill Bulatov
fdad1adaf6
Update LSP to the newest version
2023-05-28 21:55:08 +03:00
Max Brunsfeld
e4530471de
Make worktree UpdatedEntries events fully describe all changes ( #2533 )
...
This PR makes the worktree's change events more useful in a few ways:
* The changes are now described by a cheaply clone-able collection, so
that they can be used in background tasks. Right now, I'm using a simple
Arc slice.
* The `UpdatedEntries` event now captures not only changes due to FS
changes, but also newly-loaded paths that are discovered during the
initial scan.
* The `UpdatedGitRepositories` event now includes repositories whose
work-dir changed but git dir didn't change. A boolean flag is included,
to indicate whether the git content changed.
* The `UpdatedEntries` and `UpdatedGitRepositories` events are now
*used* to compute the worktree's `UpdateWorktree` messages, used to sync
changes to guests. This unifies two closely-related code paths, and
makes the host more efficient when collaborating, because the
`UpdateWorktree` message computation used to require walking the entire
`entries` tree on every FS change.
2023-05-26 15:55:14 -07:00
Max Brunsfeld
1f42bfc1bd
Include repositories with workdir changes in worktree UpdatedGitRepsositories event
2023-05-26 15:47:37 -07:00
Max Brunsfeld
2db57b5139
Adjust diagnostic transformation test to not wait for two buffer notifications
2023-05-26 15:47:37 -07:00
Max Brunsfeld
02b95ef320
Derive worktree update messages from existing change events
2023-05-26 15:47:37 -07:00
Kirill Bulatov
9cfe39f1aa
Display external paths in history ( #2534 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1793/file-finder-external-recent-paths-are-not-rendered-properly
Long paths get trimmed, but same do many of our other elements, such as
type definitions, so I think it's ok for now:

Also, we seem to do a lot of odd diagnostics handling on every external
stdlib file opened:

Other external files also emit similar messages, but not that much.
@\mikayla-maki mentioned, that this was happening before, so can be
fixed separately.
The PR adds path printing to these logs.
Release Notes:
* Fixed external files not being displayed properly in the recently
opened list in the file finder panel
2023-05-27 01:27:24 +03:00
Kirill Bulatov
5fda9e934d
Shorten full paths with ~
2023-05-27 01:21:38 +03:00
Kirill Bulatov
3a3c1c5a5b
Add a test
...
co-authored-by: Mikayla <mikayla@zed.dev >
2023-05-27 01:12:22 +03:00
Nathan Sobo
ffbfbe422b
WIP: Not sure I actually want to rip this out
2023-05-26 16:11:58 -06:00
Nathan Sobo
3904971bd8
Hide assistant gutter
2023-05-26 15:38:03 -06:00
Nathan Sobo
8f6e67f440
Cancel assists on escape
2023-05-26 14:49:27 -06:00
Max Brunsfeld
6628c4df28
Store worktree changes in a sorted arc slice, not a HashMap
...
We don't need to look-up change types by an arbitrary key, but we
do need to iterate it. It would also be useful to be able to
cheaply clone the changes, to use them in a background task.
2023-05-26 09:24:15 -07:00
Max Brunsfeld
59bfd40679
Make stricter assertions about change events in random worktree test
2023-05-26 09:24:15 -07:00
Max Brunsfeld
f890eefdef
Include paths loaded during initial scan in worktree UpdatedEntries event
2023-05-26 09:24:15 -07:00
Nathan Sobo
80080a43e4
Start on an assistant panel based on multi-buffers
...
Each message is represented as a multibuffer excerpt to allow for
fluid editing of the conversation transcript.
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2023-05-26 10:09:55 -06:00
Kirill Bulatov
cf2bbfc85a
Better display labels for external files
2023-05-26 18:18:32 +03:00
Kirill Bulatov
508533ebb7
Track abs paths in history
2023-05-26 17:31:35 +03:00
Kirill Bulatov
2fdc960704
Properly display labels for currently opened external files
2023-05-26 15:44:44 +03:00
Kirill Bulatov
b75c27da6f
Simplify selected index handling
2023-05-26 14:15:58 +03:00
Kirill Bulatov
364631a155
Add absolute paths to historic elements
2023-05-26 14:03:44 +03:00
Kirill Bulatov
128c19875d
Fix duplicate item creation in project panel ( #2532 )
...
Closes
https://linear.app/zed-industries/issue/Z-1760/creating-a-new-file-with-the-same-name-as-an-existing-file-overwrites
Now every rename/creation editor won't do anything if a duplicate name
is submitted.
Release Notes:
* Fixed a bug when created in project panel items with duplicate names
were overwriting the old files
2023-05-26 10:14:50 +03:00
Kirill Bulatov
5501dd741c
Fix duplicate item creation in project panel
2023-05-26 02:07:25 +03:00
Julia
7900d2a20a
Multibuffer edit perf ( #2531 )
...
This took so much longer than I wanted, so glad to finally be rid of
this
Release Notes:
* Improved performance when editing many git-tracked files in a
multi-buffer at the same time
2023-05-25 15:01:05 -04:00
Julia
5e39ba596e
Clean up final remaining code paths calling old diff update method
2023-05-25 14:41:09 -04:00
Julia
f40c498491
Fix tests
2023-05-25 14:29:28 -04:00
Julia
8d662edb6c
Remove concept of git diff refresh from Item trait
2023-05-25 14:29:28 -04:00
Julia
cede296b04
Project level git diff recalc handling
...
This avoids an issue where in a many-buffer multi-buffer, each modified
buffer could complete its recalc independently, causing a cascade of
repeated notifies
Now all recalcs started at the same time must complete before
A: Starting another recalc pass
B: The master notify occurring
Each buffer can still show its new diff if something else triggers it
to notify earlier, this is desirable and does not have the same negative
effects as the notify cascade as those re-layouts would need to happen
anyway
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-05-25 14:10:27 -04:00
Max Brunsfeld
54421b11f3
wip
2023-05-25 14:10:27 -04:00
Kirill Bulatov
ae3bdd755e
Support OnTypeFormatting LSP request ( #2517 )
...
Supports
https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_onTypeFormatting
rust-analyzer uses this feature to add matching brackets semantically,
e.g.
before:

after:

`use_on_type_format` settings entry was added, enabled by default, to
disable the new feature.
Release Notes:
* Support `OnTypeFormatting` LSP protocol feature, allowing
rust-analyzer to add matching brackets
2023-05-25 18:35:47 +03:00
Kirill Bulatov
739d5ca373
Have proper undo for both client and host
2023-05-25 18:29:57 +03:00
Antonio Scandurra
24098c561d
Prevent bottom dock from becoming too large or too small ( #2529 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1834/bottom-dock-can-be-dragged-down-far-enough-such-that-the-tab-bar-is
Release Notes:
- Improved the resize experience for the bottom dock, preventing it from
becoming too large or too small. (preview-only)
2023-05-25 15:44:23 +02:00
Antonio Scandurra
4185a178e7
Prevent bottom dock from becoming too large or too small
2023-05-25 15:29:59 +02:00
Antonio Scandurra
f549ada54f
Restore the ability to search terminals in the terminal panel ( #2528 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1812/find-in-terminal-panel-is-broken

This also removes navigation controls from the terminal panel, given
that terminals don't make use of that feature anyway. When the toolbar
is empty, we'll avoid showing it altogether.

Release Notes:
- Fixed a regression that was preventing the terminal panel from being
searched.
2023-05-25 15:28:32 +02:00
Antonio Scandurra
aa8c0475b1
Don't show navigation controls for terminal panel
2023-05-25 15:15:20 +02:00
Kirill Bulatov
e2ff829f98
Use Transaction instead of ProjectTransaction
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2023-05-25 16:12:14 +03:00
Antonio Scandurra
414b97adce
Add search bar to terminal panel
2023-05-25 14:46:10 +02:00
Antonio Scandurra
dba7ec4a35
Prevent pane from being erroneously zoomed when toggling the outline pane ( #2527 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1818/toggling-the-outline-pane-causes-the-pane-to-zoom
Add release note lines here:
- Fixed a bug that could cause panes to be erroneously zoomed when
toggling modals. (preview-only)
2023-05-25 14:10:08 +02:00
Antonio Scandurra
c2f3ac24a4
Prevent zoom from being restored when focusing a modal
2023-05-25 12:11:11 +02:00
Antonio Scandurra
7e1ea8f274
Remove stray dbg!
2023-05-25 12:04:41 +02:00
Kirill Bulatov
aa58d0fd77
Do not send edits over the wire
2023-05-25 12:55:44 +03:00
Kirill Bulatov
f812151840
Add integration tests
2023-05-25 09:45:50 +03:00
Kirill Bulatov
eca6d2b597
Process remote format typing also
2023-05-25 09:45:50 +03:00
Kirill Bulatov
58a56bdda2
Always use server formatting settings
2023-05-25 09:45:50 +03:00
Kirill Bulatov
d1f4b60fa1
Allow to disable the new feature
2023-05-25 09:45:50 +03:00
Kirill Bulatov
b9dabb165e
Use formatting options
2023-05-25 09:45:50 +03:00
Kirill Bulatov
3327e8a6dd
Support remote sessions
2023-05-25 09:45:50 +03:00
Kirill Bulatov
f6d7b3d2e8
Send and handle OnTypeFormatting LSP request
2023-05-25 09:45:50 +03:00
Nate Butler
793486b2e8
Update Diff Modified Color ( #2526 )
...
For some reason the yellow I used for the modified color in light themes
was really light
.
Release Notes:
* Improved the contrast of diff modified color in the editor in light
themes.
2023-05-24 23:50:37 -04:00
Joseph Lyons
3f79b0c7cc
Don't hardcode dates into script
2023-05-24 17:39:02 -04:00
Joseph Lyons
cc3186cb4a
Add script to print all prs merged between a previous date and now
2023-05-24 16:58:56 -04:00
Nathan Sobo
0b7d095c0a
Introduce the ability to talk to GPT-4 within buffers on preview and dev ( #2524 )
...
This adds basic ability to interact with OpenAI inside a buffer.
Release Notes:
* If`OPENAI_API_KEY` is defined in your environment, you can now run the
`ai: assist` command to pass the text of your current buffer to GPT-4.
If you're editing a file with a `.zmd` extension, you can also invoke
the model with `cmd-enter.` (preview-only)
2023-05-24 12:00:43 -06:00
Joseph Lyons
37d35db3d7
v0.89.x dev
2023-05-24 13:22:00 -04:00
Nathan Sobo
26051de160
Clean up
2023-05-24 11:08:00 -06:00
Max Brunsfeld
a1a66b8da4
Make toggle dock actions appear in the command palette ( #2525 )
...
This makes the `Toggle{Left,Right,Bottom}Dock` actions deserializable
from empty JSON, so that they can be constructed for the command
palette. It also fixes a bug in GPUI's `available_actions` method, in
which we'd include key bindings for actions of the same type but
different values.
Note that, for now, the command palette will perform the *focusing*
version of the actions. I'm not totally sure this is the right behavior,
but it seems more useful to me.
Release Notes:
N/A
2023-05-24 10:07:34 -07:00
Nathan Sobo
747322a02d
Merge remote-tracking branch 'origin/main' into zmd
2023-05-24 11:04:07 -06:00
Max Brunsfeld
66b3be8687
Make toggle dock actions appear in the command palette
2023-05-24 09:58:41 -07:00
Nathan Sobo
d495c1b804
Only run AI agent on dev and preview
2023-05-24 10:58:33 -06:00
Antonio Scandurra
35f9996a4f
WIP
2023-05-24 18:45:47 +02:00
Nathan Sobo
ba79a8ba94
WIP
2023-05-24 10:26:14 -06:00
Nathan Sobo
50e1e17d09
WIP
2023-05-24 09:53:08 -06:00
Nathan Sobo
051c7566cc
WIP
2023-05-24 09:38:37 -06:00
Nathan Sobo
8abaf66602
WIP
2023-05-24 09:21:50 -06:00
Nathan Sobo
6368ade1da
WIP
2023-05-24 09:12:16 -06:00
Antonio Scandurra
8832248bb9
Polish panel experience ( #2523 )
...
In this pull request we improved key bindings (as described below) and
added tooltips.
Add these release notes to the panels release notes:
- The left, right and bottom dock can be toggled and focused at the same
time respectively via `cmd-b`, `cmd-r` and `cmd-j`. Holding `shift` will
toggle them without changing the focus.
2023-05-24 16:23:24 +02:00
Antonio Scandurra
f67a22828b
Show keystroke in panel tooltips
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-24 16:13:58 +02:00
Antonio Scandurra
0cf1632d39
Only focus new terminal if the panel contains focus
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-24 16:04:02 +02:00
Antonio Scandurra
50cfe5eec3
Use cmd-b/cmd-r/cmd-j to toggle left/right/bottom dock and focus when opening
...
Also, bind the same keys with shift to toggle the dock without focusing.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-24 15:59:06 +02:00
Antonio Scandurra
7534c4e670
Fix opening excerpt when the cursor is at the end of a multi-buffer ( #2522 )
...
Fixes
https://linear.app/zed-industries/issue/Z-987/option-enter-doesnt-open-buffer-from-multibuffer-if-on-the-last-line
This was caused by seeking with a right bias, which in the case of the
last excerpt in the buffer would seek past the end of the buffer. This
commit changes the behavior to move the cursor back to the previous
excerpt if we overshoot, to ensure we always land on an excerpt.
Release Notes:
- Fixed a bug that prevented opening excerpts when the cursor was at the
end of a multi-buffer.
2023-05-24 15:08:18 +02:00
Antonio Scandurra
2a8e0824a6
Fix opening excerpt when the cursor is at the end of a multi-buffer
...
This was caused by seeking with a right bias, which in the case of the
last excerpt in the buffer would seek past the end of the buffer. This
commit changes the behavior to move the cursor back to the previous excerpt
if we overshoot, to ensure we always land on an excerpt.
2023-05-24 15:02:57 +02:00
Antonio Scandurra
8f49552121
Show maximize/minimize icon for panes and terminal panel ( #2521 )
...
Closes
https://linear.app/zed-industries/issue/Z-1790/show-zoomunzoom-icons-for-panes-and-terminal-panel

2023-05-24 11:44:39 +02:00
Antonio Scandurra
e5fd953b4f
Provide tooltips for pane buttons
2023-05-24 11:18:30 +02:00
Antonio Scandurra
1a353ad25d
Show maximize/minimize icon for panes and terminal panel
2023-05-24 11:00:12 +02:00
Antonio Scandurra
9575ffc1e3
Prevent empty panes from being zoomed ( #2520 )
...
Closes
https://linear.app/zed-industries/issue/Z-1789/empty-panes-should-not-be-zoomable
2023-05-24 10:51:52 +02:00
Antonio Scandurra
168ff99927
Prevent empty panes from being zoomed
2023-05-24 10:34:56 +02:00
Joseph T. Lyons
e463e3b2e8
Update terminal panel tooltip ( #2519 )
...
The actions in Zed now call this the Terminal Panel and the crate is
called that as well, so I think the tooltip should be updated to use
that same name.
Release Notes:
N/A
2023-05-23 22:33:08 -04:00
Joseph Lyons
e6857866d4
Update terminal panel tooltip
2023-05-23 22:23:38 -04:00
Nathan Sobo
637ed79603
WIP
2023-05-23 18:16:49 -06:00
Nathan Sobo
65fc50745b
WIP
2023-05-23 18:04:33 -06:00
Nathan Sobo
d934da1905
WIP
2023-05-23 15:25:34 -06:00
Joseph T. Lyons
ba7659fa77
add toggle right and bottom dock actions ( #2518 )
...
Release Notes:
N/A
2023-05-23 13:59:45 -04:00
Joseph Lyons
2457c55fe7
add toggle right and bottom dock actions
2023-05-23 13:53:56 -04:00
Joseph T. Lyons
aac83ceea7
Add architecture to clickhouse event request body ( #2514 )
...
See title
Release Notes:
N/A
2023-05-23 11:11:17 -04:00
Nathan Sobo
7be41e19f7
WIP
2023-05-23 08:52:21 -06:00
Antonio Scandurra
ad866c5b21
Update LiveKit client SDK to 1.0.12 ( #2516 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1756/screen-sharing-is-slow-and-sometimes-doesnt-work-at-all
Release Notes:
* Fixed some cases where screen-sharing would have low bitrate or
completely fail to start.
2023-05-23 16:19:12 +02:00
Antonio Scandurra
774530dd05
Update LiveKit client SDK to 1.0.12
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-05-23 15:32:55 +02:00
Nathan Sobo
073967c80b
WIP
2023-05-23 01:56:28 -06:00
Nathan Sobo
5362e7d346
WIP
2023-05-23 01:52:37 -06:00
Nathan Sobo
394e87d17c
WIP
2023-05-23 01:23:01 -06:00
Antonio Scandurra
dcc4dd7eb8
Allow multiple docks to be visible at once and only let them contain panels ( #2450 )
...
Closes
https://linear.app/zed-industries/issue/Z-1188/allow-docks-to-be-visible-on-left-bottom-right
To prepare the way for the AI assistant, we want to revamp the way docks
and panels work. In this PR, we replace the dock as it currently exists
with 3 independent docks at the left, bottom, and right edge of the
workspace. To replace the "expanded" dock, we will introduce a zoom
feature that works on any pane and some panels. When showing a dock with
an active panel that is zoomed, it will automatically appear zoomed.
This replicates the expanded dock experience. If you unzoom, the panel
will still be visible.
### Panels only
We want to simplify these docks to only allow them to contain *panels*.
By doing this, we don't need to give each dock a tab bar, minimizing
clutter in the workspace. Each panel will remember its size, and the
dock will adjust to that size when the panel is toggled. This will allow
each panel to take up the amount of space that makes sense for its use
case.
There will be 3 kinds of panels:
* Project panel: This currently lives in the left "sidebar", which this
PR renames to the left dock. Users will be able to left click the icon
and switch the project panel to the right dock.
* Terminal panel: This is the primary user of the previous dock. Now all
terminals will live in a terminal panel, which can be docked at the
left, bottom, or right. This dock will contain tabs, but only for
terminals. Terminals will still be able to be dragged into the
workspace, but by default, the first new terminal will live in the
terminal panel which lives in one of the 3 docks.
* Feedback: Instead of opening a pane, let's explore making this a panel
instead.
### Status bar icons
A nice feature of this change is that it simplifies our status bar by
eliminating the dock button. We will only show icons for specific
panels. Panel in the left dock will appear at the left side of the
status bar. Panels in the right dock on the far right, panels in the
bottom will appear on the right, to the immediate left of the buttons
for right panels. Left clicking any panel button will allow it to be
redocked to any valid location for that panel.
### Paving the way for the AI assistant
I'm envisioning the assistant living in the far right panel by default.
So in the stock config, you'll have the project panel on the left,
terminal on the bottom, assistant on the right, and code in the middle.
Let's fucking go!
2023-05-23 09:09:43 +02:00
Antonio Scandurra
19b817e48a
Improve styling of bottom and right docks
2023-05-23 09:02:45 +02:00
Antonio Scandurra
208ff2fba7
Merge remote-tracking branch 'origin/main' into panels
2023-05-23 08:24:28 +02:00
Nathan Sobo
0de5a444d3
WIP
2023-05-23 00:22:21 -06:00
Nathan Sobo
234dbc3ca9
WIP
2023-05-23 00:16:44 -06:00
Nathan Sobo
c4d88bc529
WIP
2023-05-22 23:43:02 -06:00
Nathan Sobo
30de64845f
WIP
2023-05-22 23:11:27 -06:00
Mikayla Maki
a5b5de5651
Add initial project panel settings ( #2515 )
...
This PR adds project panel settings for disabling git status.
Release Notes:
- Adds `project_panel: { git_status: bool }` to the settings, for
controlling whether git status information appears.
2023-05-22 20:43:24 -07:00
Mikayla Maki
a37b1b6a45
Add other setting init
2023-05-22 20:38:30 -07:00
Mikayla Maki
b19a712799
Add init_settings to tests
2023-05-22 20:33:18 -07:00
Mikayla Maki
da96802bf0
fmt
2023-05-22 20:25:27 -07:00
Mikayla Maki
7be8dead07
Add initial project panel settings
2023-05-22 20:23:07 -07:00
Nathan Sobo
7e6cccfa3d
WIP: Stream in completions
...
Drop dependency on tokio introduced by async-openai and do it ourselves.
The approach I'm taking of replacing instead of appending is causing issues. Need to just append.
2023-05-22 20:28:22 -06:00
Joseph Lyons
049b72e3ac
Add architecture to clickhouse event request body
2023-05-22 21:45:58 -04:00
Mikayla Maki
54c04a6618
Fix race condition in diff base initializaiton ( #2513 )
...
fixes
https://linear.app/zed-industries/issue/Z-1657/diff-markers-in-gutter-do-not-show-up-until-after-first-save
Release Notes:
- Fixes a race condition on buffer initialization that would cause git
diffs to not load.
2023-05-22 18:43:59 -07:00
Mikayla Maki
9307719a4b
Add run until parked for test
2023-05-22 18:40:12 -07:00
Mikayla Maki
51d94f532b
Load diff base for buffers that are opening but not yet opened when repositories are discovered
2023-05-22 18:26:33 -07:00
Mikayla Maki
fc82489128
Update scrollbar styling
2023-05-22 16:23:36 -07:00
Mikayla Maki
1b5be04f76
Fixed contrast in project panel and scrollbar ( #2512 )
...
Redo of https://github.com/zed-industries/zed/pull/2504
This makes the different git locations individually style-able
Release Notes:
- Improve git contrast (preview only)
2023-05-22 15:59:02 -07:00
Mikayla Maki
e4454f1e7f
fmt
2023-05-22 15:53:29 -07:00
Mikayla Maki
5c31c84c90
Fixed contrast in project panel and scrollbar
...
co-authored-by: nate <nate@zed.dev >
2023-05-22 15:51:31 -07:00
Mikayla Maki
fb2f17e5c9
Revert "Touch up git in project panel and scroll bar styling" ( #2511 )
...
Reverts zed-industries/zed#2504 , due to accidentally pulling in main
2023-05-22 15:36:15 -07:00
Mikayla Maki
2d1c4a1971
Revert "Touch up git in project panel and scroll bar styling"
2023-05-22 15:31:14 -07:00
Mikayla Maki
dcf4791182
WIP: Touch up git in project panel and scroll bar styling ( #2504 )
...
This makes the different git locations individually style-able
Release Notes:
* Improve git contrast (preview only)
2023-05-22 15:11:10 -07:00
Mikayla Maki
9bec74f1d4
fmt
2023-05-22 15:04:51 -07:00
Mikayla Maki
9a47415cb5
Merge branch 'main' into git-project-panel-and-scrollbar-styling
2023-05-22 15:02:28 -07:00
Mikayla Maki
5dfb0e3691
remove border from thumb
2023-05-22 14:56:55 -07:00
Nate Butler
11eb9b17c9
Update project panel & scroll bar git colors
2023-05-22 17:47:52 -04:00
Mikayla Maki
4c9d24da7c
Only fire update diff base when the dot repo is scanned ( #2510 )
...
This PR fixes a bug in the firing of the UpdatedRepositories event which
caused it to flood collaboration with new messages on every file save.
Release Notes:
* Fixed a bug in repository detection that caused it to fire
over-eagerly (preview only)
2023-05-22 14:11:19 -07:00
Mikayla Maki
96224fa7e8
Only fire update diff base when the dot repo is scanned
2023-05-22 13:57:07 -07:00
Max Brunsfeld
0e332b5f94
Clear old diagnostics when restarting a language server ( #2509 )
...
Previously, restarting a language server did not clear out the
diagnostics that were published by that server. Those diagnostics would
stick around forever.
Release Notes:
* Fixed a bug where restarting a language server would sometimes leave
buffers with stale diagnostics associated with that server.
2023-05-22 13:06:32 -07:00
Max Brunsfeld
7689cdf3f9
Clear old diagnostics when restarting a language server
2023-05-22 12:53:22 -07:00
Mikayla Maki
1d07cff765
Adjust scrollbar settings to be expandable ( #2507 )
...
Note that this PR cannot be cherrypicked into preview, as it relies on
the new settings infrastructure.
Switches settings from `show_scrollbars: "auto"` to `scrollbar: {show:
"auto", git_diffs: true}`.
fixes
https://linear.app/zed-industries/issue/Z-1650/scroll-bar-feature-settings
Release Notes:
- Changed scrollbar settings from `show_scrollbars: "auto"` to
`scrollbar: {show: "auto", git_diffs: true}`. (preview only)
2023-05-22 12:51:21 -07:00
Mikayla Maki
dcb987ba9d
Diagnostics pane was not focusable with the mouse ( #2506 )
...
fixes
https://linear.app/zed-industries/issue/Z-1432/cant-cmd-w-an-empty-diagnostics-in-a-split-pane
Release Notes:
* Fixed a bug where the diagnostics pane could not be focused or closed
in certain circumstances.
2023-05-22 12:44:39 -07:00
Mikayla Maki
cfdf9198da
Switch back to
2023-05-22 12:16:47 -07:00
Mikayla Maki
687ccd4c6f
fmt
2023-05-22 12:13:23 -07:00
Mikayla Maki
366f13bb5c
Adjust scrollbar settings to be expandable
2023-05-22 12:12:56 -07:00
Joseph Lyons
49566e5677
Update pull_request_template.md
2023-05-22 15:00:57 -04:00
Joseph Lyons
9c32b774aa
Add example of changelog line in PR template
2023-05-22 14:53:07 -04:00
Mikayla Maki
bafc1d922e
fmt
2023-05-22 11:46:52 -07:00
Mikayla Maki
e59c8e9d61
Fix diagnostic pane not being closeable
2023-05-22 11:44:23 -07:00
Max Brunsfeld
e129ed2d91
Fix spurious setting error log messages ( #2498 )
...
Fixes a bug introduced in
https://github.com/zed-industries/zed/pull/2448 , where error messages
would be logged if the user config didn't specify certain fields like
`journal` or `telemetry`.
2023-05-22 11:44:21 -07:00
Joseph Lyons
04355215b2
Indent all release note lines for each PR
2023-05-22 14:44:05 -04:00
Julia
a69144911f
Add paragraph based vertical movements ( #2502 )
...
Very selfish patch I worked on yesterday, I kept saying I wanted these
and finally decided to just add them. Feedback on the keybindings
welcome
Release Notes:
* Added `MoveToStartOfParagraph` and `MoveToEndOfParagraph` movements
for paragraph based vertical navigation
2023-05-22 14:31:34 -04:00
Mikayla Maki
85266131cf
Fix perf problem with scrollbars in large multibuffers ( #2505 )
...
Remove scrollbars from multibuffers
Release Notes:
* Removes git scrollbar highlights from multibuffers (preview only)
2023-05-22 11:11:27 -07:00
Mikayla Maki
6f4b6eec5b
Diagnostics pane was not focusable with the mouse
2023-05-22 11:10:13 -07:00
Mikayla Maki
6264b24788
fmt
2023-05-22 11:04:36 -07:00
Mikayla Maki
8669dcdc81
Make scrollbar content detection cheaper
...
Remove scrollbars from multibuffers
co-authored-by: max <max@zed.dev >
2023-05-22 10:55:44 -07:00
Antonio Scandurra
f22067b236
Remove unused imports
2023-05-22 19:38:57 +02:00
Antonio Scandurra
33f6c56b14
Fix more warnings
2023-05-22 19:36:01 +02:00
Antonio Scandurra
6f39d49b18
Fix warnings
2023-05-22 19:33:11 +02:00
Antonio Scandurra
048498e39b
Test zooming panels
2023-05-22 19:30:31 +02:00
Mikayla Maki
ef81813d56
Wire in conflict styling
2023-05-22 10:10:47 -07:00
Mikayla Maki
a355b4c135
Add conflict styles to project panel
2023-05-22 10:09:55 -07:00
Mikayla Maki
af73c1af06
Add seperate scrollbar styling
2023-05-22 10:03:02 -07:00
Antonio Scandurra
3ca95678f1
Avoid leaking docks when adding panels
2023-05-22 18:57:14 +02:00
Kirill Bulatov
9e46b17149
Do not refocus project search query on ESC press ( #2494 )
...
Closes
https://linear.app/zed-industries/issue/Z-1471/escape-should-not-move-focus-to-project-search
Makes ESC more predictable as a shortcut that cancels/roll backs the
state in project search panel.
Release Notes:
* Fixes ESC making focus to jump in project search panel
2023-05-22 19:56:10 +03:00
Mikayla Maki
2200a22c07
Wire project panel themes into rust
2023-05-22 09:55:59 -07:00
Antonio Scandurra
75a0742c90
Uncomment persistence test
2023-05-22 18:32:28 +02:00
Antonio Scandurra
5b7e852903
Await closing of items in tests
2023-05-22 18:28:30 +02:00
Antonio Scandurra
deaf60005c
Fix more tests
2023-05-22 18:21:12 +02:00
Nate Butler
b80cb73745
Add git to project panel in theme, use different values for dark and light
2023-05-22 12:09:54 -04:00
Antonio Scandurra
4aa2858b2b
Transfer focus to root view only if previously-focused view was dropped
2023-05-22 18:05:08 +02:00
Max Brunsfeld
21ada545b0
Remove assertions about behavior on invalid settings file
2023-05-22 08:48:37 -07:00
Julia
44903bc193
Add test for paragraph vertical movements
2023-05-22 11:48:07 -04:00
Antonio Scandurra
185a624b99
Fix some project panel tests
2023-05-22 16:18:53 +02:00
Antonio Scandurra
10e947cb5f
Persist project and terminal panel sizes
2023-05-22 15:55:44 +02:00
Julia
7190840081
Add paragraph based vertical movements
2023-05-22 09:12:36 -04:00
Antonio Scandurra
146809eef0
Merge branch 'main' into panels
2023-05-22 14:10:17 +02:00
Antonio Scandurra
2098ac2c77
Fix formatting for keymap.json
2023-05-22 10:41:48 +02:00
Joseph Lyons
cb1b64e51b
Fix up formatting for get preview channel changes script
2023-05-22 00:02:19 -04:00
Joseph T. Lyons
f2a74017df
Fix get preview channel changes script ( #2501 )
...
Fixes the text we match on to get PR commits and also prints the release
notes of each PR
Release Notes:
* Skip
2023-05-21 23:47:07 -04:00
Joseph Lyons
c701901c7b
Fix get preview channel changes script
2023-05-21 23:40:07 -04:00
Nathan Sobo
d5cf595761
Enable "test-support" feature on editor dependencies for tests ( #2499 )
...
Enable the `"test-support"` feature whenever we depend on the `editor`
crate in tests.
If we don't do this, we end up depending on `livekit_client` without
enabling `"test-support"`, and this causes us to link against
`WebRTC.framework` in its build script, which causes a dynamic linker
error when starting the tests.
Fixes
https://linear.app/zed-industries/issue/Z-1646/cant-run-package-tests-for-activity-monitor-and-auto-update
Release Notes:
* No notes
2023-05-20 10:19:59 -06:00
Nathan Sobo
986eafd84e
Enable test-support on editor in tests
2023-05-20 09:54:38 -06:00
Nathan Sobo
912fd23006
Parse markdown into an OpenAI chat completion request
2023-05-20 09:43:12 -06:00
Mikayla Maki
35a9b90528
Fix bugs in git implementation ( #2495 )
...
fixes
https://linear.app/zed-industries/issue/Z-1593/clean-up-git-integration
- Fixes calculation of git offsets in the scrollbar:
fixes
https://linear.app/zed-industries/issue/Z-1608/fix-scrollbar-diffs-sliding-out-of-sync-with-gutter-diffs-in
fixes
https://linear.app/zed-industries/issue/Z-1629/project-search-panel-has-git-marks-on-the-scrollbar-misaligned
fixes
https://linear.app/zed-industries/issue/Z-1625/soft-wrap-affects-diff-locations-in-scrollbar
- Improves the performance of scrollbar hunks:
fixes
https://linear.app/zed-industries/issue/Z-1640/double-check-performance-of-scrollbar-hunks
- Fixes a long standing bug with how git gutters interact with soft
wraps:
fixes
https://linear.app/zed-industries/issue/Z-1442/make-hunks-grow-to-the-end-of-softwraps-when-ending-on-a-softwrapped
- Allows work directories to be renamed
fixes
https://linear.app/zed-industries/issue/Z-1577/fix-stale-git-repositories-when-directory-is-renamed
Release Notes:
* Fix the offsets of the git diffs in the scrollbar when there are
folds, wraps, or excerpts (preview only)
* Allow the work directory of a repository to be renamed (preview only)
* Extend git gutter to cover the entirety of a wrapped line
(https://github.com/zed-industries/community/issues/937 )
2023-05-19 18:15:11 -07:00
Mikayla Maki
bbb68c523c
Refactored apart the forward and the backwards iterator for diff hunks
2023-05-19 18:09:47 -07:00
Max Brunsfeld
e32233c826
Fix spurious setting error logs on non-existent setting keys
2023-05-19 17:15:05 -07:00
Mikayla Maki
43e301eeef
refine batched anchor conversions
...
co-authored-by: max <max@zed.dev >
2023-05-19 16:52:57 -07:00
Max Brunsfeld
fb11c3e4bf
Remove stray prints
2023-05-19 16:52:30 -07:00
Mikayla Maki
1474429271
fmt
2023-05-19 16:32:07 -07:00
Mikayla Maki
c795c9b844
Rearrange git tests in worktree
...
Add support for renaming work directories
2023-05-19 16:30:00 -07:00
Mikayla Maki
623a177fe6
Fix bug where git diff hunks would not extend through a soft wrap
2023-05-19 16:23:45 -07:00
Mikayla Maki
560160b100
Batch anchor conversions in git hunk iterator
2023-05-19 16:23:45 -07:00
Mikayla Maki
2a41a32aac
Calculate y offsets correctly
2023-05-19 16:23:45 -07:00
Max Brunsfeld
d7d29472c2
Remove expensive-to-clone fields from worktree's LocalSnapshot ( #2497 )
...
This fixes performance problems that @nathansobo and I have seen in some
cases, when a large number of files changed on disk. A lot of time was
being spent in `worktree::LocalSnapshot::clone`. I think this may have
been because of needing to clone the `removed_entry_ids` map. This
structure is only really used when *mutating* the `LocalSnapshot` in the
background scanner, so I moved it off of the snapshots.
2023-05-19 16:20:19 -07:00
Mikayla Maki
06a89d9104
Add guards to other pane index removals ( #2496 )
...
These should be impossible for users to reach, but why leave it to
chance?
Release Notes:
* N/A
2023-05-19 15:21:00 -07:00
Max Brunsfeld
7ae642b9b8
Avoid storing removed_entry_ids on the LocalSnapshot
2023-05-19 15:16:04 -07:00
Mikayla Maki
c193b0b8fc
Add guards to other pane index removals
2023-05-19 15:10:44 -07:00
Max Brunsfeld
32c7157906
🎨 Make worktree repositories more consistent
2023-05-19 15:04:37 -07:00
Max Brunsfeld
6359333749
Don't store next_entry_id on worktree's local snapshot
2023-05-19 13:49:24 -07:00
Kirill Bulatov
065f71d671
Do not refocus project search query on ESC press
2023-05-19 22:06:47 +03:00
Kirill Bulatov
7d1833b759
When the file is deleted via project panel, close it in editors ( #2490 )
...
Deals with https://github.com/zed-industries/community/issues/179 by
sending a message about it, to asynchronously apply on all workspaces.
Release Notes:
* Fixes a bug when files, deleted in the project panel were left open in
the editor
2023-05-19 21:51:37 +03:00
Max Brunsfeld
844b8d9e1e
Remove unnescessary double lookup in repo for ( #2492 )
...
Release Notes:
* Optimize repository queries (preview only)
2023-05-19 11:47:05 -07:00
Kirill Bulatov
2c8fffc4f8
Use better name for the method that closes deleted buffers
...
co-authored-by: Max <max@zed.dev >
2023-05-19 21:47:00 +03:00
Max Brunsfeld
01a3e49946
Optimize retrieving repos for entries when rendering the project panel ( #2493 )
...
This fixes slowness in rendering the project panel due to retrieving the
repository for a given entry.
Release Notes:
* Fixed a lag that would occur when lots of files changed on disk while
the project panel was open (preview only).
2023-05-19 11:46:32 -07:00
Mikayla Maki
9f157bdb67
Remove unescessary methods
2023-05-19 11:30:10 -07:00
Max Brunsfeld
729a93db6b
Optimize retrieving repos for entries when rendering the project panel
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-05-19 11:29:02 -07:00
Mikayla Maki
6792788216
Remove unnescessary double lookup
2023-05-19 11:08:58 -07:00
Antonio Scandurra
5a8fb18c20
Show workspace only after initializing it
2023-05-19 19:35:00 +02:00
Antonio Scandurra
5ff49bde31
Serialize and deserialize TerminalPanel
2023-05-19 19:26:32 +02:00
Max Brunsfeld
d480555ec9
Fix performance problems in reporting changed FS paths to language servers ( #2491 )
...
Fixes
https://linear.app/zed-industries/issue/Z-1611/main-thread-hangs-while-sending-filesystem-change-events-to-lsp
Release Notes:
* Fixed a lag that would sometime occur when large numbers of files
changed on disk, due to reporting the changed files to language servers.
2023-05-19 09:42:55 -07:00
Max Brunsfeld
847d1e73a3
Replace remaining usages of glob crate with globset
2023-05-19 09:36:46 -07:00
Max Brunsfeld
459cc9c959
Optimize matching of multiple file-watch globs using the globset crate
2023-05-19 09:13:34 -07:00
Kirill Bulatov
583b15badc
When the file is deleted via project panel, close it in editors
2023-05-19 18:52:30 +03:00
Antonio Scandurra
e49281699c
Add new terminal when the terminal panel is activated, and not on focus
2023-05-19 16:07:47 +02:00
Antonio Scandurra
924ec961ff
Toggle project panel when opening new workspace in a dock-agnostic way
2023-05-19 15:27:18 +02:00
Antonio Scandurra
3d6b728364
Activate the correct panel when deserializing workspace
2023-05-19 14:18:11 +02:00
Kirill Bulatov
3984cc6d39
Properly handle WorktreeId
2023-05-19 12:37:36 +03:00
Max Brunsfeld
4bda5c4d69
Optimize LSP watched file reporting in 2 simple ways
...
* Convert globs to relative paths in advance. This avoids needing to convert
every changed path to an absolute path before performing glob matching.
* Avoid duplicate reporting for language servers with multiple worktrees.
2023-05-18 17:08:51 -07:00
Max Brunsfeld
34b0d6200f
collab 0.12.4
2023-05-18 14:58:57 -07:00
Max Brunsfeld
ffe35d171c
Avoid unnecessary code action requests when applying leader updates t… ( #2489 )
...
We noticed a huge amount of code actions requests being issued by
followers when applying leader updates. It was caused by a call to
`MultiBuffer::remove_excerpts` with an empty list of excerpts to remove.
This PR fixes that by avoiding emitting spurious events when multibuffer
excerpt manipulation methods are called with empty lists.
2023-05-18 14:52:21 -07:00
Max Brunsfeld
58f704abcb
Avoid unnecessary code action requests when applying leader updates to an editor
2023-05-18 14:46:23 -07:00
Mikayla Maki
87e206c451
Fixed an imprecise join in rejoin room ( #2488 )
...
This fixed a pre-existing bug in rejoin room that got expanded to
stalling collab with the new git status feature.
Release Notes:
* N/A
2023-05-18 14:42:59 -07:00
Mikayla Maki
99fcf23798
fmt
2023-05-18 14:31:08 -07:00
Mikayla Maki
95a7d69bce
Fixed an imprecise join in rejoin room
2023-05-18 14:29:18 -07:00
Max Brunsfeld
2883d6f1ef
Improve collab logging ( #2487 )
...
This adds some logging to the collab server, to help us identify the
source of the collaboration latency we're seeing in the 0.87 preview
version of zed.
2023-05-18 14:17:17 -07:00
Max Brunsfeld
2a11a89827
collab 0.12.3
2023-05-18 12:27:08 -07:00
Joseph Lyons
55b241a4f6
collab 0.12.2
2023-05-18 12:27:01 -07:00
Max Brunsfeld
c71b59b248
Log how long it takes to handle each RPC message
2023-05-18 12:24:07 -07:00
Kirill Bulatov
923be1892d
Maintain recently opened files history ( #2467 )
...
Part of https://github.com/zed-industries/community/issues/351 and
https://github.com/zed-industries/community/issues/1125
Adds navigation history to the search file dialogue:

The history is only shown on empty query and gets replaced by the query
results after an input.
Currently, history gets lost between the project restarts.
Release Notes:
* Added a recently opened file list to search file dialogue
2023-05-18 22:06:25 +03:00
Kirill Bulatov
2ec994dfcd
Add a unit test
2023-05-18 21:53:42 +03:00
Kirill Bulatov
201d513c50
Show navigation history in the file finder modal
...
co-authored-by: Max <max@zed.dev >
2023-05-18 21:50:38 +03:00
Kirill Bulatov
711d2c6fe7
Maintain recently opened files history
2023-05-18 21:50:38 +03:00
Julia
bd29812391
Avoid panic in get_injections ( #2486 )
2023-05-18 13:35:10 -04:00
Julia
5ab1ae1521
Avoid panic in get_injections
2023-05-18 12:23:49 -04:00
Max Brunsfeld
83f8981308
Define empty theme for tests regardless of cargo features ( #2485 )
...
This fixes some errors that were happening when running a single crate's
tests, if the test did not enable the `test-support` feature in the
`theme` crate.
2023-05-18 09:14:46 -07:00
Max Brunsfeld
71ad7e7612
Define empty theme for tests regardless of cargo features
...
Co-authored-by: Kirill <kirill@zed.dev >
2023-05-18 09:01:38 -07:00
Antonio Scandurra
f2ad17dbc0
WIP
2023-05-18 15:35:46 +02:00
Kirill Bulatov
263afc75a8
Merge pull request #2484 from zed-industries/kb/unite-dmg-build
...
Unite dmg build jobs
Follow-up of https://github.com/zed-industries/zed/pull/2472 actually doing the proper thing: allow running dmg builds on PRs if `run-build-dmg` label is attached.
2023-05-18 14:39:41 +03:00
Kirill Bulatov
5ab4eab369
Unite dmg build jobs
2023-05-18 13:49:55 +03:00
Mikayla Maki
89d8bb1425
WIP: Add persistence to new docks
2023-05-17 17:34:20 -07:00
Max Brunsfeld
5c437e2098
Fix crashes when running zed bundled
2023-05-17 16:53:48 -07:00
Max Brunsfeld
a9b107f155
Fix release-mode stub for watch_themes
2023-05-17 16:36:06 -07:00
Max Brunsfeld
d23fc6f135
Merge pull request #2448 from zed-industries/setting-store
...
Separate the settings struct into a set of dynamically-registered setting types
2023-05-17 16:19:09 -07:00
Max Brunsfeld
a56793c214
Clear buffer font size adjustments when buffer font size setting changes
2023-05-17 16:14:05 -07:00
Max Brunsfeld
823e15d85a
Refresh windows when settings file changes
2023-05-17 16:02:21 -07:00
Max Brunsfeld
667f476f7f
Remove unused watched_json file
2023-05-17 16:02:08 -07:00
Max Brunsfeld
42eca3048f
Move font size adjustment code to the theme crate
2023-05-17 15:56:32 -07:00
Max Brunsfeld
258723566f
Rename settings::register_setting -> settings::register
2023-05-17 15:06:11 -07:00
Max Brunsfeld
2d5f03e148
Remove optional path argument when getting settings
2023-05-17 15:05:20 -07:00
Max Brunsfeld
1f0e79ee9d
Merge branch 'main' into setting-store
2023-05-17 14:56:35 -07:00
Max Brunsfeld
67a25126d4
Define theme/ui text style settings in theme crate
2023-05-17 14:44:59 -07:00
Mikayla Maki
5ef03992c5
Merge pull request #2483 from zed-industries/add-scrollbar-settings
...
Add scrollbars setting
2023-05-17 14:44:08 -07:00
Mikayla Maki
f4e99ecde4
Add never option to scrollbar settings
2023-05-17 14:19:35 -07:00
Mikayla Maki
88bc55ddf5
Add a dependency on rustfmt to the CI tests
2023-05-17 14:17:10 -07:00
Mikayla Maki
6cf439e734
fmt
2023-05-17 14:12:04 -07:00
Mikayla Maki
ae3394f4de
Add scrollbars setting
2023-05-17 14:09:26 -07:00
Mikayla Maki
1c9a7a7ad8
Merge pull request #2482 from zed-industries/add-hunks-to-scrollbar
...
Add diff hunks to the scroll bar
2023-05-17 11:51:01 -07:00
Mikayla Maki
aa89632286
Add diff hunks to the scroll bar
2023-05-17 11:40:30 -07:00
Max Brunsfeld
5c729c0e56
Define base keymap setting in welcome crate
2023-05-17 11:23:09 -07:00
Julia
7d11329e80
Merge pull request #2481 from zed-industries/update-font-kit
...
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:57:39 -04:00
Julia
9e5983305b
Update font-kit to resolve panics when loading malformed fonts
2023-05-17 13:38:54 -04:00
Max Brunsfeld
89204e85c0
Merge branch 'main' into setting-store
2023-05-17 09:55:24 -07:00
Joseph Lyons
cb0c613da2
v0.88.x dev
2023-05-17 12:39:08 -04:00
Max Brunsfeld
d2ba18eae9
Customize language settings JSON schema in language crate
2023-05-17 09:26:36 -07:00
Antonio Scandurra
4898417617
Drop foreign key constraint from workspaces.dock_pane to panes table
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-05-17 18:21:35 +02:00
Antonio Scandurra
05fb051924
Store whether a panel is zoomed in the panel itself
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-05-17 17:51:11 +02:00
Antonio Scandurra
f097444546
Rebind ctrl-` to toggle terminal panel focus
...
Also, add `ctrl-~` to create new terminals.
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-05-17 17:35:10 +02:00
Antonio Scandurra
747fbfadeb
Notify old/new ancestors of the focused view when they change
2023-05-17 17:12:12 +02:00
Antonio Scandurra
981129ef8e
Show a panel/pane as zoomed only if it's the active item in workspace
2023-05-17 15:06:58 +02:00
Max Brunsfeld
6403bb86e1
Define workspace settings in workspace crate
2023-05-16 20:25:18 -07:00
Max Brunsfeld
cbd4771f10
Define project settings in project crate
2023-05-16 17:45:04 -07:00
Max Brunsfeld
65e3713d4d
Define editor settings in editor crate
2023-05-16 17:30:29 -07:00
Max Brunsfeld
39618ae32d
Define language settings in the language crate
2023-05-16 17:29:53 -07:00
Julia
0a0769d4b9
Merge pull request #2479 from zed-industries/dont-use-svg-text-feature
...
Disable usvg's text feature flags to include less dependency code
2023-05-16 18:48:12 -04:00
Julia
d61b12a05b
Disable usvg's text feature flags to include less dependency code
2023-05-16 18:44:16 -04:00
Joseph T. Lyons
362f56d519
Merge pull request #2478 from zed-industries/Fix-telemetry-bugs
...
Send editor event when saving a new file
2023-05-16 18:18:07 -04:00
Joseph Lyons
c27859871f
Send editor event when saving a new file
2023-05-16 18:16:09 -04:00
Joseph T. Lyons
2e27f26339
Merge pull request #2475 from zed-industries/add-copilot-events
...
Add events for copilot suggestion accepting and discarding
2023-05-16 17:25:54 -04:00
Joseph Lyons
ffd503951b
Don't make events for every rejected suggestion
2023-05-16 17:19:05 -04:00
Kirill Bulatov
55950e52c2
Remove extra dbg!
2023-05-16 22:15:56 +03:00
Kirill Bulatov
685f3de796
Merge pull request #2462 from zed-industries/kb/go-to-line-column-numbers
...
Support go to file_query:row:column syntax in Find File, Go To Line dialogs and CLI
Deals slightly differently with zed-industries/community#557
Deals with zed-industries/community#1184
Fixes Go To Line not respecting column number when navigating to a place
Changes a line-row separator from , to : to show it more uniformly with other tools
Adjusts file finder dialogue to allow file_query:row:column syntax and opens the buffer at the lines given
Extends CLI with file_path:row_column syntax and opens these files similarly
2023-05-16 21:24:57 +03:00
Kirill Bulatov
5d4fc99750
Unit test file:row:column parsing
2023-05-16 21:07:48 +03:00
Kirill Bulatov
be7a58b508
Finalize the CLI opening part
2023-05-16 21:07:48 +03:00
Kirill Bulatov
0c6f103899
Return proper items on workspace restoration.
...
co-authored-by: Mikayla <mikayla@zed.dev >
2023-05-16 21:07:48 +03:00
Kirill Bulatov
106064c734
Do not break Zed & Zed CLI compatibility
2023-05-16 21:07:47 +03:00
Kirill Bulatov
628558aa39
Attempt to open rows and columns from CLI input
2023-05-16 21:07:26 +03:00
Kirill Bulatov
d719352152
Unify path:row:column parsing, use it in CLI
2023-05-16 21:07:26 +03:00
Kirill Bulatov
89fe5c6b09
Test caret selection in file finder
...
co-authored-by: Max <max@zed.dev >
2023-05-16 21:07:26 +03:00
Kirill Bulatov
477bc8da05
Make Go To Line to respect column numbers
2023-05-16 21:07:26 +03:00
Kirill Bulatov
e5bca9c871
Simplify file-row-column parsing
2023-05-16 21:07:26 +03:00
Kirill Bulatov
e9606982e6
Use ':' instead of ',' to separate files, rows and columns
2023-05-16 21:07:26 +03:00
Kirill Bulatov
0db7f4202a
Properly place the caret into the window of the file opened
...
co-authored-by: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-05-16 21:07:26 +03:00
Kirill Bulatov
54c1e77aff
Move the caret to the opened file
2023-05-16 21:07:26 +03:00
Kirill Bulatov
3eea2fb5f8
Parse file find queries with extra data
2023-05-16 21:07:26 +03:00
Kirill Bulatov
9de4a1b70f
Merge pull request #2476 from zed-industries/kb/faster-dev-cli
...
Allow CLI to start Zed from local sources
2023-05-16 21:06:40 +03:00
Joseph Lyons
afe75e8cbd
Send copilot events even if file_extension is not known at the time
2023-05-16 14:02:36 -04:00
Joseph Lyons
6976d60bfe
Rework code to contain submitting of copilot events within editor
2023-05-16 13:26:05 -04:00
Julia
16cab5d021
Merge pull request #2477 from zed-industries/fixup-some-more-worktree-bugs
...
Fixup some more worktree bugs
2023-05-16 13:13:22 -04:00
Julia
8b63caa0bd
Fix worktree refresh request causing gitignore to not update
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-16 13:01:29 -04:00
Julia
f50240181a
Avoid removing fake fs entry when rename fails later in the process
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-16 13:00:39 -04:00
Antonio Scandurra
f87ae6032e
Don't rely on action propagation for zooming in and out
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2023-05-16 10:34:50 -06:00
Joseph Lyons
2d4b2e0844
Fix compile error
2023-05-16 11:51:20 -04:00
Kirill Bulatov
903eed964a
Allow CLI to start Zed from local sources
...
Zed now is able to behave as if it's being started from CLI
(`ZED_FORCE_CLI_MODE` env var)
Zed CLI accepts regular binary file path into `-b` parameter (only *.app before),
and tries to start it as Zed editor with `ZED_FORCE_CLI_MODE` env var
and other params needed.
2023-05-16 17:41:32 +03:00
Kirill Bulatov
421db9225a
Merge pull request #2470 from zed-industries/kb/fix-project-search-esc
...
In project search on ESC, reduce multiple carets to one first
2023-05-16 15:16:34 +03:00
Antonio Scandurra
adf361b374
Implement zooming for panes and docks
2023-05-16 11:49:48 +02:00
Joseph Lyons
a7fc07a8cd
Init copilot with client instead of http client
2023-05-16 03:12:39 -04:00
Joseph Lyons
f50afefed3
Subscribe to copilot events (WIP)
2023-05-16 00:35:21 -04:00
Joseph Lyons
a6a2f93607
Update telemetry client to accept copilot events
2023-05-16 00:34:58 -04:00
Mikayla Maki
ead9ac6f23
Fix typo
2023-05-15 16:47:46 -07:00
Mikayla Maki
606d5e36e1
Add events for copilot suggestion accepting and discarding
2023-05-15 16:44:09 -07:00
Mikayla Maki
790223f23a
Merge pull request #2473 from zed-industries/fix-styling-feedback
...
Fix git status issues
2023-05-15 16:28:57 -07:00
Mikayla Maki
e4d509adf4
fmt
2023-05-15 16:22:52 -07:00
Mikayla Maki
4d40aa5d6f
Restore trickle up git status to folder
...
co-authored-by: max <max@zed.dev >
2023-05-15 16:22:00 -07:00
Mikayla Maki
f59256f761
Update git repositories to be streamed with their entries
...
co-authored-by: max <max@zed.dev >
2023-05-15 16:22:00 -07:00
Mikayla Maki
68078853b7
Made status tracking resilient to folder renames
...
co-authored-by: max <max@zed.dev >
2023-05-15 16:21:58 -07:00
Mikayla Maki
307dd2b83e
Update proto names to reflect new status info
2023-05-15 16:20:01 -07:00
Mikayla Maki
1e4ab6cd75
Add index tracking to status
2023-05-15 16:20:01 -07:00
Mikayla Maki
6c26f3d0e4
Fixed formatting
2023-05-15 16:20:01 -07:00
Mikayla Maki
2b18975cdc
Change folder styling from a reduce over all child files to a simple 'always modified'
...
Remove git status from tab titles
2023-05-15 16:20:01 -07:00
Joseph T. Lyons
17f138906e
Merge pull request #2474 from zed-industries/update-jetbrains-keymap
...
Update jetbrains keymap
2023-05-15 14:17:36 -04:00
Joseph Lyons
6a7d718381
Update jetbrains keymap
2023-05-15 14:12:02 -04:00
Julia
cf53b2ca87
Merge pull request #2471 from zed-industries/optimize-update-local-worktree-buffers
...
Optimize update local worktree buffers
2023-05-15 13:13:09 -04:00
Antonio Scandurra
c03e470fe6
Introduce Panel::can_zoom
2023-05-15 17:10:30 +02:00
Kirill Bulatov
18e0ee44a6
Remove redundant scopes and actions to fix the focus toggle on ESC
...
co-authored-by: Antonio <antonio@zed.dev >
2023-05-15 13:10:15 +03:00
Kirill Bulatov
93705cbe55
Merge pull request #2472 from zed-industries/kb/zed-main-builds
...
Build Zed for main and labeled PR commits
Add a job to build Zed images marked with the SHA of the commit it was built from.
The job triggers on every commit to main or every PR with run-build-dmg label and produces an install-ready *.dmg artifact attached to the corresponding CI run.
2023-05-15 11:30:26 +03:00
Kirill Bulatov
5465948f20
Build Zed dmg
2023-05-15 11:26:41 +03:00
Kirill Bulatov
4f36ba3b1e
Add a job to build Zed images from current main
...
The job triggers on every commit to `main` or every PR with
`run-build-dmg` label and produces an install-ready *.dmg artifact attached to the
corresponding CI run.
2023-05-14 22:06:33 +03:00
Julia
fa32adecd5
Fixup more, tests finally pass
2023-05-14 12:06:00 -04:00
Nathan Sobo
ba50b35de6
wip
2023-05-13 14:34:09 -06:00
Mikayla Maki
db87e83bad
Merge pull request #2469 from zed-industries/fix-git-init-bug
...
Fix repository initialization bug
2023-05-13 10:47:55 -07:00
Mikayla Maki
a6a4b846bc
fmt
2023-05-13 10:43:16 -07:00
Mikayla Maki
5e2aaf45a0
Fix repository initialization bug
2023-05-13 10:38:24 -07:00
Mikayla Maki
3534665e2b
Merge pull request #2468 from zed-industries/touch-up-status
...
Improve status integration
2023-05-13 09:38:02 -07:00
Mikayla Maki
04041af78b
Fixed bug with failing to clear git file status
2023-05-13 02:40:22 -07:00
Mikayla Maki
62c445da57
Match priority of folder highlights to vscode
2023-05-13 02:30:59 -07:00
Mikayla Maki
41bef2e444
Refactor out git status into FileName component
...
Integrate file name component into the editor's tab content
2023-05-13 02:26:45 -07:00
Nathan Sobo
6c60853842
Don't close panel on event unless active; add tests
2023-05-12 15:44:09 -06:00
Nathan Sobo
bd795d7607
Preserve panel size when re-docking between left and right
2023-05-12 15:15:11 -06:00
Joseph T. Lyons
e1c1100c7b
Merge pull request #2466 from zed-industries/update-release-links
...
Update release links
2023-05-12 14:08:10 -04:00
Joseph Lyons
b70c874a0e
Update release links
2023-05-12 14:04:36 -04:00
Mikayla Maki
ad7ed56e6b
Delete pull_request_template.md
2023-05-12 10:15:13 -07:00
Mikayla Maki
4663ac8abf
Create pull_request_template.md
2023-05-12 10:14:54 -07:00
Mikayla Maki
e71846c653
Create pull_request_template.md
2023-05-12 10:12:47 -07:00
Mikayla Maki
deac8a6ff9
Merge pull request #2465 from zed-industries/stream-branch-first
...
Send the root branch along with it's entry
2023-05-12 09:45:40 -07:00
Mikayla Maki
60320c6b09
Send the root branch along with it's entry
2023-05-12 09:37:02 -07:00
Mikayla Maki
54e9e7c35b
Merge pull request #2464 from zed-industries/remove-between
...
Add TreeMap::remove_between that can take abstract start and end points
2023-05-12 08:59:56 -07:00
Nathan Sobo
214354b4da
Make panels independently resizable
2023-05-12 09:44:14 -06:00
Mikayla Maki
6ef0f70528
Made the map seek target a publicly implementable interface
...
Integrated remove_range with the existing git code
co-authored-by: Nathan <nathan@zed.dev >
2023-05-12 08:37:32 -07:00
Nathan Sobo
ee3637216e
Add TreeMap::remove_between that can take abstract start and end points
...
This commit introduces a new adaptor trait for SeekTarget that works around
frustrating issues with lifetimes. It wraps the arguments in a newtype wrapper
that lives on the stack to avoid the lifetime getting extended to the caller
of the method.
This allows us to introduce a PathSuccessor object that can be passed as the
end argument of remove_between to remove a whole subtree.
2023-05-12 08:21:01 -07:00
Kirill Bulatov
89352a2bdc
Merge pull request #2463 from zed-industries/kb/reapply-modal-accessibility
...
Reintroduce more accesible modal keybindings
2023-05-12 06:11:04 +03:00
Max Brunsfeld
9ae10a5dd9
Add a better API for updating settings in the SettingsStore in tests
2023-05-11 17:24:58 -07:00
Mikayla Maki
defc9c8591
Merge pull request #2455 from zed-industries/git-status-viewer
...
Add Git Status to the project panel
2023-05-11 16:13:34 -07:00
Mikayla Maki
5fe8b73f04
compile error 😅
2023-05-11 16:07:41 -07:00
Mikayla Maki
d526fa6f1f
fmt
2023-05-11 16:06:56 -07:00
Mikayla Maki
d538994c7f
Use more efficient sum tree traversals for removal and improve ergonomics with iter_from
...
co-authored-by: Nathan <nathan@zed.dev >
2023-05-11 16:06:25 -07:00
Mikayla Maki
72655fc41d
fmt
2023-05-11 13:25:57 -07:00
Mikayla Maki
6f87f9c51f
Don't scan for statuses in files that are ignored
2023-05-11 13:25:07 -07:00
Mikayla Maki
1bb34e08bb
Fix test
2023-05-11 12:03:39 -07:00
Mikayla Maki
dfb6a2f7fc
fmt
2023-05-11 12:02:25 -07:00
Mikayla Maki
5b2ee63f80
Added status trickle up
2023-05-11 12:01:42 -07:00
Kirill Bulatov
f12dffa60c
Reintroduce more accesible modal keybindings
...
Brings commit 475fc40923 back
2023-05-11 20:59:10 +03:00
Mikayla Maki
5accf7cf4e
Update is_deleted when sending new repositories
2023-05-11 10:21:25 -07:00
Max Brunsfeld
bebb5456c7
Merge pull request #2461 from zed-industries/ci-target-dir-size
...
During CI, clear the target directory if it gets larger than a maximum size
2023-05-11 09:57:36 -07:00
Max Brunsfeld
3550110e57
ci: clear the target dir if it gets too big
2023-05-11 09:43:13 -07:00
Mikayla Maki
191ac86f09
Remove the CORRECT, overly agressive deletion codepath
2023-05-11 09:24:36 -07:00
Joseph Lyons
0ab94551f4
Revert "More keybindings in macOs modals with buttons"
...
This reverts commit 1398a12062 .
2023-05-11 11:37:34 -04:00
Julia
0f34af50a8
Use path list generated during entry reload of a refresh request
2023-05-10 23:37:02 -04:00
Mikayla Maki
adfbbf21b2
fmt
2023-05-10 20:09:37 -07:00
Mikayla Maki
f5c633e80c
Fixed bug in status deletion marking
2023-05-10 19:54:02 -07:00
Mikayla Maki
fca3bb3b93
Add randomized test for git statuses
2023-05-10 19:21:27 -07:00
Mikayla Maki
9800a149a6
Remove some external context from git status test
2023-05-10 17:59:33 -07:00
Mikayla Maki
f55ca7ae3c
Fix incorrect import
2023-05-10 17:52:23 -07:00
Mikayla Maki
18becabfa5
Add postgres migration
2023-05-10 17:50:35 -07:00
Max Brunsfeld
bc5b78198a
Define terminal settings in terminal crate
2023-05-10 17:43:10 -07:00
Mikayla Maki
c7166fde3b
Bump protocol version
2023-05-10 17:38:29 -07:00
Mikayla Maki
65d4c4f6ed
Add integration test for git status
2023-05-10 17:37:36 -07:00
Mikayla Maki
e20eaca595
Got basic replication working :)
2023-05-10 17:37:36 -07:00
Mikayla Maki
2b80dfa81d
Update protos
2023-05-10 17:37:36 -07:00
Mikayla Maki
00b345fdfe
Use sum tree traversal to remove paths
2023-05-10 17:37:36 -07:00
Mikayla Maki
23a19d85b8
Fix bug in status detection when removing a directory
2023-05-10 17:37:36 -07:00
Mikayla Maki
0082d68d4a
Revert "Convert git status calculation to use Entry IDs as the key instead of repo relative paths"
...
This reverts commit 728c6892c924ebeabb086e308ec4b5f56c4fd72a.
2023-05-10 17:37:36 -07:00
Petros Amoiridis
21e1bdc8cd
Fix yellow to be yellow
2023-05-10 17:37:36 -07:00
Petros Amoiridis
6b4242cded
Use theme.editor.diff for the colors
2023-05-10 17:37:36 -07:00
Mikayla Maki
f935047ff2
Convert git status calculation to use Entry IDs as the key instead of repo relative paths
2023-05-10 17:37:36 -07:00
Mikayla Maki
94a0de4c9f
Fix compile errors
2023-05-10 17:37:36 -07:00
Mikayla Maki
a58a33fc93
WIP: integrate status with collab
2023-05-10 17:37:36 -07:00
Mikayla Maki
18cec8d64f
Format
2023-05-10 17:37:36 -07:00
Mikayla Maki
e98507d8bf
Added git status to the project panel, added worktree test
2023-05-10 17:37:36 -07:00
Mikayla Maki
93f57430da
Track live entry status in repository
2023-05-10 17:37:36 -07:00
Mikayla Maki
bd98f78101
Fix compile error
2023-05-10 17:37:36 -07:00
Mikayla Maki
67491632cb
WIP: Track live entry status in repository
...
co-authored-by: petros <petros@zed.dev >
2023-05-10 17:37:36 -07:00
Mikayla Maki
7169f5c760
Add git status to the file system abstraction
...
co-authored-by: petros <petros@zed.dev >
2023-05-10 17:37:36 -07:00
Max Brunsfeld
cee7edabf9
Ensure the SettingsStore global is added in tests
2023-05-10 16:39:59 -07:00
Joseph Lyons
6385e51957
collab 0.12.1
2023-05-10 18:16:20 -04:00
Joseph Lyons
9405b49957
v0.87.x dev
2023-05-10 16:47:09 -04:00
Max Brunsfeld
68867fe2e1
Define journal settings in journal crate
2023-05-10 12:59:24 -07:00
Max Brunsfeld
aa6ea920e2
Define telemetry settings in the client crate
2023-05-10 12:59:24 -07:00
Max Brunsfeld
9b06be2aa2
Define vim_mode setting in vim crate
2023-05-10 12:59:24 -07:00
Max Brunsfeld
926d7b356d
Define auto_update setting in the auto_update crate
2023-05-10 12:59:24 -07:00
Max Brunsfeld
b6b2c5d1d1
Generalize settings JSON schema logic to work w/ arbitrary setting types
2023-05-10 12:59:24 -07:00
Max Brunsfeld
9a6a2d9d27
Start using the SettingsStore in the app
2023-05-10 12:59:24 -07:00
Max Brunsfeld
316f791a77
Add generic update method to SettingsStore
2023-05-10 12:59:24 -07:00
Max Brunsfeld
24e06334d0
Allow registering additional settings after loading global settings
2023-05-10 12:59:24 -07:00
Max Brunsfeld
5de9652a22
Create proof-of-concept SettingStore struct
2023-05-10 12:59:22 -07:00
Nathan Sobo
5549669316
Test moving panels
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-05-10 10:41:03 -06:00
Mikayla Maki
c7fcc031eb
Merge pull request #2460 from zed-industries/show-dock-on-activate
...
Fix bug with terminal button
2023-05-10 09:08:45 -07:00
Nathan Sobo
cc21421ea8
Rename item to panel in various locations
2023-05-10 09:54:20 -06:00
Mikayla Maki
0dce5ba7ae
Fix bug with terminal button
2023-05-10 08:15:20 -07:00
Antonio Scandurra
0ccb4a50e6
Create more specific dock position settings associated with each panel
2023-05-10 16:52:10 +02:00
Antonio Scandurra
e507eadb4b
Rely on root getting re-focused when panel isn't rendered
...
This achieves two things:
- When a panel like `TerminalPanel` closes its last tab, the focus
is returned to the root view (the `Workspace`)
- When a panel is moved from a dock to another, it will get rendered
in another spot but the focus will be kept on the panel
This also ensures the focus is not lost when a panel is moved from
a dock to another because that view
2023-05-10 15:43:44 +02:00
Antonio Scandurra
9b9d53fcf8
Focus the root view if the previously-focused view isn't rendered
2023-05-10 15:40:46 +02:00
Antonio Scandurra
cdcb7c8084
Merge branch 'main' into panels
2023-05-10 15:23:37 +02:00
Antonio Scandurra
f28eee88b6
Add context menu to change panel position
2023-05-10 14:05:48 +02:00
Antonio Scandurra
8fa379bbc5
Maintain panel visibility when changing its position
2023-05-10 11:06:37 +02:00
Antonio Scandurra
6e3ce6332a
Fix panic when not specifying a project_panel setting
2023-05-10 10:43:42 +02:00
Kirill Bulatov
eec60556ab
Highlight include/exclude inputs when errors happen there
2023-05-10 11:11:31 +03:00
Kirill Bulatov
dfdf7e4866
Test the search inclusions/exclusions
2023-05-10 11:11:31 +03:00
Kirill Bulatov
80fc1bc276
Use placeholder in include/exclude editors
2023-05-10 11:11:31 +03:00
Kirill Bulatov
0e31d13a1e
Rework tab and escape key handling in search panel
...
Fixes
https://linear.app/zed-industries/issue/Z-1238/focus-the-results-multibuffer-in-project-search-on-esc
and adds a tab shortcut for project search inputs
co-authored-by: Julia <julia@zed.dev >
2023-05-10 11:11:31 +03:00
Kirill Bulatov
3da55c14a6
Fix arrow layout
2023-05-10 11:11:31 +03:00
Kirill Bulatov
6fb8679184
Trim glob input
2023-05-10 11:11:31 +03:00
Kirill Bulatov
13296d502c
Extra rows approach draft
...
co-authored-by: Max <max@zed.dev >
2023-05-10 11:11:31 +03:00
Kirill Bulatov
b5abac6af6
Draft search include/exclude logic
2023-05-10 11:11:31 +03:00
Kirill Bulatov
915154b047
Add initial include/exclude project search UI
2023-05-10 11:11:31 +03:00
Antonio Scandurra
3115c8381d
Merge pull request #2458 from zed-industries/fix-context-menu-click
...
Always dismiss context menu on click
2023-05-10 09:24:23 +02:00
Antonio Scandurra
1b5e79251c
Always dismiss context menu on click
2023-05-10 09:18:13 +02:00
Nathan Sobo
9173916ab8
Remove unused terminal_button module
2023-05-09 20:24:37 -06:00
Nathan Sobo
f554877ff4
Render the bottom dock buttons before the right dock buttons
2023-05-09 17:41:24 -06:00
Nathan Sobo
ba248244ec
Allow terminal to be docked left, bottom, or right
...
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2023-05-09 17:36:49 -06:00
Nathan Sobo
6a7feb4c4c
Allow the project panel to be docked right or left
...
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2023-05-09 17:26:54 -06:00
Nathan Sobo
0d78266ddb
Replace todo with unimplemented to reduce distractions
2023-05-09 16:41:10 -06:00
Nathan Sobo
6d16d2224d
Merge branch 'main' into panels
2023-05-09 16:35:04 -06:00
Nathan Sobo
5e8b7bd06d
Replace todo with unimplemented to reduce distractions
2023-05-09 16:31:53 -06:00
Mikayla Maki
26d80eef0a
Merge pull request #2456 from zed-industries/fix-dock-pane-focus
...
Make dock not eagerly steal focus from sub items
2023-05-09 15:59:06 -04:00
Mikayla Maki
0214228689
Fix format
2023-05-09 12:54:53 -07:00
Nathan Sobo
6645323f1b
WIP
2023-05-09 13:28:34 -06:00
Mikayla Maki
6dfb48dbd5
Fix center items not being activated when deserialized
2023-05-09 12:27:07 -07:00
Mikayla Maki
8d561d6408
Make dock not eagerly steal focus from sub items
2023-05-09 12:00:09 -07:00
Antonio Scandurra
8f12489937
WIP: Allow panels to be moved
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-09 18:57:25 +02:00
Antonio Scandurra
45df09245b
Remove unused code
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-05-09 18:06:59 +02:00
Antonio Scandurra
37d3ed5f5f
Focus new item if pane was focused when removing previous active item
...
Previously, we were relying on the item getting blurred and the workspace
receiving focus, which would in turn focus the active pane. This doesn't
play well with docks because they aren't part of the workspace panes.
2023-05-09 17:38:54 +02:00
Antonio Scandurra
641f5d1107
Ensure ctrl-` works in the terminal panel
2023-05-09 17:38:18 +02:00
Antonio Scandurra
2bc7be9a76
WIP
2023-05-09 17:14:33 +02:00
Antonio Scandurra
48ad3866b7
Randomly mutate worktree in addition to mutating the file-system
...
This ensures that we test the code path that refreshes entries.
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-05-09 17:01:11 +02:00
Antonio Scandurra
7f27d72b20
Deliver file-system change events in batches in randomized worktree test
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-05-09 16:55:03 +02:00
Julia
5c859da457
Only update changed local worktree buffers
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-09 15:13:12 +02:00
Antonio Scandurra
634b699281
Allow customization of Pane tab bar buttons
2023-05-09 15:05:29 +02:00
Antonio Scandurra
ad7f32d7d2
Fix bottom dock resizing
2023-05-09 14:46:15 +02:00
Antonio Scandurra
26fe7a81f3
Prevent splits in the terminal panel
2023-05-09 12:29:16 +02:00
Antonio Scandurra
e6be35c9a5
Show terminal count in panel button
2023-05-09 12:21:35 +02:00
Antonio Scandurra
02066afb0e
Don't pass &mut Workspace when closing items in a Pane
...
This allows closing items via actions even in the `TerminalPanel`
where the `Pane` is not directly owned by a `Workspace`.
2023-05-09 11:45:39 +02:00
Antonio Scandurra
506f978c41
Automatically close terminal dock when the last terminal was closed
2023-05-09 10:18:11 +02:00
Antonio Scandurra
916612caf1
Prevent dragging items that aren't terminals to the terminal panel
2023-05-09 10:18:11 +02:00
Antonio Scandurra
6ddc610fa2
WIP: Start on TerminalPanel
2023-05-09 10:18:11 +02:00
Nathan Sobo
1ddbda5095
Rename DockItem to Panel
2023-05-09 10:18:11 +02:00
Nathan Sobo
03f8c1206a
Rename Sidebar to Dock
2023-05-09 10:18:10 +02:00
Nathan Sobo
1919a826f9
Remove dock from workspace
2023-05-09 10:18:10 +02:00
Mikayla Maki
2d7cfb8c7c
Merge pull request #2454 from zed-industries/fix-mismatching-panes-when-deserializing-empty-panes
...
Fully remove panes and update internal data structures
2023-05-08 20:37:06 -04:00
Mikayla Maki
fa049bea6e
Refactor and fix format
2023-05-08 17:32:40 -07:00
Mikayla Maki
49335d017a
Add manual removal code to remove_panes
2023-05-08 17:25:28 -07:00
Mikayla Maki
9b2d3fcd48
Fully remove panes and update internal data structures
2023-05-08 17:09:29 -07:00
Max Brunsfeld
8fd0c9fb0e
collab 0.12.0
2023-05-08 15:54:11 -07:00
Mikayla Maki
1d66f24f23
Merge pull request #2428 from zed-industries/add-branch-name
...
Add branch name and synchronize repository representations on the worktree.
2023-05-08 17:40:47 -04:00
Mikayla Maki
9366a0dbee
Bump protocol version number
2023-05-08 14:34:14 -07:00
Mikayla Maki
f28419cfd1
Fix styling of titlebar highlights
2023-05-08 14:33:59 -07:00
Mikayla Maki
712fb5ad7f
Add postgres migration
2023-05-08 14:33:59 -07:00
Mikayla Maki
1a9afd186b
Restore randomized integration tests
2023-05-08 14:33:59 -07:00
Mikayla Maki
15d2f19b4a
fix format
2023-05-08 14:33:59 -07:00
Mikayla Maki
d2279674a7
Fix panic in tests
2023-05-08 14:33:59 -07:00
Mikayla Maki
62e763d0d3
Removed test modifications, added special case to git initialization for when the repository is inside a .git folder
2023-05-08 14:33:59 -07:00
Mikayla Maki
f9e4464658
Refresh titlebar on project notifications
2023-05-08 14:33:59 -07:00
Mikayla Maki
2c2076bd77
Adjust tests to not create repositories inside repositories
2023-05-08 14:33:59 -07:00
Mikayla Maki
ab952f1b31
Fixed randomized test failures
...
co-authored-by: Max <max@zed.dev >
2023-05-08 14:33:59 -07:00
Mikayla Maki
d8dac07408
Removed scan ID from repository interfaces
...
co-authored-by: Max <max@zed.dev >
2023-05-08 14:33:59 -07:00
Mikayla Maki
270147d20c
Finished RepositoryEntry refactoring, smoke tests passing
...
co-authored-by: Max <max@zed.dev >
2023-05-08 14:33:59 -07:00
Mikayla Maki
53569ece03
WIP: Change RepositoryEntry representation to be keyed off of the work directory
...
Removes branches button scaffolding
2023-05-08 14:33:59 -07:00
Mikayla Maki
b6d6f5c650
WIP: re-arranging the RepositoryEntry representation
...
Added branches to the randomized test to check the git branch
Added the remaining database integrations in collab
Co-authored-by: Max <max@zed.dev >
Co-authored-by: Petros <petros@zed.dev >
2023-05-08 14:33:59 -07:00
Mikayla Maki
8bde496e74
Add branch name in title UI
...
co-authored-by: Petros <petros@zed.dev >
2023-05-08 14:33:59 -07:00
Petros Amoiridis
5302c256a4
Rebase main and fix error
2023-05-08 14:33:59 -07:00
Mikayla Maki
8301ee43d6
WIP: Add repository entries to collab and synchronize when rejoining the room
...
co-authored-by: Max <max@zed.dev >
2023-05-08 14:33:59 -07:00
Mikayla Maki
2fe5bf419b
Add proto fields for repository entry maintenance
2023-05-08 14:33:59 -07:00
Mikayla Maki
c6d7ed33c2
Add smoke test for collaboration
2023-05-08 14:33:59 -07:00
Petros Amoiridis
ca4da52e39
Remove unused functions
2023-05-08 14:33:59 -07:00
Petros Amoiridis
e057b0193f
Introduce BrancesButton in title bar
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-05-08 14:33:58 -07:00
Petros Amoiridis
797d47a08c
Render title root names without branches
2023-05-08 14:33:58 -07:00
Petros Amoiridis
92a222aba8
Introduce a version control branch icon
2023-05-08 14:33:58 -07:00
Mikayla Maki
8f0aa3c6d9
Add branch name into title
2023-05-08 14:33:58 -07:00
Petros Amoiridis
d34ec462f8
Display branch information per worktree root
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-05-08 14:33:58 -07:00
Mikayla Maki
ffd9d4eb59
Fix bug in repo detection
2023-05-08 14:33:58 -07:00
Mikayla Maki
3570810516
Add API for accessing git branch
2023-05-08 14:33:58 -07:00
Mikayla Maki
26afd592c5
Wire in the branch name
2023-05-08 14:33:58 -07:00
Mikayla Maki
5b4e58d1de
Fix repo_for and clean up repository_entries
2023-05-08 14:33:58 -07:00
Mikayla Maki
023d665fb3
Fix TreeMap retain
2023-05-08 14:33:58 -07:00
Mikayla Maki
ae890212e3
Restored a lost API and got everything compiling
2023-05-08 14:33:58 -07:00
Mikayla Maki
bcf608e9e9
WIP: Refactor existing git code to use new representation.
...
co-authored-by: petros <petros@zed.dev >
2023-05-08 14:33:58 -07:00
Mikayla Maki
563f13925f
WIP: Convert old git repository vec to new treemap based approach.
...
co-authored-by: Nathan <nathan@zed.dev >
2023-05-08 14:33:58 -07:00
Mikayla Maki
a58d3d8128
Add a data driven representation of the current git repository state to the worktree snapshots
...
WIP: Switch git repositories to use SumTrees
Co-authored-by: Nathan <nathan@zed.dev >
2023-05-08 14:33:58 -07:00
Mikayla Maki
bb93447a0d
Merge pull request #2453 from zed-industries/fix-click-fallthrough
...
Fixed clicks falling through the modal terminal
2023-05-08 13:59:57 -04:00
Mikayla Maki
2cf928c85a
Fixed clicks falling through the modal terminal
...
co-authored-by: Antonio <antonio@zed.dev >
2023-05-08 10:54:12 -07:00
Kirill Bulatov
39bddfc7b7
Only allow invisbles in local and leader selections
2023-05-08 19:36:51 +03:00
Kirill Bulatov
98ff18c430
Code review fixes
2023-05-08 19:36:51 +03:00
Kirill Bulatov
e6489e999d
Add invisibles wrapping test
2023-05-08 19:36:51 +03:00
Kirill Bulatov
d2b2dc39d9
Do not print invisibles in non-full mode editors
2023-05-08 19:36:51 +03:00
Nate Butler
ab6b3adb2b
Add a theme entry for whitespace, use it to style whitespaces
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
Co-Authored-By: Kirill Bulatov <mail4score@gmail.com >
2023-05-08 19:36:51 +03:00
Kirill Bulatov
fb3ef4bcf6
Fix wrapped line detection
2023-05-08 19:36:51 +03:00
Kirill Bulatov
075bab2ea9
Use more convntional name for the settings
2023-05-08 19:36:51 +03:00
Kirill Bulatov
706f6f495a
Add a test
2023-05-08 19:36:51 +03:00
Kirill Bulatov
ec725fe399
Do not print extra invisibles on line wraps
2023-05-08 19:36:51 +03:00
Kirill Bulatov
95bcd19020
Refactor line glyphs drawing methods
2023-05-08 19:36:51 +03:00
Kirill Bulatov
4aaf44df94
Support invisibles in the selection
2023-05-08 19:36:51 +03:00
Kirill Bulatov
1eeeec157e
Use cached standard glyphs for invisible symbols
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-05-08 19:36:51 +03:00
Kirill Bulatov
714734d279
Add whitespaces rendering
2023-05-08 19:36:51 +03:00
Kirill Bulatov
2d8c88ad73
Draw tabs with svg icons in editor code only
2023-05-08 19:36:51 +03:00
Kirill Bulatov
f0a88b3337
Make invisibles display configurable
2023-05-08 19:36:51 +03:00
Kirill Bulatov
ad731ea6d2
Draft invisibles' tabs display
2023-05-08 19:36:51 +03:00
Max Brunsfeld
4f8607039c
Add is_tab field to chunks
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-05-08 19:36:51 +03:00
Julia
cf304a0edc
Merge pull request #2452 from zed-industries/prevent-some-rounding-clipping
...
Prevent some cases of clipping icons due to pixel coord rounding
2023-05-08 11:48:33 -04:00
Julia
332b364a30
Prevent some cases of clipping icons due to pixel coord rounding
2023-05-08 11:42:00 -04:00
Antonio Scandurra
235470bbfd
Merge pull request #2451 from zed-industries/kb/extra-deps
...
Remove unused dependencies
2023-05-08 14:46:27 +02:00
Kirill Bulatov
6cb0bc89d2
Remove unused dependencies
2023-05-07 21:07:55 +03:00
Antonio Scandurra
0296974ab1
Merge pull request #2441 from zed-industries/implicit-ancestry
...
Determine view ancestry during layout
2023-05-05 10:58:00 +02:00
Antonio Scandurra
5e16f70067
💄
2023-05-05 10:53:15 +02:00
Antonio Scandurra
080a1f00a3
Delay focus_in event for window activation till after layout
2023-05-05 10:47:42 +02:00
Antonio Scandurra
b9ed327b94
Replace usages of is_parent_view_focused with is_self_focused
...
Previously, this was used because we didn't have access to the current
view and `EventContext` was an element-only abstraction. Now that the
`EventContext` wraps the current view's `ViewContext` we can simply check
for the view's focus and avoid querying ancestors.
2023-05-05 10:08:22 +02:00
Antonio Scandurra
80ad59a620
Make focusing the parent an effect to avoid querying ancestors
2023-05-05 10:04:54 +02:00
Joseph T. Lyons
c55a4c0feb
Merge pull request #2447 from zed-industries/fix-auto-update
...
Do not use post_json() to auto update
2023-05-04 17:15:09 -04:00
Mikayla Maki
3631b3a86c
Merge pull request #2446 from zed-industries/fix-copilot-logged-out
...
Fix copilot stuck in logged out state
2023-05-04 16:52:04 -04:00
Mikayla Maki
89af803565
Rearrange the state machine
2023-05-04 13:45:31 -07:00
Julia
137cbaba34
Merge pull request #2445 from zed-industries/construct-text-buffer-in-background
...
Construct text buffer in background
2023-05-04 16:01:39 -04:00
Julia
eacea55aaf
Fixup cases using buffer model handle id as buffer id
2023-05-04 12:32:31 -04:00
Julia
1883e260ce
Offload text::Buffer construction to background worker
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-04 12:32:31 -04:00
Julia
7e06062bdb
Store history base text as rope
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-05-04 12:32:31 -04:00
Joseph Lyons
8313414e1e
Do not use post_json() to auto update
2023-05-04 12:12:36 -04:00
Antonio Scandurra
d6b0569bed
Merge branch 'main' into implicit-ancestry
2023-05-04 17:19:06 +02:00
Antonio Scandurra
f51425d390
Merge pull request #2444 from zed-industries/fix-clicking-sidebar-buttons
...
Use `Workspace::toggle_sidebar_item` when clicking on sidebar button
2023-05-04 17:14:40 +02:00
Antonio Scandurra
64e0c16baa
Use Workspace::toggle_sidebar_item when clicking on sidebar button
...
Previously, we were mistakenly using `Sidebar::toggle_item`, which only
performs part of the toggle operation.
2023-05-04 17:06:37 +02:00
Antonio Scandurra
cbae4e751b
Merge pull request #2443 from zed-industries/fix-vim-mode-rename
...
Avoid calling `update_window` twice in `blurred` event handler
2023-05-04 16:24:51 +02:00
Antonio Scandurra
912a4cf549
Avoid calling update_window twice in blurred event handler
...
This was preventing us from unhooking vim when performing a rename,
which prevented typing in the rename editor.
2023-05-04 16:18:01 +02:00
Antonio Scandurra
0f93714d4f
Merge pull request #2442 from zed-industries/filter-vim-commands
...
Filter out vim commands when vim mode is disabled
2023-05-04 15:00:19 +02:00
Antonio Scandurra
b1f5cfaa79
Merge pull request #2440 from zed-industries/fix-navigate-to-definitions-panic
...
Fix panic when opening multiple definitions in a multibuffer
2023-05-04 14:56:43 +02:00
Antonio Scandurra
b3baebde22
Filter out vim commands when vim mode is disabled
2023-05-04 14:52:34 +02:00
Antonio Scandurra
da19edc3e3
Merge branch 'main' into implicit-ancestry
2023-05-04 14:39:58 +02:00
Antonio Scandurra
121264d35a
Fix panic when opening multiple definitions in a multibuffer
...
The editor is on the stack, so adding an item to the `Pane` containing
the editor will cause a double borrow and a consequent panic. This
commit fixes the issue by deferring the opening of the definitions.
2023-05-04 14:34:42 +02:00
Antonio Scandurra
7e2a461486
Merge pull request #2439 from zed-industries/fix-keystrokes-for-action
...
Cache view's type id and keymap context into a separate map
2023-05-04 14:22:42 +02:00
Antonio Scandurra
5cc6304fa6
Verify keystrokes can be queried while views are on the stack
2023-05-04 12:09:32 +02:00
Antonio Scandurra
3d679ddb26
Avoid re-allocating KeymapContext after every view notification
2023-05-04 12:04:30 +02:00
Antonio Scandurra
18e39ef2fa
Cache view's type id and keymap context into a separate map
...
During `layout`, we now pass a mutable reference to the element's
parent view. This is a recursive process that causes the view to
be removed from `AppContext` and then re-inserted back into it once
the layout is complete.
As such, querying parent views during `layout` does not work as such
views will have been removed from `AppContext` and not yet re-inserted
into it. This caused a bug in `KeystrokeLabel`, which used the `keystrokes_for_action`
method to query its ancestors to determine their type id and keymap context.
Now, any time a view notifies, we will cache its keymap context so that
we don't need to query the parent view during `layout`.
2023-05-04 10:47:56 +02:00
Antonio Scandurra
7b7a495be3
Remove stray dbg! statement
2023-05-04 09:56:49 +02:00
Antonio Scandurra
f6f18be9c3
Remove WindowContext::is_child_focused
2023-05-04 09:53:35 +02:00
Antonio Scandurra
67a3891f15
Make dispatch_event related methods public to the crate only
2023-05-04 09:53:35 +02:00
Antonio Scandurra
92183e0d72
Ensure querying keystrokes or actions is safe
...
This is achieved by moving `available_actions` into `AsyncAppContext` (where
we know no view/window is on the stack) and `keystrokes_for_action` into `LayoutContext`
where we'll fetch the previous frame's ancestors and notify the current view if those
change after we perform a layout.
2023-05-04 09:53:31 +02:00
Joseph Lyons
053b34875b
collab 0.11.0
2023-05-03 14:59:04 -04:00
Joseph Lyons
653ea3a85d
v0.86.x dev
2023-05-03 14:38:41 -04:00
Max Brunsfeld
c2c29d3fb6
Merge pull request #2427 from zed-industries/copilot-disabled-globs
...
Add copilot.disabled_globs setting
2023-05-03 11:00:08 -07:00
Max Brunsfeld
9d41f83b1b
Merge branch 'main' into copilot-disabled-globs
2023-05-03 10:53:28 -07:00
Antonio Scandurra
040cc4d4c3
Allow notifying views when the ancestry of another view is outdated
2023-05-03 19:25:00 +02:00
Max Brunsfeld
8eb1312deb
Add copilot menu item for enabling paths by glob
2023-05-03 10:14:01 -07:00
Antonio Scandurra
7250754f8e
Make dispatch_keystroke public to the crate only
2023-05-03 19:13:17 +02:00
Antonio Scandurra
9e8f852afb
Remove ViewContext::is_child
2023-05-03 19:09:07 +02:00
Antonio Scandurra
5157442703
Fix integration test relying on deferred happening after focus
...
Focus is now one of the last things that happens during `flush_effects`,
and we shouldn't have relied on `defer` in the first place to verify
focus changes.
2023-05-03 19:00:32 +02:00
Antonio Scandurra
c65465b0b5
Ensure workspace gets rendered in collab integration tests
2023-05-03 18:31:07 +02:00
Antonio Scandurra
e9ed40da37
Remove the ability to retrieve the view's parent
2023-05-03 16:52:55 +02:00
Antonio Scandurra
7f137ed3dd
Compute view ancestry at layout time
2023-05-03 16:36:14 +02:00
Antonio Scandurra
7f345f8bf5
Separate Window::build_scene into layout and paint
2023-05-03 12:18:16 +02:00
Antonio Scandurra
3f037e5128
Merge pull request #2437 from zed-industries/fix-joining-call
...
Fix "IncomingCallNotification was dropped" error when accepting a call
2023-05-03 10:49:04 +02:00
Antonio Scandurra
376aa1235f
Fix "IncomingCallNotification was dropped" error when accepting a call
...
This was caused by accepting the call, which caused the notification to
be removed. When `active_call.accept_incoming()` finally completed, we
would try to get the app state from it in order to join the project, but
couldn't becuase the view would have already been dropped.
This commit fixes the bug by capturing a weak handle to the app state
when accepting the call as opposed to trying to read it from the view
when the accept completes.
2023-05-03 10:37:57 +02:00
Antonio Scandurra
c3cf9e3185
Merge pull request #2436 from zed-industries/close-window-end-call
...
Move methods querying window state into `AsyncAppContext`
2023-05-03 10:27:05 +02:00
Joseph T. Lyons
f576586cd7
Merge pull request #2435 from zed-industries/use-json-post-request-for-update-requests
...
Use json_post() request for update requests
2023-05-02 23:42:25 -04:00
Joseph Lyons
41d4454f45
Use post_json so that the Content-Type is set to application/json
2023-05-02 23:23:43 -04:00
Joseph Lyons
69a4fffae2
Update post_json to take in a bool for allowing for redirects
2023-05-02 23:22:55 -04:00
Joseph T. Lyons
7f5afeb9fa
Merge pull request #2434 from zed-industries/add-download-and-uplodate-metadata-to-update-request
...
Add download and upload metadata to update request
2023-05-02 22:27:58 -04:00
Joseph Lyons
2b95aba99c
Add download and upload metadata to update request
2023-05-02 17:16:42 -04:00
Kirill Bulatov
1398a12062
More keybindings in macOs modals with buttons
...
Closes https://github.com/zed-industries/community/issues/1095
by forcing the non-Cancel button to get a focus.
Due to the way macOs handles buttons on modals, the focus gain had to be
achieved via certain button addition order, rather than conventional
"setFocus"-ish API, see the related comment for details.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-05-02 21:10:20 +03:00
Antonio Scandurra
70f8cf4cf6
Move methods querying window state into AsyncAppContext
2023-05-02 19:38:48 +02:00
Julia
4f6939732e
Merge pull request #2432 from zed-industries/more-diagnostic-source
...
Show diagnostic source in more places
2023-05-02 09:16:11 -04:00
Julia
185c1650df
Show diagnostic source in inline diagnostic
2023-05-02 09:08:07 -04:00
Antonio Scandurra
9108e4151e
Merge pull request #2431 from zed-industries/fix-broken-contact-finder
...
Fix broken styling in contact finder
2023-05-02 13:55:14 +02:00
Antonio Scandurra
94f1775533
Fix broken styling in contact finder
...
This regressed as part of #2372 , where we forgot to theme the contact
finder picker differently from the rest of the app.
2023-05-02 13:46:49 +02:00
Antonio Scandurra
e8f2d985ff
Merge pull request #2430 from zed-industries/fix-toggle-contacts-panic
...
Fix panic when showing contacts popover via keybinding
2023-05-02 11:53:24 +02:00
Antonio Scandurra
f985fac6f9
Fix panic when showing contacts popover via keybinding
2023-05-02 11:47:05 +02:00
Antonio Scandurra
484cda51cf
Merge pull request #2429 from zed-industries/fix-debug-elements-panic
...
Move `debug_elements` to `AsyncAppContext`
2023-05-02 11:15:57 +02:00
Kirill Bulatov
f5278c49b0
Clarify GH Token scope requirements
2023-05-02 12:12:57 +03:00
Antonio Scandurra
794446bf8b
Move debug_elements to AsyncAppContext
...
Previously, `debug_elements` was available on `WindowContext`. If that
method was called while having a borrow out to a view, it would panic because
the view would already have been borrowed.
By moving it to an `AsyncAppContext` we ensure the method can't be called while
a view is being used.
2023-05-02 11:09:40 +02:00
Antonio Scandurra
4c1cba6def
Remove unnecessary Element impl for RootElement
2023-05-02 10:09:57 +02:00
Julia
f7de0ad8ae
Show diagnostic source in diagnostic multibuffer headers
2023-05-01 16:48:27 -04:00
Max Brunsfeld
c485fc86a2
Add copilot.disabled_globs setting
2023-05-01 13:45:47 -07:00
Joseph T. Lyons
f62ba2eec7
use installation_id over device_id
2023-05-01 16:29:51 -04:00
Julia
5fb9d53dd0
Merge pull request #2425 from zed-industries/trim-eslint-workspace-configuration
...
Trim eslint workspace configuration & remove diagnostic source underline
2023-05-01 13:24:14 -04:00
Julia
40ab5c1fb9
Remove underline from diagnostic source
2023-05-01 13:15:41 -04:00
Julia
4966a4a681
Reduce hardcoded ESLint workspace configuration
2023-05-01 13:14:35 -04:00
Antonio Scandurra
a8084ad3f4
Merge pull request #2424 from zed-industries/constrain-programmatic-dispatch
...
Allow programmatic action dispatch only via `AsyncAppContext`
2023-05-01 17:10:57 +02:00
Antonio Scandurra
780ece551e
Defer hiding the dock and going back/forward when Pane is on the stack
2023-05-01 17:06:05 +02:00
Antonio Scandurra
e3b2407ebf
Run until parked now that the command palette spawns to dispatch action
2023-05-01 16:58:07 +02:00
Antonio Scandurra
6c931ab9da
Inline test-only AppContext methods
2023-05-01 16:49:17 +02:00
Antonio Scandurra
eb2cce98a7
Move dispatch_action_any_action_at to AsyncAppContext
2023-05-01 16:40:57 +02:00
Antonio Scandurra
c4472b0786
Remove ViewContext::dispatch_action
2023-05-01 16:27:36 +02:00
Antonio Scandurra
d815fc88ae
Remove ViewContext::dispatch_any_action
2023-05-01 14:24:00 +02:00
Antonio Scandurra
029538fe21
Make dispatch_global_action private
2023-05-01 11:45:35 +02:00
Antonio Scandurra
0f44648b38
Merge pull request #2423 from zed-industries/fix-panic-in-go-to-definition
...
Fix panic when clicking on a definition
2023-04-29 15:02:18 +02:00
Antonio Scandurra
e566929d9e
Fix panic when clicking on a definition
...
This was introduced with #2420 and was caused by re-entrantly updating
the workspace. Instead of passing the workspace reference from the outside,
we now define the definition navigation as a method on the editor which solves
the issue.
Note that we also needed to introduce a `defer` call when navigating to a definition
to prevent the workspace from reading the editor during `open_project_item`.
2023-04-29 14:53:17 +02:00
Joseph T. Lyons
ae5794d911
Merge pull request #2421 from zed-industries/metrics-2
...
Rework telemetry code to support sending events to Clickhouse
2023-04-28 17:16:33 -04:00
Julia
32f26d1e9a
Merge pull request #2422 from zed-industries/source-eslint-server-from-github
...
Source ESLint server from Github rather than 3rd party NPM package
2023-04-28 16:53:07 -04:00
Julia
1bf85214a4
Source ESLint server from Github rather than 3rd party NPM package
2023-04-28 16:42:36 -04:00
Joseph Lyons
6b0faa2d9c
Rework telemetry code to support sending events to Clickhouse
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-04-28 16:06:55 -04:00
Antonio Scandurra
dc999f719b
Merge pull request #2420 from zed-industries/simplify-action-dispatch
...
Remove `impl_internal_actions!` macro
2023-04-28 17:39:56 +02:00
Antonio Scandurra
106ebeb386
Remove obsolete presenter modules
2023-04-28 17:37:25 +02:00
Antonio Scandurra
489b1f6a63
Merge remote-tracking branch 'origin/main' into simplify-action-dispatch
2023-04-28 17:31:12 +02:00
Antonio Scandurra
1c5376a560
Remove impl_internal_actions macro
2023-04-28 17:29:57 +02:00
Antonio Scandurra
1d41a703ad
Remove internal actions from terminal_button
2023-04-28 17:29:17 +02:00
Antonio Scandurra
33da9e5690
Remove internal actions from project_panel
2023-04-28 17:21:10 +02:00
Antonio Scandurra
e1535735b8
Remove DeployContextMenu internal action
2023-04-28 16:51:01 +02:00
Antonio Scandurra
f65e64829e
Remove Scroll internal action
2023-04-28 16:43:31 +02:00
Antonio Scandurra
3409ee1785
Remove DeployMouseContextMenu internal action
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-28 16:41:46 +02:00
Antonio Scandurra
c22342e271
💄
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-28 16:38:00 +02:00
Antonio Scandurra
1f35e1dbf9
Remove internal actions from copilot_button
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-28 16:36:57 +02:00
Antonio Scandurra
a91903c2ab
Remove internal actions from link_go_to_definition
2023-04-28 16:24:46 +02:00
Antonio Scandurra
264a2c1835
Remove HideHover and HoverAt internal actions
2023-04-28 16:12:24 +02:00
Antonio Scandurra
e6f561ce46
Remove unused Jump internal action
2023-04-28 15:57:36 +02:00
Antonio Scandurra
c04cb0286a
Remove Dismiss and RespondToContactRequest internal actions
2023-04-28 15:56:41 +02:00
Antonio Scandurra
0469e25de6
Remove LeaveCall internal action
2023-04-28 14:14:25 +02:00
Antonio Scandurra
83436213ad
Remove Jump internal action
2023-04-28 14:13:07 +02:00
Antonio Scandurra
3763b985e3
Fix panic due to re-entrantly reading Workspace
2023-04-28 12:36:50 +02:00
Antonio Scandurra
a978f3fe4f
Remove Select internal action
2023-04-28 12:33:22 +02:00
Antonio Scandurra
5215adbd3f
Remove ToggleExpanded and Call internal actions
2023-04-28 12:26:47 +02:00
Antonio Scandurra
5d8fcceee3
Remove RespondToCall internal action
2023-04-28 12:24:07 +02:00
Antonio Scandurra
4bcba487c5
Remove SplitWithProjectEntry internal action
2023-04-28 12:19:38 +02:00
Antonio Scandurra
272039a858
Remove SplitWithItem internal action
2023-04-28 12:17:31 +02:00
Antonio Scandurra
6857426b78
Remove RemoveWorktreeFromProject internal action
2023-04-28 12:11:59 +02:00
Antonio Scandurra
71a4bc7905
Remove OpenSharedScreen internal action
2023-04-28 12:09:34 +02:00
Antonio Scandurra
d953729233
Remove JoinProject internal action
2023-04-28 11:22:04 +02:00
Antonio Scandurra
f881f9e3d8
Remove ToggleFollow internal action
2023-04-28 10:07:44 +02:00
Antonio Scandurra
06c01a5937
Eliminate OpenPaths global action for workspace and replace with methods
...
We no longer want to invoke this with dispatch_action.
2023-04-27 18:36:28 -06:00
Max Brunsfeld
db73ba5a1a
Merge pull request #2419 from zed-industries/zombie-copilot-process
...
Shutdown copilot server when quitting zed
2023-04-27 14:47:30 -07:00
Max Brunsfeld
1533c17cd7
Shutdown copilot server when quitting zed
2023-04-27 14:39:00 -07:00
Max Brunsfeld
7258db7a4e
Merge pull request #2417 from zed-industries/hover-markdown
...
Render markdown more correctly in the editor hover popover
2023-04-27 14:15:04 -07:00
Max Brunsfeld
6042df393b
Give code spans in markdown a background highlight
2023-04-27 13:58:30 -07:00
Max Brunsfeld
8eb9c6563a
Generalize Text element to let you add arbitrary scene primitives for runs of text
2023-04-27 13:58:06 -07:00
Julia
92c9de1f50
Merge pull request #2415 from zed-industries/diagnostic-hovers-source
...
Show source of diagnostic on hover
2023-04-27 15:12:22 -04:00
Julia
87539e7b82
Update test to not fail due to absence of diagnostic source
2023-04-27 15:04:48 -04:00
Max Brunsfeld
66d4cb8c14
Tweak rendering of multi-paragraph list items in markdown
2023-04-27 11:39:34 -07:00
Julia
a284fae515
Don't hardcode workspaceFolder for ESLint adapter
2023-04-27 14:35:34 -04:00
Julia
678c188de0
Re-allow diagnostics hovers to soft wrap
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-27 14:35:34 -04:00
Julia
3f7533a0b4
Show source of diagnostic hovers
2023-04-27 14:35:34 -04:00
Max Brunsfeld
45c7073934
Merge pull request #2418 from zed-industries/vim-inactive-window-crash
...
Fix vim mode crash when active editor changes in inactive window
2023-04-27 10:48:49 -07:00
Max Brunsfeld
30f20024c0
Fix vim mode crash when active editor changes in inactive window
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-27 10:43:35 -07:00
Antonio Scandurra
6cbc1dcd87
💄
2023-04-27 14:56:16 +02:00
Antonio Scandurra
20e38d2def
Remove OpenProjectEntryInPane internal action
2023-04-27 14:51:02 +02:00
Antonio Scandurra
b6437d6d9e
Remove Toast and DismissToast internal actions
2023-04-27 14:43:10 +02:00
Antonio Scandurra
2950344c25
Remove internal actions from Dock
2023-04-27 14:29:15 +02:00
Antonio Scandurra
15d83d40b0
Remove internal actions from menu crate
2023-04-27 14:29:11 +02:00
Antonio Scandurra
816eb06a7b
Remove internal actions from CopilotCodeVerification
2023-04-27 14:25:34 +02:00
Antonio Scandurra
32f21771a6
Remove internal actions from ContextMenu
2023-04-27 14:25:14 +02:00
Antonio Scandurra
022368225e
Remove internal actions from Pane
2023-04-27 14:23:26 +02:00
Antonio Scandurra
5521ff1b22
Allow passing a handler function to context menu items
2023-04-27 11:32:12 +02:00
Antonio Scandurra
d3b976d044
Remove ContextMenu::element_item
2023-04-27 11:11:21 +02:00
Antonio Scandurra
df2f471ddf
Remove unused ContextMenu::ViewAction
2023-04-27 10:55:37 +02:00
Antonio Scandurra
06b12bbb68
Remove unnecessarily general keystroke_label_for function
2023-04-27 10:55:14 +02:00
Max Brunsfeld
c6abb0db3a
Improve rendering of multi-paragraph list items in hover markdown
2023-04-26 17:09:20 -07:00
Max Brunsfeld
c75207c4e5
Merge pull request #2416 from zed-industries/outline-view-leaving-lines-highlighted
...
Remove highlighted rows when confirming outline view
2023-04-26 16:11:22 -07:00
Max Brunsfeld
c15dadbb8c
Remove highlighted rows when confirming outline view
2023-04-26 15:46:29 -07:00
Max Brunsfeld
d298ce3fd3
Render more markdown features in hover popover
2023-04-26 15:33:10 -07:00
Max Brunsfeld
7960067cf9
Fix bug where Text element would wrap at the right glyph in the wrong run
2023-04-26 15:33:10 -07:00
Max Brunsfeld
54e7464163
collab 0.10.0
2023-04-26 13:24:08 -07:00
Max Brunsfeld
1bbcff543b
Add API for adding mouse regions within Text
2023-04-26 12:00:26 -07:00
Joseph Lyons
99e82d829f
v0.85.x dev
2023-04-26 14:19:52 -04:00
Nathan Sobo
a45282eb63
Merge pull request #2414 from zed-industries/spawn-weak-for-views
...
Pass a `WeakViewHandle` to `ViewContext::spawn`
2023-04-26 06:10:44 -06:00
Antonio Scandurra
6317e885c7
Don't allow strong view handles to be read/updated with an AsyncAppContext
...
This avoids an invitation to hold strong view handles across async await
points, which is a common source of leaks.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-26 13:36:13 +02:00
Antonio Scandurra
689e878bd8
Use a WeakViewHandle in Client for view message handlers
2023-04-26 12:21:02 +02:00
Antonio Scandurra
57beec6071
Allow direct read/update of WeakViewHandle only in AsyncAppContext
2023-04-26 12:20:57 +02:00
Antonio Scandurra
2b6830c798
Remove unnecessary calls to WeakViewHandle::upgrade
2023-04-26 11:13:46 +02:00
Antonio Scandurra
94c2eaad23
Replace ViewContext::spawn with ViewContext::spawn_weak
2023-04-26 10:23:27 +02:00
Antonio Scandurra
09f7e41907
Merge pull request #2405 from zed-industries/fewer-context-traits
...
Simplify traits for accessing app state uniformly across different kinds of contexts
2023-04-26 10:02:56 +02:00
Antonio Scandurra
7ca412ade3
Merge remote-tracking branch 'origin/main' into fewer-context-traits
2023-04-26 09:54:58 +02:00
Max Brunsfeld
a7145021b6
Extract a named struct from text_layout::Line's style runs
2023-04-25 14:05:23 -07:00
Max Brunsfeld
3cb50ed6b7
Merge pull request #2413 from zed-industries/project-search-focus
...
Preserve previous focus when re-focusing project search
2023-04-25 09:33:09 -07:00
Max Brunsfeld
3db67a48b5
Preserve previous focus when re-focusing project search
2023-04-25 09:28:50 -07:00
Max Brunsfeld
c31a5063d0
Merge pull request #2411 from zed-industries/rust-snippet-variable-completions
...
Avoid treating snippet completions' details as their variable types
2023-04-25 08:59:35 -07:00
Max Brunsfeld
db276a422f
Merge pull request #2412 from zed-industries/more-workspace-deps
...
Specify more dependencies at the cargo workspace level, to avoid repeating versions
2023-04-24 18:09:35 -07:00
Max Brunsfeld
ebbe52e6b0
🎨 Specify more dependencies at the workspace level
2023-04-24 17:41:55 -07:00
Max Brunsfeld
dd3f6ff4ca
Avoid treating snippet completions' details as their variable types
2023-04-24 16:20:14 -07:00
Max Brunsfeld
b76194db97
Merge pull request #2409 from zed-industries/stale-excerpts
...
Fix stale project diagnostic excerpts for guests
2023-04-24 14:22:04 -07:00
Max Brunsfeld
7bd51851c2
🎨
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-04-24 13:54:47 -07:00
Max Brunsfeld
a8ddba55d8
Send language server updates via the same task that sends buffer operations
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-04-24 13:52:03 -07:00
Max Brunsfeld
ce34bf62fe
Add failing test for diagnostic message ordering
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-04-24 13:18:37 -07:00
Max Brunsfeld
d2ba1ec275
Merge pull request #2407 from zed-industries/lsp-log-view
...
Add a simple language server log view
2023-04-24 10:15:29 -07:00
Max Brunsfeld
f3ada72785
Avoid accidentally dropping subscription when detaching it
2023-04-24 10:04:45 -07:00
Max Brunsfeld
1793c5ff6c
Upgrade tree-sitter-json
2023-04-24 09:43:31 -07:00
Max Brunsfeld
e7cb996044
Improve the LSP log UI
2023-04-24 09:43:31 -07:00
Max Brunsfeld
6ed7f1281f
Persist LSP logs after log view is closed
2023-04-24 09:43:31 -07:00
Max Brunsfeld
6ef6f03322
Update LspLog view to use new gpui APIs
2023-04-24 09:43:31 -07:00
Max Brunsfeld
a280a93cd8
Start work on a language server log view
2023-04-24 09:43:31 -07:00
Max Brunsfeld
2dd4920625
Add LanguageServer::on_io method, for observing JSON sent back and forth
2023-04-24 09:43:31 -07:00
Max Brunsfeld
abdccf7393
Use a workspace dependency for the futures crate
2023-04-24 09:43:31 -07:00
Mikayla Maki
d82cc49f79
Merge pull request #2408 from zed-industries/change-copilot-wording
...
Change copilot wording to be more explicit
2023-04-25 04:28:23 +12:00
Mikayla Maki
c12e2ac3fb
fix formatting
2023-04-24 09:25:04 -07:00
Mikayla Maki
c7874cf169
Update copilot_button.rs
2023-04-24 09:03:54 -07:00
Antonio Scandurra
c165fb9be5
Remove ReadView and UpdateView traits
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-24 17:36:14 +02:00
Antonio Scandurra
a6115d9330
Remove UpdateModel trait
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-24 16:52:09 +02:00
Antonio Scandurra
a9417f3d2e
Remove ReadModelWith trait
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-24 16:44:54 +02:00
Antonio Scandurra
5f500d34b2
Remove UpgradeModelHandle trait
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-24 16:40:30 +02:00
Antonio Scandurra
b8fab6fde9
Remove UpgradeViewHandle trait
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-04-24 16:33:27 +02:00
Mikayla Maki
455d383d08
Change copilot wording to be more explicit
2023-04-21 21:42:23 -07:00
Mikayla Maki
f10de10915
Merge pull request #2406 from zed-industries/fix-nondeterministic-terminal-test
...
Fix minor terminal bugs
2023-04-22 12:42:20 +12:00
Mikayla Maki
fa7f4974a0
Remove unused import
2023-04-21 17:26:45 -07:00
Mikayla Maki
733abc9ed2
Revert previous change
2023-04-21 17:24:20 -07:00
Mikayla Maki
616188c541
Fix a bug where the character under a cursor could not reliably be selected
2023-04-21 17:15:29 -07:00
Mikayla Maki
8e0d359c63
Merge branch 'main' into fix-nondeterministic-terminal-test
2023-04-22 11:17:06 +12:00
Mikayla Maki
d841c3729b
Wire through the gutter, rather than implicitly adding it
2023-04-21 16:12:33 -07:00
Mikayla Maki
23932b7e6c
Fixed non-deterministic test failure and made mouse to cell conversion work correctly
2023-04-21 16:06:07 -07:00
Max Brunsfeld
06cb388beb
Merge pull request #2404 from zed-industries/fix-command-palette
...
Stopgap: Fix missing actions in the command palette
2023-04-21 15:16:45 -07:00
Nathan Sobo
e6604d1641
Fix missing actions in the command palette
...
Previously, the workspace view was on the stack when we were computing the
available actions, which excluded it. This is a stopgap. We should find a
better solution ASAP.
2023-04-21 15:59:29 -06:00
Nathan Sobo
83bf3d071d
WIP
2023-04-21 15:36:52 -06:00
Nathan Sobo
55db28e074
Eliminate ReadModel trait
2023-04-21 15:05:19 -06:00
Nathan Sobo
5dac95c47c
Eliminate ReadView trait
2023-04-21 15:03:57 -06:00
Nathan Sobo
bce51c521a
Merge pull request #2403 from zed-industries/into-element
...
Rename Element to AnyElement, Drawable to Element, and make containers generic over any Element type
2023-04-21 14:44:22 -06:00
Nathan Sobo
993dbf86cb
Merge remote-tracking branch 'origin/main' into into-element
2023-04-21 14:27:25 -06:00
Nathan Sobo
09111b65d8
Merge pull request #2401 from zed-industries/simplify-context-lifetimes
...
Remove unnecessary lifetime parameter from WindowContext
2023-04-21 14:26:26 -06:00
Nathan Sobo
caf3d5c163
Fix more formatting
2023-04-21 14:25:49 -06:00
Nathan Sobo
c1810e8ec9
Fix formatting
2023-04-21 13:09:36 -06:00
Nathan Sobo
fe492eacbf
Refine naming of element-related types and traits
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-21 13:06:37 -06:00
Antonio Scandurra
03619dfa55
Rename Drawable::boxed to into_element and make containers generic
...
Multi-element are now generic over any drawable child, which can be converted
into an element.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-21 12:43:19 -06:00
Mikayla Maki
69273648b3
Merge pull request #2402 from zed-industries/fix-panics
...
Fix panic in pane.rs
2023-04-22 05:53:48 +12:00
Mikayla Maki
b8fd6435d7
Fix test covering this case
2023-04-21 10:48:34 -07:00
Mikayla Maki
aa2af53f56
Align return of close_active_item to match original format
2023-04-21 10:44:27 -07:00
Mikayla Maki
39512655aa
Remove unused cyclic dependency from copilot crate
...
Move notification handling earlier so that there are less copilot messages in the log
2023-04-21 10:38:36 -07:00
Mikayla Maki
6ee0d104d6
Fix panic in remove active item
2023-04-21 10:08:52 -07:00
Petros Amoiridis
c9048b54c1
Merge pull request #2399 from zed-industries/petros/z-827-copy-the-newline-shortcuts-to-zed
...
Add newline shortcuts for popular editors
2023-04-21 19:09:10 +03:00
Antonio Scandurra
4ac894ffbe
Remove unnecessary lifetime parameter from WindowContext
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 18:06:53 +02:00
Antonio Scandurra
a4fbcbf160
Merge pull request #2400 from zed-industries/fix-breadcrumbs-signature
...
Fix `ProjectDiagnosticsEditor::breadcrumbs` signature
2023-04-21 18:06:22 +02:00
Antonio Scandurra
4d433663bd
Fix ProjectDiagnosticsEditor::breadcrumbs signature
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 17:54:26 +02:00
Antonio Scandurra
238ebafa48
Merge pull request #2372 from zed-industries/window_context_2
...
Give elements access to their parent views and simplify contexts
2023-04-21 17:32:14 +02:00
Julia
88406045f5
Merge pull request #2398 from zed-industries/fix-diagnostics-breadcrumbs
...
Render breadcrumbs for diagnostics multi-buffer
2023-04-21 11:31:35 -04:00
Petros Amoiridis
3992e95109
Add newline shortcuts for popular editors
2023-04-21 18:29:35 +03:00
Antonio Scandurra
f54a289b6f
Remove handle to view from TerminalElement
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 16:56:06 +02:00
Antonio Scandurra
a860a6cd62
Make App::notify_view private
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 16:50:57 +02:00
Antonio Scandurra
8c7f821d14
Introduce a new WindowContext::remove_window API
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 16:39:53 +02:00
Petros Amoiridis
c3231047ad
Merge pull request #2396 from zed-industries/petros/z-77-the-start-local-collaboration-script-no
...
Fix script/start-local-collaboration
2023-04-21 17:36:22 +03:00
Antonio Scandurra
f12746c4b7
Avoid double borrow of view in ProjectPanel drag and drop
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 16:23:47 +02:00
Antonio Scandurra
31e906d068
Avoid double borrow of views on up and up_out in DragAndDrop
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-21 16:19:51 +02:00
Petros Amoiridis
65c5605e68
Look for the main display always
2023-04-21 17:18:01 +03:00
Petros Amoiridis
3c54b14c5b
Remove debugging information
2023-04-21 17:17:04 +03:00
Antonio Scandurra
5b40641fde
Take a target view when marking an element as draggable
2023-04-21 15:52:05 +02:00
Antonio Scandurra
b0cbd13e7a
Remove stray push_layer from EditorElement::paint
2023-04-21 11:46:13 +02:00
Antonio Scandurra
e5192a4853
Use update_default_global to filter command palette items for copilot
2023-04-21 11:07:36 +02:00
Antonio Scandurra
c76b9794e4
Merge branch 'main' into window_context_2
2023-04-21 10:58:08 +02:00
Antonio Scandurra
d32a7218cd
Remove stray dbg! statements
2023-04-21 10:49:47 +02:00
Julia
c7cc5bca02
Render breadcrumbs for diagnostics multi-buffer
2023-04-20 23:39:45 -04:00
Mikayla Maki
8e4cc549dc
Merge pull request #2397 from zed-industries/finally-fix-terminal-line-height
...
Create a new setting to adjust the line height in the terminal
2023-04-21 12:39:49 +12:00
Mikayla Maki
1fa52adabd
Fix warning
2023-04-20 17:34:47 -07:00
Mikayla Maki
c72b70d4ae
Fixed silly custom settings parsing
2023-04-20 17:33:06 -07:00
Mikayla Maki
f54ab73b47
Merge branch 'main' into finally-fix-terminal-line-height
2023-04-21 12:26:32 +12:00
Mikayla Maki
dfdc826015
Create a new setting to adjust the line height in the terminal
2023-04-20 17:24:27 -07:00
Nathan Sobo
1b2e480e1e
Remove unnecessary replace
2023-04-20 15:26:48 -06:00
Nathan Sobo
0bce80b6f8
Fix remaining vim failures
2023-04-20 15:25:11 -06:00
Antonio Scandurra
137d9384b5
Initialize the active editor when vim mode is enabled
...
Instead of waiting for a focus event. This makes more tests pass.
2023-04-20 14:02:40 -06:00
Petros Amoiridis
7b4b1d6312
Use regex to make extraction bulletproof
2023-04-20 20:06:33 +03:00
Max Brunsfeld
abdfb5a451
collab 0.9.0
2023-04-20 09:52:32 -07:00
Max Brunsfeld
3a855184bc
v0.84.x dev
2023-04-20 09:52:07 -07:00
Joseph T. Lyons
65f7228fed
Merge pull request #2389 from zed-industries/save-panics-as-structured-data
...
Save panics as structured data
2023-04-20 12:51:00 -04:00
Max Brunsfeld
b414d43ee3
Merge pull request #2392 from zed-industries/eslint-multiple-language-server-adapters-rebased
...
Allow buffers to use multiple language servers
2023-04-20 09:40:23 -07:00
Petros Amoiridis
dcc804783c
Install jq if it's missing
2023-04-20 19:06:23 +03:00
Petros Amoiridis
460ea8e16c
Increase reliability and support multiple monitors
2023-04-20 19:06:23 +03:00
Petros Amoiridis
b11e239779
Make the script more reliable
2023-04-20 19:06:22 +03:00
Mikayla Maki
ad71020990
Merge pull request #2395 from zed-industries/remove-stable-hiding-copilot
...
Remove stable guard for copilot
2023-04-21 04:04:04 +12:00
Max Brunsfeld
21bb13d309
Fix comment formatting errors for rust 1.69
2023-04-20 09:03:42 -07:00
Max Brunsfeld
32c57bcd22
Store buffer's diagnostic sets in a smallvec
2023-04-20 08:58:41 -07:00
Max Brunsfeld
960a2bc589
Don't use ESLint for now
2023-04-20 08:58:41 -07:00
Max Brunsfeld
0ebe44bfd5
Handle multiple language servers for a given path in project diagnostics view
2023-04-20 08:58:41 -07:00
Max Brunsfeld
4dd917c123
Introduce a LanguageServerId wrapper type
...
Clarify the meaning of all the usizes in use in all of these
struct fields an method signatures.
2023-04-20 08:58:41 -07:00
Julia
c5f86bc6af
Avoid language servers fighting over diagnostics summaries
...
Previously each server would stomp all over the existing results
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
9e2949e7ba
Refactor language server startup
...
Avoid parallel vecs
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
c59204c5e6
Cleanup
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
26abc824a9
Bump protocol version
2023-04-20 08:58:41 -07:00
Julia
df94aee758
Fix failing tests
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
6156dbced0
Finish getting multiple diagnostics sources building and running
2023-04-20 08:58:41 -07:00
Julia
bb4de47b15
Start getting diagnostics sets to work with multiple servers
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
2a5c0fa5f8
Get ESLint to launch and provide diagnostics
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-04-20 08:58:41 -07:00
Julia
6e68ff5a50
Get it to build with multiple adapters per language! 🎉
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-20 08:58:41 -07:00
Julia
ba7233f265
Incomplete refactor to allow for multiple adapters per language
2023-04-20 08:58:39 -07:00
Mikayla Maki
c1daf0fc36
Fix format
2023-04-20 08:54:44 -07:00
Mikayla Maki
ad8162fc9c
Make sign_in init conditional
2023-04-20 08:36:29 -07:00
Mikayla Maki
f5bbb41cc2
Remove import
2023-04-20 08:34:50 -07:00
Mikayla Maki
5c8b41dd54
Remove stable guard for copilot
2023-04-20 08:33:45 -07:00
Antonio Scandurra
0d5eea8169
Track active window id in test platform
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-20 17:22:11 +02:00
Antonio Scandurra
d9bb37c649
Add WindowContext::update_default_global
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-20 17:13:13 +02:00
Antonio Scandurra
1d487e19f9
Fix editor tests
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-20 16:15:14 +02:00
Antonio Scandurra
c52b6328b7
Merge branch 'main' into window_context_2
2023-04-20 16:01:47 +02:00
Antonio Scandurra
e282c7ad45
Finish converting all the pickers to the new API
2023-04-20 15:26:05 +02:00
Petros Amoiridis
21e39e7523
Merge pull request #2394 from zed-industries/petros/z-804-change-default-settings-for-json-to-2
...
Set default tab_size for JSON to 2 and apply new formatting
2023-04-20 14:45:52 +03:00
Antonio Scandurra
370875b1d4
Merge pull request #2393 from zed-industries/relay-change-events-to-copilot
...
Relay buffer change events to Copilot language server
2023-04-20 13:34:42 +02:00
Petros Amoiridis
eca93c124a
Apply the tab_size change to keymaps and settings
2023-04-20 14:08:30 +03:00
Petros Amoiridis
bed76462e2
Define tab_size equal to 2 in default settings
2023-04-20 14:06:43 +03:00
Antonio Scandurra
df71a9cfae
Move buffer change reporting to a background task
2023-04-20 11:59:05 +02:00
Antonio Scandurra
4151bd39da
Add buffer management test to Copilot
2023-04-20 10:51:50 +02:00
Antonio Scandurra
4d207981ae
Notify LSP when Copilot suggestions are accepted/rejected
2023-04-20 10:15:31 +02:00
Antonio Scandurra
5d57167302
Make it easier to access a running/authenticated copilot server
2023-04-20 10:12:10 +02:00
Antonio Scandurra
4c3d6c854a
Send editor information to copilot
2023-04-20 09:34:20 +02:00
Antonio Scandurra
b9a7b70e52
Register unknown buffer on the fly if completions are requested for it
2023-04-20 09:34:20 +02:00
Antonio Scandurra
34bcf6f072
Reopen file in Copilot language server when language or URI changes
2023-04-20 09:34:20 +02:00
Antonio Scandurra
672cf6b8c7
Relay buffer change events to Copilot
2023-04-20 09:34:20 +02:00
Nathan Sobo
d70644618a
WIP: Make PickerDelegate a fully owned object instead of a view
...
This avoids issues with the parent view being on the stack when we want to
interact with the delegate from the picker. Still have several picker usages
to convert.
2023-04-19 22:05:29 -06:00
Mikayla Maki
ce8442a3d8
Fix underflow potential
2023-04-19 17:42:19 -07:00
Mikayla Maki
dd73233973
Merge pull request #2386 from zed-industries/copilot-shipping
...
Get copilot ready to ship
2023-04-20 12:38:27 +12:00
Mikayla Maki
26ab774b7f
Removed debounce on suggestion cycling code
2023-04-19 17:34:09 -07:00
Mikayla Maki
f16b96cafc
add copilot menu
2023-04-19 17:27:44 -07:00
Mikayla Maki
9b8a3e4de5
Fixed panic in new cycling code
...
Made cycling fire without debounce
2023-04-19 16:50:31 -07:00
Mikayla Maki
2882e0fa5b
Remove new CTA in copilot sign in UI
...
Add a trim_end to copilot suggestions
2023-04-19 16:39:55 -07:00
Mikayla Maki
745e5e3a09
Add italic styles to copilot suggestions
2023-04-19 15:23:19 -07:00
Mikayla Maki
70ff4ca48f
WIP: lower our usage of the copilot API by seperating out the cycling completion
...
Restore copilot setting visibility
co-authored-by: antonio <antonio@zed.dev >
2023-04-19 15:23:17 -07:00
Mikayla Maki
ea1c3fa7a0
Only fire completion cycling requests if specifically asked for by the user
2023-04-19 15:21:30 -07:00
Antonio Scandurra
8610f3acf3
Introduce a button to disable copilot integration
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-19 20:25:59 +02:00
Joseph Lyons
0326a45a91
Give closure parameter a name
2023-04-19 14:21:53 -04:00
Antonio Scandurra
54a78d7024
Clarify Copilot context menu
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-19 20:18:06 +02:00
Antonio Scandurra
4a9989fe38
Clear all suggestions from Editor when disabling Copilot
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-19 20:10:57 +02:00
Antonio Scandurra
1fd07b6fcf
Clarify copilot settings
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-19 20:07:05 +02:00
Petros Amoiridis
699b2060b3
Merge pull request #2390 from zed-industries/petros/z-66-command-to-add-a-new-line-on-the
...
Add newline above and improve newline below
2023-04-19 21:02:55 +03:00
Petros Amoiridis
b3b8f8532d
Assert the editor and unmarked texts are the same
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-04-19 20:52:01 +03:00
Petros Amoiridis
f9c60b98c0
Add newline above and improve newline below
...
Add a new action for inserting a new line above the current line. @ForLoveOfCats also helped fix a bug among other things. When two collaborators had their cursors at the end of a line, and one collaborator performed a newline below action, the second collaborator's cursor would be dragged to the new line. This is also fixing that.
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-04-19 19:57:23 +03:00
Joseph Lyons
27a6bacab8
Save panics as structured data
2023-04-19 08:31:47 -04:00
Nathan Sobo
5514349b6b
Add Component elements
2023-04-18 22:49:06 -06:00
Max Brunsfeld
c5e56a5e45
Fail the randomized test build after reporting the error to zed.dev
2023-04-18 18:41:33 -07:00
Max Brunsfeld
5934e882b8
Merge pull request #2379 from zed-industries/shebang
...
Select language based on a file's first content line in addition to its path
2023-04-18 17:31:19 -07:00
Max Brunsfeld
ad9fe79cf2
Merge pull request #2388 from zed-industries/cmd-o-new-window
...
When opening projects, only reuse the current window if it is empty
2023-04-18 17:31:08 -07:00
Max Brunsfeld
7cc868bc8c
When opening projects, only reuse the current window if it is empty
2023-04-18 17:05:26 -07:00
Max Brunsfeld
44d26b69ae
Merge pull request #2387 from zed-industries/panic-in-set-selections-from-remote
...
Fix 'invalid insertion' panic when following
2023-04-18 16:43:47 -07:00
Max Brunsfeld
bd7d50f339
Fix 'invalid insertion' panic when following
...
Wait for the necessary buffer operations to arrive before attempting to
set selections and scroll top.
2023-04-18 16:13:18 -07:00
Nate Butler
a8b3826955
Merge pull request #2384 from zed-industries/update-copilot-styles
...
Update copilot styles
2023-04-18 15:17:10 -04:00
Julia
4c086a4836
Merge pull request #2385 from zed-industries/rerender-breadcrumbs-on-focus-change
...
Re-render toolbar items when updating their knowledge of pane focus
2023-04-18 15:13:53 -04:00
Julia
721baf5746
Re-render toolbar items when updating their knowledge of pane focus
2023-04-18 14:56:39 -04:00
Nate Butler
957ab65422
Mix neutral and blue to make a predictive color that is unique
2023-04-18 14:47:52 -04:00
Joseph T. Lyons
614a9c8977
Merge pull request #2377 from zed-industries/add-tab-tooltips
...
Add tab tooltips
2023-04-18 14:37:38 -04:00
Nate Butler
ae0647c3a9
Update predictive color
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-04-18 14:29:08 -04:00
Joseph Lyons
304eddbbe4
Remove unnecessary lifetimes from tab_description
2023-04-18 14:15:56 -04:00
Joseph Lyons
9afd804062
Remove unnecessary lifetimes from tab_tooltip_text
2023-04-18 14:03:02 -04:00
Antonio Scandurra
eee39b4c5c
Don't capture Workspace handle in defer when rendering Dock
...
GPUI already provides a mutable reference to the `Workspace` in the
`defer` callback.
2023-04-18 17:41:40 +02:00
Antonio Scandurra
136e599051
Merge branch 'main' into window_context_2
2023-04-18 17:29:37 +02:00
Antonio Scandurra
bcba11ba82
Reflect new behavior in test now that we don't replace windows anymore
2023-04-18 17:27:05 +02:00
Antonio Scandurra
d03c431f9a
Fix warnings/errors now that AsyncAppContext::update returns Result
2023-04-18 14:58:57 +02:00
Antonio Scandurra
31e6bb4fc1
Return Result from AsyncAppContext::update_view
2023-04-18 12:03:53 +02:00
Antonio Scandurra
1b477c9e38
Merge pull request #2383 from zed-industries/show-copilot-more-often
...
Clean up completion tasks, even if they fail or return no results
2023-04-18 11:16:47 +02:00
Antonio Scandurra
d26d0ac56f
Clean up completion tasks, even if they fail or return no results
...
This fixes a bug where leaving the completion task in `completion_tasks`
could cause the Copilot suggestion to not be shown due to the LSP not
successfully return a completion.
2023-04-18 11:03:17 +02:00
Antonio Scandurra
75d6b6360f
Add failing test to demonstrate Copilot not showing enough suggestions
2023-04-18 10:24:20 +02:00
Max Brunsfeld
8f25b98e6f
Print the final minimized test plan before sending it to zed.dev
2023-04-17 16:35:54 -07:00
Max Brunsfeld
695973d117
Use Node 18 on CI, for fetch API
2023-04-17 16:22:30 -07:00
Max Brunsfeld
516964280b
Merge pull request #2376 from zed-industries/randomized-tests-runner
...
Add an Actions workflow that repeatedly runs the randomized integration tests
2023-04-17 15:45:45 -07:00
Max Brunsfeld
485c56e3bd
Don't run randomized tests on pushes to main
2023-04-17 15:43:12 -07:00
Max Brunsfeld
837866f962
Consolidate logic for running randomized tests in scripts
2023-04-17 15:37:11 -07:00
Julia
4adc92b8e5
Merge pull request #2382 from zed-industries/dont-have-contacts-popover-affect-share-unshare-button
...
Don't have contacts popover affect appearance of Share/Unshare button
2023-04-17 14:18:39 -04:00
Julia
14ef0edd7f
Don't have contacts popover affect appearance of Share/Unshare button
2023-04-17 14:13:28 -04:00
Max Brunsfeld
233cd80f63
Merge pull request #2381 from zed-industries/fix-buffer-latency
...
Send buffer operations in batches to reduce latency
2023-04-17 10:59:51 -07:00
Max Brunsfeld
5d73e646d8
Delete pull_request_template.md
2023-04-17 10:23:57 -07:00
Antonio Scandurra
1f284408a9
Send buffer operations in batches to reduce latency
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-04-17 10:22:13 -07:00
Julia
f5a2534c1b
Merge pull request #2380 from zed-industries/show-followers-full-color
...
Unconditionally display followers in full color
2023-04-17 13:16:19 -04:00
Julia
61f4f8aaeb
Unconditionally display followers in full color
2023-04-17 13:10:40 -04:00
Antonio Scandurra
493a418c91
WIP
2023-04-17 18:52:48 +02:00
Antonio Scandurra
38ab6b123f
Make production code compile again
2023-04-17 12:33:33 +02:00
Antonio Scandurra
bed94455b9
Avoid calling focus_in when creating window
...
This is redundant because when creating a window we will receive
an activation event if the window was effectively focused. And if
it wasn't, we shouldn't call `focus_in`.
2023-04-17 11:57:51 +02:00
Max Brunsfeld
1dcd4717b1
Select language based on a file's first content line in addition to its path
2023-04-16 12:28:27 -07:00
Joseph Lyons
ebe57254e0
Add tab tooltips
2023-04-15 06:46:14 -04:00
Max Brunsfeld
3569c61784
Minimize randomized test failures before reporting issues
2023-04-14 17:51:24 -07:00
Max Brunsfeld
5c3da91e15
Report randomized test failures to zed.dev, to create issues in linear
2023-04-14 15:45:01 -07:00
Max Brunsfeld
c329546570
Extract randomized test CI process into a script
2023-04-14 14:25:55 -07:00
Max Brunsfeld
253411bfd0
Start work randomized test runner GH action workflow
2023-04-14 13:54:57 -07:00
Max Brunsfeld
e655a6c767
Merge pull request #2375 from zed-industries/worktree-scan-id-fix
...
Always bump worktree's scan_id when refreshing an entry
2023-04-14 09:53:40 -07:00
Antonio Scandurra
f09e21aa93
WIP: force using (at least) a window context to update views
2023-04-14 17:08:13 +02:00
Antonio Scandurra
a820862165
Take WindowContext in workspace::ItemHandle methods
2023-04-14 16:36:23 +02:00
Antonio Scandurra
a8e75a9b55
Remove weak handle from EditorElement to Editor
2023-04-14 14:29:03 +02:00
Antonio Scandurra
060242a28a
Take a WindowContext in StatusItemViewHandle::set_active_pane_item
2023-04-14 14:26:20 +02:00
Antonio Scandurra
2652f65bee
Fix handle_window_activation_effect updating the wrong view
2023-04-14 12:33:13 +02:00
Antonio Scandurra
98dce89379
Pass WindowContext to ViewHandle::is_focused
2023-04-14 12:12:08 +02:00
Antonio Scandurra
74ca223114
Fix formatting for the entire workspace
2023-04-14 12:08:33 +02:00
Antonio Scandurra
33bc47dbe2
Merge branch 'main' into window_context_2
2023-04-14 12:07:09 +02:00
Antonio Scandurra
183b9ef809
Make full-screen and window bounds callbacks take a WindowContext
2023-04-14 11:56:31 +02:00
Antonio Scandurra
7394bf1cdc
Fix most of the warnings
2023-04-14 10:51:53 +02:00
Antonio Scandurra
5666e8301e
Log an error when a scene fails to build
2023-04-14 10:32:56 +02:00
Antonio Scandurra
9ef79735dc
Move more window-specific methods from AppContext to WindowContext
2023-04-14 10:29:35 +02:00
Antonio Scandurra
c62357db02
Fix window activation
2023-04-14 08:24:01 +02:00
Max Brunsfeld
5ea49b3ae3
Fix inconsistent worktree state when renaming entries while scanning
2023-04-13 22:34:34 -07:00
Max Brunsfeld
bb1cfd51b8
Add randomized test for mutating worktree during initial scan
2023-04-13 22:34:03 -07:00
Max Brunsfeld
debb694d97
Always bump scan_id when refreshing an entry
...
The scan_id needs to be bumped even if a scan is already in progress,
so that worktree updates can detect that entries have changed. This
means that the worktree's completed_scan_id may increase by more than
one at the end of a scan.
2023-04-13 16:51:11 -07:00
Max Brunsfeld
c13914bda1
Merge pull request #2371 from zed-industries/refresh-entry-delay
...
Restructure background scanner to handle refresh requests even while scanning directories
2023-04-13 12:44:04 -07:00
Joseph T. Lyons
6a75e884c0
Merge pull request #2374 from zed-industries/add-vim-mode-metric
...
Add vim mode metric
2023-04-13 13:52:31 -04:00
Joseph Lyons
5f0bf5929f
Add vim mode metric
2023-04-13 13:46:22 -04:00
Antonio Scandurra
84d2605ccf
Avoid passing cx when emitting from CallbackCollection
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-13 16:53:44 +02:00
Antonio Scandurra
ff774786bf
Reimplement AppContext::handle_focus_effect
2023-04-13 16:21:39 +02:00
Antonio Scandurra
4900e04ff3
Fix window refreshing
2023-04-13 12:19:11 +02:00
Antonio Scandurra
0269a8699b
Start removing some warnings
2023-04-13 12:04:37 +02:00
Antonio Scandurra
702c4ce403
Uncomment List tests and fix related problems in WindowContext
2023-04-13 12:01:18 +02:00
Antonio Scandurra
f4daeb4778
Merge pull request #2373 from zed-industries/fix-copilot-panic
...
Avoid interpolating Copilot suggestion if cursor excerpt differs
2023-04-13 10:48:57 +02:00
Antonio Scandurra
495c7acadf
Avoid interpolating Copilot suggestion if cursor excerpt differs
2023-04-13 10:44:08 +02:00
Max Brunsfeld
5ca603dbeb
Don't process gitignore updates after the initial scan
2023-04-12 18:17:29 -07:00
Max Brunsfeld
3d14bfd90c
Prioritize path refresh requests over gitignore status updates
2023-04-12 18:08:00 -07:00
Max Brunsfeld
2d97387f49
Restructure background scanner to handle refresh requests even while scanning
2023-04-12 16:29:51 -07:00
Nathan Sobo
b89c4e06be
WIP: Compiling, many warnings, haven't tested
2023-04-12 12:54:24 -06:00
Nathan Sobo
25ad635577
WIP
2023-04-12 12:38:26 -06:00
Nathan Sobo
4cb13fb39c
WIP
2023-04-12 12:22:26 -06:00
Nathan Sobo
a25f962185
WIP
2023-04-12 12:13:35 -06:00
Max Brunsfeld
a85c2d71ad
collab 0.8.3
2023-04-12 11:11:32 -07:00
Joseph Lyons
afbd275f4f
v0.83.x dev
2023-04-12 13:31:39 -04:00
Joseph T. Lyons
ee238a300e
Merge pull request #2368 from zed-industries/Improve-tab-closing-experience
...
Add tab context menu
2023-04-12 13:08:46 -04:00
Joseph T. Lyons
b39b3541e9
Merge pull request #2370 from zed-industries/flip-screen-sharing-icon-states
...
Flip screen sharing icon states
2023-04-12 12:50:00 -04:00
Nathan Sobo
40896352ff
wip
2023-04-12 10:28:53 -06:00
Nathan Sobo
868301bedb
WIP
2023-04-12 10:07:17 -06:00
Antonio Scandurra
83070a19c4
WIP
2023-04-12 15:55:43 +02:00
Nathan Sobo
b54f08db77
WIP
2023-04-12 06:51:03 -06:00
Antonio Scandurra
6d8635fa29
Merge pull request #2349 from zed-industries/randomized-tests-operation-script
...
Restructure randomized integration test to allow editing and replaying a plan, fix discovered bugs
2023-04-12 11:45:47 +02:00
Antonio Scandurra
12a286ac50
Forget buffered operations when resyncing with the host
...
Previously, we could end up with a situation where the host did not
see an operation but a guest that didn't have that buffer open would. When
such guest would finally open the buffer, they would apply the operation
without however sending it to the host. The guest wouldn't bother resyncing
it because it wasn't part of its open buffers.
2023-04-12 10:39:01 +02:00
Nathan Sobo
d9e4136b02
WIP
2023-04-11 21:56:37 -06:00
Nathan Sobo
e6cc132b19
WIP
2023-04-11 18:48:00 -06:00
Nathan Sobo
e115baa60c
WIP
2023-04-11 18:21:56 -06:00
Joseph Lyons
0b52308c99
Represent dirty state in item-testing code
2023-04-11 16:27:12 -04:00
Joseph Lyons
c39764487c
Construct context menu in a more clear way
2023-04-11 15:46:52 -04:00
Max Brunsfeld
61d048cb25
Don't wait for host's reply before broadcasting buffer updates to guests
2023-04-11 12:37:08 -07:00
Joseph Lyons
ae930bde87
Flip screen sharing icon states
2023-04-11 15:30:44 -04:00
Max Brunsfeld
727afae4ff
Fix unit tests after fixing gpui model drop semantics
...
co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-11 10:58:01 -07:00
Nate Butler
209e9a59c5
Merge pull request #2369 from zed-industries/nate/update-ayu-theme
...
Update `Ayu` Theme Family
2023-04-11 13:05:25 -04:00
Nate Butler
7ba094e10e
add license_checksum
2023-04-11 12:56:18 -04:00
Nate Butler
20ec9f6daf
Add meta fields to ayu
2023-04-11 12:37:20 -04:00
Nate Butler
65c2fb1cc6
Fix paths after publishing
2023-04-11 12:25:02 -04:00
Nate Butler
de60657d53
Ignore the target folder
2023-04-11 12:23:54 -04:00
Nate Butler
975f5d5fa8
Format
2023-04-11 12:23:21 -04:00
Nate Butler
527f0310e2
Update + publish the Ayu theme
2023-04-11 12:22:49 -04:00
Antonio Scandurra
42b10044fc
Fix running client crate tests
2023-04-11 17:43:05 +02:00
Antonio Scandurra
5eb1719ab8
Re-send worktree if reconnecting while initial scan isn't finished yet
...
Previously, if the client was disconnected while the initial worktree
state was being sent, it would not see the remaining state after reconnecting.
This was due to `scan_id` and `completed_scan_id` both being initialized to
`0`, so the client would ask for updates since `0` and get nothing.
This commit changes the worktree to initialize `scan_id` to `1` and
`completed_scan_id` to `0`, so that we get the full worktree again on reconnect.
2023-04-11 17:15:43 +02:00
Antonio Scandurra
172441ab72
Cancel pending calls when participant fails to reconnect
...
Previously, we would only cancel pending calls when the room became
empty.
2023-04-11 16:33:08 +02:00
Antonio Scandurra
5e37c893c2
Ensure project is still alive by the time remote LSP request starts
2023-04-11 15:14:32 +02:00
Antonio Scandurra
5898600239
Use LspCommand to handle code actions
2023-04-11 15:12:58 +02:00
Antonio Scandurra
651a83977e
🔥
2023-04-11 14:53:08 +02:00
Antonio Scandurra
ac532cb6fa
Use LspCommand to handle completions
2023-04-11 14:52:07 +02:00
Antonio Scandurra
9e6d865882
Prevent already dropped model from being upgraded during release
2023-04-11 10:43:05 +02:00
Antonio Scandurra
6ba5e06247
Stop waiting for buffers when releasing a remote project
2023-04-11 10:42:43 +02:00
Antonio Scandurra
643381ce0c
Make UpdateDiffBase a Foreground message to prevent reordering
2023-04-11 08:50:26 +02:00
Joseph Lyons
67cb046298
Add tab context menu
2023-04-11 00:03:47 -04:00
Max Brunsfeld
abfbba68f0
Improve randomized test assertion message when diff base is wrong
2023-04-10 18:28:34 -07:00
Max Brunsfeld
25e3c4e586
Fix leak when project is unshared while LSP handler waits for edits
2023-04-10 17:03:58 -07:00
Nathan Sobo
3de8fe0f87
WIP
2023-04-10 17:27:47 -06:00
Max Brunsfeld
e853e77d59
Upgrade postage for oneshot channel drop fix
...
Previously, dropping a oneshot sender didn't wake the receiver.
2023-04-10 16:03:49 -07:00
Nathan Sobo
6638407ff9
WIP: Everything shredded
2023-04-10 16:10:32 -06:00
Julia
0e4de87e0e
Merge pull request #2367 from zed-industries/log-github-api-response-for-deserialize-error
...
In the case of Github release deserialize error, log response text
2023-04-10 17:04:59 -04:00
Julia
189784f5fd
In the case of Github release deserialize error, log response text
...
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2023-04-10 16:45:15 -04:00
Max Brunsfeld
e79815622c
Preserve ordering between UpdateProject and CreateBufferForPeer messages
...
Previously, because UpdateProject messages were sent in a separately-
spawned task, they could be sent after CreateBufferForPeer messages that
were intended to be sent after them.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-10 12:54:25 -07:00
Antonio Scandurra
9761febf82
Avoid broadcasting SaveBuffer in response to a client's save request
...
The host will send a `SaveBuffer` message anyway and this prevents re-querying
the database, which could cause two `BufferSaved` messages to race and, as a
result, cause guest to apply them in the wrong order.
2023-04-10 10:02:13 +02:00
Antonio Scandurra
3a82c04248
Improve assertion message when buffer state diverges
2023-04-10 10:01:44 +02:00
Antonio Scandurra
016343e65d
Merge branch 'main' into randomized-tests-operation-script
2023-04-10 08:45:22 +02:00
Antonio Scandurra
7f73ebdab5
Apply BufferReloaded message to incomplete remote buffers
2023-04-10 08:41:31 +02:00
Antonio Scandurra
116d4f20fa
Merge pull request #2366 from zed-industries/avoid-unwrapping-on-try-send
...
Don't panic if worktree was dropped before sending path changes
2023-04-10 08:36:53 +02:00
Antonio Scandurra
372e31d54f
Don't panic if worktree was dropped before sending path changes
...
In `refresh_entry`, we send a message to the `self.path_changes_tx` channel
to notify the background thread that a path has changed. However, given that
`refresh_entry` uses `spawn_weak`, the worktree could get dropped before sending
the message, which could cause a panic.
This commit changes the code to return an error instead of panicking.
2023-04-10 08:16:08 +02:00
Nathan Sobo
7536645eea
WIP
2023-04-08 08:01:05 -06:00
Nathan Sobo
9d23a98157
WIP
2023-04-08 06:43:39 -06:00
Max Brunsfeld
acbf9b55d7
Halt UpdateBuffer messages until sync if one errors
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-07 17:31:52 -07:00
Max Brunsfeld
e50c48852a
Wait for host to acknowledge buffer updates before sending them to other guests
2023-04-07 16:27:48 -07:00
Max Brunsfeld
f519f32ec2
Fixed removal of closed projects in randomized test
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-07 12:24:59 -07:00
Joseph Lyons
035189a2a1
Put file location details of panic on separate line
2023-04-07 14:32:14 -04:00
Nathan Sobo
676dbdc57b
Merge pull request #2365 from zed-industries/dont_export_gpui_platform_module
...
Don't export platform::* from gpui
2023-04-07 12:12:05 -06:00
Nathan Sobo
2186de38ab
Merge AppContext impl blocks
2023-04-07 11:54:08 -06:00
Nathan Sobo
2615a11f7c
Don't export platform::* from gpui
...
I'd like to avoid cluttering the top-level namespace with all the platform-
specific types.
2023-04-07 11:45:53 -06:00
Joseph T. Lyons
f450692e77
Merge pull request #2364 from zed-industries/put-backtrace-on-a-newline-when-reporting-panics
...
Put backtrace on a new line when reporting panics
2023-04-07 12:46:53 -04:00
Joseph Lyons
9cf3481fc7
Put backtrace on a new line when reporting panics
2023-04-07 12:12:18 -04:00
Joseph T. Lyons
c58601ab8d
Merge pull request #2363 from zed-industries/add-copy-path-commands
...
Update copy path commands
2023-04-07 12:09:39 -04:00
Joseph Lyons
5e55eb279c
Update copy path commands
2023-04-07 02:36:56 -04:00
Nathan Sobo
dad403f483
Merge pull request #2362 from zed-industries/eliminate-mutable-app-context
...
Merge MutableAppContext into AppContext
2023-04-06 16:19:47 -06:00
Nathan Sobo
95eb918b4c
Fix broken test due to trimmed trailing whitespace during formatting
2023-04-06 16:10:39 -06:00
Nathan Sobo
8136d8a8a6
Fix formatting
2023-04-06 15:54:44 -06:00
Nathan Sobo
de9bf6dfbd
Merge MutableAppContext into AppContext
...
There may have been a good reason for the difference at some point, or I was
still learning Rust. But now it's just &mut AppContext vs &AppContext.
2023-04-06 15:49:03 -06:00
Max Brunsfeld
aa7918c4b5
Fix handling of redundant buffer creation messages on guests
...
Check if the buffer already exists *before* overwriting it.
Ignore redundant registrations on remote projects.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-06 12:17:25 -07:00
Max Brunsfeld
22a6a243bc
Move project assertions into main assertion function
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-04-06 11:38:42 -07:00
Joseph T. Lyons
dd00966cc6
Merge pull request #2361 from zed-industries/add-close-items-to-left-and-right
...
Add close items to left and right
2023-04-06 13:06:25 -04:00
Antonio Scandurra
ef04dc14cc
Update file on incomplete buffer instead of waiting for it to be opened
...
This ensures that two successive file updates coming from the host are
not applied in reverse order.
2023-04-06 17:48:44 +02:00
Julia
4b39df4a6b
Merge pull request #2304 from zed-industries/bump-diff-width
...
Increase git diff gutter width slightly
2023-04-06 10:58:55 -04:00
Antonio Scandurra
8020ea783f
Wait to see guest's buffer version before converting completion anchor
2023-04-06 16:23:10 +02:00
Antonio Scandurra
4a61e2dfa4
Save server operations that were in the middle of being applied
...
Previously, if the test panicked before it had a chance to fully
apply an operation, it would end up not being saved in the plan.
With this commit we will mark the operation as applied before we
start processing it, and mark it as not applied if, once we're done,
we've found out that it couldn't be applied. This is consistent with
what we do for client operations.
2023-04-06 16:02:16 +02:00
Antonio Scandurra
f995d07542
Return error if subscribing to an entity that was already subscribed to
2023-04-06 14:42:19 +02:00
Antonio Scandurra
d7f56d6126
Forget which buffers were shared when host reconnects
...
This fixes a bug where the host would momentarily disconnect and the guest
would close and reopen the project. This would cause the host to not observe
the guest closing the project. When the guest tried to open one of the
buffers opened prior to closing the project, the host would not send them the
buffer state because it would still remember that the buffer was shared.
The `shared_buffers` map is now cleared when the host reconnects and will slowly
get re-filled as guests issue `SynchronizeBuffers` requests.
2023-04-06 13:49:09 +02:00
Joseph Lyons
4883ec2201
Add close items to left and right
2023-04-06 03:33:38 -04:00
Max Brunsfeld
bf3b8adf35
Avoid async fs call before checking if operation is applicable
...
This way, the executor isn't influenced by operations that aren't applicable.
2023-04-05 18:11:33 -07:00
Max Brunsfeld
1064b14779
Don't use TestPlan's rng in fake LSP handlers
...
These should use the test context's rng, so that they behave the same whether
a pre-recorded plan was used, or the plan is being generated.
2023-04-05 17:50:04 -07:00
Max Brunsfeld
2d63ed3ca4
Merge branch 'main' into randomized-tests-operation-script
2023-04-05 17:10:20 -07:00
Nathan Sobo
e5861d6c35
Fix typos in EULA
2023-04-05 18:02:35 -06:00
Max Brunsfeld
bda7086220
Clear guest's shared buffers if they rejoin project after leaving while host was disconnected
2023-04-05 16:53:36 -07:00
Max Brunsfeld
8e68c7f808
Do include operations in serialized test plan if they cause a client to hang
2023-04-05 16:52:39 -07:00
Max Brunsfeld
43a94cda5f
Don't skip worktree updates if unknown entries are removed
...
When rejoining a project, if entries were both created and deleted since
joining the project, the guest will receive those entries ids in as
removed.
2023-04-05 15:36:01 -07:00
Max Brunsfeld
661fba8640
Run executor until parked at end of each iteration of random collaboration test
...
Without this, the server doesn't get dropped at the end of the test, and we eventually run
out of file handles due to sqlite connections being retained.
2023-04-05 15:05:32 -07:00
Max Brunsfeld
781d66f628
Omit operations for non-existent users from serialized test plan
2023-04-05 15:04:27 -07:00
Julia
43b6e7a944
Merge pull request #2360 from zed-industries/maybe-fix-lock-screen-crash
...
Hesitant possible fix for lock screen crash
2023-04-05 14:10:40 -04:00
Julia
6e3bf7fed4
Hesitant possible fix for lock screen crash
...
This may cause issues in this situations but as I cannot repro this I'm
making the call to try something and see how it plays out
2023-04-05 14:01:54 -04:00
Joseph Lyons
e4bb5c296c
v0.82.x dev
2023-04-05 13:00:52 -04:00
Joseph T. Lyons
3b6c975658
Merge pull request #2357 from zed-industries/update-eula
...
Update EULA
2023-04-05 12:57:34 -04:00
Joseph Lyons
5becdbdea8
Fix spacing in EULA
2023-04-05 12:45:48 -04:00
Julia
af826f5efd
Merge pull request #2359 from zed-industries/prefer-right-statusbar-items
...
Prioritize displaying right statusbar items overtop left items if needed
2023-04-05 12:16:30 -04:00
Julia
77bb52f72c
Prioritize displaying right statusbar items overtop left items if needed
2023-04-05 12:08:52 -04:00
Mikayla Maki
64428bac15
Merge pull request #2358 from zed-industries/more-copilot-fixes
...
Invalidate copilot suggestion on backspaces
2023-04-05 08:59:30 -07:00
Mikayla Maki
78742d5615
Add additional case to range invalidation test
...
co-authored-by: antonio <antonio@zed.dev >
2023-04-05 08:52:56 -07:00
Mikayla Maki
b585470518
Invalidate copilot suggestion on backspaces
...
Restore an observation on initialization
co-authored-by: antonio <antonio@zed.dev >
2023-04-05 08:48:39 -07:00
Antonio Scandurra
e2c690cece
Merge pull request #2356 from zed-industries/copilot-on-preview
...
Disable Copilot entirely for stable releases
2023-04-05 16:20:53 +02:00
Nathan Sobo
0d0f6b5a05
Update EULA
2023-04-05 08:18:51 -06:00
Antonio Scandurra
7ba46a0630
Honor ZED_RELEASE_CHANNEL environment variable only in development
...
We don't want people to be able to override the release channel in
production.
2023-04-05 15:55:44 +02:00
Antonio Scandurra
15b26e10d4
Disable Copilot entirely for stable releases
...
This lets us remove the logic for detecting whether a user is a staff
member.
2023-04-05 15:49:59 +02:00
Antonio Scandurra
781d065d0b
Merge pull request #2355 from zed-industries/refine-copilot
...
Iterate some more on Copilot
2023-04-05 14:21:18 +02:00
Antonio Scandurra
03a4c9d6d5
Use the cursor variable instead of selection.start
2023-04-05 14:15:58 +02:00
Antonio Scandurra
dd416cdfd2
📝
2023-04-05 14:14:43 +02:00
Antonio Scandurra
f920e02d96
Indent instead of accepting suggestion if cursor is in leading whitespace
2023-04-05 14:09:09 +02:00
Antonio Scandurra
908a7cf47e
💄
2023-04-05 13:59:19 +02:00
Antonio Scandurra
dcd8bdfc88
Update visible suggestion if edit occurs outside the current editor
2023-04-05 11:06:14 +02:00
Antonio Scandurra
6e821eea4b
Prevent tab from accepting a copilot suggestion when it isn't visible
2023-04-05 10:31:11 +02:00
Antonio Scandurra
661be7ba51
Refresh copilot suggestions when accepting a completion
2023-04-05 10:28:00 +02:00
Antonio Scandurra
7a7dc95611
Refresh copilot suggestions when undoing/redoing
2023-04-05 10:27:19 +02:00
Antonio Scandurra
399451b676
Capture copilot behavior in a editor unit test
2023-04-05 10:26:43 +02:00
Max Brunsfeld
1159f5517b
Avoid applying outdated UpdateProject methods after rejoining a room
2023-04-04 21:49:37 -07:00
Max Brunsfeld
1ccf174388
Avoid applying outdated UpdateProject messages
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-04-04 18:34:39 -07:00
Antonio Scandurra
808ddc26e7
Merge pull request #2353 from zed-industries/more-intuitive-autocomplete-with-copilot
...
Match VS Code's behavior when deciding whether to show Copilot suggestion
2023-04-04 20:03:07 +02:00
Antonio Scandurra
65fd605b82
Revert "Return the previous suggestion when replacing it"
...
This reverts commit 971c88db80 .
2023-04-04 18:59:28 +02:00
Nate Butler
e7150d0b66
Merge pull request #2354 from zed-industries/nate/fix-embedded-highlight-in-ruby
...
Fix embedded highlight in ruby
2023-04-04 12:46:32 -04:00
Nate Butler
7ff97e50a7
Fix embedded highlight in ruby
2023-04-04 12:41:38 -04:00
Antonio Scandurra
b58ac815a8
Trigger copilot only on insertion and deletion
...
Also, avoid showing the suggestion if a completion is in progress to
avoid flickering.
2023-04-04 17:51:37 +02:00
Antonio Scandurra
971c88db80
Return the previous suggestion when replacing it
2023-04-04 17:14:52 +02:00
Antonio Scandurra
a2aad31cf1
Merge pull request #2352 from zed-industries/debounce-copilot
...
Debounce copilot completions
2023-04-04 16:52:59 +02:00
Antonio Scandurra
e970d84184
Debounce copilot completions
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-04-04 16:02:25 +02:00
Antonio Scandurra
5df5973262
Merge pull request #2351 from zed-industries/more-copilot-enhancements
...
Fix additional Copilot issues
2023-04-04 14:22:12 +02:00
Antonio Scandurra
60955fb8ee
Refresh active copilot suggestion when accepting completion
2023-04-04 11:15:14 +02:00
Antonio Scandurra
79d5bb45dc
Clear Copilot suggestions when it gets disabled from the settings
2023-04-04 10:45:56 +02:00
Antonio Scandurra
abf158a9e4
Merge pull request #2347 from zed-industries/disable-yaml-key-ordering
...
Disable key ordering diagnostic for YAML
2023-04-04 10:00:48 +02:00
Max Brunsfeld
bcf9b2f10d
Add missing random delays in FakeFs
2023-04-03 22:42:34 -07:00
Mikayla Maki
91d85987b9
Merge pull request #2350 from zed-industries/copilot-disable
...
Disable copilot unless the staff mode flag is flipped
2023-04-03 22:00:47 -07:00
Mikayla Maki
fa32a20c42
fixup! fixup! fixup! removed copilot from generated schema and command palette
2023-04-03 21:46:59 -07:00
Mikayla Maki
a1abe8d33c
fixup! fixup! removed copilot from generated schema and command palette
2023-04-03 21:46:30 -07:00
Mikayla Maki
ae6a671fea
fixup! removed copilot from generated schema and command palette
2023-04-03 21:45:18 -07:00
Mikayla Maki
47de4dcd32
removed copilot from generated schema and command palette
2023-04-03 21:38:26 -07:00
Mikayla Maki
6bfecd7f66
Refactor staff mode into a seperate crate and make copilot initialization wait for the staff mode flag to be flipped
2023-04-03 20:16:45 -07:00
Max Brunsfeld
b251e249a7
Check for consistency between clients every time the system quiesces
2023-04-03 19:11:37 -07:00
Max Brunsfeld
7b0a6c0dfa
Add an 'on_failure' attribute to gpui tests
...
This lets us perform a finalization step when a randomized test fails.
2023-04-03 18:16:08 -07:00
Max Brunsfeld
5ecc9606af
Use synchronous locks in FakeFs
...
This way, the state can be accessed without running the deterministic
executor.
2023-04-03 18:15:07 -07:00
Mikayla Maki
55297c1a26
Merge pull request #2348 from zed-industries/copilot-feedback
...
Fix issues from copilot feedback
2023-04-03 16:29:41 -07:00
Max Brunsfeld
f95732e981
Fix bug where guest would drop BufferSaved messages while opening the buffer
2023-04-03 16:23:44 -07:00
Mikayla Maki
1627cf7eae
Add standard copilot keybinding
2023-04-03 16:14:07 -07:00
Mikayla Maki
bab0e88b6f
Fix bug where copilot auth window will only be shown once
2023-04-03 16:01:04 -07:00
Max Brunsfeld
543301f949
Avoid repeatedly loading/saving the test plan for each iteration
2023-04-03 15:58:11 -07:00
Mikayla Maki
2e33f8b228
fixup! Remove per-file copilot enable/disable
2023-04-03 15:21:43 -07:00
Mikayla Maki
48d9c30b0e
Remove per-file copilot enable/disable
2023-04-03 15:15:42 -07:00
Mikayla Maki
0250898a2b
Enable copilot in all file types by default
2023-04-03 15:06:49 -07:00
Max Brunsfeld
c960277349
Merge branch 'main' into randomized-tests-operation-script
2023-04-03 13:09:25 -07:00
Antonio Scandurra
2c0a645f19
Provide workspace_folders capability when initializing LSP
...
This fixes the YAML language server which was erroring on startup
after adding the `did_change_watched_files` capability in #2258 .
2023-04-03 20:12:26 +02:00
Antonio Scandurra
588b2da40a
Disable key ordering diagnostic for YAML language server
2023-04-03 20:02:29 +02:00
Petros Amoiridis
69557655ee
Merge pull request #2346 from zed-industries/petros/z-360-dragging-file-from-tree-to-split-results
...
Fix dragging file from tree to split results in empty pane
2023-04-03 16:43:12 +03:00
Petros Amoiridis
5a397726d2
Do not drop the task
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-04-03 16:36:08 +03:00
Nathan Sobo
cdfe873802
Merge pull request #2343 from zed-industries/handles
...
Make typed handles wrappers around their untyped equivalents
2023-04-03 09:20:37 -04:00
Antonio Scandurra
0cb73b6579
Merge pull request #2345 from zed-industries/autocomplete-vs-copilot
...
Make autocompletion and copilot mutually exclusive
2023-04-03 14:37:02 +02:00
Antonio Scandurra
b88aa9af1d
Clear active copilot suggestion only if there is one
2023-04-03 14:32:41 +02:00
Antonio Scandurra
ec5309b543
Make autocompletion and copilot mutually exclusive
2023-04-03 14:15:21 +02:00
Antonio Scandurra
b6a9d90609
Move creation of GetCompletionsParams entirely to the background
2023-04-03 13:30:57 +02:00
Antonio Scandurra
0b9e609e2a
Merge pull request #2344 from zed-industries/copilot-collaboration
...
Fix Copilot errors when opening buffers that don't exist locally
2023-04-03 13:26:21 +02:00
Antonio Scandurra
b26d4f4f62
🔥
2023-04-03 13:18:16 +02:00
Antonio Scandurra
75ecf92ae4
Fix Copilot errors when opening buffers that don't exist locally
2023-04-03 12:28:32 +02:00
Nathan Sobo
138aa0492a
Add downcast_ref to AnyViewHandle
...
I use unsafe code to transmute an AnyViewHandle to a ViewHandle<T> when
the type matches. Because ViewHandle<T> is repr(transparent) to the
wrapped AnyViewHandle, this is safe.
2023-04-02 16:10:16 -06:00
Nathan Sobo
71cf6ec5ae
Use into_any instead of weird 'as' hack
2023-04-02 15:55:30 -06:00
Nathan Sobo
27258a0889
Remove From trait for AnyViewHandle in favor of into_any method
...
I think it's more explicit.
2023-04-02 15:50:42 -06:00
Nathan Sobo
aed8df96ff
Wrap AnyWeak handles with their typed counterparts
2023-04-02 15:42:03 -06:00
Nathan Sobo
82a713fd1d
Store AnyViewHandle inside ViewHandle and Deref to it
2023-04-02 14:59:55 -06:00
Julia
59fb4b3d29
Merge pull request #2342 from zed-industries/trust-npm-version-management
...
Trust NPM instead of managing dirs for different Node server versions
2023-03-31 17:21:16 -04:00
Julia
8c0db17634
Trust NPM instead of managing dirs for different Node server versions
2023-03-31 17:15:44 -04:00
Mikayla Maki
c19e6f8f0e
Merge pull request #2338 from zed-industries/more-copilot-bugs
...
More copilot bugs
2023-03-31 12:45:19 -07:00
Mikayla Maki
297fd5f985
Merge pull request #2340 from zed-industries/fix-json-lsp-remove
...
Fix bug where JSON LSP would be deleted on installation.
2023-03-31 12:41:28 -07:00
Mikayla Maki
dcaa355ad2
Switch from removing all directories in the container dir to removing the non-version dir
2023-03-31 12:36:23 -07:00
Julia
0ae298a86f
Merge pull request #2339 from zed-industries/revert
...
Revert "Merge pull request #2335 from zed-industries/dont-delete-json…
2023-03-31 15:33:12 -04:00
Julia
0f4f3bfbde
Revert "Merge pull request #2335 from zed-industries/dont-delete-json-server-after-downloading-it"
...
This reverts commit 516e77906e , reversing
changes made to 54582fd77f .
2023-03-31 15:31:50 -04:00
Mikayla Maki
57b5c1ee20
Fix crash on initiating copilot during collaboration. Copilot is now disabled when collaborating.
2023-03-31 12:28:58 -07:00
Mikayla Maki
f616e8bac9
Merge pull request #2336 from zed-industries/respect-languages-alias-in-settings-file
...
Add support for writing to the langauge_overrides alias in settings
2023-03-31 11:51:25 -07:00
Mikayla Maki
b6882f0cbf
Fix typo in copilot button
2023-03-31 11:50:31 -07:00
Mikayla Maki
e5a6b11d8f
Merge pull request #2334 from zed-industries/quiet-copilot-loggin
...
Add handlers for LogMessage and statusNotification to copilot LSP
2023-03-31 11:22:23 -07:00
Mikayla Maki
c1445fe015
Add support for the langauge_overrides alias in the settings file updating code
2023-03-31 11:20:46 -07:00
Mikayla Maki
bdce96b19a
Update copilot.rs
2023-03-31 11:16:52 -07:00
Julia
516e77906e
Merge pull request #2335 from zed-industries/dont-delete-json-server-after-downloading-it
...
Don't delete JSON language server directly after downloading it
2023-03-31 14:08:09 -04:00
Julia
0199ffed5f
Don't delete JSON language server directly after downloading it
...
This was accidentally added during the messy NodeRuntime/Copilot rebase
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-31 14:01:04 -04:00
Mikayla Maki
f561e5ef2c
remove spare debug
2023-03-31 11:00:06 -07:00
Mikayla Maki
4865ea2efc
Add handlers for LogMessage and statusNotification to copilot LSP
2023-03-31 10:58:18 -07:00
Antonio Scandurra
54582fd77f
Merge pull request #2333 from zed-industries/copilot-improvements
...
Fix several Copilot bugs
2023-03-31 18:14:39 +02:00
Antonio Scandurra
b208d1a489
🎨
2023-03-31 18:10:10 +02:00
Antonio Scandurra
5f579a4287
Fix prefix/suffix calculation when determining copilot suggestion
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-31 18:05:07 +02:00
Antonio Scandurra
b588ba1435
Avoid auto-indenting when accepting copilot suggestion
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-03-31 17:17:35 +02:00
Antonio Scandurra
6e43e77c3f
Use copilot's Completion::{range,text} to determine suggestion
...
Previously, we were using display text, but this isn't always correct. Now,
we just attempt to determine what text Copilot wants to insert by finding
a prefix and suffix in the existing text with the suggested text.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-03-31 17:08:41 +02:00
Mikayla Maki
9b16277cf8
Merge pull request #2316 from zed-industries/copilot
...
🚨 WIP 🚨 Copilot
2023-03-30 18:27:14 -07:00
Mikayla Maki
713f5f604f
Fix leaked handle and failure to update language in context menu
2023-03-30 17:40:11 -07:00
Mikayla Maki
e38f52d595
Fix unrelated panics in tests
2023-03-30 17:19:29 -07:00
Mikayla Maki
c3188be4c1
cargofmt
2023-03-30 16:58:11 -07:00
Mikayla Maki
81411b9114
Merge branch 'main' into copilot
2023-03-30 16:57:18 -07:00
Mikayla Maki
c28d2c490b
Remove test modals
2023-03-30 16:52:55 -07:00
Mikayla Maki
afc9b832c8
Finish device code flow for copilot
2023-03-30 16:50:33 -07:00
Mikayla Maki
f5d4bcd934
Added erorr states and first-pass error handling to the copilot status bar item.
...
Added correct icons
Added a new 'Toast' action which allows other crates to easily pop toasts with an optional click action
2023-03-30 14:10:57 -07:00
Julia
3cfe61a4f4
Merge pull request #2332 from zed-industries/per-server-code-action-kinds
...
Allow each language adapter to provide their own code action kinds array
2023-03-30 15:54:55 -04:00
Julia
cdde523ea4
Allow each language adapter to provide their own code action kinds array
2023-03-30 15:41:54 -04:00
Nate Butler
f235d9f411
Add zed plus copilot icon
2023-03-30 14:34:33 -04:00
Nate Butler
655897b182
Update icons
2023-03-30 14:32:51 -04:00
Nate Butler
58b453ad6e
Add new copilot state icons
2023-03-30 14:18:03 -04:00
Mikayla Maki
b7461c32dd
Improve settings writing for more cases
2023-03-30 10:40:53 -07:00
Mikayla Maki
e46cd2def3
Switch to using zed hosted copilot LSP (again)
...
co-authored-by: antonio <antionio@zed.dev >
2023-03-30 09:29:49 -07:00
Petros Amoiridis
007aa92581
Merge pull request #2323 from zed-industries/petros/z-402-recent-projects-replace-expanded-home
...
Replace home directory with the tilde substitution
2023-03-30 18:12:39 +03:00
Petros Amoiridis
dc51735112
Fix doctests
2023-03-30 17:57:14 +03:00
Petros Amoiridis
adc5ef911f
Remove the Errors section from rust docs
...
The section does not add anything that we don't already know.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-30 14:04:37 +03:00
Petros Amoiridis
18c6c7ebb7
Fix error
2023-03-30 14:03:59 +03:00
Petros Amoiridis
9ef3e45bcd
Update crates/recent_projects/src/highlighted_workspace_location.rs
...
Co-authored-by: Antonio Scandurra <me@as-cii.com >
2023-03-30 11:35:17 +03:00
Antonio Scandurra
e3a311fda9
Merge pull request #2331 from zed-industries/tab-map-sync
...
Speed up tab searching in `TabMap::sync`
2023-03-30 10:20:57 +02:00
Antonio Scandurra
af4c4c7cf0
Speed up tab searching in TabMap::sync by looking for \t only
...
Instead of looking for `\n` as a stopping condition, we cap the range
we pass to `SuggestionSnapshot::chunks` to stop on the next line. This
makes character searching faster, because looking for a single character
uses `memchr`. Also, this avoids an extra conditional in a tight loop such
as the chunk scanning one contained in `TabMap::sync`.
2023-03-30 10:03:13 +02:00
Antonio Scandurra
79346b0706
Use + instead of | to break out of tab expansion in TabMap::sync
2023-03-30 09:49:07 +02:00
Mikayla Maki
5b3b74345d
Remove some strays
2023-03-29 22:22:02 -07:00
Mikayla Maki
a8033b266d
Fix bug with enable setting, clean up sign in UIs
2023-03-29 21:51:07 -07:00
Mikayla Maki
cc7c5b416c
Add status bar icon reflecting copilot state to Zed status bar
2023-03-29 21:31:33 -07:00
Mikayla Maki
8fac32e1eb
WIP, not compiling
2023-03-29 17:59:21 -07:00
Max Brunsfeld
ec5ffe9922
Merge pull request #2329 from zed-industries/new-window-on-click-doc
...
Open a new window when activating Zed from the dock w/ no windows open
2023-03-29 17:33:32 -07:00
Mikayla Maki
76efab005f
WIP
2023-03-29 17:25:41 -07:00
Max Brunsfeld
b5f762ab25
Open a new window when activating Zed from the dock w/ no windows open
2023-03-29 17:24:44 -07:00
Nate Butler
e3822a5b5c
Add copilot icons
2023-03-29 20:23:32 -04:00
Mikayla Maki
ae3b3ea458
Merge branch 'main' into copilot
2023-03-29 16:57:38 -07:00
Mikayla Maki
ebd06b43f5
Add copilot settings
...
Add copilot pause / resume
Add copilot statusbar item stub
2023-03-29 16:40:52 -07:00
Max Brunsfeld
7601e7902a
Merge pull request #2325 from zed-industries/tab-map-long-lines
...
Avoid slowdowns with long lines by skipping tab expansion beyond a certain column
2023-03-29 14:48:23 -07:00
Max Brunsfeld
0c07a373a8
🎨
2023-03-29 14:43:01 -07:00
Julia
e558d3f903
Merge pull request #2328 from zed-industries/breadcrumbs-outline-toggle
...
Open symbol outline when clicking on editor breadcrumbs
2023-03-29 15:51:30 -04:00
Julia
737e2e1b3c
Open symbol outline when clicking on editor breadcrumbs
2023-03-29 15:46:43 -04:00
Mikayla Maki
f812796283
Make modal behavior stateless
...
Co-authored-by: antonio <antonio@zed.dev >
2023-03-29 12:45:53 -07:00
Antonio Scandurra
49447128a9
Make edits smaller when tab expansion changes on a line
2023-03-29 21:40:37 +02:00
Joseph Lyons
6e2a9297ff
v0.81.x dev
2023-03-29 14:13:01 -04:00
Antonio Scandurra
b86f8188d1
Expand edit to end of the line when old/new row exceeds max expansion
2023-03-29 16:49:21 +02:00
Petros Amoiridis
b15632bd45
Remove convert_to_shortened_path from gpui platform
2023-03-29 17:41:01 +03:00
Petros Amoiridis
b4593cd90b
Use util::paths::compact
2023-03-29 17:40:39 +03:00
Petros Amoiridis
69989d0463
Introduce compact function in util create
2023-03-29 17:32:27 +03:00
Petros Amoiridis
d5f53111e8
Enable doctests in util crate
2023-03-29 17:31:55 +03:00
Petros Amoiridis
a128439699
Move code into the platform
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com >
2023-03-29 16:25:13 +03:00
Petros Amoiridis
87c1b190a8
Replace home directory with the tilde substitution
2023-03-29 16:25:10 +03:00
Antonio Scandurra
719d0f0abf
Rename skip_leading_tab to inside_leading_tab
2023-03-29 14:53:28 +02:00
Antonio Scandurra
813f722925
Increment input_column correctly when inside the leading tab
2023-03-29 14:52:50 +02:00
Antonio Scandurra
056f4e914f
Merge pull request #2327 from zed-industries/remove-unused-code
...
Delete unused code
2023-03-29 09:09:47 +02:00
Antonio Scandurra
a64296938d
Delete unused code
2023-03-29 09:04:13 +02:00
Mikayla Maki
d60ef03d66
WIP Add copilot disabled setting
2023-03-28 20:52:50 -07:00
Mikayla Maki
0b0c7e4ce9
Move command palette filter into collections crate
...
Filter out copilot commands from command palette when not active
2023-03-28 20:13:17 -07:00
Mikayla Maki
aea8475d30
Apply cargo fmt
2023-03-28 18:45:37 -07:00
Antonio Scandurra
a5cec18775
Remove copilot smoke test
2023-03-28 18:41:35 -07:00
Antonio Scandurra
12370f120e
🎨
2023-03-28 18:40:51 -07:00
Antonio Scandurra
ce9774be53
Improve detection of common prefix in text_for_active_completion
2023-03-28 18:40:42 -07:00
Mikayla Maki
9d8d2bb8f4
Add rough versions of all 3 modals
2023-03-28 18:00:09 -07:00
Max Brunsfeld
5c1f82ae3d
Don't use TabMap::expand_tabs in line_indent_for_buffer_row
2023-03-28 17:37:57 -07:00
Max Brunsfeld
08e93e9321
Only expand tabs up until a limited column
2023-03-28 16:40:04 -07:00
Max Brunsfeld
c23feeab3a
🎨 Make expand_tabs and collapse_tabs instance methods on TabSnapshot
2023-03-28 14:10:43 -07:00
Mikayla Maki
941da24f73
Refactor out the node runtime crate and hook up all related imports
2023-03-28 10:27:31 -07:00
Mikayla Maki
0ef9cefe0f
Finish shape of copilot auth UI
2023-03-28 09:42:01 -07:00
Mikayla Maki
6ff09865eb
Create copilot auth popup UI
2023-03-28 09:42:01 -07:00
Antonio Scandurra
da81ff3295
Optimize CopilotState::text_for_active_completion
2023-03-28 09:42:01 -07:00
Antonio Scandurra
034bc75467
Refresh copilot suggestions when hitting alt-] if none are showing
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-28 09:42:01 -07:00
Antonio Scandurra
d236d9e8c9
Clear copilot suggestions when hitting escape
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-28 09:42:01 -07:00
Nate Butler
ef6c28326d
Update editor.ts
2023-03-28 09:42:01 -07:00
Nate Butler
2fede1c01f
Use syntax.predictive.color to style suggestions
2023-03-28 09:42:01 -07:00
Antonio Scandurra
1162615043
Reuse existing suggestion when inserting to avoid flickering
2023-03-28 09:42:01 -07:00
Antonio Scandurra
6715e5247c
Rework SuggestionMap to take highlight style when retrieving chunks
2023-03-28 09:42:01 -07:00
Antonio Scandurra
093e0a30e9
Replace editor::CycleCopilotSuggestions with copilot::NextSuggestion
2023-03-28 09:42:01 -07:00
Antonio Scandurra
2f95510a2e
Start integrating Copilot with editor
...
There's still a bit to do in terms of reusing the previous suggestion
when the prefix matches, but we're getting there.
2023-03-28 09:42:01 -07:00
Antonio Scandurra
b16e2169ce
WIP: Start on showing window for authenticating with copilot
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-28 09:42:01 -07:00
Antonio Scandurra
9713d1bb31
Fix invalid translation between bottom/top left coordinate spaces
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-28 09:42:01 -07:00
Antonio Scandurra
99cca59c84
Restructure verification code prompting to open a window instead
...
Also, prevent multiple calls to `sign_in` from racing with each other.
2023-03-28 09:42:01 -07:00
Mikayla Maki
19cc86a2d4
Wait to show the auth modal until the sign request has returned
2023-03-28 09:42:00 -07:00
Mikayla Maki
15e29d44b9
Add basic copilot modal
2023-03-28 09:42:00 -07:00
Mikayla Maki
b57d5174aa
Add copilot theme, start sketching out the auth modal
2023-03-28 09:42:00 -07:00
Antonio Scandurra
591e246450
Implement Copilot::completions_cycling
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-03-28 09:42:00 -07:00
Antonio Scandurra
155594c8b8
Successfully fetch completions from Copilot
...
We still need to process them and return them into a more Zed-friendly
structure, but we're getting there.
2023-03-28 09:42:00 -07:00
Antonio Scandurra
180371929b
Start on copilot completions
2023-03-28 09:42:00 -07:00
Antonio Scandurra
8ba9e63ab8
🎨
2023-03-28 09:42:00 -07:00
Antonio Scandurra
59d9277a74
Implement Copilot sign in and sign out
2023-03-28 09:42:00 -07:00
Antonio Scandurra
797bb7d780
Start copilot and check sign in status
2023-03-28 09:42:00 -07:00
Antonio Scandurra
5471217089
Use the same serde version across the entire workspace
2023-03-28 09:42:00 -07:00
Mikayla Maki
9a99eaee96
Fix bad global
2023-03-28 09:42:00 -07:00
Mikayla Maki
455cdc8b37
Add copilot crate
...
Refactor HTTP and github release downloading into util
Lazily download / upgrade the copilot LSP from Zed
Co-authored-by: Max <max@zed.dev >
Co-Authored-By: Antonio <antonio@zed.dev >
2023-03-28 09:41:59 -07:00
Julia
35b2aceffb
Merge pull request #2324 from zed-industries/download-node
...
Automatically download Node for Node based language servers
2023-03-28 12:10:24 -04:00
Julia
ee3ac9c344
Rename installation.rs -> github.rs now that is all it concerns
2023-03-28 11:51:09 -04:00
Julia
350f8ed304
Download the JSON LSP package instead of our own bundled binary
2023-03-28 11:48:00 -04:00
Julia
d4560fe321
Prevent deadlock when multiple languages attempt to install Node at once
2023-03-28 10:18:22 -04:00
Max Brunsfeld
c68c8462bb
Merge pull request #2322 from zed-industries/project-panel-paste-infinite-loop
...
Fix infinite loop in ProjectPanel::paste when filename has multiple dots
2023-03-27 17:09:10 -07:00
Max Brunsfeld
17bc83d699
Fix infinite loop in ProjectPanel::paste when filename has multiple dots
2023-03-27 16:45:11 -07:00
Max Brunsfeld
e5d552ef97
Merge pull request #2321 from zed-industries/new-file-with-no-window
...
Make 'new file' action open a window when there are no windows open
2023-03-27 16:10:30 -07:00
Max Brunsfeld
4a2132bc91
Make 'new file' action open a window when there are no windows open
2023-03-27 16:05:00 -07:00
Joseph T. Lyons
e10338ed17
Merge pull request #2313 from zed-industries/unify-spelling-of-key-binding-to-be-two-words
...
Unify spelling of `key binding` to be two words
2023-03-27 15:58:12 -04:00
Petros Amoiridis
eb7c6028f4
Merge pull request #2320 from zed-industries/petros/z-349-make-restart-to-update-zed-look
...
Make "Restart to update Zed" look clickable
2023-03-27 20:19:06 +03:00
Julia
df4380b066
Download aarch64 or x64 Node binary according to system architecture
2023-03-27 11:05:17 -04:00
Petros Amoiridis
b153bf7118
Add a hovered style to lspStatus background
2023-03-27 14:26:56 +03:00
Petros Amoiridis
374b284a3d
Run prettier on TS files
2023-03-27 14:26:05 +03:00
Julia
c72d33e029
Initial impl of NodeRuntime w/JSON borked and a deadlock :)
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-27 00:00:16 -04:00
Julia
1a2e509e35
Remove server_args from LspAdapter
...
Prepare to remove concept of a runtime from greater server startup code,
which is important for future language server extensibility
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-27 00:00:16 -04:00
Julia
ed442cfc8c
Invoke npm from downloaded Node
2023-03-27 00:00:16 -04:00
Julia
edd6c85af7
Initial running of servers on downloaded Node
2023-03-27 00:00:16 -04:00
Julia
b579211861
Report if language server requires Node or not
2023-03-27 00:00:16 -04:00
Nathan Sobo
d89936e4a9
Merge pull request #2319 from zed-industries/copy-highlight-json
...
Add "editor: copy highlight json" command
2023-03-24 17:17:45 -06:00
Nathan Sobo
f0992e7d67
Trim empty tokens; copy selected range if non-empty
2023-03-24 17:10:50 -06:00
Nathan Sobo
3dfedd1b21
Merge adjacent chunks with the same highlight name in copied JSON
2023-03-24 16:52:00 -06:00
Nathan Sobo
195215f1e0
Add "editor: copy highlight json" command
...
Nate needs this to feed to Figma for highlighted code in designs.
2023-03-24 16:37:57 -06:00
Max Brunsfeld
c74f8eb9e3
Merge pull request #2258 from zed-industries/lsp-file-change-notifications
...
Implement `DidChangedWatchedFiles` LSP feature
2023-03-24 14:42:23 -07:00
Max Brunsfeld
455ffb17f1
Handle path changes and progress updates from all worker threads during initial scan
2023-03-24 14:35:18 -07:00
Max Brunsfeld
027def6800
Merge branch 'main' into lsp-file-change-notifications
2023-03-24 08:52:43 -07:00
Max Brunsfeld
a0e98ccc35
🎨 BackgroundScanner::run
2023-03-23 18:05:12 -07:00
Max Brunsfeld
89e99d2902
🎨 Don't store path changes statefully on the background scanner
2023-03-23 16:04:47 -07:00
Max Brunsfeld
3ff5aee4a1
Respect LSP servers watch glob patterns
2023-03-23 16:03:07 -07:00
Mikayla Maki
76b75b4b43
Merge pull request #2318 from zed-industries/fix-unknown-in-non-editor-buffers
...
changed language status bar item to only show on editors
2023-03-23 13:33:42 -07:00
Mikayla Maki
5db11c628b
changed language status bar item to only show on editors
2023-03-23 13:29:23 -07:00
Mikayla Maki
5cad3d3a67
Merge pull request #2317 from zed-industries/fix-titlebar-right-spacing
...
Fix misaligned UI in the right titlebar
2023-03-23 13:16:40 -07:00
Mikayla Maki
bb5c2833a3
Aligned title bar items to the center and fixed left spacing on the sign in button
...
co-authored-by: max <max@zed.dev >
2023-03-23 13:08:31 -07:00
Petros Amoiridis
566a04ebca
Merge pull request #2311 from zed-industries/petros/z-279-add-terminals-count
...
Add terminals count
2023-03-23 10:52:01 +02:00
Mikayla Maki
f9d3963dbb
Merge pull request #2315 from zed-industries/fix-fold-indicator-offsets
...
Fix fold indicator offsets
2023-03-22 17:13:13 -07:00
Mikayla Maki
e87c3b6dd7
Update element.rs
...
remove spare parens
2023-03-22 17:05:54 -07:00
Mikayla Maki
e729c4ad4f
Fix fold indicator offsets
2023-03-22 17:04:52 -07:00
Max Brunsfeld
361b7c3a0c
Clear auto-indent requests when replacing a buffer's entire text
2023-03-22 15:10:16 -07:00
Max Brunsfeld
eaee5571a0
Use a more stable, readable serialization format for neovim-backed vim tests
2023-03-22 14:31:11 -07:00
Joseph Lyons
6de38f7410
v0.80.x dev
2023-03-22 16:33:06 -04:00
Julia
df553de363
Merge pull request #2314 from zed-industries/another-one
...
Remove another spot with a flag old npm does not like
2023-03-22 15:56:23 -04:00
Julia
4fc37cf982
Remove another spot with a flag old npm does not like
2023-03-22 15:40:51 -04:00
Joseph Lyons
9d88cd8842
Unify spelling of key binding to be two words
2023-03-22 13:34:12 -04:00
Petros Amoiridis
fd9eff3a78
Remove struct
2023-03-22 19:28:06 +02:00
Petros Amoiridis
bd1515cdd2
Only show count when we have terminals
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-22 18:23:41 +02:00
Joseph T. Lyons
bd85ef363f
Merge pull request #2312 from zed-industries/unkown
...
Fix typo in "Unknown" language
2023-03-22 11:20:18 -04:00
Nathan Sobo
e017b99384
Fix typo
2023-03-22 09:13:10 -06:00
Petros Amoiridis
15406ff2d9
Remove comment
2023-03-22 16:31:42 +02:00
Petros Amoiridis
d5bb2d13b8
Introduce terminal button count
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-22 16:13:58 +02:00
Petros Amoiridis
aa7254167a
Fix typo
2023-03-22 15:31:21 +02:00
Antonio Scandurra
005eb559ee
Merge pull request #2310 from zed-industries/fix-sharing-status-indicator
...
Remove screen sharing indicator when call ends
2023-03-22 09:40:23 +01:00
Antonio Scandurra
7df798ded5
Remove screen sharing indicator when call ends
...
Previously, we would only remove it when the screen sharing stopped.
2023-03-22 09:32:27 +01:00
Max Brunsfeld
c1f53358ba
Remove unnecessary Arc around background scanner's snapshot
2023-03-21 15:47:02 -07:00
Max Brunsfeld
f7b2713b77
Fix error in joining empty paths
2023-03-21 15:41:24 -07:00
Max Brunsfeld
5da2b123b5
Allow refreshing worktree entries while the initial scan is in-progress
2023-03-21 15:15:12 -07:00
Max Brunsfeld
b10b0dbd75
Only mutate background snapshot in the background scanner
2023-03-21 11:26:33 -07:00
Max Brunsfeld
d742c758bc
Restructure communication from BackgroundScanner to LocalWorktree
...
The worktree no longer pulls the background snapshot from the background scanner.
Instead, the background scanner sends both snapshots to the worktree. Along with
these, it sends the path change sets.
Also, add randomized test coverage for the worktree UpdatedEntries events.
2023-03-21 11:26:13 -07:00
Max Brunsfeld
cbeb6e692d
Move postage crate version specification to workspace Cargo.toml
2023-03-21 11:26:13 -07:00
Max Brunsfeld
d36b2a3129
🎨 Simplify some worktree methods
...
* Consolidate local worktree construction into one method
* Simplify remote worktree construction
* Reduce indirection around pulling worktree snapshots from the background
2023-03-21 11:26:13 -07:00
Max Brunsfeld
399f082415
Update wrong assertions after fixing missing event in FakeFs
2023-03-21 11:26:13 -07:00
Max Brunsfeld
51b093197d
Add missing import in project tests
2023-03-21 11:26:13 -07:00
Max Brunsfeld
27ad6a57ce
Tweak logging in worktree randomized test
2023-03-21 11:26:13 -07:00
Max Brunsfeld
c730dca3c5
Update worktree randomized test to use worktree's public interface and the fake fs
2023-03-21 11:26:13 -07:00
Max Brunsfeld
be5868e1c0
Conservatively report fs events that occurred during initial worktree scan
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-03-21 11:26:13 -07:00
Max Brunsfeld
61172c8478
Notify language servers of FS changes
2023-03-21 11:26:13 -07:00
Max Brunsfeld
9837a6e288
Add failing test for reporting FS change events to language servers
2023-03-21 11:26:13 -07:00
Antonio Scandurra
194c7a3af0
Merge pull request #2309 from zed-industries/suggestion-map
...
Introduce `DisplayMap::replace_suggestion`
2023-03-21 18:18:50 +01:00
Antonio Scandurra
2893c9bdb7
Don't move up/down by more rows than the requested ones
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-21 17:52:53 +01:00
Antonio Scandurra
f7cba4cec4
Make Suggestion fields public
2023-03-21 16:51:33 +01:00
Antonio Scandurra
ba3913df8c
Expose a DisplayMap::replace_suggestion method
2023-03-21 16:41:54 +01:00
Antonio Scandurra
9c8732a355
Integrate SuggestionMap into the rest of DisplayMap
2023-03-21 16:39:02 +01:00
Antonio Scandurra
d1978a719b
Add a version field to SuggestionSnapshot
2023-03-21 12:47:04 +01:00
Antonio Scandurra
3d165f705f
Extract a SuggestionMap::randomly_mutate method
2023-03-21 11:51:06 +01:00
Antonio Scandurra
35830a0271
Implement SuggestionSnapshot::to_{fold,suggestion}_point
2023-03-21 11:39:29 +01:00
Antonio Scandurra
d448a5cb5c
Implement SuggestionSnapshot::to_point
2023-03-21 11:28:36 +01:00
Antonio Scandurra
f829ce5641
Implement SuggestionSnapshot::to_offset
2023-03-21 11:28:33 +01:00
Antonio Scandurra
c0e124a55a
Implement SuggestionSnapshot::text_summary_for_range
2023-03-21 11:28:30 +01:00
Antonio Scandurra
52a156aebe
Implement SuggestionSnapshot::clip_point
2023-03-21 11:28:27 +01:00
Antonio Scandurra
ccb6196224
Implement SuggestionSnapshot::buffer_rows
2023-03-21 11:28:23 +01:00
Antonio Scandurra
1a9dbfa86a
Add unit test to verify basic properties of the SuggestionMap
2023-03-21 08:29:33 +01:00
Joseph T. Lyons
8c0dd887ff
Merge pull request #2299 from zed-industries/correct-verb-tense-in-default-settings
...
Correct verb tense in default settings
2023-03-20 14:50:46 -04:00
Antonio Scandurra
3edf83cb99
Implement SuggestionSnapshot::line_len
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-20 19:45:39 +01:00
Antonio Scandurra
f44549eb29
Enhance randomized test to verify SuggestionMap::{chunks,sync}
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-20 19:29:22 +01:00
Antonio Scandurra
4d6726ef39
WIP: Flesh out more of the suggestions randomized test
2023-03-20 18:06:24 +01:00
Petros Amoiridis
98ae69a61f
Merge pull request #2282 from zed-industries/petros/z-283-make-pop-up-positioning-consistent
...
Consistent pop-up menu positions
2023-03-20 17:55:40 +02:00
Petros Amoiridis
24bbca7326
Position pane new, split, and dock context menus
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-03-20 17:49:33 +02:00
Nathan Sobo
d429ce0f62
Merge pull request #2308 from zed-industries/feedback-icon
...
Use an envelope as the feedback icon so we can use the speech bubble for discussions
2023-03-20 09:14:34 -06:00
Nathan Sobo
10e6c5b651
Use an envelope as the feedback icon
...
This makes room to use the speech bubble for discussion threads.
2023-03-20 09:04:30 -06:00
Antonio Scandurra
9970e5f60c
Start on randomized test and add SuggestionMapSnapshot::chunks
2023-03-20 15:56:15 +01:00
Antonio Scandurra
fb48854e5a
Simplify signature of SuggestionMap::replace
2023-03-20 14:00:14 +01:00
Antonio Scandurra
83051f1e86
Add SuggestionMap::replace
2023-03-20 13:50:14 +01:00
Antonio Scandurra
94a9e28e35
Start on SuggestionMap
2023-03-20 13:22:14 +01:00
Mikayla Maki
2a024a255f
Merge pull request #2307 from zed-industries/fix-panic-in-editor-tab-content
...
Do UTF8-aware truncation on long item names in editor item
2023-03-18 15:49:06 -07:00
Mikayla Maki
436c59d8ef
Do UTF8-aware truncation on long item names in editor item
2023-03-18 15:44:23 -07:00
Mikayla Maki
5356ec4730
Merge pull request #2287 from zed-industries/fix-fold-range-finding
...
Fix code folds with wraps
2023-03-17 17:18:56 -07:00
Mikayla Maki
5a3d5dff42
Make folds tab aware
2023-03-17 17:14:40 -07:00
Mikayla Maki
c39b4ac229
Fix boundary condition in buffer_line_len when at the end of a file
...
co-authored-by: max <max@zed.dev >
2023-03-17 16:56:44 -07:00
Mikayla Maki
5a1bbb96ba
Merge pull request #2302 from zed-industries/fix-dispatch-path-panic
...
Align dispatch_keystroke with other uses of ancestors iterator
2023-03-17 16:34:00 -07:00
Mikayla Maki
b16e53a577
Merge pull request #2306 from zed-industries/fix-panic-with-multi-line-env
...
Parse user enviroment using null terminators instead of newlines
2023-03-17 16:18:05 -07:00
Mikayla Maki
109e17b4b2
Parse user enviroment using null terminators instead of newlines
2023-03-17 16:14:07 -07:00
Mikayla Maki
eba119b914
Fix fold tests with new representation
...
Switch UI code from using display rows to using buffer rows
Make folds only show up on lines with line layouts
co-authored-by: Max <max@zed.dev >
2023-03-17 16:00:22 -07:00
Max Brunsfeld
fc828971f1
collab 0.8.2
2023-03-17 15:00:31 -07:00
Max Brunsfeld
691383ca68
Merge pull request #2305 from zed-industries/faster-access-token-validation
...
Faster access token validation
2023-03-17 14:56:30 -07:00
Max Brunsfeld
b8e8363a72
Add logging and metric for time spent hashing auth tokens
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2023-03-17 14:32:13 -07:00
Max Brunsfeld
623133ffa0
Reduce scrypt work factor to speed up websocket authentication
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2023-03-17 14:31:39 -07:00
Max Brunsfeld
9633a4b527
Return a 400, not a 500 when token validation fails
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-17 13:56:12 -07:00
Julia
368a6405a1
Increase git diff gutter width slightly
2023-03-17 15:28:38 -04:00
Mikayla Maki
459e320d79
Merge pull request #2303 from zed-industries/add-unknown-language
...
Add an 'Unknown' state for a mouse-driven way to select a file language
2023-03-17 11:41:40 -07:00
Mikayla Maki
04f52c3d50
Show active buffer language in all cases
2023-03-17 11:34:17 -07:00
Max Brunsfeld
26dae3c04e
Lookup access tokens by id when authenticating a connection
...
This avoids the cost of hashing an access token multiple times,
to compare it to all known access tokens for a given user.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-17 11:13:50 -07:00
Mikayla Maki
578c69476d
Align dispatch_keystroke with other uses of ancestors iterator and filter out non-existant views
2023-03-17 11:07:10 -07:00
Mikayla Maki
1125a168f4
Merge pull request #2301 from zed-industries/fix-file-finder-panic
...
Never call set_selected_index with an invalid index
2023-03-17 10:18:27 -07:00
Antonio Scandurra
d8758658e3
Merge pull request #2300 from zed-industries/ligatures
...
Allow customization of OpenType features
2023-03-17 17:34:17 +01:00
Mikayla Maki
f7f9b8cffe
Never call set_selected_index with an invalid index
2023-03-17 09:32:01 -07:00
Antonio Scandurra
1af8f4be19
Deserialize Theme directly into the heap to avoid stack overflow
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-03-17 15:58:52 +01:00
Antonio Scandurra
786d95b8c8
Avoid storing fonts::Features in TextStyle
...
We were only using it for debugging purposes and that was causing
the `Theme` struct to become too big to hold on the stack.
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-03-17 15:12:02 +01:00
Antonio Scandurra
4d915f4530
Don't make fonts::Features Copy
2023-03-17 13:54:56 +01:00
Antonio Scandurra
989c9f0196
Mention calt: false in the default settings to disable ligatures
2023-03-17 13:48:34 +01:00
Antonio Scandurra
f9d793cb4a
Honor more OpenType features
2023-03-17 13:40:00 +01:00
Petros Amoiridis
3bddf01962
Run prettier to format things
2023-03-17 14:05:49 +02:00
Petros Amoiridis
86ed5b8b83
Position contacts and user menus
...
Using the new approach for consistency
2023-03-17 14:05:46 +02:00
Antonio Scandurra
9181ac9872
Honor the calt font feature
2023-03-17 12:01:27 +01:00
Antonio Scandurra
76167ca65c
Allow setting font features on TextStyle
2023-03-17 11:49:22 +01:00
Antonio Scandurra
7d13b00914
Allow setting font features on the terminal as well
2023-03-17 11:42:24 +01:00
Antonio Scandurra
b2c733baab
WIP: Allow specifying font features in the editor
...
This just lays the foundation for threading through a `fonts::Features`
struct, but it's not used yet.
2023-03-17 09:51:36 +01:00
Joseph Lyons
6eb65eb989
Correct verb tense in default settings
2023-03-17 00:51:03 -04:00
Julia
3464961aa4
Merge pull request #2298 from zed-industries/fix-deadlock
...
Fix deadlock while initializing JSON language server
2023-03-16 17:41:54 -04:00
Julia
757f05042d
Fix deadlock while initializing JSON language server
...
As it turns out both parking-lot and std's `RwLock` disallows taking
multiple read locks on the same thread
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-16 17:32:51 -04:00
Max Brunsfeld
9633732db7
collab 0.8.1
2023-03-16 14:21:35 -07:00
Max Brunsfeld
e34d80cff4
Merge pull request #2296 from zed-industries/tx-serialization-retry-delay
...
Introduce a delay before retrying a transaction after a serialization failure
2023-03-16 14:16:20 -07:00
Mikayla Maki
f2492666d4
Merge pull request #2297 from zed-industries/fix-random-panics
...
WIP: Fix random panics
2023-03-16 13:20:54 -07:00
Joseph T. Lyons
b3b20e4c46
Merge pull request #2295 from zed-industries/swap-atom-keybinding-for-CollapseSelectedEntry
...
Swap atom keybinding for CollapseSelectedEntry
2023-03-16 16:12:28 -04:00
Max Brunsfeld
b9bc66aa9b
Log the delay when retrying a transaction
2023-03-16 13:07:38 -07:00
Max Brunsfeld
35280f7d80
Introduce a delay before retrying a transaction after a serialization failure
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-16 13:07:38 -07:00
Mikayla Maki
6571555c4d
Fix unwrap in git2 library causing panics in Zed
2023-03-16 13:06:23 -07:00
Joseph Lyons
a252c2a15b
Swap atom keybinding for CollapseSelectedEntry
...
This is a temporary solution to this bug:
https://linear.app/zed-industries/issue/Z-340/the-project-panel-shouldnt-be-listening-to-key-commands-when-editing-a
2023-03-16 15:59:14 -04:00
Mikayla Maki
c3325430ca
Fix divide by 0 in terminal
...
Fix fail to remove contact in contact list
2023-03-16 12:31:50 -07:00
Julia
1fbdea6a03
Merge pull request #2294 from zed-industries/remove-flag-old-npm-does-not-like
...
Remove CLI flag which old versions of NPM do not like
2023-03-16 13:11:45 -04:00
Julia
24dba2157f
Remove CLI flag which old versions of NPM do not like
...
TODO: Bundle or version restrict Node
2023-03-16 13:07:09 -04:00
Mikayla Maki
c427a8c584
WIP - DEBUGGING
2023-03-16 08:41:19 -07:00
Antonio Scandurra
356b8c6980
Merge pull request #2293 from zed-industries/yaml-hover-bug
...
Fix hover popover rendering lots of `&emsp` for YAML
2023-03-16 16:15:14 +01:00
Antonio Scandurra
9498f02f2c
Retrieve workspace configuration before initializing language server
2023-03-16 15:01:31 +01:00
Antonio Scandurra
f5a4c6a7c1
Provide editor.tabSize in workspace configuration for YAML
...
This fixes a bug that caused the hover popover to display lots of
` ` occurrences.
2023-03-16 10:46:55 +01:00
Antonio Scandurra
88e664bfd9
Add test for language registration and loading
2023-03-16 10:46:55 +01:00
Antonio Scandurra
8a685fa52a
Use LanguageRegistry::workspace_configuration everywhere
2023-03-16 10:46:55 +01:00
Antonio Scandurra
4d52fc0d12
Remove available language only when it has loaded
...
This also ensures that, if you load the same language more than once,
a future that resolves to the language (or an error) is returned at
all times. Previously, we would only return it the first time the language
was loaded.
2023-03-16 10:46:55 +01:00
Antonio Scandurra
a8ac08f5bd
Coalesce multiple RwLocks into one LanguageRegistryState struct
2023-03-16 10:46:55 +01:00
Antonio Scandurra
e30ea43a14
Include loaded languages when computing lsp workspace configuration
2023-03-16 10:46:55 +01:00
Antonio Scandurra
60d3fb48e2
Start computing workspace configuration more dynamically
2023-03-16 10:46:55 +01:00
Max Brunsfeld
ed9927b495
Merge pull request #2292 from zed-industries/restart-app
...
Make 'restart' action more reliable
2023-03-15 18:01:22 -07:00
Max Brunsfeld
d69868fa44
Make restart action more reliable
2023-03-15 17:44:50 -07:00
Julia
1ed3aedb16
Merge pull request #2291 from zed-industries/change-LSHandlerRank
...
Change `LSHandlerRank` to `Alternate`
2023-03-15 19:33:33 -04:00
Julia
905e2586e9
Change LSHandlerRank to Alternate
2023-03-15 19:18:39 -04:00
Max Brunsfeld
51eb53be0d
Merge pull request #2290 from zed-industries/close-remote-projects-when-leaving-call
...
Close remote project windows when leaving a call
2023-03-15 15:34:51 -07:00
Max Brunsfeld
b34477458e
Close remote project windows when leaving a call
2023-03-15 15:24:58 -07:00
Nathan Sobo
385dfe1661
Merge pull request #2289 from zed-industries/sort-language-names-case-agnostically
...
Sort language names case agnostically
2023-03-14 20:00:52 -06:00
Joseph Lyons
3c7237e600
Sort language names case agnostically
2023-03-14 21:45:17 -04:00
Nathan Sobo
44a2506c40
Merge pull request #2288 from zed-industries/cut-off-collaborator-avatars
...
Fix collaborator avatars being clipped and not centered
2023-03-14 19:39:01 -06:00
Max Brunsfeld
c4e7611d04
Fix collaborator avatars being clipped and not centered
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
Co-authored-by: Julia Risley <julia@zed.dev >
2023-03-14 17:59:33 -07:00
Mikayla Maki
75bea91245
Convert code folding to be in terms of buffer points instead of display points
...
Co-authored-by: max <max@zed.dev >
2023-03-14 16:48:03 -07:00
Max Brunsfeld
828e9c1bb8
v0.79.x dev
2023-03-14 12:49:33 -07:00
Max Brunsfeld
2042188f5a
Merge pull request #2286 from zed-industries/discoverable-sign-in
...
Make sign-in more discoverable
2023-03-14 11:08:18 -07:00
Max Brunsfeld
0bbb4b22c6
Rename 'Authenticate' action to 'Sign In'
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-14 11:01:23 -07:00
Max Brunsfeld
75901f1c33
Show sign in button directly in titlebar when not signed in
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-14 10:59:39 -07:00
Antonio Scandurra
a6ebc9bd26
collab 0.8.0
2023-03-14 18:21:16 +01:00
Antonio Scandurra
9e3085b0c4
Merge pull request #2284 from zed-industries/automatic-user-creation
...
Create user record automatically when someone logs in on the website
2023-03-14 18:20:13 +01:00
Mikayla Maki
7af9dda869
Merge pull request #2285 from zed-industries/fix-failed-theme-setting
...
Fix failed theme setting
2023-03-14 10:10:39 -07:00
Mikayla Maki
2a5ac4f203
Merge pull request #2283 from zed-industries/fix-code-fold-indicator-scaling
...
Change fold icon width to scale with font size
2023-03-14 10:07:25 -07:00
Mikayla Maki
d8a3f16891
Refactor load into a seperate function
2023-03-14 09:56:27 -07:00
Mikayla Maki
99257a8213
Fix failed initialization of setting file in welcome experience
2023-03-14 09:46:28 -07:00
Antonio Scandurra
0f429243d7
Fix seed binary
2023-03-14 12:37:56 +01:00
Antonio Scandurra
cba41ef7c5
Create user record automatically when someone logs in on the website
...
Now that we are moving out of the private alpha, we should let everyone
in when they try to log into zed.dev.
2023-03-14 12:25:04 +01:00
Mikayla Maki
2ba38b2fca
Change icon width to scale with font size
2023-03-14 00:42:15 -07:00
Petros Amoiridis
e7f78c4f74
Merge pull request #2281 from zed-industries/petros/z-298-the-terminal-button-is-not-shown-for
...
Remove check for staffmode
2023-03-14 00:12:13 -07:00
Petros Amoiridis
8980df1f5d
Remove feature flag
...
It wasn't working in production anyway
2023-03-14 09:05:04 +02:00
Nathan Sobo
2db8ac4a6f
Merge pull request #2280 from zed-industries/terms
...
Add terms of use to DMG in the bundle script
2023-03-13 16:08:07 -06:00
Nathan Sobo
818a514110
Add terms of use to DMG in the bundle script
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-13 15:47:59 -06:00
Mikayla Maki
1b4f783b97
Merge pull request #2279 from zed-industries/remove-invite-link
...
Remove UI for invite link in prep for beta launch
2023-03-13 14:35:52 -07:00
Mikayla Maki
88599add56
Remove UI for invite link in prep for beta launch
2023-03-13 12:54:20 -07:00
Max Brunsfeld
05f6747132
v0.78.x dev
2023-03-13 12:00:56 -07:00
Max Brunsfeld
1096720b41
Merge pull request #2244 from zed-industries/less-surprising-defaults
...
Clean up some default settings
2023-03-13 11:54:46 -07:00
Julia
5c7c4dd4dd
Clean up some default settings
2023-03-13 14:54:28 -04:00
Max Brunsfeld
da35202bbf
Merge pull request #2278 from zed-industries/screenshares-from-before-joining
...
Fix failure to see screenshare tracks that were started prior to join…
2023-03-13 11:22:40 -07:00
Max Brunsfeld
f5c4a2a0dd
Fix failure to see screenshare tracks that were started prior to joining a call
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-13 11:15:22 -07:00
Mikayla Maki
77a63c6598
Merge pull request #2277 from zed-industries/switch-invite-person-icon
...
Update Collab + icon
2023-03-13 10:54:33 -07:00
Nate Butler
edd925f77b
Format
2023-03-13 13:49:00 -04:00
Nate Butler
6d0f8290a4
Merge pull request #2276 from zed-industries/improve-picker-state-contrast
...
Improve picker state contrast
2023-03-13 13:48:04 -04:00
Nate Butler
6497ca8ccb
Update icon
2023-03-13 13:47:58 -04:00
Max Brunsfeld
e60dea7049
collab 0.7.2
2023-03-13 10:11:44 -07:00
Nate Butler
e64fe6d660
Improve contrast of project panel active state in light themes
2023-03-13 13:10:46 -04:00
Antonio Scandurra
f6f09e8661
Merge pull request #2274 from zed-industries/leave-on-quit
...
Leave room on quit
2023-03-13 18:08:01 +01:00
Max Brunsfeld
ef7d8f46df
Merge pull request #2273 from zed-industries/fix-dock-opening-in-collaboration
...
Fix dock opening on collaboration
2023-03-13 10:04:43 -07:00
Nate Butler
7df2440757
Format
2023-03-13 12:59:23 -04:00
Nate Butler
6fd4e28813
Update picker active and hover styles
...
Thanks for pointing this out @ForLoveOfCats
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-03-13 12:59:17 -04:00
Antonio Scandurra
bca1acf6d3
Leave room on quit
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-03-13 17:52:10 +01:00
Mikayla Maki
097a768725
Remove panic in recent projects picker
2023-03-13 09:44:42 -07:00
Mikayla Maki
404dd43c30
Fix dock opening on collaboration
2023-03-13 09:36:45 -07:00
Petros Amoiridis
c6f27903cc
Merge pull request #2271 from zed-industries/petros/z-278-lock-pop-up-to-the-terminal-button
...
A new approach for positioning pop-up menus tied to an icon/button
2023-03-13 08:46:44 -07:00
Antonio Scandurra
f6b0c56a47
Merge pull request #2268 from zed-industries/mention-username-of-user-in-prompt-when-removing-a-contact
...
Mention username of user in prompt when removing a contact
2023-03-13 14:28:11 +01:00
Antonio Scandurra
e45d680126
Merge pull request #2272 from zed-industries/add-textmate-keymap
...
Add TextMate keymap
2023-03-13 14:26:32 +01:00
Antonio Scandurra
e993d32900
Merge pull request #2270 from zed-industries/add-default-keybindings-for-reveal-in-finder
...
Add default keybindings for reveal in finder
2023-03-13 14:25:26 +01:00
Antonio Scandurra
09911d43bc
Merge pull request #2269 from zed-industries/unify-action-names-with-keybinding-names
...
Unify action names with keybinding name
2023-03-13 14:24:42 +01:00
Joseph Lyons
c8696149b8
Add TextMate keymap
2023-03-13 08:27:04 -04:00
Petros Amoiridis
db73d831c7
Use local overlay position mode and alignment
...
When we show the context menu, we don't specify an explicit position other than the default one which is equal to the origin in the context of a local overlay position mode. We then rely on `AnchorCorner` and aligning the context menu child view in the stack with `top().right()` for pop-ups that need to appear at the top of the icon/button.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-13 12:50:12 +02:00
Petros Amoiridis
d2411a6c86
Merge pull request #2253 from zed-industries/joseph/z-226-add-terminal-popup-menu
...
Add terminal pop up menu
2023-03-13 02:47:44 -07:00
Petros Amoiridis
726c8eb43f
Use type_id to determine what has the focus
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-13 11:42:40 +02:00
Joseph Lyons
c59dafab7e
Update method names to match action names
2023-03-12 06:08:12 -04:00
Joseph Lyons
e272a1a18f
Switch github_login to String
...
One of our macros, `impl_actions!`, didn't like that `RemoveContact` had a lifetime.
2023-03-12 05:03:31 -04:00
Joseph Lyons
90bca1b94a
Add default keybindings for reveal in finder
2023-03-12 04:58:17 -04:00
Joseph Lyons
06ad3a7f7b
Unify action names with keybinding name
2023-03-12 04:37:39 -04:00
Joseph Lyons
c18f1b6246
Mention username of user in prompt when removing a contact
2023-03-11 19:28:35 -05:00
Joseph Lyons
46efb844af
Remove hardcoding of "Terminal" string
2023-03-11 16:27:00 -05:00
Petros Amoiridis
29f0078084
Show tooltip for Give Feedback icon
2023-03-11 17:40:47 +02:00
Petros Amoiridis
432aeeac56
Remove comment
...
I know @JosephTLyons you had added that, but I am not entirely sure this is how the view should be called. Let's discuss this further if you fill strong about it.
2023-03-11 17:22:21 +02:00
Petros Amoiridis
8440a98850
Activate terminal button when a terminal is focus
...
This is code I brought over from https://github.com/zed-industries/zed/pull/2267 by @mikayla-maki after fixing the conflicts.
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-11 16:45:28 +02:00
Petros Amoiridis
bccc34c61a
Merge branch 'main' into joseph/z-226-add-terminal-popup-menu
2023-03-11 16:42:42 +02:00
Max Brunsfeld
e8b3d4e0fa
Encode db-max-connections env var as a string in k8s manifest
2023-03-10 17:19:16 -08:00
Max Brunsfeld
ff1c7db38f
collab 0.7.1
2023-03-10 16:36:03 -08:00
Mikayla Maki
30a08467b0
Merge pull request #2263 from zed-industries/language-status-bar
...
Language status bar
2023-03-10 16:26:42 -08:00
Mikayla Maki
c8de738972
Align feedback button styles with other sidebar buttons
...
Make feedback button reflect whether you're in a feedback buffer
2023-03-10 16:19:33 -08:00
Mikayla Maki
87ac409e51
Merge pull request #2265 from zed-industries/fix-menu-bar-greying-out
...
Fix too-agressive menu bar greying
2023-03-10 16:05:07 -08:00
Mikayla Maki
badfe70a93
Merge pull request #2267 from zed-industries/fix-terminal-icon-active-state
...
Activate and deactivate the terminal icon based on focused view
2023-03-10 16:02:34 -08:00
Mikayla Maki
11d8394af2
Fix the terminal icon button to only be active when a terminal is focused
2023-03-10 15:54:42 -08:00
Mikayla Maki
c24194156e
Merge pull request #2257 from zed-industries/check-all-contexts
...
Fix keyboard shortcuts not showing
2023-03-10 15:52:56 -08:00
Mikayla Maki
ece2af1e22
Fix a corner case in available action resolution
...
Add tests for new keybinding resolution behavior
co-authored-by: max <max@zed.dev >
2023-03-10 15:36:20 -08:00
Mikayla Maki
adf94a1681
Switch from using the key window to the main window mac platform API
...
When the help menu is open, the help menu's search field is the key window, and this was causing menu item action resolution to fail
co-authored-by: Max <max@zed.dev >
2023-03-10 14:43:28 -08:00
Julia
09d306df85
Merge pull request #2266 from zed-industries/avoid-panic
...
Avoid panic scanning recursive symlink before gitignore is encountered
2023-03-10 17:19:55 -05:00
Julia
0a5cf4b831
Avoid panic scanning recursive symlink before gitignore is encountered
2023-03-10 16:54:57 -05:00
Mikayla Maki
9398de6a57
Add feedback for telemetry item when there's no data
2023-03-10 13:15:36 -08:00
Mikayla Maki
e45104a1c0
Move feedback to overflow menu and help menu
2023-03-10 12:48:11 -08:00
Mikayla Maki
74b10e4ba5
Merge pull request #2264 from zed-industries/make-terminal-default-better
...
Make terminal fallback correctly when unable to deserialize a cwd
2023-03-10 12:27:54 -08:00
Mikayla Maki
ddbffd2c41
Make terminal fallback correctly when unable to deserialize your cwd
2023-03-10 12:23:29 -08:00
Mikayla Maki
00a38e4c3b
Bound the search range for the keybindings by the highest handler path
2023-03-10 12:12:32 -08:00
Mikayla Maki
37d01c7fb3
Merge pull request #2199 from zed-industries/welcome-experience
...
Welcome experience
2023-03-10 10:48:30 -08:00
Mikayla Maki
281ff92236
Stub out blank pane experience
2023-03-10 09:58:11 -08:00
Antonio Scandurra
bb721a08f5
💄
2023-03-10 17:43:48 +01:00
Antonio Scandurra
f50b51bdad
Adjust styling
2023-03-10 17:37:45 +01:00
Antonio Scandurra
693172854c
Show active buffer's language on the right in the status bar
2023-03-10 17:37:34 +01:00
Antonio Scandurra
b3c7526fb5
Return last excerpt in MultiBuffer::excerpt_containing if overshooting
2023-03-10 17:28:08 +01:00
Antonio Scandurra
6e37ff880f
Replace "Give Feedback" with an icon and move it to the left
...
This is so we can show the current language in the status bar on
the right, and having two pieces of text sitting next to each other
felt too busy.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-03-10 17:02:52 +01:00
Antonio Scandurra
f08685f65f
Merge pull request #2262 from zed-industries/manual-language-selection
...
Introduce language selector
2023-03-10 16:38:17 +01:00
Antonio Scandurra
ce828d55d5
Bind language_selector::Toggle to cmd-k m
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-03-10 16:32:18 +01:00
Antonio Scandurra
f28806d09b
Emphasize currently-selected language
2023-03-10 15:48:39 +01:00
Antonio Scandurra
686f5439ad
Set buffer language when confirming selection in language selector
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-03-10 15:34:26 +01:00
Antonio Scandurra
b402f27d50
Introduce a new language picker that displays available languages
...
Right now this panics when trying to select a language, so that's
what we're going to implement next.
Co-Authored-By: Julia Risley <julia@zed.dev >
2023-03-10 15:28:10 +01:00
Antonio Scandurra
d39c761de5
Merge pull request #2261 from zed-industries/async-language-loading
...
Allow waiting for language to be loaded in LanguageRegistry APIs
2023-03-10 15:27:08 +01:00
Antonio Scandurra
7a600e7a65
Allow waiting for language to be loaded in LanguageRegistry APIs
2023-03-10 12:17:47 +01:00
Antonio Scandurra
221bb54e48
Introduce a new TryFutureExt::unwrap method
2023-03-10 11:41:13 +01:00
Antonio Scandurra
431e11a033
Merge pull request #2260 from zed-industries/increase-max-connections
...
Increase the amount of max connections to the database
2023-03-10 10:27:26 +01:00
Antonio Scandurra
8b7273e46e
Increase the amount of max connections to the database
2023-03-10 10:10:59 +01:00
Mikayla Maki
9dc608dc4b
Switch from changing the meaning of the predicate to adding an additional match_dispatch_path_context API for UI elements
2023-03-09 19:32:09 -08:00
Mikayla Maki
648f0e5b7b
Remove new logo from style tree
2023-03-09 19:18:17 -08:00
Julia
b40ea4df14
Merge pull request #2259 from zed-industries/preserve-contacts-editor-contents
...
Preserve contacts popover editor contents when switching to search mode
2023-03-09 22:10:46 -05:00
Julia
01e3173ed0
Preserve contacts popover editor contents when switching to search mode
2023-03-09 22:05:32 -05:00
Nate Butler
8ee25be7b9
Update empty pane styling
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-09 20:18:29 -05:00
Mikayla Maki
0384456e7d
Change context matcher to search the entire stack
2023-03-09 16:18:37 -08:00
Mikayla Maki
20064b5629
Add welcome to menu
...
remove debug
2023-03-09 15:38:28 -08:00
Mikayla Maki
daed75096e
Fix editor test to clearly show trailing whitespace
...
Adjsut default dock size to be a multiple of 16
2023-03-09 13:18:03 -08:00
Mikayla Maki
718052bb72
Undo accidental indent change of hoverpopover.ts
2023-03-09 13:02:25 -08:00
Mikayla Maki
4eb75f058f
Fix bug with wrong view ids being passed
2023-03-09 12:00:58 -08:00
Petros Amoiridis
6c68a3e709
Remove unneeded code
2023-03-09 20:02:40 +02:00
Nate Butler
e7af3f223a
Merge pull request #2254 from zed-industries/nate/update-themes
...
WIP: More theme updates
2023-03-09 11:00:20 -05:00
Nate Butler
baff428de5
Re-add Ayu
2023-03-09 10:51:28 -05:00
Nate Butler
3952e98320
Remove Zed Pro theme
2023-03-09 10:50:11 -05:00
Nate Butler
51be0efa1f
Format
2023-03-09 10:47:58 -05:00
Nate Butler
5bfd5e35b3
Add light themes
2023-03-09 10:47:01 -05:00
Petros Amoiridis
d53c18cc57
Open menu relative to the mouse cursor
2023-03-09 16:57:38 +02:00
Petros Amoiridis
5b7d0ee6fe
Show button in a normal state
2023-03-09 16:54:47 +02:00
Petros Amoiridis
e2bdd261a1
Remove debugging statement
2023-03-09 16:53:34 +02:00
Mikayla Maki
9187863d0e
re-add spaces removed by new setting
2023-03-09 00:45:05 -08:00
Antonio Scandurra
3daeabc1d6
collab 0.7.0
2023-03-09 09:30:04 +01:00
Antonio Scandurra
bebfe53e89
Merge pull request #2256 from zed-industries/liveness-probe
...
Introduce Kubernetes liveness probe to ensure database works
2023-03-09 09:26:21 +01:00
Antonio Scandurra
9328bb0153
Introduce Kubernetes liveness probe to ensure database works
2023-03-09 09:17:55 +01:00
Antonio Scandurra
89c283ecf0
Merge pull request #2252 from zed-industries/limit-messages-processed-in-parallel
...
Prevent collab server from being overwhelmed with messages
2023-03-09 08:51:48 +01:00
Antonio Scandurra
a00ce3f286
Add randomized test to remove active selections from buffer
2023-03-09 07:47:05 +01:00
Antonio Scandurra
4ce51c8138
Limit dirty buffer save optimization to multi-buffers
2023-03-09 07:26:22 +01:00
Mikayla Maki
f626920af1
Remove permanent Zed stateless
2023-03-08 19:03:50 -08:00
Mikayla Maki
325827699e
Adjust styling for blank page experience
2023-03-08 19:02:13 -08:00
Julia
a3b1980a5e
Merge pull request #2255 from zed-industries/sort-collaborators-alphabetical
...
Sort collaborators in titlebar alphabetically instead of by replica id
2023-03-08 21:54:29 -05:00
Mikayla Maki
709c101834
Adjust styles on usage note
2023-03-08 18:50:17 -08:00
Mikayla Maki
943ea61452
Add a note on how to check the telemetry
2023-03-08 18:47:52 -08:00
Julia
981b3a459f
Sort collaborators in titlebar alphabetically instead of by replica id
2023-03-08 21:38:30 -05:00
Mikayla Maki
a65dd0fd98
Restore correct checkbox text
2023-03-08 18:15:29 -08:00
Mikayla Maki
cf6ea6d698
Fix bug with action keybindings not being resolved
2023-03-08 18:11:11 -08:00
Mikayla Maki
152755b043
Add blank pane experience
2023-03-08 17:56:39 -08:00
Mikayla Maki
dad66eb3fb
Make the workspace always open the dock
2023-03-08 14:49:52 -08:00
Mikayla Maki
f62e0b502a
Remove welcome experience action
...
Make logo switch between light and dark
co-authored-by: Nathan <nathan@zed.dev >
2023-03-08 14:49:48 -08:00
Nate Butler
344f59adf7
Tweak welcome design
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-08 17:14:15 -05:00
Nate Butler
cc33f83e4e
Add Zed logo icon
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-08 16:45:35 -05:00
Nate Butler
9842b7ad1a
WIP
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-08 16:34:27 -05:00
Max Brunsfeld
14497027d4
collab 0.6.2
2023-03-08 12:22:16 -08:00
Joseph Lyons
ae510c80db
v0.77.x dev
2023-03-08 13:25:32 -05:00
Petros Amoiridis
ad7e49ed06
Give focus to the selected terminal
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-03-08 19:47:57 +02:00
Antonio Scandurra
b687aec9d9
Avoid saving buffer if it's neither dirty nor in conflict
...
However, keep emitting `Saved` events so that the language server
is notified and can perform tasks related to saving (e.g., running
`cargo check` in the case of rust-analyzer).
2023-03-08 17:04:01 +01:00
Antonio Scandurra
a435dc1339
Clear selections on buffer only if they hadn't been cleared already
2023-03-08 17:04:01 +01:00
Antonio Scandurra
b4561b848d
Limit the number of parallel messages handled for any given connection
2023-03-08 17:04:01 +01:00
Petros Amoiridis
baa9e271d5
Make pop up open on the side of the button
2023-03-08 11:00:30 +02:00
Mikayla Maki
350ddf2025
Add keymap picker UI
...
Co-authored-by: Max <max@zed.dev >
2023-03-07 17:29:08 -08:00
Mikayla Maki
3594243644
Fix bug where open would offer to hang up a remote call
...
Co-authored-by: max <max@zed.dev >
2023-03-07 17:29:08 -08:00
Mikayla Maki
904993dfc9
Change open paths to replace the existing window if dispatched from a window
...
co-authored-by: Max <max@zed.dev >
2023-03-07 17:28:52 -08:00
Julia
4179ed66a6
Merge pull request #2251 from zed-industries/clear-follow-state-on-project-close
...
Update db followers table when user leaves a project
2023-03-07 19:09:09 -05:00
Julia
d173b1d412
Update db followers table when user leaves a project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-03-07 18:56:03 -05:00
Mikayla Maki
ab4b3293d1
Fix project panel button and style it
...
Co-authored-by: max <max@zed.dev >
2023-03-07 14:49:13 -08:00
Mikayla Maki
5892f16602
Add test for base keymap setting
2023-03-07 14:02:42 -08:00
Nate Butler
84aefb9dcb
Add the rest of the Atelier dark themes
2023-03-07 13:47:18 -08:00
Nate Butler
4e81513af1
Add more Atelier themes
2023-03-07 13:35:32 -08:00
Nate Butler
90296667b0
Remove current staff themes
2023-03-07 13:35:23 -08:00
Nate Butler
e0f9b2b40f
Update Atelier Dune
2023-03-07 13:27:01 -08:00
Nate Butler
477453c396
Update existing Atelier themes
2023-03-07 13:22:07 -08:00
Mikayla Maki
19fc143209
Add base keymap setting
...
Format all files
Co-Authored-by: Nathan <nathan@zed.dev >
2023-03-07 12:19:51 -08:00
Joseph Lyons
ca03d871a6
Add a separator between the New Terminal button and existing terminal buttons
2023-03-07 15:09:06 -05:00
Joseph Lyons
0a3f0c5252
Use terminal titles for buttons
2023-03-07 15:04:12 -05:00
Joseph Lyons
c80942ea00
Begin work to dynamically add terminal names to menu
2023-03-07 14:41:18 -05:00
Joseph Lyons
caa6a75238
Show a pop up menu for terminals
...
Co-Authored-By: Joseph T. Lyons <19867440+JosephTLyons@users.noreply.github.com >
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-07 20:16:08 +02:00
Julia
4f4af55329
Merge pull request #2248 from zed-industries/increase-reconnect-timeout
...
Increase room reconnect timeout
2023-03-07 12:30:20 -05:00
Julia
1e5aff9e51
Update collab integration test to new reconnect timeout
2023-03-07 12:23:18 -05:00
Nate Butler
ee154feda4
Merge pull request #2231 from zed-industries/nate/add-gruvbox
...
Add Gruvbox Theme
2023-03-06 18:49:26 -08:00
Mikayla Maki
3b31f10c6f
Made the theme picker sort from dark to light
...
Added a layer into 'ConstrainedBox' to clip it
's children
Made the welcome experience responsive to small and large sizes
2023-03-06 18:36:18 -08:00
Mikayla Maki
8db7e17ac5
Move install_cli function to a seperate crate
...
Add install cli button to welcome experience
Add toast pop ups for CLI installation status
2023-03-06 17:55:58 -08:00
Mikayla Maki
1f6bd0ea77
Fix edge case where the welcome page might open in the dock if the user's actions race the welcome experience action
2023-03-06 16:35:15 -08:00
Mikayla Maki
ba652fc033
Finish basic welcome experience
2023-03-06 16:28:23 -08:00
Max Brunsfeld
7163ba429b
Merge pull request #2250 from zed-industries/syntax-highlighting-tweaks
...
Syntax highlighting tweaks
2023-03-06 16:05:10 -08:00
Max Brunsfeld
c832e4406e
Remove more colors from default syntax theme
...
These default colors weren't consistent with the rest of the
syntax theme.
2023-03-06 15:57:04 -08:00
Max Brunsfeld
515724821e
Make racket highlight query more consistent with other langs
2023-03-06 15:56:20 -08:00
Max Brunsfeld
0867162c87
Fix lua highlight query
...
* Fix regex predicate on constants.
* Remove 'function.call' highlight name. In other languages, we
differentiate calls from definitions with the 'function.definition'
highlight name. We actually don't use this in any themes though.
2023-03-06 15:54:17 -08:00
Max Brunsfeld
aba2914a31
Fix constant highlighting in JS, TypeScript
...
Previously, SCREAMING_SNAKE_CASE identifiers were highlighted as
types due to a mistake in the order of patterns in the highlight
queries.
2023-03-06 15:38:12 -08:00
Max Brunsfeld
246a6adab7
Merge pull request #2239 from zed-industries/add-constructor-to-syntax-overrides
...
Add constructor to syntax overrides
2023-03-06 15:27:09 -08:00
Mikayla Maki
020a0965b0
WIP
2023-03-06 14:26:32 -08:00
Mikayla Maki
b74553455f
Add an element to pane to take care of wiring initial mouse handlers
2023-03-06 14:26:32 -08:00
Mikayla Maki
4a8527478d
Add child item alignment to flex implementation
...
Fix checkbox styling
co-authored-by: Nathan <nathan@zed.dev >
2023-03-06 14:26:32 -08:00
Mikayla Maki
4c179875ab
Add png image loading to gpui
...
add zed logo into welcome experience
Co-authored-by: Nathan <nathan@zed.dev >
2023-03-06 14:26:32 -08:00
Mikayla Maki
f89f33347d
Added CTA buttons to welcome experience
...
Co-authored-by: Nathan <nathan@zed.dev >
2023-03-06 14:26:32 -08:00
Mikayla Maki
9dee2ca2be
WIP
2023-03-06 14:26:32 -08:00
Mikayla Maki
62aeb6b8b3
Added background to welcome page
2023-03-06 14:26:32 -08:00
Mikayla Maki
5210be95fe
Added welcome experience sketch
...
Made toolbar hideable
2023-03-06 14:26:32 -08:00
Mikayla Maki
7d7053b990
Move to using stateless
2023-03-06 14:26:31 -08:00
Mikayla Maki
118435a348
Added basic styling for checkboxes, yay
...
Co-authored-by: Max <max@zed.dev >
2023-03-06 14:25:10 -08:00
Mikayla Maki
86e2101592
Added the ability to nested values to the settings file, while preserving user formatting
...
co-authored-by: max <max@zed.dev >
2023-03-06 14:25:10 -08:00
Mikayla Maki
50586812ec
Make generate licenses quieter
2023-03-06 14:25:10 -08:00
Mikayla Maki
416c793076
Start on welcome experience settings
2023-03-06 14:25:10 -08:00
Mikayla Maki
a0637a769c
WIP
2023-03-06 14:25:10 -08:00
Mikayla Maki
9401ef223d
Add welcome crate and associated types
2023-03-06 14:25:10 -08:00
Julia
620890c411
Merge pull request #2247 from zed-industries/tidy-up-sprite-cache
...
Tidy up `SpriteCache::render_glyph`
2023-03-06 11:29:51 -05:00
Antonio Scandurra
0ec984f924
Tidy up SpriteCache::render_glyph
2023-03-06 17:08:35 +01:00
Max Brunsfeld
01bbf20962
Merge pull request #2235 from zed-industries/no-panic-uploads-in-debug
...
Don't upload panic files when running in a PTY
2023-03-04 09:42:46 -08:00
Mikayla Maki
996294ba67
Merge pull request #2246 from zed-industries/fix-lsp-derive-error
...
Make diagnostic processing order independent
2023-03-04 02:25:47 -08:00
Mikayla Maki
ddf2f2cb0a
Update test to use new group ids and new ordering of diagnostics.
2023-03-04 02:21:55 -08:00
Mikayla Maki
bd4d7551a5
Make diagnostic processing order independent
...
Co-authored-by: max <max@zed.dev >
2023-03-03 16:35:12 -08:00
Julia
5097cf5cb7
Merge pull request #2245 from zed-industries/confirm-restart-unsaved
...
Confirm restart if prompt-quit is enabled or there are unsaved changes
2023-03-03 16:10:40 -08:00
Julia
13212d274e
Confirm restart if prompt-quit is enabled or there are unsaved changes
2023-03-03 16:06:03 -08:00
Julia
b9110c9268
Increase reconnect timeout
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-03 13:10:08 -08:00
Joseph T. Lyons
b9573872e1
Merge pull request #2243 from zed-industries/joseph/z-225-track-open-terminals
...
Keep track of open terminals
2023-03-03 12:55:28 -08:00
Joseph Lyons
3ec71a742d
Keep track of open terminals
...
Co-Authored-By: Petros Amoiridis <petros@hey.com >
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-03-03 12:50:08 -08:00
Mikayla Maki
50682dc685
Merge pull request #2233 from zed-industries/fix-code-folding-initialization
...
Initialize code fold indicators on buffer startup
2023-03-03 12:30:53 -08:00
Julia
2bca64f13b
Merge pull request #2242 from zed-industries/mouse-event-handlers-yes
...
Fix surprising mouse propagation & avoid focusing tab while closing
2023-03-03 12:29:50 -08:00
Mikayla Maki
606d683f29
Add interactable fold markers
...
Change fold handlers to be driven by the fold map
Switch to a mouse region based implementation for click regions
Co-authored-by: Max <max@zed.dev >
2023-03-03 12:26:36 -08:00
Julia
ff2e6bc3bd
Fix surprising mouse propagation & avoid focusing tab while closing
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-03 12:22:58 -08:00
Joseph T. Lyons
218f2fd0fe
Merge pull request #2241 from zed-industries/joseph/z-223-add-terminal-button-to-status-bar
...
Add a terminal button to status bar
2023-03-03 12:15:59 -08:00
Max Brunsfeld
bb0257bbac
Merge branch 'main' into no-panic-uploads-in-debug
2023-03-03 12:02:44 -08:00
Joseph Lyons
929ebd7175
Add a terminal button to status bar
...
Co-Authored-By: Petros Amoiridis <petros@hey.com >
2023-03-03 12:00:41 -08:00
Max Brunsfeld
124aa74b03
Merge pull request #2234 from zed-industries/error-on-combined-injections-in-injections
...
Fix range relativization when combined injections occur inside of other injections
2023-03-03 11:58:13 -08:00
Petros Amoiridis
a2f75eb031
Merge pull request #2240 from zed-industries/petros/update-setup-instructions
...
Add missing steps to the setup instructions
2023-03-03 11:47:38 -08:00
Petros Amoiridis
6194c5df16
Add missing steps to the setup instructions
2023-03-03 11:36:26 -08:00
Max Brunsfeld
d14b684237
Merge pull request #2236 from zed-industries/avoid-clobbering-panic-file
...
Avoid clobbering panic files when they happen at the same time
2023-03-03 11:15:48 -08:00
Max Brunsfeld
7a8cba0544
Merge pull request #2227 from zed-industries/strip-trailing-whitespace
...
Add settings to normalize whitespace on save
2023-03-03 11:15:32 -08:00
Nate Butler
f1b5bf051a
Fornat
2023-03-03 10:58:43 -08:00
Nate Butler
ad4201f768
Hack to fix syntax.constructor causing TS error
2023-03-03 10:58:25 -08:00
Nate Butler
75a9cfdabe
Remove leftover log
2023-03-03 10:22:50 -08:00
Julia
3b6f66791f
Merge pull request #2238 from zed-industries/subpixel-variant-incorrectly-wrapping
...
Avoid wrapping to the 0th glyph variant when the 4th should be used
2023-03-03 13:13:34 -05:00
Julia
9311e01271
Avoid wrapping to the 0th glyph variant when the 4th should be used
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-03-03 10:04:44 -08:00
Nate Butler
6d068e926b
Merge pull request #2237 from zed-industries/revert-2232-tab-bar-background-focus-drag
...
Revert "Avoid tab bar background activating an item at the end of a tab drag"
2023-03-03 09:49:55 -08:00
Nate Butler
6854063d0b
Revert "Avoid tab bar background activating an item at the end of a tab drag"
2023-03-03 09:47:58 -08:00
Mikayla Maki
7ca0b38048
Made fold inline styles be driven by the fold map
...
co-authored-by: Max <max@zed.dev >
2023-03-03 09:32:58 -08:00
Max Brunsfeld
a598f0b13c
Avoid clobbering panic files when they happen at the same time
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-02 20:51:29 -08:00
Max Brunsfeld
eb6088701e
Don't upload panic files when running in a PTY
2023-03-02 20:32:49 -08:00
Mikayla Maki
24ba47e75d
Merge pull request #2230 from zed-industries/fix-tab-x
...
Fix tab bar x
2023-03-02 19:48:08 -08:00
Mikayla Maki
3dd5b3f426
Attempted to initialize code-fold indicators, does not work
2023-03-02 19:42:59 -08:00
Mikayla Maki
9f86ca8574
Update tabBar.ts
2023-03-02 15:48:31 -08:00
Julia
bc2ea58c6a
Merge pull request #2232 from zed-industries/tab-bar-background-focus-drag
...
Avoid tab bar background activating an item at the end of a tab drag
2023-03-02 16:18:04 -05:00
Julia
b343e8056a
Avoid tab bar background activating an item at the end of a tab drag
2023-03-02 13:06:58 -08:00
Mikayla Maki
6a2a1303c4
Fix failing license
...
co-authored-by: nate <nate@zed.dev >
2023-03-02 12:32:47 -08:00
Max Brunsfeld
a366ba19af
Fix range relativization when combined injections occur inside of other injections
...
For example, ERB template inside of a markdown code block
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-03-01 14:38:35 -08:00
Max Brunsfeld
70cb2fa8d7
Apply external command formatting if buffer has changed while computing it
2023-03-01 10:17:04 -08:00
Nate Butler
f67c3f1f1d
Add Gruvbox syntax overrides
2023-03-01 11:49:13 -05:00
Nate Butler
bde0456111
Init gruvbox theme
2023-03-01 10:16:45 -05:00
Mikayla Maki
8734bd8435
Seperate out x-mark width
2023-03-01 00:18:45 -08:00
Mikayla Maki
34fbffb4cc
Fix tab bar x
2023-02-28 22:48:31 -08:00
Max Brunsfeld
368d2a73ea
Perform whitespace formatting regardless of whether buffer has a language server or path
2023-02-28 21:52:00 -08:00
Max Brunsfeld
e7b56f6342
adjust buffer-formatting assertion to reflect final newline addition
2023-02-28 21:52:00 -08:00
Max Brunsfeld
1deff43639
Avoid calling edits_since in apply_diff
2023-02-28 21:52:00 -08:00
Max Brunsfeld
a890b8f3b7
Add a setting for ensuring a single final newline on save
2023-02-28 21:52:00 -08:00
Max Brunsfeld
7faa0da5c7
Avoid finalizing transactions inside Buffer::apply_diff
2023-02-28 21:52:00 -08:00
Max Brunsfeld
ff85bc6d42
Add setting for removing trailing whitespace on save
2023-02-28 21:52:00 -08:00
Max Brunsfeld
b00e467ede
Add APIs for stripping trailing whitespace from a buffer
2023-02-28 21:52:00 -08:00
Mikayla Maki
2e1adb0724
Merge pull request #2229 from zed-industries/fix-click-range-bug
...
Fix off by one error in click ranges
2023-02-28 20:33:00 -08:00
Mikayla Maki
269df10a16
Fix off by one error in click ranges
2023-02-28 20:27:34 -08:00
Mikayla Maki
8358efbd6c
Merge pull request #2228 from zed-industries/make-folds-show-on-active-lines
...
Made code fold indicators show up on active line indicators
2023-02-28 20:01:09 -08:00
Mikayla Maki
dc11d2726e
Made code fold indicators show up on active line indicators
2023-02-28 19:53:53 -08:00
Mikayla Maki
41d3c5287b
Merge pull request #2220 from zed-industries/add-fold-indicators
...
Add code folding indicators into the gutter.
2023-02-28 17:30:17 -08:00
Mikayla Maki
2198c295b3
Fix comments
2023-02-28 17:25:35 -08:00
Mikayla Maki
6cf62a5b02
Update tests to use new fold indicator
2023-02-28 17:17:29 -08:00
Mikayla Maki
f8401394f5
Removed DisplayRow abstraction
2023-02-28 17:12:48 -08:00
Mikayla Maki
b53d1eef71
Added background styling of the ...
2023-02-28 16:35:44 -08:00
Mikayla Maki
c397fd9a71
Added click regions and cursor styles
2023-02-28 16:34:28 -08:00
Mikayla Maki
9b8adecf05
Adjusted code-folding behavior
2023-02-28 16:34:28 -08:00
Mikayla Maki
e0f553c0f5
WIp
2023-02-28 16:34:28 -08:00
Mikayla Maki
37a2ef9d41
Make chevrons and lightning bolt interactive
2023-02-28 16:34:28 -08:00
Mikayla Maki
89b93d4f6f
Added fold changes on gutter hover
2023-02-28 16:34:28 -08:00
Mikayla Maki
2036fc48b5
moved code action indicator to the left
2023-02-28 16:34:28 -08:00
Mikayla Maki
cb3e873a67
Fixed autoscroll timing
2023-02-28 16:34:28 -08:00
Mikayla Maki
da78abd99f
Added DisplayRow abstraction to make folding code more readable
2023-02-28 16:34:28 -08:00
Mikayla Maki
637e8ada42
Fix bugs in code folding
2023-02-28 16:34:28 -08:00
Mikayla Maki
e3061066c9
Add code folding indicators into the gutter.
2023-02-28 16:34:28 -08:00
Nate Butler
514da604d7
Merge pull request #2223 from zed-industries/nate/extend-syntax
...
Extend syntax styles available in the theme
2023-02-28 11:26:47 -05:00
Nate Butler
b9811e48e4
One family tune up + tidy
2023-02-28 11:20:16 -05:00
Nate Butler
fb69611568
Fix order of template_substitution in highlights.scm
2023-02-28 11:19:55 -05:00
Nate Butler
a8a045e8bf
Merge branch 'main' into nate/extend-syntax
2023-02-28 11:07:35 -05:00
Nate Butler
59bd503696
Tidy theme names
2023-02-28 10:55:08 -05:00
Nate Butler
fb7818f93c
Revert changes to Andromeda
2023-02-28 10:50:03 -05:00
Joseph T. Lyons
3fb426e8b2
Merge pull request #2209 from zed-industries/add-link-to-community-repo-in-feedback-editor
...
Add link to community repo in feedback editor text
2023-02-28 09:03:21 -05:00
Kay Simmons
f0a31f86c7
remove commented line
2023-02-27 12:06:10 -08:00
Kay Simmons
dc7fe72f18
Merge pull request #2226 from zed-industries/fix-infinite-loop-in-path-distance
...
fix infinite loop in path distance for fuzzy finder
2023-02-27 12:03:40 -08:00
Kay Simmons
b3dffeaf2a
fix infinite loop in path distance for fuzzy finder
2023-02-27 11:57:21 -08:00
Kay Simmons
81cbefec22
Merge pull request #2225 from zed-industries/vim-go-to-definition
...
add go to definition binding to vim normal mode
2023-02-27 11:10:23 -08:00
Joseph Lyons
4f9a07cffc
Merge branch 'main' into add-link-to-community-repo-in-feedback-editor
2023-02-27 13:56:01 -05:00
Kay Simmons
184f37015a
add go to definition binding to vim normal mode
2023-02-27 10:23:30 -08:00
Nate Butler
c9997a81a3
Move syntax types to syntax.ts
2023-02-27 11:01:32 -05:00
Nate Butler
df798c1a7f
Remove punctuation.special until bug is fixed
2023-02-27 10:52:53 -05:00
Nate Butler
465fcec36d
Format
2023-02-27 10:48:55 -05:00
Nate Butler
40c2409b80
Add missing variable property to Syntax
2023-02-27 10:47:52 -05:00
Nate Butler
46dc347a1a
Bring andromeda in line with it's correct colors
2023-02-27 10:47:30 -05:00
Nate Butler
f84046b74f
use @boolean in all flavors of js
2023-02-27 10:40:01 -05:00
Nate Butler
8c51a62a8d
Unify regex highlight style under @string.regex
2023-02-27 10:08:24 -05:00
Nate Butler
794e6e22a6
Format
2023-02-26 17:12:48 -05:00
Nate Butler
504d88d56c
Remove unused code
2023-02-26 17:12:11 -05:00
Nate Butler
94c76c45e6
Style One Dark with new properties
2023-02-26 17:11:02 -05:00
Nate Butler
f2d6a03dff
Finish adding default properties
2023-02-26 17:10:52 -05:00
Nate Butler
3b19a409f8
Add some comments
2023-02-26 15:01:18 -05:00
Nate Butler
7854f4a1ef
WIP need to finish default styles
2023-02-26 14:57:43 -05:00
Nate Butler
6cb35536b3
Start on syntax organization
2023-02-26 14:15:06 -05:00
Nate Butler
161373710c
WIP
2023-02-26 13:24:41 -05:00
Joseph T. Lyons
11e2caff15
Merge pull request #2222 from zed-industries/update-app-icons
...
Update app icons
2023-02-26 11:07:07 -05:00
Joseph Lyons
36ada13966
Update app-icon@2x.png
2023-02-26 11:03:43 -05:00
Joseph Lyons
2c61eeb56d
Update app-icon.png
2023-02-26 11:03:31 -05:00
Joseph Lyons
ccae9448d4
Update app-icon-preview@2x.png
2023-02-26 11:03:22 -05:00
Joseph Lyons
bb46b26494
Update app-icon-preview.png
2023-02-26 11:03:03 -05:00
Nate Butler
098e6969f7
Merge pull request #2221 from zed-industries/theme-syntax-overrides
...
Theme syntax overrides 🎉
2023-02-26 10:56:45 -05:00
Nate Butler
d910eed1f1
Format
2023-02-26 10:31:19 -05:00
Nate Butler
64b07dbfeb
Add syntax overrides for One Light
2023-02-26 10:09:16 -05:00
Nate Butler
4f307c7601
Use syntax as merged name instead of mergedSyntax
...
This lets us retain the existing uses of syntax, and fixes colors that were being assigned incorrectly.
2023-02-26 01:20:44 -05:00
Nate Butler
23c967418a
Add a syntax override style for One Dark
2023-02-26 01:07:45 -05:00
Nate Butler
77ed437cda
Add the ability to override the system syntax config
2023-02-26 01:07:21 -05:00
Kay Simmons
0b1334b8c5
Merge pull request #2218 from zed-industries/file-finder-distance-sorting
...
Sort matches in file finder by distance to active item after score
2023-02-25 14:26:05 -08:00
Kay Simmons
cdc6566d87
fixup poor utility naming
2023-02-25 14:12:25 -08:00
Kay Simmons
36f3d3d738
Add test for new sorting behavior
2023-02-25 14:06:54 -08:00
Nate Butler
27712c25ef
Merge pull request #2219 from zed-industries/nate/theme-tidying
...
Tidy `styles` app
2023-02-25 12:07:02 -05:00
Nate Butler
68af726ee4
Update packages
...
Tested post update.
2023-02-25 11:53:01 -05:00
Nate Butler
0ea7959ba4
Remove unused/old base16 theme code
...
Neither of these files have anything in them that is used anywhere else in the styles app.
Tested both `build` and `build-licenses` after removing these.
2023-02-25 11:50:22 -05:00
Nate Butler
bcb7b80517
Don't format package or package-lock
2023-02-25 11:47:27 -05:00
Nate Butler
10a30cf330
Format styles with updated prettier config
...
In the system color PR I updated the prettier config to match what we use on zed.dev. I didn't want to format all of styles as it would add a lot of unrelated line changes to that PR.
Doing that format now.
2023-02-25 11:46:33 -05:00
Nate Butler
06a86162bb
Merge pull request #2150 from zed-industries/nate/system-colors
...
Add system color palette
2023-02-25 11:43:02 -05:00
Nate Butler
b986c38a31
Format using new prettier config
2023-02-25 11:33:57 -05:00
Nate Butler
69fd273367
Add the same prettier config as zed.dev
2023-02-25 11:33:16 -05:00
Nate Butler
8e828947fb
Add missing dep
2023-02-25 11:32:04 -05:00
Nate Butler
2d8adf4c56
Remove theme tool for now
...
This is likely the biggest thing I'm unsure about for this PR, so I'm going to pull it into a seperate branch so I can merge the system color library in.
I think a better approach for this will be one of two things:
- Have a single next app that covers everything to do with themes (previewing ramps, generated themes, components etc.)
- Create a mono or turborepo that splits things up into packages (system, theme, themes, theme-tool, etc)
2023-02-25 11:27:18 -05:00
Kay Simmons
0b48e238f2
Sort file finder matches by distance to the active item after match score
2023-02-24 18:13:26 -08:00
Max Brunsfeld
04495aa8cd
Merge pull request #2217 from zed-industries/format-on-save-trigger
...
Pass the 'Save' format trigger when formatting on save
2023-02-24 17:29:52 -08:00
Max Brunsfeld
5fea49e639
Pass the 'Save' format trigger when formatting on save
...
In an earlier refactor, I accidentally caused the 'Manual'
trigger to *always* be passed.
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2023-02-24 17:11:35 -08:00
Mikayla Maki
0704d9dcdb
Merge pull request #2216 from zed-industries/update-bromberg
...
Update bromberg dependency to have alloc
2023-02-24 14:41:32 -08:00
Mikayla Maki
a57fcf5afc
Update bromberg dependency to have alloc
2023-02-24 14:34:24 -08:00
Max Brunsfeld
e910fd8493
collab 0.6.1
2023-02-24 09:44:23 -08:00
Mikayla Maki
d5123bc832
Merge pull request #2215 from zed-industries/revert-2214-fix-reveal-path-panic
...
Revert "Remove borrow from reveal_path()"
2023-02-24 09:40:03 -08:00
Mikayla Maki
8656708de4
Revert "Remove borrow from reveal_path()"
2023-02-24 09:39:52 -08:00
Joseph Lyons
72197802a2
Tweak code to remove duplication
2023-02-24 08:53:58 -05:00
Joseph Lyons
f8f1a3f86e
Unify text style names
2023-02-24 08:46:28 -05:00
Mikayla Maki
2ec25bef84
Merge pull request #2214 from zed-industries/fix-reveal-path-panic
...
Remove borrow from reveal_path()
2023-02-23 21:48:09 -08:00
Mikayla Maki
89ddf14b0e
Remove borrow from reveal_path()
2023-02-23 21:36:17 -08:00
Julia
be86cb35ba
Merge pull request #2213 from zed-industries/per-project-follow-status
...
Differentiate between follow state on a per-project basis
2023-02-24 00:26:41 -05:00
Julia
465d8cc2ff
Differentiate between follow state on a per-project basis
2023-02-24 00:07:17 -05:00
Max Brunsfeld
93b9e762ec
Merge pull request #2212 from zed-industries/initial-traffic-light-position
...
Adjust window's traffic light position when setting its title
2023-02-23 15:02:05 -08:00
Max Brunsfeld
fbc934b884
Adjust window's traffic light position when setting its title
2023-02-23 14:44:45 -08:00
Mikayla Maki
350b7b82f7
Merge pull request #2207 from zed-industries/project-panel-actions
...
Fix project panel actions
2023-02-23 14:31:29 -08:00
Mikayla Maki
b179fc2b99
Remove comment
2023-02-23 14:24:53 -08:00
Mikayla Maki
8860346324
Fix broken dock command
2023-02-23 14:15:29 -08:00
Mikayla Maki
9004640586
Convert keymap context to use generics and Cow<'static> so we don't have to add .to_string() and .into() for each usage
2023-02-23 14:10:55 -08:00
Kay Simmons
03498314fa
Merge pull request #2211 from zed-industries/hover-binding
...
add hover binding from vscode
2023-02-23 14:05:28 -08:00
Kay Simmons
ce4b672a14
add hover binding from vscode
2023-02-23 13:50:43 -08:00
Kay Simmons
3f9405f8f1
Merge pull request #2210 from zed-industries/fix-enter-vim-normal-mode
...
Fix enter in normal mode acting incorrectly
2023-02-23 13:46:15 -08:00
Kay Simmons
2276d25bdf
Fix enter in normal mode acting incorrectly
2023-02-23 13:40:31 -08:00
Mikayla Maki
ffe53bed87
Reverts keymap precedence order change
2023-02-23 13:32:45 -08:00
Joseph Lyons
37f910949d
Add link to community repo in feedback editor
2023-02-23 16:30:00 -05:00
Julia
1e3b4f0387
Merge pull request #2208 from zed-industries/new-collab-ui-3
...
Add same grayscale logic to followers which leaders have; new call UI [3/N]
2023-02-23 16:05:42 -05:00
Julia
e1df85e86d
Add same grayscale logic to followers which leaders have
2023-02-23 15:59:37 -05:00
Mikayla Maki
f6601f64e5
Added editor-in-project-panel overrides to the default keymap
2023-02-23 09:36:30 -08:00
Antonio Scandurra
6ccc90327c
Merge pull request #2206 from zed-industries/fix-refresh-room
...
Fix error when deleting rooms containing projects on refresh
2023-02-23 16:03:14 +01:00
Antonio Scandurra
bbeb33bc7e
Fix error when deleting rooms containing projects on refresh
...
A foreign key violation was causing the server to never delete stale
rooms during `Database::refresh_room` due to having one or more project
records referencing the room.
2023-02-23 15:54:35 +01:00
Antonio Scandurra
e74db2d180
Merge pull request #2205 from zed-industries/call-ui-follow-up
...
Refine new call UI
2023-02-23 15:39:59 +01:00
Antonio Scandurra
74e0bed38f
Fix compilation errors after restructuring room_transaction
2023-02-23 15:17:22 +01:00
Antonio Scandurra
832549f1a3
Merge branch 'main' into call-ui-follow-up
2023-02-23 15:15:46 +01:00
Antonio Scandurra
b965333325
Show avatar in user menu
2023-02-23 15:09:32 +01:00
Joseph T. Lyons
2be0283bf2
Merge pull request #2204 from zed-industries/fix-description-of-telemetry-setting
...
Fix description of telemetry setting
2023-02-23 08:59:30 -05:00
Antonio Scandurra
59a66190e5
Avoid trying to reconnect to a room if client is signed out
2023-02-23 14:53:10 +01:00
Antonio Scandurra
9334267bd0
Tear down peer when signing out
2023-02-23 14:47:02 +01:00
Antonio Scandurra
a0daf47134
Don't panic when rendering collab titlebar item while signed out
2023-02-23 14:46:02 +01:00
Petros Amoiridis
9a729a2e64
Merge pull request #2202 from zed-industries/petros/z-86-replace-terminal-tab-title-with-an-icon
...
Replace terminal tab title with an icon
2023-02-23 11:04:43 +02:00
Antonio Scandurra
1c636500de
Merge pull request #2200 from zed-industries/fix-slow-project-join
...
Hold room lock through the entirety of a `room_transaction`
2023-02-23 09:11:58 +01:00
Max Brunsfeld
65a9ac449f
Remove leave button from the title bar
2023-02-22 23:30:32 -08:00
Max Brunsfeld
bf5c3d963a
Rearrange collab titlebar items to avoid movement of the toggle contacts button
...
* Replace username in titelbar with a `...` user menu that shows
the current user name and contains a sign-in/sign-out button.
* Move the '+' (toggle contacts) button back to the right side.
* Move the collaborators back to the right side.
* Move the share/unshare button to the left side, beside the project title
* Only show the share/unshare button when in a call.
2023-02-22 22:56:11 -08:00
Joseph Lyons
c33d0f940a
Fix description of telemetry setting
2023-02-22 23:50:20 -05:00
Max Brunsfeld
24e0a027ee
Run check-formatting CI job on a mac mini
2023-02-22 15:35:05 -08:00
Max Brunsfeld
d49e35f947
Merge pull request #2203 from zed-industries/collab-ui-fixes
...
Fix minor issues with new collab UI
2023-02-22 14:22:05 -08:00
Max Brunsfeld
40aee8d7bc
Add missing tooltip for contacts menu button
...
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2023-02-22 14:18:17 -08:00
Max Brunsfeld
d33d27faa4
Fix ToggleContactsMenu action name in keymap
...
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2023-02-22 14:17:59 -08:00
Max Brunsfeld
46ead28971
Bump RPC protocol version number
2023-02-22 13:40:14 -08:00
Max Brunsfeld
111aff29cc
collab 0.6.0
2023-02-22 12:35:15 -08:00
Max Brunsfeld
e2a2e40599
v0.76.x dev
2023-02-22 12:34:29 -08:00
Max Brunsfeld
b73423daaa
Merge pull request #2114 from zed-industries/new-collaboration-ui
...
New collaboration UI part 1/N
2023-02-22 12:32:41 -08:00
Julia
0324ca3b08
Be more specific about clearing (leader, follower) row
...
Previously anyone unfollowing someone would clear all other rows for
other followers leading to an incorrect state, fix and test
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 15:29:20 -05:00
Julia
36040cd0e1
Add top level leave call button
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 14:44:23 -05:00
Julia
a07867d628
Fiddle with titlebar item spacing
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 14:13:29 -05:00
Julia
812145f9ab
Only show in-call share/unshare button if own project
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 13:40:43 -05:00
Julia
dbe5b0205c
Add style leader selection container
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 13:36:06 -05:00
Petros Amoiridis
3d6c81584f
Add an icon to the terminal view tab
...
The terminal icon already existed in `assets/icons`
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-22 20:30:44 +02:00
Petros Amoiridis
81ece4fd44
Deduplicate tab theme related code
...
We've noticed that the search theme struct had two fields for a tab icon width and spacing. But we already have those in the tab theme struct. We decided to remove the duplicate and reuse the tab fields.
We also wanted to move where the spacing is being used. Instead of doing it at the left of the label, we do it at the right of the icon to match how it is done in other areas of the UI.
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-22 20:28:57 +02:00
Petros Amoiridis
2ec5c88f98
Make icon width match other areas
...
This was 8 but we've seen areas where this was 14, like the project search tab icon. We want to match this.
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-22 20:25:39 +02:00
Mikayla Maki
7b559176f1
Merge pull request #2201 from zed-industries/save-shortcuts
...
Add OS UI Keybindings
2023-02-22 09:16:19 -08:00
Mikayla Maki
d7305077bf
Merge pull request #2198 from zed-industries/more-item-defaults
...
Add more default impls to the item trait
2023-02-22 09:14:12 -08:00
Mikayla Maki
4798b72cb8
Fixed keyboard shortcuts in mac os native panels
...
co-authored-by: Antonio <antonio@zed.dev >
2023-02-22 09:10:16 -08:00
Mikayla Maki
71d8ead318
Introduce an OSAction that can be associated with menu items for mac platform compatibility.
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-02-22 09:02:31 -08:00
Julia
9b92a8e3fe
Add mockup accurate avatar background
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 11:34:55 -05:00
Julia
7f4da80386
Initial dedicated face pile element
...
Rather than overload Flex with yet another special case, add a dedicated
element to handle this overlap instead
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 11:34:55 -05:00
Julia
6a731233c5
Remove Flex::with_reversed_pain_order
2023-02-22 11:34:55 -05:00
Max Brunsfeld
b7cf426908
Start work on styling of follower avatars in facepiles
...
* Make follower avatars smaller than top-level avatars
* Make avatars in facepiles overlap
* Render an opaque background behind avatars in facepiles.
2023-02-22 11:34:55 -05:00
Max Brunsfeld
0dc92bec5c
Retrieve room id from the project when following/unfollowing
...
Previously, we were accidentally using the project id as the room id.
2023-02-22 11:34:55 -05:00
Julia
c75aca25b6
Remove left side collaborator list
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 11:34:55 -05:00
Julia
ae87961a77
Close contacts popover when call ends
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-02-22 11:34:55 -05:00
Julia
e9464815e0
Make tooltip lie less
2023-02-22 11:34:55 -05:00
Julia
1ed47663ef
Avoid moving contacts popover during call start & add button style state
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-02-22 11:34:55 -05:00
Julia
dd02bc7748
Initial adding of contact menu to call-less share button
2023-02-22 11:22:37 -05:00
Julia
e403b868b7
Add followers table to sqlite scheme for tests
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-22 11:22:37 -05:00
Julia
3105ecd0bd
Shuffle share/unshare button back to the right side
2023-02-22 11:22:37 -05:00
Julia
05e9615507
Highlight face pile which local user is following
2023-02-22 11:22:37 -05:00
Julia
1abb7794cb
Handle case where follower is local user
2023-02-22 11:22:37 -05:00
Julia
50e681bbb1
Add username to right side
2023-02-22 11:22:37 -05:00
Julia
3fb8395085
Make things a bit more infallible
2023-02-22 11:22:37 -05:00
Julia
4513c40993
Following face piles finally take their first breath
2023-02-22 11:21:23 -05:00
Julia
4ffc8cd9fd
Fix deadlock in db get_room
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-22 11:21:23 -05:00
Julia
33c265d3cf
Abuse a closure instead of abusing options/iterators quite so much
2023-02-22 11:21:23 -05:00
Julia
58c41778e7
Absolute pain of the iterator kind (start laying out a user's followers)
2023-02-22 11:21:23 -05:00
Julia
2592ec7265
Initial tracking of unfollows on collab server
2023-02-22 11:21:23 -05:00
Julia
d6462c611c
Begin tracking follow states on collab server
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-22 11:21:23 -05:00
Julia
28786a3c18
Add Flex with_reversed_paint_order & initially move face piles to left
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev >
2023-02-22 11:21:23 -05:00
Julia
a5fd0250ab
Start fleshing out layout of collaborator list entries
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev >
2023-02-22 11:21:23 -05:00
Julia
f68eda97fb
Tell project when it has been unshared
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev >
2023-02-22 11:21:23 -05:00
Julia
99236f1875
Add collaborators to collaborator list, including self user
2023-02-22 11:21:23 -05:00
Julia
bf8658067f
Add collaborator count to collaborator list button
2023-02-22 11:21:23 -05:00
Julia
c697c1a96a
Switch collaborator list to using own style
2023-02-22 11:21:23 -05:00
Julia
2b6aa3f5d1
Begin adding collaborator list popover
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-22 11:21:23 -05:00
Julia
e96d52f35a
Move share button and support unsharing
2023-02-22 11:21:23 -05:00
Julia
ed2f1ddd2d
Move workspace title into collaboration titlebar item render
2023-02-22 11:21:11 -05:00
Antonio Scandurra
8dd249a7cd
Hold room lock through the entirety of a room_transaction
...
Previously, when the host repeatedly sent `UpdateWorktree` messages,
new guests attempting to join a project would observe a severe slowdown
caused by a database serialization error (e.g., the coherence of the data
would get violated midway through `Database::join_project` due to worktree
entries being mutated as the user joined). Writing entries is pretty fast,
whereas reading all of them for a project can take more than 100ms.
Transactions that failed due to a serialization error are retried, but the guest
would keep retrying until the host finished writing because the guest's read
was slow.
This commit changes the semantics of `room_transaction` to acquire a room
lock before even starting the transaction and holding it all the way after
commit (storing it, as before, in the `RoomGuard`). This ensures that a fast
writer (the host) can't starve a slow reader (the guest), allowing the latter
to make progress by temporarily pausing writes by the former.
2023-02-22 16:04:29 +01:00
Kay Simmons
24fcad3fa2
Merge pull request #2189 from zed-industries/labeled-tasks
...
Labeled Tasks
2023-02-21 21:31:47 -08:00
Kay Simmons
46af9a90ce
fix test warning
2023-02-21 21:13:03 -08:00
Kay Simmons
1c69e289b7
Fix formatting
2023-02-21 21:07:45 -08:00
Mikayla Maki
9d782be4c8
Remove now-default stubs
2023-02-21 17:51:49 -08:00
Mikayla Maki
cae9e733a1
Add more default impls to the item trait
...
Change pane to not split if the underlying item cannot be cloned
2023-02-21 17:29:39 -08:00
Mikayla Maki
77c396a0ab
Merge pull request #2197 from zed-industries/label-text-cow
...
Changed label and text to be generic over static and owned strings
2023-02-21 17:05:57 -08:00
Mikayla Maki
b500ed3171
Changed label and text to be generic over static strings and owned strings
2023-02-21 16:47:29 -08:00
Kay Simmons
6b6e4e3bfe
Add basic test for labeled tasks
2023-02-21 16:14:22 -08:00
Joseph T. Lyons
1683a54698
Merge pull request #2195 from zed-industries/add-reveal-in-finder-to-additional-locations
2023-02-21 18:48:16 -05:00
Mikayla Maki
14488619a3
Merge pull request #2196 from zed-industries/open_urls
...
Fix open URLs, restarts, and make bundling easier to use
2023-02-21 15:36:50 -08:00
Mikayla Maki
cf4e719484
Fixes a race condition in the restart implementation
...
Fixes open_urls racing workspace initialization and causing a double-open (community#927)
Adds a -d flag to the bundle script to compile in debug mode
Co-Authored-by: Max <max@zed.dev >
2023-02-21 15:28:16 -08:00
Joseph Lyons
8c3232bb9b
Add reveal in finder to additional locations
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-21 16:09:11 -05:00
Joseph Lyons
ebf1da1de8
Remove print macros
2023-02-21 10:46:12 -05:00
Kay Simmons
3564e95f27
Add labeled tasks to gpui and observe them in the activity status to give feedback when we are still waiting for the language server
2023-02-20 20:28:48 -08:00
Max Brunsfeld
ecf77a510a
Merge pull request #2194 from zed-industries/window-position-env-vars
...
Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
2023-02-20 15:29:51 -08:00
Max Brunsfeld
927f7b3363
Fix handling of ZED_WINDOW_{SIZE,POSITION} env vars
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-02-20 15:11:20 -08:00
Max Brunsfeld
07bb42898f
Merge pull request #2193 from zed-industries/autoclose-fixes
...
Restructure scope-specific auto-close pairs, fix regression in skipping over auto-closed brackets
2023-02-20 13:51:29 -08:00
Max Brunsfeld
a11165ad0a
Add unit test for auto-closing quotation marks with overrides
2023-02-20 13:46:17 -08:00
Max Brunsfeld
ab82e13167
Run cargo fmt
2023-02-20 11:10:30 -08:00
Julia
0e0170712e
Merge pull request #2192 from zed-industries/format-ci-enforcement
...
Enforce rustfmt on CI & clean up some let-else format errors
2023-02-20 13:55:34 -05:00
Max Brunsfeld
8be844a13f
Add test that loads all bundled languages
2023-02-20 10:53:37 -08:00
Max Brunsfeld
7c98395e77
Add missing comment pattern to TSX overrides query
2023-02-20 10:53:37 -08:00
Max Brunsfeld
8922156923
Restructure how bracket pairs are overridden to unify lists
...
This way, a bracket pair that is disabled in a given scope can still be skipped, if
it was auto-closed before that scope existed.
2023-02-20 10:53:37 -08:00
Max Brunsfeld
51cea1b1fb
Merge branch 'main' into randomized-tests-operation-script
2023-02-20 10:39:00 -08:00
Julia
bda37ffb9c
Enforce rustfmt on CI & clean up some let-else format errors
2023-02-20 13:27:35 -05:00
Max Brunsfeld
2982a98d1c
Merge pull request #2187 from zed-industries/save-untitled-buffer-bugs
...
Fix newly-discovered bugs in saving untitled buffers
2023-02-20 10:05:58 -08:00
Max Brunsfeld
010eba509c
Make Project::save_buffer and ::save_buffers into methods
2023-02-20 09:42:44 -08:00
Max Brunsfeld
56b7eb6b6f
Only send UpdateBufferFile messages for buffers whose files have changed
...
Send that message when saving a buffer as a new path.
2023-02-20 09:41:59 -08:00
Petros Amoiridis
6551742c58
Merge pull request #2191 from zed-industries/petros/z-53-reveal-in-finder-crashes-zed
...
Move reveal_path to ForegroundPlatform
2023-02-20 19:09:54 +02:00
Petros Amoiridis
4bb986b3be
Move reveal_path to ForegroundPlatform
...
So that we can use spawn to use the OS API call.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-20 18:57:37 +02:00
Kay Simmons
efafd1d8d3
Merge pull request #2188 from zed-industries/dont-open-project-items-in-dock
...
Dont open project items in dock
2023-02-18 13:53:29 -08:00
Kay Simmons
0981244797
further tweak comment
2023-02-18 13:53:13 -08:00
Kay Simmons
159d3ab00c
Add comment explaining push_keystroke
2023-02-18 13:49:08 -08:00
Kay Simmons
3fb6e31b92
revert for loop change and store matched actions in a sorted set instead
2023-02-18 13:42:28 -08:00
Kay Simmons
04df00b221
Iterate over keymap then dispatch path when matching keybindings to make precedence more intuitive
...
Rename action which adds the active tab to the dock to be more intuitive
Add action which moves the active tab out of the dock and bind it to the same keybinding
2023-02-18 13:10:01 -08:00
Kay Simmons
dc6f7fd577
pull toggle button into its own file
2023-02-18 12:32:19 -08:00
Kay Simmons
ac3e8f61ef
Merge pull request #2186 from zed-industries/better-vim-matching-motion
...
Better vim matching motion
2023-02-17 22:10:28 -08:00
Kay Simmons
fc811d14b1
Fix failing test
2023-02-17 22:00:39 -08:00
Max Brunsfeld
cdf64b6cad
Unify save and save_as for local worktrees
...
This fixes state propagation bugs due to missing RPC calls in save_as.
2023-02-17 17:21:48 -08:00
Max Brunsfeld
3a7cfc3901
Move the save and save_as code paths close together
2023-02-17 17:21:48 -08:00
Kay Simmons
5e4d113308
fix bracket ranges failing test
2023-02-17 17:19:23 -08:00
Max Brunsfeld
de6eb00e2b
Start work on making save and save_as code paths more similar
2023-02-17 15:52:13 -08:00
Max Brunsfeld
76975c29a9
Refactor: split Project::format logic into local and remote cases
2023-02-17 15:29:54 -08:00
Kay Simmons
57a7ff9a6f
fix vim percent motion to better match the docs and observed behavior
2023-02-17 14:55:19 -08:00
Max Brunsfeld
eebce28b32
Respect UpdateBufferFile messages on guest buffers without file
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-02-17 12:38:04 -08:00
Max Brunsfeld
31dac39e34
Fix assignment of language to formerly-untitled buffers
...
When lazy-loading a language, check if it matches plain text buffers.
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2023-02-17 11:12:57 -08:00
Mikayla Maki
5cfe206433
Merge pull request #2185 from zed-industries/refactor-restart
...
Used the pre-existing app_path call in the GPUI platform
2023-02-17 10:39:45 -08:00
Mikayla Maki
ff2fb06b2c
Used the pre-existing app_path call in the GPUI platform
2023-02-17 10:30:28 -08:00
Mikayla Maki
a5ad2f544e
Update README.md
2023-02-16 16:51:57 -08:00
Mikayla Maki
7b291df21f
Merge pull request #2184 from zed-industries/relaunch
...
Restart
2023-02-16 16:50:20 -08:00
Mikayla Maki
6e33f33da1
Switch to open based restarting
2023-02-16 16:47:43 -08:00
Mikayla Maki
4ea7a24b93
Made the 'update zed to collaborate' button clickable
2023-02-16 14:53:50 -08:00
Julia
48b76f96fc
Merge pull request #2183 from zed-industries/default-settings-yaml-casing
...
Use correct case for YAML in default settings
2023-02-16 16:37:37 -05:00
Julia
c72a50e203
Use correct case for YAML in default settings
2023-02-16 16:37:07 -05:00
Mikayla Maki
43f61ab413
Added action to autoupdate
2023-02-16 13:35:32 -08:00
Mikayla Maki
cf83ecccbb
Added workspace restart command
2023-02-16 13:28:56 -08:00
Kay Simmons
848c6b78d5
Merge pull request #2181 from zed-industries/update-typesript-tree-sitter
...
update tree-sitter-typescript to add support for new satisfies operator
2023-02-16 12:56:40 -08:00
Max Brunsfeld
b90fc046ca
Merge pull request #2180 from zed-industries/turbofish-highlight
...
Highlight functions called with a turbofish in Rust
2023-02-16 12:52:37 -08:00
Max Brunsfeld
98b51634c4
Merge pull request #2182 from zed-industries/faster-injections
...
Fix syntax-related performance problems on gigantic files
2023-02-16 12:52:13 -08:00
Max Brunsfeld
28eb69e74e
Bump tree-sitter for optimization of querying in range
2023-02-16 12:35:35 -08:00
Kay Simmons
b03eebeb6c
update tree-sitter-typescript to add support for new satisfies operator
2023-02-16 12:24:35 -08:00
Kay Simmons
eac33d732e
wip
2023-02-16 12:23:45 -08:00
Max Brunsfeld
2d39358323
rust: Highlight functions called with a turbofish
2023-02-16 12:11:57 -08:00
Joseph T. Lyons
a4a179763a
Merge pull request #2171 from zed-industries/add-option-to-advance-cursor-downward-when-toggling-comment
...
Add option to advance cursor downward when toggling comment
2023-02-16 15:03:38 -05:00
Julia
19b686ad65
Merge pull request #2177 from zed-industries/check-before-test
...
Cargo check before test to catch warnings/errors
2023-02-16 14:43:33 -05:00
Antonio Scandurra
ac882c7db5
Merge pull request #2179 from zed-industries/debounce-diagnostics
...
Simulate disk-based diagnostics finishing 1s after saving buffer
2023-02-16 16:34:19 +01:00
Antonio Scandurra
baee6d0342
Simulate disk-based diagnostics finishing 1s after saving buffer
...
Previously, we would simulate disk-based diagnostics finishing after
saving a buffer. However, the language server may produce diagnostics
right after emitting the event, causing the diagnostics status bar item
to not reflect the latest state of the buffer.
With this change, we will instead simulate disk-based diagnostics finishing
after 1s after saving the buffer (only for language servers that
don't have the concept of disk-based diagnostics, such as TypeScript). This
ensures we always reflect the latest state and doesn't cause the UI to flicker
as a result of the LSP sending us diagnostics after every input.
2023-02-16 16:04:08 +01:00
Julia
50ccf16de1
Cargo check before test to catch warnings/errors
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-02-15 17:53:28 -05:00
Kay Simmons
bef2013c7f
wip
2023-02-15 14:40:14 -08:00
Kay Simmons
2c904cb0bf
Merge pull request #2176 from zed-industries/better-move-to-brackets
...
Make jump to matching bracket action more predictable
2023-02-15 14:32:51 -08:00
Kay Simmons
33306846a6
add tree-sitter-typescript to editor crate test support features
2023-02-15 14:28:50 -08:00
Kay Simmons
30caeeaeb5
fix comment typo
2023-02-15 14:11:00 -08:00
Kay Simmons
0ba051a754
use more predictable rules for selecting which bracket to jump to and where
2023-02-15 14:04:16 -08:00
Max Brunsfeld
32191e318e
Merge pull request #2175 from zed-industries/restore-toggle-dock-binding
...
Put back shift-escape binding for FocusDock action
2023-02-15 14:04:01 -08:00
Max Brunsfeld
7037842bef
Put back shift-escape binding for FocusDock action
2023-02-15 13:57:07 -08:00
Julia
8bd20d8c3a
Merge pull request #2173 from zed-industries/tab-bar-background-focus-pane
...
Focus pane when clicking on tab bar background
2023-02-15 16:07:10 -05:00
Julia
df1775326c
Merge pull request #2172 from zed-industries/window-title-shenanigans
...
Window title shenanigans
2023-02-15 16:03:30 -05:00
Julia
df0715e7c9
Indicate in native window title if project is shared or remote
2023-02-15 15:56:16 -05:00
Julia
e56dfd9177
Tell OS about window title
2023-02-15 15:55:55 -05:00
Joseph Lyons
afb375f909
v0.75.x dev
2023-02-15 14:57:51 -05:00
Joseph T. Lyons
bcf7a32284
Update pull_request_template.md
2023-02-15 14:10:23 -05:00
Joseph Lyons
5fbc9736e5
Add option to advance cursor downward when toggling comment
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-15 14:00:49 -05:00
Petros Amoiridis
fbd23986e3
Merge pull request #2161 from zed-industries/community/3-reveal-in-finder
...
Introduce Reveal in Finder
2023-02-15 16:11:04 +02:00
Antonio Scandurra
114eef8592
Merge pull request #2170 from zed-industries/fix-persistent-lsp-messages
...
Fix LSP status messages persisting
2023-02-15 15:09:01 +01:00
Antonio Scandurra
5df50e2fc9
Add timeouts to HTTP client
2023-02-15 15:00:44 +01:00
Petros Amoiridis
7a667f390b
Use open_url from the platform module
...
And remove the open function from the `util` crate.
2023-02-15 15:58:57 +02:00
Antonio Scandurra
2482a1a9ce
Add timeout to HTTP requests during npm info and npm fetch
2023-02-15 14:48:36 +01:00
Antonio Scandurra
7641965326
Merge pull request #2169 from zed-industries/improve-autocomplete
...
Score matches case-sensitively when query contains an uppercase char
2023-02-15 13:30:05 +01:00
Antonio Scandurra
8db131a3a1
Score matches case-sensitively when query contains an uppercase char
2023-02-15 13:12:45 +01:00
Mikayla Maki
4f1e8c953e
Merge pull request #2168 from zed-industries/auto-update-setting
...
Add auto update setting
2023-02-14 18:10:56 -08:00
Mikayla Maki
c2de0f6b5e
Add auto update setting
2023-02-14 18:05:42 -08:00
Mikayla Maki
17e8172dc3
Merge pull request #2167 from zed-industries/clear-terminal-highlights
...
Reset search matches when the terminal is cleared
2023-02-14 10:02:06 -08:00
Mikayla Maki
8e9d95fefc
Fix error where terminal search matches wouldn't be updated when clearing
2023-02-14 09:54:31 -08:00
Julia
3a7ac9c0ff
Focus pane when clicking on tab bar background
2023-02-14 12:39:29 -05:00
Antonio Scandurra
88c6b890bc
Merge pull request #2165 from zed-industries/toggle-soft-wrap
...
Introduce `editor: toggle soft wrap` bound to `alt-z`
2023-02-14 15:27:31 +01:00
Antonio Scandurra
1012cea4af
Soft wrap at editor width if it's narrower than preferred line length
2023-02-14 15:22:00 +01:00
Antonio Scandurra
4a2b7e4820
Use alt-z to toggle soft wrap in active editor
...
When there isn't a default soft-wrapping for the active editor, we
will soft wrap at the editor width. This is consistent with Visual
Studio Code.
2023-02-14 15:16:06 +01:00
Antonio Scandurra
6c0b35acb0
Merge pull request #2164 from zed-industries/fix-surround-rust-star
...
Surround with bracket only when opening brace is 1 character long
2023-02-14 14:42:13 +01:00
Antonio Scandurra
888fcb5b1b
Surround with bracket only when opening brace is 1 character long
2023-02-14 14:36:18 +01:00
Petros Amoiridis
015b8db1c3
Introduce reveal_path in Platform
...
And implement it for MacPlatform, and instead of using an external process to run `open`, use the NSWorkspace selectFile instance method.
2023-02-14 15:14:15 +02:00
Antonio Scandurra
ebe1fa7a96
Merge pull request #2163 from zed-industries/quick-invite-bug
...
Avoid creating more than one room when inviting multiple people at once
2023-02-14 12:55:21 +01:00
Antonio Scandurra
7be868e372
Avoid creating more than one room when inviting multiple people at once
...
Previously, when initiating a call by calling multiple people, only
the first person would get the call while all the others would briefly
show a "pending" status but never get the call.
This would happen because `ActiveCall` was trying to a create a different
room for each person called, because the original room creation hadn't finished
and so a `ModelHandle<Room>` wasn't being store in the active call.
With this commit, only one room can be created at any given time and further
invites have to wait until that room creation is done.
2023-02-14 12:03:30 +01:00
Antonio Scandurra
087d51634d
Fix test that wasn't properly verifying disconnection from livekit
2023-02-14 10:46:29 +01:00
Max Brunsfeld
ea663f3017
Bump tree-sitter for tree-balancing bugfix
2023-02-13 23:46:44 -08:00
Kay Simmons
5041300b52
Merge pull request #2157 from zed-industries/vim-fixes
...
Vim fixes
2023-02-13 14:21:47 -08:00
Kay Simmons
2c9199fd32
fix build error
2023-02-13 14:12:43 -08:00
Kay Simmons
327932ba3b
Remove catch all keymap and KeyPressed action
2023-02-13 13:50:37 -08:00
Kay Simmons
459060764a
fix sqlez warning, introduce tab and enter bindings to vim for inputing tab and enter text when waiting for text
2023-02-13 13:50:37 -08:00
Kay Simmons
3d53336916
More vim fixes and move some more things out of app.rs
2023-02-13 13:50:37 -08:00
Kay Simmons
c1812ddc27
fix issue with single line editors in vim not properly unhooking vim mode bindings
2023-02-13 13:50:37 -08:00
Mikayla Maki
d80dba1fe3
Switch from vec to smallvec
2023-02-13 12:49:57 -08:00
Antonio Scandurra
6703264600
Limit BufferSnapshot::chunks to the outline item range
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-02-13 19:57:15 +01:00
Nate Butler
5ce147a2ad
Remove unneeded API from theme-tool
2023-02-12 21:04:54 -05:00
Nate Butler
a32c0d1c9b
Update colors.
2023-02-12 21:04:31 -05:00
Nate Butler
e65c0810ba
Add gray color families
2023-02-12 20:02:51 -05:00
Nate Butler
1fcfa5d272
Generate color meta, document functions and tidy.
2023-02-12 19:45:16 -05:00
Nate Butler
addfcdc1f4
Remove bezier-easing from styles
...
This was installed in the wrong app
2023-02-12 11:59:36 -05:00
Nate Butler
4501a5a7ee
Add initial system palette reference colors
2023-02-12 00:15:41 -05:00
Nate Butler
a120996f0d
Test using HSL + curves to build a scale
2023-02-11 23:34:46 -05:00
Joseph T. Lyons
0a50d271b7
Merge pull request #2158 from zed-industries/split-feedback-editor
...
Split up feedback_editor.rs
2023-02-11 23:19:25 -05:00
Joseph T. Lyons
01a590a1fb
Merge pull request #2160 from zed-industries/remove-toggle-right-sidebar-command
...
Remove toggle right sidebar command
2023-02-11 22:17:38 -05:00
Joseph Lyons
d42d495cb0
Remove toggle right sidebar command
2023-02-11 21:53:10 -05:00
Nate Butler
187fac1579
Allow passing a chroma color as a start/mid/end color
2023-02-11 21:10:47 -05:00
Nate Butler
0acb820f04
Document ref/color further
2023-02-11 08:14:13 -05:00
Nate Butler
dda0febf39
Organize
2023-02-11 07:56:41 -05:00
Petros Amoiridis
9143790602
Include code only on macOS
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-02-11 11:12:46 +02:00
Kay Simmons
b31813fad3
Split concepts out into self contained files in feedback editor
2023-02-10 22:50:05 -08:00
Nate Butler
0e238210bb
Update chip style
2023-02-10 22:06:03 -05:00
Mikayla Maki
912c396b37
Merge pull request #2156 from zed-industries/fix-atelier-cave-license
...
Update the atelier cave license file
2023-02-10 12:04:36 -08:00
Mikayla Maki
436ab6e454
Fix other atelier license
2023-02-10 11:58:25 -08:00
Mikayla Maki
889b15683d
Update the atelier cave license file
2023-02-10 11:52:31 -08:00
Mikayla Maki
135dcf19a2
Merge pull request #2154 from zed-industries/fix-tooltip-crash
...
Don't render tooltip keystroke label if there's no focused view
2023-02-10 11:41:03 -08:00
Petros Amoiridis
5d23aaacc8
Introduce an open function
...
And refactor some of the older code to simplify it
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-02-10 21:11:54 +02:00
Petros Amoiridis
a789476c95
Introduce reveal_in_finder function
...
And use this function in a new Reveal in Finder option of the project panel context menu.
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-02-10 21:11:05 +02:00
Nathan Sobo
da5a6a8b4f
Don't render tooltip keystroke label if there's no focused view
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-02-10 07:57:01 -07:00
Nate Butler
76685406ed
Add remaining colors
2023-02-09 23:26:44 -05:00
Nate Butler
70eedbb48e
Group light and dark scales
2023-02-09 13:41:37 -05:00
Nate Butler
42b5fa1fa3
WIP: Use algorithm to generate reference color palette
...
Adapted from @k-vyn/coloralgorithm
Generate colors for our reference palette.
2023-02-09 12:37:05 -05:00
Joseph T. Lyons
7de04abdcb
Merge pull request #2146 from zed-industries/feedback-editor-polish
...
Feedback editor polish
2023-02-09 10:01:27 -05:00
Antonio Scandurra
373e88e9fb
Merge pull request #2147 from zed-industries/fix-pyright
...
Always respond to language server, even when its requests are malformed
2023-02-09 15:52:57 +01:00
Antonio Scandurra
c3a88857f9
Always respond to language server, even when its requests are malformed
...
This was causing Pyright to get stuck waiting for a response when sending
us the `workspace/configuration` request. For some reason, after upgrading
to Pyright 1.1.293, `scopeUri` is being sent as an empty string sometimes,
which causes serde to error when trying to deserialize that request.
Co-Authored-By: Petros Amoiridis <petros@zed.dev >
2023-02-09 15:30:10 +01:00
Nate Butler
f787f6054b
List colors for reference palette in theme tool
2023-02-09 00:39:57 -05:00
Nate Butler
6f342bb2c6
Remove leftovers from create-next-app
2023-02-09 00:10:32 -05:00
Nate Butler
0ba44c6dc4
Start on system colors
2023-02-09 00:09:52 -05:00
Nate Butler
2ff82732b9
Init theme tool
2023-02-09 00:09:44 -05:00
Nate Butler
cbfdfa8124
Remove comment
2023-02-08 22:52:27 -05:00
Joseph Lyons
57e10ce7c6
Style info text
2023-02-08 21:26:27 -05:00
Joseph Lyons
a9c2f42f70
Move string to variable
2023-02-08 21:26:27 -05:00
Joseph Lyons
83f9d51dee
Fix layout of elements in the feedback editor's toolbar
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-08 21:26:27 -05:00
Mikayla Maki
767d2f9766
Merge pull request #2134 from zed-industries/fix-action-keystroke-bugs
...
Fix several action dispatching bugs
2023-02-08 15:56:50 -08:00
Joseph Lyons
3fb14d7caf
v0.74.x dev
2023-02-08 14:55:21 -05:00
Antonio Scandurra
952cdb4e98
Merge pull request #2145 from zed-industries/fix-focus-in-project-search
...
Focus results editor only when starting a new project search
2023-02-08 18:25:02 +01:00
Joseph Lyons
bbe8297297
Add feedback information text
2023-02-08 11:23:44 -05:00
Antonio Scandurra
76c066baee
Focus results editor only when starting a new project search
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2023-02-08 17:22:14 +01:00
Joseph Lyons
654ee48feb
Add tooltip to submit feedback button
2023-02-08 10:37:04 -05:00
Joseph Lyons
ef16963772
Remove placeholder text
2023-02-08 10:22:36 -05:00
Joseph T. Lyons
37c052f53d
Include is_staff boolean in in-app feedback
2023-02-08 10:14:18 -05:00
Joseph T. Lyons
582f5d0114
Merge pull request #2130 from zed-industries/inform-user-that-telemetry-can-be-disabled
...
Inform user that telemetry can be disabled
2023-02-07 21:15:16 -05:00
Joseph T. Lyons
fd016b9bcd
Merge pull request #2133 from zed-industries/feedback-submit-button
...
Implement a button for submitting feedback
2023-02-07 21:13:42 -05:00
Joseph Lyons
317eb7535c
Fix variable names
2023-02-07 21:08:07 -05:00
Kay Simmons
55589533e2
Update yaml-tree-sitter git hash
...
Update yaml-tree-sitter git hash
2023-02-07 15:51:45 -08:00
Kay Simmons
9a8585ce0c
Merge pull request #2144 from zed-industries/yaml-lsp
...
Add yaml language server
2023-02-07 15:44:10 -08:00
Kay Simmons
aa0a18968a
removed unused import
2023-02-07 15:40:29 -08:00
Kay Simmons
0777f459ba
Add yaml language server
2023-02-07 15:34:27 -08:00
Joseph T. Lyons
2732cc2cbe
Merge pull request #2143 from zed-industries/remove-release-action-for-Discourse
...
Remove release action for Discourse
2023-02-07 18:34:21 -05:00
Joseph Lyons
e8dad56af9
Remove release action for Discourse
2023-02-07 18:26:55 -05:00
Mikayla Maki
87cf8ac60e
Fixed strange y results from faulty conversion to screen coordinates
...
co-authored-by: Nathan <nathan@zed.dev >
2023-02-07 15:26:03 -08:00
Joseph T. Lyons
f44658ad2a
Merge pull request #2142 from zed-industries/update-links-to-community-repository
...
Update links to community repository
2023-02-07 18:23:50 -05:00
Joseph Lyons
20377ea4e9
Update links to community repository
2023-02-07 18:19:27 -05:00
Mikayla Maki
db2aaa4367
Fixed bug in setting cursor style
2023-02-07 14:35:46 -08:00
Kay Simmons
099b79910f
Merge pull request #2137 from zed-industries/yaml
...
yaml highlighting
2023-02-07 14:32:02 -08:00
Kay Simmons
fe25994fb3
fix highlights, indents, and tab size for yaml
2023-02-07 14:20:23 -08:00
Joseph Lyons
7cef4a5d40
Allocate theme struct directly into the heap
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-02-07 13:39:48 -05:00
Max Brunsfeld
0c49030ade
Merge pull request #2140 from zed-industries/feedback/929-project-search-crashes
...
Feedback/929 project search crashes
2023-02-07 10:12:00 -08:00
Petros Amoiridis
e15ffc8560
Make truncate_and_trailoff a bit more clear
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-02-07 20:06:20 +02:00
Joseph Lyons
58987275fc
Merge branch 'main' into feedback-submit-button
2023-02-07 12:55:53 -05:00
Petros Amoiridis
9bff82f161
Use truncate_and_trailoff function
...
A function that already works with unicode characters.
2023-02-07 19:25:57 +02:00
Petros Amoiridis
be0241bab1
Add test for string with unicode characters
2023-02-07 19:25:07 +02:00
Kay Simmons
de0b136be2
wip yaml highlighting
2023-02-07 01:00:50 -08:00
Kay Simmons
4e80ae13ec
Merge pull request #2136 from zed-industries/fix-recent-projects-panic
...
Fix Recent Project Panic
2023-02-07 00:38:18 -08:00
Kay Simmons
b020955ac4
show notification if no recent projects
2023-02-07 00:10:11 -08:00
Max Brunsfeld
a606058537
Merge pull request #2135 from zed-industries/handle-window-moved-crash
...
Fix crash when unplugging display containing a zed window
2023-02-06 17:05:32 -08:00
Max Brunsfeld
f065399799
Fix crash when unplugging display containing a zed window
...
Co-authored-by: Kay Simmons <kay@zed.dev >
2023-02-06 16:44:06 -08:00
Mikayla Maki
926b59b15d
Fixed a bug where the command palette wouldn't check the keymap context when showing available actions
...
Fixed a bug where context menus wouldn't show action keystrokes
WIP Fixing a bug where tooltips won't show action keystrokes
Co-Authored-By: Max <max@zed.dev >
2023-02-06 15:42:14 -08:00
Kay Simmons
2d6219ebe2
Merge pull request #2131 from zed-industries/lua
...
Add lua syntax highlighting and lsp support
2023-02-06 15:40:03 -08:00
Joseph Lyons
8228618b9e
Correct theme function name
2023-02-06 18:19:15 -05:00
Joseph Lyons
d4d9a142fc
Implement a button for submitting feedback
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
2023-02-06 17:41:36 -05:00
Kay Simmons
035901127a
remove unused version regex
2023-02-05 23:25:20 -08:00
Kay Simmons
37bfeed2e6
Merge pull request #2129 from zed-industries/move-sharing-status-indicator
...
Move sharing status indicator to collab ui
2023-02-05 23:24:23 -08:00
Kay Simmons
4642817e72
Add lua syntax highlighting and lsp support
2023-02-05 23:21:29 -08:00
Joseph Lyons
83e21387af
Inform user that telemetry can be disabled
2023-02-04 22:18:07 -05:00
Kay Simmons
3e92e4d110
fix unsaved change
2023-02-03 12:47:20 -08:00
Kay Simmons
303216291b
Move sharing status indicator out of the call crate and into collab_ui in order so that the model doesn't depend on the view
2023-02-03 11:17:50 -08:00
Kay Simmons
8be9d21340
Merge pull request #2128 from zed-industries/feedback/922-unify-find-all-references-label
...
Make app menu and context menu labels consistent
2023-02-03 10:29:43 -08:00
Joseph Lyons
9742bd7fd4
Reduce length of feedback placeholder text
2023-02-03 08:14:14 -05:00
Petros Amoiridis
3014cc5299
Do not capitalize prepositions in title case
...
This also match the app menu
2023-02-03 12:16:09 +02:00
Petros Amoiridis
d6b728409f
Be consistent in the app & context menus
2023-02-03 12:14:13 +02:00
Petros Amoiridis
433f284571
Merge pull request #2126 from zed-industries/731-make-cursor-visible-immediately
...
Focus the editor when activating previous pane
2023-02-03 10:12:34 +02:00
Kay Simmons
7270f950b8
Merge pull request #2115 from zed-industries/call-status-indicator
...
Add call status indicator to the status bar
2023-02-02 17:18:22 -08:00
Kay Simmons
ae15673dfd
Merge pull request #2124 from zed-industries/fix-display-uuid-panic
...
Make display uuid optional if the display is disconnected
2023-02-02 17:17:01 -08:00
Joseph T. Lyons
8697f81a37
Merge pull request #2127 from zed-industries/fix-discourse-release
...
Fix discourse release
2023-02-02 14:29:50 -05:00
Joseph T. Lyons
21ded7639a
Merge pull request #2125 from zed-industries/trim-leading-and-trailing-whitespace-in-feedback
...
Trim leading and trailing whitespace in feedback
2023-02-02 13:43:35 -05:00
Joseph Lyons
3f95788d45
Clean up whitespace
2023-02-02 13:38:41 -05:00
Joseph Lyons
1afd6f859d
Fix discourse release action
...
Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com >
2023-02-02 13:38:25 -05:00
Petros Amoiridis
2b0592da21
Guard against tab_bar_context_menu
...
We don't want to have the tab_bar_context_menu as the active item of the pane where the split started from
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-02 20:15:43 +02:00
Petros Amoiridis
8f61134e7e
Allow comparing ViewHandle to AnyViewHandle
...
Since they both have a window_id and a view_id.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-02-02 20:15:40 +02:00
Joseph Lyons
888145ebed
Trim leading and trailing whitespace in feedback
2023-02-02 12:43:55 -05:00
Kay Simmons
a50f0181fb
Add setting to disable the call icon
2023-02-01 16:21:53 -08:00
Kay Simmons
62d32db66c
Make display uuid optional if the display is disconnected
2023-02-01 14:59:43 -08:00
Nate Butler
d6962d957b
Add note to base16.ts
2023-02-01 16:26:08 -05:00
Joseph Lyons
fd2a9b3df9
v0.73.x dev
2023-02-01 13:45:06 -05:00
Kay Simmons
460dc62888
start adding setting for the screen sharing status indicator
2023-01-31 15:17:16 -08:00
Kay Simmons
e35db69dbd
Add call status indicator to the status bar
2023-01-31 15:00:49 -08:00
Mikayla Maki
a89cc22af4
Merge pull request #2113 from zed-industries/terminal-lost-cwd
...
Fix lost terminal working directories
2023-01-30 14:43:43 -08:00
Mikayla Maki
e682e2dd72
Changed SQLez migrations to be executed eagerly
...
Added fix for terminal working directory's sometimes getting lost
co-authored-by: Kay <kay@zed.dev >
2023-01-30 14:38:48 -08:00
Joseph T. Lyons
65641b1d3e
Merge pull request #2112 from zed-industries/fix-version-for-feedback-related-commands
...
Fix version for feedback-related commands
2023-01-30 14:43:33 -05:00
Joseph Lyons
248161aa63
Fix version for feedback-related commands
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-01-30 14:13:25 -05:00
Mikayla Maki
d9278f7416
Merge pull request #2066 from zed-industries/remove-staff-mode
...
Small patches
2023-01-27 15:50:00 -08:00
Mikayla Maki
57781fd7aa
Move StaffMode declaration out of paths
2023-01-27 15:45:33 -08:00
Mikayla Maki
2d889f59bf
Rewrite license documentation to be more clear
2023-01-27 15:44:19 -08:00
Mikayla Maki
2802e3a1c6
Fixed failling tests
2023-01-27 15:44:17 -08:00
Mikayla Maki
ea39983f78
Removed old experiments settings and staff mode flag, added new StaffMode global that is set based on the webserver's staff bit
2023-01-27 15:43:12 -08:00
Mikayla Maki
ca2e0256e1
Renamed open recent action to match menu
2023-01-27 15:38:48 -08:00
Mikayla Maki
070b89243f
Merge pull request #2107 from zed-industries/fix-ci
...
Add an install step to the CI build script
2023-01-27 15:38:12 -08:00
Mikayla Maki
e530406d62
Add an install step to the CI build script
2023-01-27 15:24:21 -08:00
Kay Simmons
ea0dd8972f
Merge pull request #2090 from zed-industries/workspace-window-position-persistence
...
Workspace window position persistence
2023-01-27 15:24:01 -08:00
Kay Simmons
a1308d20ce
Merge pull request #2105 from zed-industries/fix-focus-stealing-when-collaborating
...
Limit focus grabbing in followed pane
2023-01-27 15:23:43 -08:00
Kay Simmons
486b3f64d1
Merge pull request #2106 from zed-industries/fix-local-integration-test-failure
...
fix local failing test
2023-01-27 15:23:23 -08:00
Kay Simmons
0f93386071
Add run until parked to test_fs_operations to ensure both update chunks are completed before asserting the changes
2023-01-27 15:07:51 -08:00
Kay Simmons
77a4f907a0
removed invalid focus assertion
2023-01-27 13:43:36 -08:00
Kay Simmons
d6acea525d
add test for is_child_focused
2023-01-27 13:00:26 -08:00
Kay Simmons
89a5506f43
Add function which checks if a child of a view is focused and use that to only focus item updates from the leader when that the active item was focused
2023-01-27 12:39:32 -08:00
Antonio Scandurra
5431488a9a
collab 0.5.4
2023-01-27 11:07:12 +01:00
Antonio Scandurra
ac7618da17
Merge pull request #2103 from zed-industries/connection-staleness
...
Fix connection staleness issues
2023-01-27 11:01:24 +01:00
Antonio Scandurra
647d9861b1
Abort collaboration process if any thread panics
2023-01-27 09:50:59 +01:00
Mikayla Maki
d7ac15fa71
Merge pull request #2101 from zed-industries/theme-licenses
...
Added build-licenses command to style tree
2023-01-26 18:29:20 -08:00
Mikayla Maki
3a1d533c01
Combine both license generations into one file
2023-01-26 18:25:28 -08:00
Mikayla Maki
c44acaefff
Added build-licenses command to style tree
2023-01-26 17:33:54 -08:00
Kay Simmons
1593b1e13d
window position restoration working
2023-01-26 16:35:00 -08:00
Max Brunsfeld
fabcdb909a
Merge pull request #2100 from zed-industries/visible-worktrees-in-collab-ui
...
Omit hidden worktrees when showing projects in collaboration UI
2023-01-26 15:01:10 -08:00
Max Brunsfeld
f99e4043c4
Run CI for version branches but not all branches starting with 'v'
2023-01-26 14:57:24 -08:00
Max Brunsfeld
1b45911857
Omit hidden worktrees when showing projects in collaboration UI
2023-01-26 14:47:37 -08:00
Max Brunsfeld
4918ad5789
Merge pull request #2099 from zed-industries/empty-go-to-def-multibuffer
...
Avoid opening a definitions tab if there are no definitions found
2023-01-26 10:35:35 -08:00
Max Brunsfeld
9f86748aff
Avoid opening a definitions tab if there are no definitions found
2023-01-26 10:30:01 -08:00
Petros Amoiridis
489be5e77b
Merge pull request #2077 from zed-industries/2064-remove-contacts
...
Remove contact from contact list
2023-01-26 20:04:15 +02:00
Max Brunsfeld
b396e153d1
Merge pull request #2098 from zed-industries/help-menu-licenses
...
Add 'view dependency licenses' item to Help appication menu
2023-01-26 09:56:44 -08:00
Max Brunsfeld
1c572fd86e
Add 'view dependency licenses' item to Help appication menu
2023-01-26 09:53:46 -08:00
Petros Amoiridis
73af155dd6
Refactor Database::remove_contact
...
Refactor it to avoid sending irrelevant messages to update the UI.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-26 19:01:51 +02:00
Antonio Scandurra
eca6115e4b
Ensure proto::UpdateWorktree::removed_entries doesn't exceed chunk size
...
This was causing the database to panic because we were trying to remove too
many entries at once.
2023-01-26 17:26:31 +01:00
Antonio Scandurra
74aeec360d
Cancel pending call when participant leaves room after a reconnection
...
Previously, if a user temporarily disconnected while there was a pending
call, we would fail to cancel such pending call when the caller left the
room. This was due to the caller reconnecting and having a different connection
id than the one originally used to initiate the call.
2023-01-26 16:44:55 +01:00
Petros Amoiridis
2f26fcd889
Merge branch 'main' into 2064-remove-contacts
2023-01-26 16:34:17 +02:00
Joseph T. Lyons
a4d9d6c750
Merge pull request #2095 from zed-industries/fix-crash-when-opening-feedback-while-in-call
...
Fix crash when opening feedback while in call
2023-01-25 21:16:12 -05:00
Max Brunsfeld
a2a3ebc42f
Merge pull request #2096 from zed-industries/lazy-load-languages
...
Load languages lazily in the background
2023-01-25 18:09:45 -08:00
Max Brunsfeld
ddf4e1a316
Load languages lazily in the background
2023-01-25 17:47:46 -08:00
Kay Simmons
a369fb8033
better but still broken
2023-01-25 17:05:57 -08:00
Joseph Lyons
9ff34bcb6a
Remove no-longer-needed method
2023-01-25 20:03:44 -05:00
Julia
10f130ee30
Merge pull request #2094 from zed-industries/project-lost-window-close-action-shortcut-accessibility
...
Add "Close Window" global action which does not need a focused workspace
2023-01-25 18:58:22 -05:00
Julia
3819a67185
Add "Close Window" global action which does not need a focused workspace
2023-01-25 18:51:25 -05:00
Joseph Lyons
6e7101ca6b
Fix crash when opening feedback while in call
2023-01-25 17:48:01 -05:00
Julia
2df2d09e3c
Merge pull request #2091 from zed-industries/style
...
Style
2023-01-25 15:22:52 -05:00
Joseph Lyons
4c3244b982
v0.72.x dev
2023-01-25 15:20:41 -05:00
Julia
a79b4e312b
Style
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-01-25 15:09:57 -05:00
Kay Simmons
5eac797a93
mostly working now
2023-01-25 11:36:38 -08:00
Kay Simmons
a581d0c5b8
wip
2023-01-25 11:32:19 -08:00
Kay Simmons
15799f7af6
wip
2023-01-25 11:32:19 -08:00
Joseph T. Lyons
81ed961659
Merge pull request #2088 from zed-industries/add-cursor-position-to-feedback-editor
...
Add cursor position to feedback editor
2023-01-25 14:29:24 -05:00
Max Brunsfeld
9db55b3029
Merge pull request #2087 from zed-industries/buffer-language-registry
...
Assign the language registry to all buffers in the project
2023-01-25 11:25:40 -08:00
Joseph Lyons
328b779185
Clean up construction of FeedbackEditor
2023-01-25 14:20:58 -05:00
Joseph Lyons
7f3d937938
Count chars
2023-01-25 14:20:40 -05:00
Joseph Lyons
f68f9f37ab
Add cursor position to feedback editor
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2023-01-25 14:20:23 -05:00
Julia
c22d13286d
Merge pull request #2085 from zed-industries/cleanup-debug-printing
...
Clean up some debug printing
2023-01-25 14:18:43 -05:00
Joseph Lyons
44c7f162b6
Merge branch 'main' into add-cursor-position-to-feedback-editor
2023-01-25 14:01:45 -05:00
Max Brunsfeld
7003a475a7
Assign the language registry to all buffers in the project
2023-01-25 10:44:15 -08:00
Julia
3d8dbee76a
Clean up some debug printing
2023-01-25 13:37:04 -05:00
Petros Amoiridis
160870c9de
Improve user notification
...
The message is not really true. When one declines, the other person can notice that the contact request is not pending any more. They will know. Switching to not alerted is closer to what is really happening.
2023-01-25 19:46:51 +02:00
Mikayla Maki
ba6ffd8256
Merge pull request #2081 from zed-industries/fix-failing-ci
...
Fixes a broken conditional that is only caught on darwin systems
2023-01-25 09:45:30 -08:00
Mikayla Maki
ecb7d1072f
Fixes a broken conditional that is only caught on darwin systems
2023-01-25 09:33:07 -08:00
Mikayla Maki
38b83a70aa
Merge pull request #2078 from zed-industries/fix-cursor-style
...
Fix cursor style thrashing on overlapping windows
2023-01-25 09:15:55 -08:00
Mikayla Maki
1fc6276eab
Remove debug wiring
2023-01-25 09:10:51 -08:00
Mikayla Maki
45e4e3354e
Changed the presenter to only send 'set_cursor_style' on the topmost window
...
co-authored-by: Antonio <antonio@zed.dev >
2023-01-25 09:10:35 -08:00
Mikayla Maki
27a80a1c94
WIP
2023-01-25 09:10:35 -08:00
Mikayla Maki
426aeb7c5e
WIP - adds platform APIs for checking the top most window
2023-01-25 09:10:35 -08:00
Petros Amoiridis
35524db136
Add a confirmation prompt
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-25 18:55:08 +02:00
Petros Amoiridis
e928c1c61e
Test removing a contact
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-25 17:31:42 +02:00
Petros Amoiridis
5d4eb2b7ae
Push responder and requester to remove_contacts
...
When we ask the server to remove a contact we need to push the requester and responder ids to `remove_contacts` so that when the UI updates, the correct contacts will disappear from the list.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-25 13:10:29 +02:00
Petros Amoiridis
db978fcb6c
Add an x mark icon to the list of contacts
...
We want to be able to remove contacts from our list. This was not possible. This change add an icon and dispatches the RemoveContact action.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-25 13:10:29 +02:00
Joseph Lyons
3329b2bbd6
Remove gpui:: prefix from parameters
2023-01-24 19:46:04 -05:00
Joseph T. Lyons
a66a0cfd70
Merge pull request #2075 from zed-industries/add-upper-character-count-limit
...
Add upper character count limit
2023-01-24 19:44:19 -05:00
Julia
27ee994e17
Merge pull request #2074 from zed-industries/decode-openurl-to-pathbuf
...
Decode URL from `openURLs` to handle percent encoded paths
2023-01-24 19:08:17 -05:00
Julia
0414723a54
Decode URL from openURLs to handle percent encoded paths
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-01-24 18:48:15 -05:00
Joseph Lyons
588419492a
Add upper character count limit
2023-01-24 17:38:20 -05:00
Max Brunsfeld
52296836fe
Merge pull request #2069 from zed-industries/markdown-fenced-blocks
...
Support syntax highlighting in Markdown fenced code blocks
2023-01-24 14:19:36 -08:00
Max Brunsfeld
678ee26c5e
Merge branch 'main' into markdown-fenced-blocks
2023-01-24 14:13:50 -08:00
Julia
29d67452e0
Merge pull request #2072 from zed-industries/os-file-associations
...
Insert macOS file association metadata during bundle process
2023-01-24 17:09:41 -05:00
Max Brunsfeld
51984f0d39
Fix feedback editor compile error due to LanguageRegistry API change
2023-01-24 14:09:24 -08:00
Julia
4d73d4b1b9
Insert macOS file association metadata during bundle process
2023-01-24 17:07:02 -05:00
Max Brunsfeld
9c25d37dfc
Merge branch 'main' into randomized-tests-operation-script
...
In randomized integration test, incorporate random updates of existing
files into the test's new structure.
2023-01-24 12:39:24 -08:00
Nathan Sobo
e8cea130a4
Merge pull request #2068 from zed-industries/doc-reparse
...
Document Buffer::reparse
2023-01-24 09:09:38 -07:00
Antonio Scandurra
dff08d3cfe
Merge branch 'main' into markdown-fenced-blocks
2023-01-24 15:43:35 +01:00
Antonio Scandurra
c48e3f3d05
Reparse unknown injection ranges in buffer when adding a new language
2023-01-24 15:29:59 +01:00
Antonio Scandurra
f3509824e8
WIP: Start on SyntaxMapSnapshot::unknown_injection_languages
2023-01-24 12:55:49 +01:00
Antonio Scandurra
14c72cac58
Store syntax layers even if a language for the injection can't be found
2023-01-24 12:25:12 +01:00
Joseph T. Lyons
f95bda64ba
Merge pull request #2009 from zed-industries/in-app-feedback
...
In app feedback
2023-01-24 01:05:05 -05:00
Nathan Sobo
96ffe84edb
Document Buffer::reparse
2023-01-23 21:51:10 -07:00
Joseph Lyons
2b3d09f70a
Fix CI missing license check
2023-01-23 18:34:10 -05:00
Joseph Lyons
8e8f66a5e1
Merge branch 'main' into in-app-feedback
2023-01-23 18:24:12 -05:00
Joseph Lyons
c9299a49e1
Clean out unused code
2023-01-23 18:19:10 -05:00
Mikayla Maki
9f048a4b1c
Merge pull request #2044 from zed-industries/licensing-scripts
...
Licensing scripts
2023-01-23 12:58:27 -08:00
Mikayla Maki
0f0d5d5726
Added cargo-about auto-install and CI steps
2023-01-23 12:51:32 -08:00
Mikayla Maki
d060114f00
Added complete scripts for generating third party license files
2023-01-23 12:47:12 -08:00
Mikayla Maki
9d58032064
Add action to open licenses file
2023-01-23 12:45:18 -08:00
Mikayla Maki
4609be20de
WIP: Adding license compliance to CI
2023-01-23 12:43:42 -08:00
Mikayla Maki
4d05d61ed7
Merge pull request #2049 from zed-industries/425-create-file-for-cli
...
Create files passed as args to CLI
2023-01-23 10:44:55 -08:00
Antonio Scandurra
8dabdd1baa
Ensure injection layer is recomputed when language changes
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2023-01-23 19:02:06 +01:00
Julia
4678f6e0a5
Merge pull request #2063 from zed-industries/active-tab-close-icon-pointing-hand
...
Avoid stomping on tab close icon's cursor style
2023-01-23 11:48:35 -05:00
Julia
95b259b841
Avoid stomping on tab close icon's cursor style
2023-01-23 11:43:50 -05:00
Antonio Scandurra
79cf6fb8b6
WIP: Add test for dynamic language injection
2023-01-23 09:45:36 +01:00
Antonio Scandurra
cb610f37f2
WIP: Search language injections also by file extension
...
There are still a few things left:
1. Add test to verify we can successfully locate a language by its extension
2. Add test to reproduce bug where changing the fenced code block language
won't reparse the block with the new language
3. Reparse injections for which we couldn't find a language when the language
registry changes.
4. Check why the markdown grammar considers the trailing triple backtick as
`(code_block_content)`, as opposed to being part of the outer markdown.
2023-01-23 08:56:41 +01:00
Antonio Scandurra
36e4dcef16
Avoid allocating a string to compare language names
2023-01-23 08:56:41 +01:00
Antonio Scandurra
c49dc8d6e5
Rename LanguageRegistry::get_language to language_for_name
2023-01-23 08:56:41 +01:00
Antonio Scandurra
f086fa3f21
Add syntax injections for Markdown fenced code blocks
2023-01-23 08:56:41 +01:00
Joseph Lyons
c118f9aabd
Fix new errors after merge
2023-01-23 01:31:02 -05:00
Joseph Lyons
f2a5a4d0fd
Merge branch 'main' into in-app-feedback
2023-01-23 01:20:10 -05:00
Joseph Lyons
fb2278dc6d
Complete first iteration of in-app feedback
2023-01-23 00:59:46 -05:00
Mikayla Maki
50d37e1ae7
Merge pull request #2060 from zed-industries/fix-ci-fail
...
Fix mismatched return types on CI
2023-01-20 18:28:59 -08:00
Mikayla Maki
8dcaa81aad
switch return type of accepts_first_mouse
2023-01-20 18:19:24 -08:00
Max Brunsfeld
e1a58e9381
Merge pull request #2059 from zed-industries/no-indent-adjustment-on-error
...
Avoid adjusting indentation of lines inside of newly-created errors
2023-01-20 17:13:30 -08:00
Max Brunsfeld
56080771e6
Add test for avoiding indent adjustment inside newly-created errors
2023-01-20 17:02:38 -08:00
Mikayla Maki
bb24f1142f
Removed dbg
2023-01-20 16:47:23 -08:00
Mikayla Maki
94b2f8e07f
Merge pull request #2054 from zed-industries/notification-mouse-events
...
Notification mouse events
2023-01-20 16:41:27 -08:00
Mikayla Maki
310d867aab
Switch PopUp windows to use the NSTrackingArea API and add support for the mouseExited event
...
Co-authored-by: Antonio <antonio@zed.dev >
2023-01-20 16:35:25 -08:00
Max Brunsfeld
9f74d6e4ac
Highlight and auto-indent await expressions in rust
2023-01-20 15:56:56 -08:00
Max Brunsfeld
f7ceebfce3
Avoid adjusting indentation of lines inside newly-created errors
2023-01-20 15:56:45 -08:00
Joseph Lyons
083986dfae
WIP
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-01-20 18:05:24 -05:00
Max Brunsfeld
df1e1295e3
Merge pull request #2056 from zed-industries/confirm-quit
...
Add confirm_quit setting
2023-01-20 14:11:02 -08:00
Joseph Lyons
c1934d6232
WIP
2023-01-20 16:56:56 -05:00
Kay Simmons
4bee273511
Merge pull request #2057 from zed-industries/multiple-definitions-multibuffer
...
Multiple Definitions Multibuffer
2023-01-20 13:49:07 -08:00
Kay Simmons
2e37c0ea4a
Open multiple definitions in a multibuffer instead of opening the files directly
2023-01-20 13:28:13 -08:00
Max Brunsfeld
2f42af2ac3
Add confirm_quit setting
2023-01-20 13:02:38 -08:00
Max Brunsfeld
be2c601176
Merge pull request #2055 from zed-industries/language-config-overrides
...
Language config overrides
2023-01-20 11:15:26 -08:00
Max Brunsfeld
8dcef46842
Drop 'override.' prefix from capture names in override query
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-01-20 10:44:33 -08:00
Max Brunsfeld
2aa7a9e95b
Add overrides for all languages
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-01-20 10:39:31 -08:00
Mikayla Maki
8af1294ba5
Changed platform mouse moved handling to only fire on active or popup windows
...
co-authored-by: Antonio <antonio@zed.dev >
2023-01-20 09:37:09 -08:00
Mikayla Maki
5a00729fad
Merge pull request #2051 from zed-industries/show-following-to-followed
...
Show following to followed
2023-01-20 09:23:34 -08:00
Mikayla Maki
97203e1e02
Fix broken merge
2023-01-20 09:19:58 -08:00
Mikayla Maki
95e661a78c
Switched from active hover to NSViews acceptsFirstMouse API
...
Co-authored-by: Nathan <nathan@zed.dev >
2023-01-20 09:14:38 -08:00
Julia
b54b77b9ec
Merge pull request #2053 from zed-industries/on-move-out
...
Hide hovers when mouse leaves area & window focus is lost
2023-01-20 10:55:26 -05:00
Julia
467e3dc50a
Hide editor hover on mouse move out & always notify when hiding hover
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-20 10:16:24 -05:00
Julia
131f3471fc
Don't dispatch mousemove without focus & avoid swallowing external moves
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-20 10:11:28 -05:00
Mikayla Maki
88170df7f0
Switched from active hover to NSViews acceptsFirstMouse API
2023-01-19 15:21:26 -08:00
Max Brunsfeld
2967b46a17
Implement scope-specific bracket matching and comment toggling
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-01-19 15:04:27 -08:00
Mikayla Maki
4eeb1aec50
Adds UI for showing the followed-by status to collaboration
2023-01-19 14:22:12 -08:00
Max Brunsfeld
1851e2e77c
Start work on language config overrides
...
Co-authored-by: Julia Risley <julia@zed.dev >
2023-01-19 12:32:08 -08:00
Mikayla Maki
4a46227909
Change incoming call notification to only require one click
2023-01-19 11:43:46 -08:00
Mikayla Maki
86371d9f5e
Merge pull request #2050 from zed-industries/disable-soft-wrap-in-single-line-editors
...
Disable soft wrap in single line editors
2023-01-19 11:26:54 -08:00
Joseph Lyons
38476f5429
Disable soft wrap in single line editors
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-01-19 13:45:05 -05:00
Petros Amoiridis
6c9422808a
Merge pull request #2048 from zed-industries/408-add-date-to-zedlog
...
Add date to the log format
2023-01-19 20:26:01 +02:00
Petros Amoiridis
d30e129d63
Create files passed as args to CLI
...
Co-Authored-by: Mikayla <mikayla@zed.dev >
2023-01-19 19:38:05 +02:00
Julia
ad1947fa50
Add in-window on-move-out mouse handler concept
2023-01-19 12:34:13 -05:00
Petros Amoiridis
f088de5947
Add date to the log format
...
Co-Authored-By: Mikayla <mikayla@zed.dev >
2023-01-19 19:05:17 +02:00
Antonio Scandurra
c85ad96b45
Merge pull request #2047 from zed-industries/optimize-large-multi-buffers
...
Avoid stalling the UI thread when running large searches
2023-01-19 17:31:14 +01:00
Antonio Scandurra
1f649e52de
Document RopeFingerprint
2023-01-19 17:25:59 +01:00
Antonio Scandurra
0a7111d216
Fix tests
2023-01-19 16:26:27 +01:00
Antonio Scandurra
a58b39f884
Merge branch 'main' into optimize-large-multi-buffers
2023-01-19 16:18:21 +01:00
Antonio Scandurra
c124caeb0d
Add test for stream_excerpts_with_context_lines
2023-01-19 15:54:32 +01:00
Antonio Scandurra
5ce065ac92
Introduce MultiBuffer::stream_excerpts_with_context_lines
...
This allows us to push excerpts in a streaming fashion without blocking
the main thread.
2023-01-19 15:42:14 +01:00
Max Brunsfeld
5189dea3d5
Merge pull request #2046 from zed-industries/line-breaks-in-outline-items
...
Prevent outline items from accidentally spanning multiple lines
2023-01-18 16:46:45 -08:00
Max Brunsfeld
d9948bf772
Prevent outline items from accidentally spanning multiple lines
2023-01-18 16:43:18 -08:00
Max Brunsfeld
062e7a03a9
Update comments in Pane::close_items
2023-01-18 15:17:44 -08:00
Max Brunsfeld
17b4bfdf98
Merge pull request #2045 from zed-industries/fewer-unsaved-prompts
...
Avoid prompting to save when closing an untitled buffer that is still open elsewhere
2023-01-18 15:10:19 -08:00
Max Brunsfeld
06c31a0daa
Fix workspace tests after changing Item trait
2023-01-18 15:00:40 -08:00
Mikayla Maki
203f569f2e
collab 0.5.3
2023-01-18 12:52:58 -08:00
Mikayla Maki
b0fb5913b6
v0.71.x dev
2023-01-18 12:39:38 -08:00
Petros Amoiridis
6cc84a77c8
Merge pull request #2042 from zed-industries/fix-pasting-files
...
Allow pasting the same entry more than once in project panel
2023-01-18 18:37:31 +02:00
Petros Amoiridis
27a6951403
Allow pasting the same entry more than once in project panel
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-18 17:35:21 +02:00
Petros Amoiridis
9f3c8c1e3a
Merge pull request #2041 from zed-industries/fix-renaming-file
...
Fix mouse interrupting file/dir editing in project panel
2023-01-18 15:53:08 +02:00
Antonio Scandurra
a8f466b422
Don't starve the main thread adding too many search excerpts at once
2023-01-18 14:22:23 +01:00
Petros Amoiridis
f8d092fdc6
Fix mouse interrupting file/dir editing in project panel
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2023-01-18 15:22:20 +02:00
Antonio Scandurra
8ca0f9ac99
Fix compile errors
2023-01-18 13:58:01 +01:00
Antonio Scandurra
a653e87658
WIP: Avoid converting RopeFingerprint into a string
...
Co-Authored-By: Petros Amoiridis <petros@zed.dev >
2023-01-18 12:22:08 +01:00
Joseph Lyons
bec03dc882
WIP
2023-01-18 00:12:52 -05:00
Kay Simmons
2c3c8b4cb0
Merge pull request #2039 from zed-industries/vim-mode-single-line-editors
...
disable vim mode in non full editors
2023-01-17 18:43:16 -08:00
Max Brunsfeld
a0a50cb412
Set up fake project paths correctly in tests
2023-01-17 17:40:34 -08:00
Kay Simmons
cf193154e1
fix broken test
2023-01-17 17:35:39 -08:00
Kay Simmons
c3518cefe8
disable vim mode in non full editors
2023-01-17 17:32:10 -08:00
Kay Simmons
4746fb5936
Merge pull request #2038 from zed-industries/fix-sidebar-width-with-dock
...
Fix issue with sidebars resizing themselves when dock is toggled
2023-01-17 17:22:24 -08:00
Max Brunsfeld
8651320c9f
Make workspace items expose their underlying models, remove file-related methods
2023-01-17 17:21:06 -08:00
Kay Simmons
c9a306b4ac
Change sidebars to use the window width as a max width rather than participating in the flex
...
co-authored-by: Mikayla <mikayla@zed.dev >
2023-01-17 16:58:55 -08:00
Max Brunsfeld
292708573f
Replace MultiBuffer::files with ::for_each_buffer
2023-01-17 16:16:44 -08:00
Joseph T. Lyons
c3b102f5a8
Add users to mailing list when using an invite link
2023-01-17 16:46:01 -05:00
Max Brunsfeld
f61b870db6
Merge pull request #2034 from zed-industries/tab-focus-search
...
Use tab instead of command-f to move focus from the search editor to the main editor
2023-01-17 10:25:04 -08:00
Max Brunsfeld
1a6a807db5
Merge pull request #2035 from zed-industries/always-auto-indent-block-on-paste
...
Always auto-indent in block-wise mode when pasting
2023-01-17 10:24:41 -08:00
Antonio Scandurra
01aac0de48
Merge pull request #2036 from zed-industries/spurious-modified-buffers
...
Fix buffers appearing as modified when guest joined after buffer had been saved
2023-01-17 18:21:21 +01:00
Antonio Scandurra
dc88a67f50
Fix assertions
2023-01-17 18:09:45 +01:00
Julia
5ce0472a75
Merge pull request #2037 from zed-industries/go-to-fit
...
Utilize fit autoscroll for various go-to actions
2023-01-17 10:49:22 -05:00
Antonio Scandurra
cc788dc5f7
Verify saved_version, saved_version_fingerprint and saved_mtime
2023-01-17 16:46:06 +01:00
Julia
7726a9ec3d
Utilize fit autoscroll for various go-to actions
2023-01-17 10:42:53 -05:00
Antonio Scandurra
fcf97ab41e
Bump protocol version
2023-01-17 16:32:54 +01:00
Antonio Scandurra
bb200aa082
Relay saved version metadata to ensure buffers modified state converges
2023-01-17 16:32:54 +01:00
Antonio Scandurra
2cd9db1cfe
Ensure Buffer::{is_dirty,has_conflict} converge in randomized test
2023-01-17 16:32:51 +01:00
Antonio Scandurra
467e5691b9
Include saved mtime and fingerprint when serializing buffers
...
This still doesn't include:
- An assertion in the randomized test to ensure buffers are not spuriously
marked as modified
- Sending an update when synchronizing buffers after a reconnection
2023-01-17 10:46:19 +01:00
Max Brunsfeld
0bd6f9b6ce
Add a test for block-wise auto-indent without original indent info
2023-01-16 18:06:58 -08:00
Max Brunsfeld
244f259331
Always auto-indent in block-wise mode when pasting
...
If the text was copied outside of Zed, so the original indent column is unknown,
then act as if the first line was copied in its entirety.
2023-01-16 17:42:06 -08:00
Max Brunsfeld
625151806a
Merge pull request #2022 from zed-industries/restart-lsp-after-invalid-version-reported
...
Fix crash when restarting a language server after it reports an unknown buffer version
2023-01-16 16:26:50 -08:00
Max Brunsfeld
6810490bf4
Remove tree-sitter dependency from gpui
2023-01-16 16:11:13 -08:00
Max Brunsfeld
3312a06368
Move focus back from buffer search using tab, not cmd-f
2023-01-16 16:01:15 -08:00
Max Brunsfeld
373902d933
Add '>' child operator in keymap context predicates
2023-01-16 16:00:46 -08:00
Max Brunsfeld
f62d13de21
Use a hand-coded parser for keymap context predicates
2023-01-16 15:53:49 -08:00
Julia
df2e9625b3
Merge pull request #2033 from zed-industries/open-with-zed
...
Make Finder "Open With" work correctly
2023-01-16 16:39:02 -05:00
Julia
765773cfe6
Make Finder "Open With" work correctly
2023-01-16 16:34:10 -05:00
Max Brunsfeld
9e5612348c
Merge pull request #2032 from zed-industries/drag-split-dock-panic
...
Fix panic when trying to create a split in the dock by dragging
2023-01-16 11:51:28 -08:00
Max Brunsfeld
aa9710f7c3
Avoid unwrapping pane split in SplitWithProjectEntry
...
Also, implement pane-splitting operations more consistently.
2023-01-16 11:46:47 -08:00
Max Brunsfeld
b90e1012bf
Don't render split drag targets in the dock
2023-01-16 10:24:17 -08:00
Max Brunsfeld
2c84b74126
Avoid retaining project in randomized test while LSP request is outstanding
2023-01-16 09:48:54 -08:00
Antonio Scandurra
96186a3dae
Merge pull request #2030 from zed-industries/fix-typescript-lsp
...
Fix error when running TypeScript language server after version 3.0.2
2023-01-16 17:33:44 +01:00
Antonio Scandurra
2c1fd7b0bf
Add a 5s timeout when running npm info and npm install
...
This prevents those two commands from getting stuck when there is
no internet connection.
2023-01-16 16:51:45 +01:00
Antonio Scandurra
9779663c6b
Use cli.mjs when available in TypeScript language server
...
Otherwise, fall back to using `cli.js`.
2023-01-16 16:50:30 +01:00
Joseph T. Lyons
8e02266d07
Add Discourse release action
2023-01-14 02:30:21 -05:00
Max Brunsfeld
1a9ff2420e
Clean up how applications are marked as inapplicable
2023-01-12 22:09:36 -08:00
Max Brunsfeld
e04d0be853
Remove unneeded log messages in randomized test
2023-01-12 14:30:53 -08:00
Max Brunsfeld
00e8625037
Simplify management of entity ids for different app contexts in randomized test
2023-01-12 14:30:10 -08:00
Max Brunsfeld
a3c7416218
Don't include user ids with MutateClients ops in serialized test plans
2023-01-12 14:28:31 -08:00
Mikayla Maki
24ef80f4b6
Merge pull request #2027 from zed-industries/fix-keybindings-in-command-palette
...
Fix bug where keybindings would not show in command palette
2023-01-11 16:40:04 -08:00
Mikayla Maki
febf992a43
Fix bug where keybindings would not show in command palette
2023-01-11 16:35:49 -08:00
Kay Simmons
e9fdb13cb5
Merge pull request #2025 from zed-industries/vim-r
...
Vim replace
2023-01-11 16:28:39 -08:00
Kay Simmons
216b1aec08
fix replace in normal and visual modes
2023-01-11 14:57:40 -08:00
Max Brunsfeld
02f6928328
collab 0.5.2
2023-01-11 14:00:44 -08:00
Max Brunsfeld
fe27f135c0
Bump protocol version after reconnect support
2023-01-11 14:00:16 -08:00
Max Brunsfeld
74f8b493b2
collab 0.5.1
2023-01-11 13:25:28 -08:00
Max Brunsfeld
49379924cb
Avoid dropping is_complete column for backward compatibility
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-01-11 13:25:02 -08:00
Kay Simmons
14eec66e38
in progress
2023-01-11 12:10:55 -08:00
Mikayla Maki
048da9ddce
collab 0.5.0
2023-01-11 10:50:16 -08:00
Mikayla Maki
9c627e82a0
v0.70.x dev
2023-01-11 10:34:11 -08:00
Mikayla Maki
14899d867e
Merge pull request #2020 from zed-industries/telemtry-opt-out
...
Telemetry opt out
2023-01-10 17:43:30 -08:00
Max Brunsfeld
db831c3fbb
Remove roadmap from readme
2023-01-10 17:38:34 -08:00
Mikayla Maki
bfb43c67f8
Silence spurious log error
...
co-authored-by: Kay <kay@zed.dev >
2023-01-10 16:50:54 -08:00
Mikayla Maki
a3da41bfad
Fix test failures due to dependency on Settings global in client for telemetry
...
co-authored-by: kay <kay@zed.dev >
2023-01-10 16:39:03 -08:00
Max Brunsfeld
ef987cae6b
Merge pull request #2019 from zed-industries/panic-activating-next-pane-in-dock
...
Fix crash when activating prev/next pane while dock is active
2023-01-10 16:27:39 -08:00
Max Brunsfeld
41ff42ddec
Fix crash when restarting a language server after it reports an unknown buffer version
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-01-10 16:27:15 -08:00
Mikayla Maki
37a4de1a84
Add opt-out for metric reporting
...
co-authored-by: kay <kay@zed.dev >
2023-01-10 15:49:54 -08:00
Max Brunsfeld
551dc1f318
Fix crash when activating prev/next pane while dock is active
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2023-01-10 15:32:14 -08:00
Mikayla Maki
866f0e1344
Add the ability to opt-out of panic reporting
...
Co-authored-by: Kay <kay@zed.dev >
2023-01-10 15:07:01 -08:00
Kay Simmons
a222821dfa
Merge pull request #2017 from zed-industries/dont-save-single-file-workspaces
...
Don't save single file worktrees
2023-01-09 17:31:34 -08:00
Mikayla Maki
d49a29d793
Merge pull request #2016 from zed-industries/serialization-updates
...
Serialization touch ups
2023-01-09 16:18:30 -08:00
Kay Simmons
176738d674
Address issue with workspaces where single file worktrees such as those from git commit messages would get restored
...
Co-authored-by: Mikayla <mikayla@zed.dev >
2023-01-09 16:18:04 -08:00
Max Brunsfeld
576a9bb92c
Drop project's buffers when closing a remote project
2023-01-09 14:49:36 -08:00
Mikayla Maki
ebbe6e7aa9
Add serializing and restoring editor scroll position
...
Co-authored-by: Kay <kay@zed.dev >
2023-01-09 14:06:40 -08:00
Mikayla Maki
d237bdaa9b
Added support for ALTER TABLE syntax in the syntax error checker function
...
Co-authored-by: Kay <kay@zed.dev >
2023-01-09 12:41:37 -08:00
Max Brunsfeld
5a4fa4b11e
Merge branch 'main' into randomized-tests-operation-script
2023-01-09 12:26:11 -08:00
Max Brunsfeld
3e3a703b60
Skip inapplicable operations when running an edited test plan
2023-01-09 11:36:53 -08:00
Joseph Lyons
5517e743e1
Merge branch 'main' into in-app-feedback
2023-01-09 14:05:30 -05:00
Joseph Lyons
c1e61b479c
Move feedback items into a feedback crate
2023-01-09 13:55:06 -05:00
Mikayla Maki
828f406b4f
Fixed issue where serialized terminal working directories would be lost in complex interactions
...
Co-authored-by: Kay <kay@zed.dev >
Co-authored-by: Julia <julia@zed.dev >
2023-01-09 10:54:13 -08:00
Mikayla Maki
e743f3b1d8
Merge pull request #2015 from zed-industries/screenshare-on-terminal
...
Added open screenshare when following into non-followable buffer
2023-01-09 10:28:46 -08:00
Mikayla Maki
69e28d04b0
Added open screenshare when following into non-followable buffer
2023-01-09 10:19:11 -08:00
Julia
2be4f41964
Merge pull request #2013 from zed-industries/autocomplete-require-word-start-match
...
Require first codepoint of autocomplete query to match the first codepoint of some completion's subword
2023-01-09 13:06:43 -05:00
Julia
97ed89a797
Test that completion word splitting does reasonable things
2023-01-09 13:02:44 -05:00
Antonio Scandurra
ad7eaca443
Make Buffer::diff_base available outside of tests
2023-01-08 09:36:58 -07:00
Antonio Scandurra
ddbf251b5f
Merge pull request #2014 from zed-industries/git-diff-reconnect
...
Update git diff base when synchronizing a guest's buffers
2023-01-08 09:28:51 -07:00
Antonio Scandurra
95098e4f29
Update git diff base when synchronizing a guest's buffers
2023-01-08 09:10:57 -07:00
Antonio Scandurra
529ccbda3a
Introduce git index mutations to randomized collaboration test
...
The test now fails at the following seed:
```bash
SEED=850 ITERATIONS=1 OPERATIONS=131 cargo test --package=collab random
```
2023-01-08 08:52:16 -07:00
Joseph Lyons
a73e264c3d
Merge branch 'in-app-feedback' of https://github.com/zed-industries/zed into in-app-feedback
2023-01-07 18:53:11 -05:00
Joseph Lyons
0200fc5542
WIP
...
Don't rely on contacts popover or contacts list for theming
Add metrics id to request body
Clean up some code and comments
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-01-07 18:53:00 -05:00
Joseph Lyons
9694771752
Move notes into PR
2023-01-07 18:53:00 -05:00
Joseph Lyons
9fc7f54631
Add to TODO
2023-01-07 18:53:00 -05:00
Joseph Lyons
1545b2ac61
Update TODO
2023-01-07 18:53:00 -05:00
Joseph Lyons
318a0b7ed0
In-app feedback WIP
2023-01-07 18:53:00 -05:00
Julia
a46ca32356
Completion word start filtering which is codepoint aware
2023-01-07 15:34:28 -05:00
Julia
12cd712b53
Require start autocomplete query byte to match a completion word start byte
2023-01-06 22:47:06 -05:00
Max Brunsfeld
c503ba00b6
Add env vars to store and load test plan from JSON files
2023-01-06 17:51:25 -08:00
Nathan Sobo
3cffee4065
Merge pull request #2011 from zed-industries/project-reconnection
...
Retain connection to remote projects when temporarily disconnected
2023-01-06 18:01:08 -07:00
Nathan Sobo
213658f1e9
Fix tests that failed due to defaulting the grouping interval to zero in tests
2023-01-06 17:56:21 -07:00
Kay Simmons
6b337914d7
Merge pull request #2010 from zed-industries/vim-f-t
...
Vim f and t bindings
2023-01-06 16:32:39 -08:00
Nathan Sobo
386f7ba16d
Merge remote-tracking branch 'origin/main' into project-reconnection
2023-01-06 16:52:22 -07:00
Max Brunsfeld
2351f2bd0c
Tolerate failure to join remote projects in randomized test
2023-01-06 15:40:42 -08:00
Max Brunsfeld
99390a7237
Represent all randomized test actions as operations
2023-01-06 15:32:11 -08:00
Max Brunsfeld
210286da48
Make operations for all buffer manipulations
2023-01-06 15:32:11 -08:00
Max Brunsfeld
f1b3692a35
Tweak operation rates
2023-01-06 15:32:11 -08:00
Max Brunsfeld
f243633f3e
Set up flow for mutating clients via explicit operation values
2023-01-06 15:32:11 -08:00
Max Brunsfeld
ce8dd5a286
wip
2023-01-06 15:32:11 -08:00
Max Brunsfeld
a74c5073a4
Start work on allowing random collab test to be minimized
...
Represent operations as an explicit enum.
2023-01-06 15:32:11 -08:00
Joseph Lyons
5387695ee0
WIP
...
Don't rely on contacts popover or contacts list for theming
Add metrics id to request body
Clean up some code and comments
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2023-01-06 17:40:30 -05:00
Kay Simmons
73e7967a12
working f and t bindings
2023-01-06 14:24:20 -08:00
Joseph Lyons
9d4cf2ff62
Move notes into PR
2023-01-06 15:41:31 -05:00
Antonio Scandurra
83c98ce049
Prevent making further requests after language server shut down
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-01-06 13:40:32 -07:00
Joseph Lyons
658541ec9f
Add to TODO
2023-01-06 15:32:28 -05:00
Max Brunsfeld
6a57bd2794
Merge pull request #2008 from zed-industries/callback-leaks
...
Fix callback leaks when subscriptions are added and dropped in the same effect cycle
2023-01-06 12:01:27 -08:00
Antonio Scandurra
8487ae77e7
Share new worktrees when resharing project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-01-06 12:58:19 -07:00
Max Brunsfeld
b762d70202
Remove unused CallbackCollection method
2023-01-06 11:51:36 -08:00
Max Brunsfeld
53cb3a4429
Remove GC step for callback collections, always drop callbacks asap
2023-01-06 11:33:50 -08:00
Max Brunsfeld
ef192a902a
Remove dropped subscription eagerly when removing callbacks
2023-01-06 11:03:45 -08:00
Antonio Scandurra
585c23e9f6
Match guest's reported buffers on host when synchronizing after reconnect
...
If the host thinks a guest has a buffer that they don't have, the host won't
send it to them when they attempt to open it the next time. This can happen
if the guest disconnected before they received the host's response to an
initial open buffer request.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2023-01-06 11:48:34 -07:00
Max Brunsfeld
4708f5d88f
Add test for notifying and dropping subscriptions in an update cycle
2023-01-06 10:46:03 -08:00
Max Brunsfeld
a165cd596b
Make event tests in gpui more consistent
2023-01-06 10:44:45 -08:00
Antonio Scandurra
0d31c8c1c8
Only share worktrees when UpdateProject succeeded
2023-01-06 10:41:11 -07:00
Antonio Scandurra
8c5a0ca3a4
Couple worktree sharing with project metadata updates
2023-01-06 10:31:36 -07:00
Antonio Scandurra
5c05b7d413
Ensure initial project metadata is sent when first sharing a project
2023-01-06 10:18:26 -07:00
Max Brunsfeld
3da69117ae
Use a CallbackCollection for action dispatch observations
2023-01-06 09:15:53 -08:00
Nathan Sobo
4256a96051
Avoid holding project handle on a call that could hang
...
This fixes a leaked handle error.
2023-01-05 21:01:27 -07:00
Max Brunsfeld
82e9f736bd
Use a CallbackCollection for release observations
...
Co-authored-by: Kay Simmons <kay@zed.dev >
2023-01-05 18:02:53 -08:00
Max Brunsfeld
fa620bf98f
Fix logic error in dropping callback subscriptions
...
Co-authored-by: Kay Simmons <kay@zed.dev >
2023-01-05 17:30:39 -08:00
Max Brunsfeld
378f0c32fe
Restructure callback subscriptions
...
Fix a callback leak that would occur when dropping a subscription
to a callback collection after triggering that callback, but before
processing the effect of *adding* the handler.
Co-authored-by: Kay Simmons <kay@zed.dev >
2023-01-05 16:41:23 -08:00
Joseph Lyons
404f59090c
Update TODO
2023-01-05 18:14:28 -05:00
Joseph Lyons
eb02834582
In-app feedback WIP
2023-01-05 17:58:52 -05:00
Nathan Sobo
77e322cb75
Wait for incomplete buffers when handling incoming buffer file updates
2023-01-05 13:50:25 -07:00
Julia
f669b8a029
Merge pull request #2007 from zed-industries/recent-projects-prefer-first-match
...
Prefer first max while fuzzy matching projects fixes unexpected behavior
2023-01-05 12:10:51 -05:00
Julia
09d57d1f26
Prefer first max while fuzzy matching projects fixes unexpected behavior
2023-01-05 11:27:50 -05:00
Nathan Sobo
7a629769b7
Re-request incomplete remote buffers when syncing buffers
...
Any buffers we requested but that haven't been fully sent will cause
outstainding open requests to hang. If we re-request them, any
waiting open requests will resume when the requested buffers finish
being created.
Co-authored-by: Max Brunsfeld <max@zed.dev >
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2023-01-04 16:00:43 -07:00
Joseph T. Lyons
bd223f5a1f
Merge pull request #2002 from zed-industries/appease-clippy
...
Appease clippy
2023-01-04 16:33:29 -05:00
Nathan Sobo
1006ada458
Update scan_id on worktree entries when there is a conflict
...
Forgetting to do this meant we were unable to sync changes with reconnecting
guests in some cases.
2023-01-04 13:59:16 -07:00
Mikayla Maki
79f8f08caf
v0.69.x dev
2023-01-04 11:45:25 -08:00
Nathan Sobo
789bbf15b7
Update buffer files when synchronizing buffers
...
It's possible that the host was disconnected when attempting to notify
guests of a file save, so we need to transmit this in order to correctly
update the file's mtime.
Next failing seed OPERATIONS=200 SEED=6894
2023-01-04 12:33:48 -07:00
Nathan Sobo
1dd085fc92
Introduce completed_scan_id to worktree
...
We need to know the most recent scan id we have actually completed. This is to
handle the case where a guest disconnects when we're in the middle of streaming
worktree entries to them. When they reconnect, they need to report a scan_id
from before we started streaming the entries, because we have no record of when
the stream was interrupted.
Next failure:
SEED=5051 ITERATIONS=1 OPERATIONS=200 cargo test --release --package=collab random -- --nocapture
2023-01-03 18:26:57 -07:00
Julia
1e18480808
Merge pull request #2005 from zed-industries/tsserver-include-completion-detail
...
Include Typescript completion item `detail` field in completion label
2023-01-03 16:44:10 -05:00
Julia
93a634991b
Include Typescript completion item detail field in completion label
2023-01-03 16:37:35 -05:00
Nathan Sobo
90fb9b53ad
WIP
2023-01-03 13:30:14 -07:00
Julia
d0ce7b3516
Merge pull request #2003 from zed-industries/correct-ra-name-key-default-settings
...
Correct default settings' name key for RA in init options example
2023-01-03 13:51:03 -05:00
Julia
b94c265240
Correct default settings' name key for RA in init options example
2023-01-03 13:50:08 -05:00
Nathan Sobo
8d70a22fa3
Record failing seed
2023-01-02 21:12:39 -07:00
Nathan Sobo
a6ffcdd0cf
Track open buffers when handling sync requests
...
When a host sends a buffer to a guest for the first time, they record that
they have done so in a set tied to that guest's peer id. When the guest
reconnects and syncs buffers, they do so under a different peer id, so we
need to be sure we track which buffers we have sent them to avoid sending
them the same buffer twice, which violates the guest's assumptions.
2023-01-02 20:27:59 -07:00
Max Brunsfeld
74843493f4
Assign fake fs entries' mtimes more consistently
2023-01-02 10:20:52 -08:00
Julia
6b62ce2aaa
Merge pull request #2001 from zed-industries/dissmis-search-button
...
Add dismiss buffer search button & fix some faulty icon button styling
2023-01-02 11:21:16 -05:00
Julia
2b1118f597
Add dismiss buffer search button & fix some faulty icon button styling
...
Co-Authored-By: Nate Butler <nate@zed.dev >
2023-01-01 23:50:46 -05:00
Joseph Lyons
233b28a1b9
Appease clippy
2023-01-01 23:50:45 -05:00
Mikayla Maki
eeb21af841
Merge pull request #2000 from zed-industries/fix-line-seperator
...
Add other line seperators to regex normalization
2022-12-30 18:24:36 -08:00
Mikayla Maki
a5bccecd48
Add other line seperators to regex normalization
2022-12-30 18:18:02 -08:00
Joseph T. Lyons
0f818f2458
Merge pull request #1996 from zed-industries/add-close-clean-items-command
...
Add close clean items command
2022-12-29 14:12:04 -05:00
Joseph T. Lyons
7187cc8a4c
Merge pull request #1994 from zed-industries/add-close-all-items-command
...
Add close all items command
2022-12-29 14:11:44 -05:00
Joseph Lyons
2bc36600d4
Rename variable
2022-12-29 13:43:56 -05:00
Joseph Lyons
60f29410ca
Add close clean items command
2022-12-29 13:28:52 -05:00
Joseph Lyons
ca3c4566dd
Add close all items command
2022-12-29 01:43:49 -05:00
Nathan Sobo
f3dee2d332
Remove printlns, found a failure
...
Failing seed:
SEED=416 MAX_PEERS=2 ITERATIONS=5000 OPERATIONS=159 cargo +beta test --package=collab random -- --nocapture
2022-12-27 17:01:31 -07:00
Nathan Sobo
273988b8d5
Set transaction group interval to ZERO by default in tests
...
We were seeing non-deterministic behavior in randomized tests when
generating backtraces took enough time to cause transactions to group
in some cases, but not group in others.
Tests will need to explicitly opt into grouping if they want it by
setting the interval explicitly. We have tests in the text module that
currently test the history grouping explicitly, but I'm not sure
it's needed elsewhere.
2022-12-27 16:47:28 -07:00
Joseph T. Lyons
b6337f59fd
Merge pull request #1992 from zed-industries/add-home-and-end-key-support
...
Add home and end key support
2022-12-26 00:34:37 -05:00
Joseph Lyons
21a0df406f
Add home and end key support
2022-12-26 00:24:26 -05:00
Max Brunsfeld
599acf0daa
WIP - Panic immediately when detecting non-determinism via a change to the execution trace
2022-12-23 17:34:13 -08:00
Antonio Scandurra
6458a9144e
WIP: failing randomized test
...
SEED=175 MAX_PEERS=2 ITERATIONS=1 OPERATIONS=159 cargo test --package=collab random -- --nocapture
2022-12-23 15:02:06 +01:00
Antonio Scandurra
344d05045d
Avoid hanging waiting for operations when buffer has none
2022-12-23 12:26:48 +01:00
Antonio Scandurra
75803d8dbb
Respond with an error when client hasn't got a registered handle
2022-12-23 11:53:13 +01:00
Joseph T. Lyons
04e053a216
Merge pull request #1991 from zed-industries/add-actions-for-requesting-features-and-filing-bug-reports
...
Add actions for requesting features and filing bug reports
2022-12-22 23:17:44 -05:00
Joseph Lyons
41bff3947c
Add actions for requesting features and filing bug reports
2022-12-22 23:04:33 -05:00
Joseph T. Lyons
46152c6249
Merge pull request #1990 from zed-industries/add-memory-to-system-specs
...
Add memory to system specs
2022-12-22 18:16:50 -05:00
Joseph Lyons
f65fda2fa4
Add memory to system specs
2022-12-22 18:10:49 -05:00
Joseph T. Lyons
96ac650465
Merge pull request #1989 from zed-industries/add-command-to-copy-system-information-to-the-clipboard
...
add command to copy system information to the clipboard
2022-12-22 14:31:23 -05:00
Joseph Lyons
ea16082a42
Factored data into a SystemSpecs struct
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2022-12-22 14:27:32 -05:00
Max Brunsfeld
42e74e7eef
Excluded deleted entries when initially sending worktrees to guests
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-22 11:18:10 -08:00
Antonio Scandurra
738e161bc6
WIP: failing test
...
SEED=882 RUST_LOG=collab::tests::randomized_integration_tests=info MAX_PEERS=2 ITERATIONS=1 OPERATIONS=49 cargo test --package=collab random -- --nocapture
2022-12-22 18:32:21 +01:00
Antonio Scandurra
559e14799c
Restructure randomized test to be a bit clearer and test more stuff
2022-12-22 17:54:25 +01:00
Joseph Lyons
eeb5b03d63
add command to copy system information to the clipboard
2022-12-22 03:43:04 -05:00
Max Brunsfeld
d750b02a7c
Handle file and diff updates to incomplete buffers
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-21 15:39:57 -08:00
Max Brunsfeld
c321f5d94a
Assert that buffers' file state matches in randomized collab test
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-12-21 15:38:44 -08:00
Max Brunsfeld
89da738fae
In randomized test, open remote projects via the room
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-12-21 14:13:43 -08:00
Max Brunsfeld
8cd94060bb
💄 Avoid referring to all clients as guests in random integration test
2022-12-21 11:37:18 -08:00
Max Brunsfeld
d8ccdff9fc
Move randomized integration test into its own file
2022-12-21 11:26:24 -08:00
Antonio Scandurra
47348542ef
Synchronize buffers when either the host or a guest reconnects
2022-12-21 14:20:56 +01:00
Antonio Scandurra
b5fb8e6b8b
Remove unused JoinProjectError
2022-12-21 13:10:07 +01:00
Antonio Scandurra
b0336cd27e
Add failing test for buffer synchronization after disconnecting
2022-12-21 11:56:15 +01:00
Antonio Scandurra
ecd80c553c
Verify removing worktrees while host is offline
2022-12-21 11:47:01 +01:00
Antonio Scandurra
59d7f06c57
Handle proto::UpdateProjectCollaborator message in Project
2022-12-21 11:09:27 +01:00
Max Brunsfeld
15f666a50a
Refresh project collaborator connection id for rejoined projects
2022-12-20 18:03:33 -08:00
Max Brunsfeld
ec6f2a3ad4
💄 Reorder private Project method
2022-12-20 17:32:42 -08:00
Max Brunsfeld
213be3d6bd
Delete stale projects after cleanup interval, via server foreign key cascade
2022-12-20 17:27:42 -08:00
Max Brunsfeld
55800fc696
💄 Avoid repeated sql condition in rejoin_room
2022-12-20 17:23:52 -08:00
Max Brunsfeld
6a2066af6c
💄 Reduce indentation in Database::rejoin_room
2022-12-20 17:16:56 -08:00
Max Brunsfeld
cb8962691a
Remove unnecessary UnshareProject message sent to clients leaving a project
2022-12-20 16:58:44 -08:00
Max Brunsfeld
bb00134f5f
Clean up projects when leaving a room
2022-12-20 16:44:57 -08:00
Max Brunsfeld
21d6665c37
Merge branch 'main' into project-reconnection
2022-12-20 15:50:09 -08:00
Max Brunsfeld
6542b30d1f
Implement rejoining projects as guest when rejoining a room
...
Co-authored-by: Julia Risley <julia@zed.dev >
2022-12-20 15:02:26 -08:00
Max Brunsfeld
55ebfe8321
Handle unshared projects when rejoining a room
...
Also, construct remote projects via the room, to guarantee
that the room can manage the projects' sharing lifecycle.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-20 11:10:46 -08:00
Antonio Scandurra
9d15b3d295
Remove unused import
2022-12-20 17:47:22 +01:00
Antonio Scandurra
d31fd9bbf2
Support adding worktrees to project while host is offline
2022-12-20 17:42:08 +01:00
Antonio Scandurra
52babc51a0
Make host reconnection test pass when mutating worktree while offline
2022-12-20 17:30:58 +01:00
Antonio Scandurra
1a3940a12e
Fix project reconnection test to ensure rooms actually reconnects
2022-12-20 14:51:46 +01:00
Antonio Scandurra
1aec691b35
Sketch out project reconnection routine on the server
2022-12-20 12:03:43 +01:00
Max Brunsfeld
70dd586be9
Start work on rejoining rooms, supplying all project info at once
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-12-19 17:50:43 -08:00
Max Brunsfeld
af85db9ea5
WIP - Retain hosts' project state when they disconnect
2022-12-19 11:38:08 -08:00
Max Brunsfeld
67b265b3d5
Add failing integration test for resharing projects on reconnect
2022-12-19 11:37:28 -08:00
Max Brunsfeld
c8b209306e
collab 0.4.2
2022-12-19 11:29:22 -08:00
Max Brunsfeld
61c6c825b5
Merge pull request #1980 from zed-industries/following-panics
...
Fix panics when following
2022-12-19 11:26:28 -08:00
Antonio Scandurra
0ede89d82a
WIP
2022-12-19 20:05:00 +01:00
Julia
6f211292b2
Merge pull request #1984 from zed-industries/format-problematic-db-macros
...
Format problematic DB macros
2022-12-19 11:17:34 -05:00
Julia
c49573dc11
Format problematic DB macros
2022-12-19 11:11:10 -05:00
Julia
de9c58d216
Merge pull request #1983 from zed-industries/multi-buffer-git-gutter
...
Multi buffer git gutter
2022-12-19 10:53:42 -05:00
Antonio Scandurra
84a860e54d
Merge pull request #1982 from zed-industries/fix-rust-analyzer
...
Update rust-analyzer's `disk_based_diagnostics_progress_token`
2022-12-19 16:33:01 +01:00
Antonio Scandurra
cb60eb8a57
Update rust-analyzer's disk_based_diagnostics_progress_token
2022-12-19 16:27:25 +01:00
Antonio Scandurra
d8219545c9
💄
2022-12-19 16:17:27 +01:00
Antonio Scandurra
06f6d02579
Stop counting extensions in worktree
2022-12-19 16:05:22 +01:00
Max Brunsfeld
1e02ebbd11
Replicate pending selections separately from other selections
...
This fixes a panic that would occur when a leader created
a pending selection that overlapped another selection,
because the follower would attempt to treat that pending
selection as non-pending, which would violate the invariant
that selections are sorted and disjoint.
2022-12-17 14:00:53 -08:00
Max Brunsfeld
8c64514570
Add ZED_STATELESS env var, for suppressing persistence
...
Use this env var in the start-local-collaboration script to make
the behavior more predictable.
2022-12-17 12:03:51 -08:00
Kay Simmons
6fcb3c9020
Merge pull request #1972 from zed-industries/recent-workspace
...
Recent Project Picker
2022-12-16 15:51:57 -08:00
Kay Simmons
2c47bd4a97
Clear stale projects if they no longer exist
2022-12-16 15:45:17 -08:00
Antonio Scandurra
a5f624203e
collab 0.4.1
2022-12-16 12:02:03 +01:00
Antonio Scandurra
98d1b6ec5a
Merge pull request #1975 from zed-industries/screen-share-after-reconnect
...
Prevent screen-sharing from being lost after a reconnection
2022-12-16 12:00:02 +01:00
Antonio Scandurra
457e1046c8
Bump protocol version
2022-12-16 11:48:14 +01:00
Antonio Scandurra
21ab1bb434
Remove unnecessary PeerId parsing code
2022-12-16 11:45:42 +01:00
Antonio Scandurra
aa44de3d16
Fix test ensuring room is left when disconnected from LiveKit
2022-12-16 10:52:32 +01:00
Max Brunsfeld
ad37034960
Identify LiveKit room participants by user id, not peer id
...
This way, their participant id can remain the same when they reconnect.
2022-12-15 17:19:32 -08:00
Julia
ebd0c5d000
Handle reversed=true for multi-buffer git-hunks-in-range iteration
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-12-15 18:17:32 -05:00
Julia
f88b413f6a
Rewrite multi-buffer aware git hunks in range to be more correct
...
Less ad-hoc state tracking, rely more on values provided by the
underlying data
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-12-15 17:09:09 -05:00
Antonio Scandurra
c2f5381e5a
collab 0.4.0
2022-12-15 19:37:53 +01:00
Antonio Scandurra
ea1f6689b9
Merge pull request #1971 from zed-industries/update-app-icons
...
Update Zed & Zed Preview icons
2022-12-15 19:37:04 +01:00
Antonio Scandurra
b1affb13bb
Merge pull request #1973 from zed-industries/fix-reconnects-after-deploy
...
Improve reconnections to server after it is redeployed
2022-12-15 19:35:42 +01:00
Antonio Scandurra
2679e245a5
Minor stylistic change
2022-12-15 16:40:16 +01:00
Antonio Scandurra
5a334622ea
💄
2022-12-15 16:34:59 +01:00
Antonio Scandurra
5720c43fe7
Merge branch 'main' into fix-reconnects-after-deploy
2022-12-15 15:32:05 +01:00
Joseph T. Lyons
af4d846428
Merge pull request #1954 from zed-industries/add-symlink-to-applications-directory-in-dmg
2022-12-15 08:06:17 -05:00
Antonio Scandurra
5fb522a9b1
collab 0.3.14
2022-12-15 11:31:51 +01:00
Antonio Scandurra
86e5ae1f2e
Allow nulls in projects.host_connection_{id,server_id}
...
The server version on stable won't be able to fill values for those
columns when we deploy the migration to preview.
With this commit we're also dropping the unused `worktree_extensions`
and `project_activity_periods` tables. The last version of the server
on stable (0.2.6) doesn't contain any code that accesses those tables.
2022-12-15 11:30:51 +01:00
Antonio Scandurra
aadd7f2886
collab 0.3.13
2022-12-15 10:53:17 +01:00
Antonio Scandurra
067a19c971
Avoid logging an error when user who hasn't joined any room disconnects
2022-12-15 10:45:03 +01:00
Antonio Scandurra
688f179256
Use "id" nomenclature more consistently
2022-12-15 10:15:59 +01:00
Antonio Scandurra
af77f1188a
Re-add server_id indices for room_participants/project_collaborators
2022-12-15 09:58:25 +01:00
Julia
0dedc1f3a4
Get tests building again
2022-12-15 00:17:28 -05:00
Max Brunsfeld
6c58a4f885
Fix stale server queries, use foreign keys from connectionsn to servers
2022-12-14 17:34:24 -08:00
Kay Simmons
81e3b48f37
Add keybinding
2022-12-14 16:14:16 -08:00
Kay Simmons
6da59311d1
Add open recent project to file menu
2022-12-14 16:02:48 -08:00
Kay Simmons
2bc685281c
Add recent project picker
2022-12-14 15:59:50 -08:00
Max Brunsfeld
7e0b6ed1c6
Bump RPC version due to multibuffer following PR
2022-12-14 15:34:22 -08:00
Max Brunsfeld
e08d6cd6de
Merge pull request #1921 from zed-industries/multibuffer-following
...
Allow following collaborators into editors with multi-excerpt buffers (refactors + find-all-refs)
2022-12-14 15:33:11 -08:00
Max Brunsfeld
954c9ac3fd
Add integration test coverage for following into multibuffers
2022-12-14 15:28:58 -08:00
Max Brunsfeld
e4c5dfcf6c
Use run_until_parked instead of 'condition' in all integration tests
2022-12-14 15:05:35 -08:00
Nate Butler
5f6313d336
Update Zed & Zed Preview icons
2022-12-14 17:41:18 -05:00
Max Brunsfeld
70efd2bebe
Introduce a ViewId message, identifying views across calls
2022-12-14 14:40:07 -08:00
Max Brunsfeld
43b7e16c89
Handle retina screens in start-local-collaboration script
2022-12-14 11:50:15 -08:00
Max Brunsfeld
f99f581bfc
Clean up state matching in from_state_proto using let/else statements
2022-12-14 11:09:33 -08:00
Max Brunsfeld
09d3fbf04f
In editor following test, apply excerpt removals to both followers
2022-12-14 11:08:08 -08:00
Antonio Scandurra
363e3cae4b
WIP
2022-12-14 19:25:07 +01:00
Antonio Scandurra
930be6706f
WIP
2022-12-14 18:02:39 +01:00
Antonio Scandurra
05e99eb67e
Introduce an epoch to ConnectionId and PeerId
2022-12-14 15:55:56 +01:00
Antonio Scandurra
9bd400cf16
collab 0.3.12
2022-12-14 11:43:33 +01:00
Antonio Scandurra
553585b9a1
Add more logging to Room
2022-12-14 11:43:12 +01:00
Antonio Scandurra
674fddac87
Instrument rpc::Server::start and reduce cleanup timeout again
2022-12-14 11:42:12 +01:00
Antonio Scandurra
63e7b9189d
collab 0.3.11
2022-12-14 11:25:04 +01:00
Antonio Scandurra
9530976f61
Try using a longer timeout for cleaning up stale rooms
2022-12-14 11:24:36 +01:00
Antonio Scandurra
02c30b0091
collab 0.3.10
2022-12-14 09:35:52 +01:00
Antonio Scandurra
b9c7796547
Reduce readiness probe delay and period
2022-12-14 09:35:36 +01:00
Antonio Scandurra
e00cb6b074
collab 0.3.9
2022-12-14 09:05:19 +01:00
Antonio Scandurra
dc47552180
Fix kubernetes configuration for readiness probe
2022-12-14 08:58:19 +01:00
Antonio Scandurra
98a593b263
collab 0.3.8
2022-12-14 08:56:02 +01:00
Antonio Scandurra
897506c797
Define readiness probe to know when the new server can accept traffic
2022-12-14 08:54:46 +01:00
Antonio Scandurra
59c9a57570
collab 0.3.7
2022-12-14 08:43:18 +01:00
Antonio Scandurra
dde6cf596e
Don't wait for stale project deletion before listening for connections
2022-12-14 08:42:34 +01:00
Antonio Scandurra
2596fefa04
collab 0.3.6
2022-12-13 23:09:02 +01:00
Antonio Scandurra
34b69896e4
Listen to SIGTERM in addition to ctrl-c for graceful shutdown
2022-12-13 23:08:43 +01:00
Antonio Scandurra
7824ace58b
collab 0.3.5
2022-12-13 22:40:55 +01:00
Antonio Scandurra
b150efbd96
Set log level to debug for preview deployment
...
Also, add a log statement when we receive the interrupt signal.
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-12-13 22:38:55 +01:00
Max Brunsfeld
c20204d269
collab 0.3.4
2022-12-13 11:17:37 -08:00
Max Brunsfeld
45bfcfc3b8
Fix excessive delay before clearing stale room data
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-13 11:17:20 -08:00
Julia
cf72173282
Clamp end of visual git hunk to requested range
2022-12-13 13:58:50 -05:00
Max Brunsfeld
5218a2f966
collab 0.3.3
2022-12-13 10:17:01 -08:00
Max Brunsfeld
95748123b5
Merge remote-tracking branch 'origin/collab-0.3.x'
2022-12-13 10:16:25 -08:00
Max Brunsfeld
6ad326ac58
Wait longer before deleting outdated rooms from the database
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-13 10:14:43 -08:00
Mikayla Maki
b0652c55c6
Merge pull request #1968 from zed-industries/fix-text-size-in-updates
...
Fix text size in notifications
2022-12-13 10:00:24 -08:00
Mikayla Maki
790ef19a48
Fix mis-set variables
2022-12-13 09:58:04 -08:00
Julia
ecd44e6914
Git diff recalc in project diagnostics
2022-12-13 12:35:58 -05:00
Julia
2cd9987b54
Git diff recalc in project search
2022-12-13 12:35:58 -05:00
Julia
7c3dc1e3dc
Cleanup
2022-12-13 12:35:58 -05:00
Julia
00b7c78e33
Initial hacky displaying of git gutter in multi-buffers
2022-12-13 12:35:58 -05:00
Max Brunsfeld
11800a8a78
Merge branch 'main' into multibuffer-following
2022-12-13 09:25:18 -08:00
Antonio Scandurra
99c5f8c713
collab 0.3.2
2022-12-13 15:16:41 +01:00
Antonio Scandurra
461c2400ad
Merge pull request #1965 from zed-industries/preserve-calls-during-server-restarts
...
Automatically re-join call when server is restarted
2022-12-13 14:12:32 +01:00
Antonio Scandurra
073a2988e6
Move creation of room_id index into its own migration
2022-12-13 13:57:41 +01:00
Antonio Scandurra
70aac75dd5
Run until parked before asserting about participants in restart test
2022-12-13 13:53:51 +01:00
Antonio Scandurra
4dc838fbb7
Reset connection pool when tearing down the server in tests
2022-12-13 13:51:25 +01:00
Antonio Scandurra
d4c8fa3090
Use a synchronous mutex for ConnectionPool
2022-12-13 13:50:51 +01:00
Antonio Scandurra
a594ba8f8a
Simulate server restarts in randomized test
2022-12-13 12:18:38 +01:00
Antonio Scandurra
f1884d608b
Allow server to see client disconnection before giving up on reconnecting
2022-12-13 12:17:21 +01:00
Antonio Scandurra
417db95693
Fix typo in index name
2022-12-13 11:44:48 +01:00
Antonio Scandurra
0220d7ba5d
Include room_id in CallCanceled message
...
This ensures we don't accidentally cancel old calls.
2022-12-13 11:43:09 +01:00
Antonio Scandurra
e2b132ef23
💄
2022-12-13 11:37:39 +01:00
Antonio Scandurra
7e8d9d52d3
Delete stray debug statement
2022-12-13 11:36:40 +01:00
Antonio Scandurra
6a6a032f1f
Delete stale rooms/participants after RECONNECT_TIMEOUT
2022-12-13 11:32:37 +01:00
Mikayla Maki
fcea254e8e
Merge pull request #1963 from zed-industries/fix-workspace-corner-cases
...
Fix small workspace deserialization corner cases
2022-12-12 17:56:43 -08:00
Mikayla Maki
9bf0a02eae
Allow an empty center group to successfully deserialize into an empty pane.
...
Fix error when deserializing pane axis which caused it's members.len() > 1 invariant to be violated
Fix failure to gain center pane focus when failing to deserialize a center pane entirely
Co-authored-by: Max <max@zed.dev >
2022-12-12 17:51:16 -08:00
Max Brunsfeld
2affbcc495
Merge pull request #1962 from zed-industries/scrolling-breaks-follow
...
Avoid breaking follow when syncing leader's scroll position
2022-12-12 16:37:58 -08:00
Mikayla Maki
8012e9fcbd
Merge pull request #1961 from zed-industries/fix-next-screen-bug
...
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:47:16 -08:00
Mikayla Maki
cd2d593a6c
Fixed issue where the NextScreen action would never have an effect
2022-12-12 15:36:51 -08:00
Max Brunsfeld
9ef00ea44c
Avoid breaking follow when syncing leader's scroll position
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
Co-authored-by: Kay Simmons <kay@zed.dev >
2022-12-12 15:36:30 -08:00
Mikayla Maki
91d6b66fc4
Merge pull request #1959 from zed-industries/serializing-bug-fixes
...
Add check for if the user wants a blanks workspace when deserializing
2022-12-12 13:37:43 -08:00
Mikayla Maki
5a29a74956
Fetch last workspace explicitly when starting Zed
...
co-authored-by: Max <max@zed.dev >
2022-12-12 13:29:18 -08:00
Mikayla Maki
db3119b553
Add check for if the user wants a blanks workspace when deserializing
2022-12-12 12:25:52 -08:00
Max Brunsfeld
f797dfb88f
Merge branch 'main' into multibuffer-following
2022-12-12 11:47:39 -08:00
Antonio Scandurra
beea9b68ff
Allow re-joining room after server restarts
2022-12-12 16:03:21 +01:00
Antonio Scandurra
82397f34d1
Merge pull request #1950 from zed-industries/reconnect-to-room
...
Automatically re-join call when client connection drops
2022-12-12 13:40:21 +01:00
Antonio Scandurra
3cd77bfcc4
Always cast connection ids to i32
...
Postgres doesn't support unsigned types. This also adds indices to
support querying `project_collaborators` and `room_participants`
by connection id.
2022-12-12 11:43:08 +01:00
Antonio Scandurra
456396ca6e
Rename connection_lost to answering_connection_lost
2022-12-12 11:43:08 +01:00
Antonio Scandurra
26b5653427
Delete hosted projects from database when connection is lost
2022-12-12 11:43:08 +01:00
Antonio Scandurra
895c365485
Introduce random reconnections in the randomized test
2022-12-12 11:43:08 +01:00
Antonio Scandurra
8fa26bfe18
Fix test_calls_on_multiple_connections after adding room reconnection
2022-12-12 11:43:08 +01:00
Antonio Scandurra
aca3f02590
Re-join room when client temporarily loses connection
2022-12-12 11:43:08 +01:00
Antonio Scandurra
d74fb97158
Remove Executor trait from collab and use an enum instead
...
This will let us save off the executor and avoid using generics.
2022-12-12 11:43:08 +01:00
Joseph Lyons
7608875625
Remove extraneous newline
2022-12-10 09:56:42 -05:00
Joseph Lyons
dcf11ac7e5
Add symlink to applications directory in dmg
2022-12-10 09:48:40 -05:00
Mikayla Maki
5879dcc4e9
Merge pull request #1951 from zed-industries/dock-bugfix
...
Fix infinite loop in dock position when deserializing
2022-12-09 13:19:44 -08:00
Mikayla Maki
34388a1d31
Updated is_child() to omit self
2022-12-09 12:07:49 -08:00
Mikayla Maki
3a4f8d267a
Fix infinite loop in dock position when deserializing
2022-12-09 11:50:24 -08:00
Antonio Scandurra
0366d725ea
collab 0.3.1
2022-12-09 08:19:41 +01:00
Antonio Scandurra
8bd7b28056
Merge pull request #1949 from zed-industries/do-not-drop-unregistered
...
Don't drop `unregistered` column in reconnection support migration
2022-12-09 08:15:53 +01:00
Antonio Scandurra
2697112a8a
Don't drop unregistered column in reconnection support migration
...
We don't use this column anymore because, when a project is unshared, we
simply remove it from the `projects` table. However, this column is expected
in the stable version of the server and the database is shared between stable
and preview. If we dropped it, stable would start throwing errors.
2022-12-09 08:11:18 +01:00
Mikayla Maki
9bd4bc8813
Merge pull request #1940 from zed-industries/terminal-collab-kickoff
...
WIP - move terminal to project as pre-prep for collaboration
2022-12-08 20:30:32 -08:00
Mikayla Maki
925c9e13bb
Remove terminal container view, switch to notify errors
2022-12-08 20:21:00 -08:00
Mikayla Maki
da100a09fb
WIP
2022-12-08 20:21:00 -08:00
Mikayla Maki
c42da5c9b9
WIP
2022-12-08 20:21:00 -08:00
Mikayla Maki
2733f91d8c
Fix bugs resulting from refactoring the terminal into project and workspace halves
2022-12-08 20:21:00 -08:00
Mikayla Maki
83aefffa38
Rearrange the terminal code to not have a cyclic dependency with the project
2022-12-08 20:21:00 -08:00
Mikayla Maki
1b8763d0cf
WIP - move terminal to project as pre-prep for collaboration
2022-12-08 20:21:00 -08:00
Max Brunsfeld
7dde54b052
v0.68.x dev
2022-12-08 15:33:02 -08:00
Kay Simmons
b1e37378dc
Merge pull request #1944 from zed-industries/vim-page-movement
...
Add scroll commands to vim mode
2022-12-08 14:58:19 -08:00
Kay Simmons
e61a38b3a9
remove printline
2022-12-08 14:45:22 -08:00
Kay Simmons
2cf48c03f9
fix final failing tests
2022-12-08 14:39:48 -08:00
Joseph Lyons
ab978ff1a3
collab 0.3.0
2022-12-08 16:35:13 -05:00
Joseph T. Lyons
dcd4b8f7db
Merge pull request #1941 from zed-industries/Allow-overwriting-signup-data
...
Allow overwriting signup data if a user signs up more than once with the same email address
2022-12-08 16:11:28 -05:00
Kay Simmons
2eb335158b
Merge pull request #1946 from zed-industries/fix-zombie-tooltips
...
notify views when hover finishes in tooltip wrapper
2022-12-08 11:37:12 -08:00
Kay Simmons
10aecc310e
notify views when hover finishes in tooltip wrapper
2022-12-08 11:26:46 -08:00
Kay Simmons
750e7eb833
Merge pull request #1945 from zed-industries/drag-and-drop-deadzones
...
Add deadzones to drag and drop
2022-12-08 11:15:42 -08:00
Kay Simmons
36bc90b2b8
Add deadzones to drag and drop
2022-12-07 17:46:00 -08:00
Kay Simmons
f6f41510d2
fix failing tests from incorrect follow behavior
2022-12-07 17:25:48 -08:00
Kay Simmons
cffb064c16
Refactor editor scrolling and implement scroll commands from vim mode
2022-12-07 16:39:32 -08:00
Antonio Scandurra
3313387b28
Merge pull request #1943 from zed-industries/fix-inviting-existing-users-via-different-mail
...
Fix inviting existing users via a different email address
2022-12-07 14:19:17 +01:00
Joseph Lyons
d71d543337
Ensure that subsequent signup happens after initial
...
We can't rely on the fact that the test won't run fast enough such that both `created_at`s are the same time. This ensures the subsequent signup happens after the initial one and that the database doesn't overwrite the initial one.
2022-12-07 08:15:01 -05:00
Antonio Scandurra
665219fb00
Fix inviting user that had already signed up via a different email
2022-12-07 14:07:01 +01:00
Antonio Scandurra
1b8f23eeed
Add failing test showcasing inviting existing user via different email
2022-12-07 14:06:59 +01:00
Joseph Lyons
5f31907127
Clean up test
2022-12-07 07:12:27 -05:00
Joseph Lyons
97989b04a0
Remove comment
2022-12-06 17:18:54 -05:00
Joseph Lyons
694840cdd6
Allow overwriting signup data if a user signs up more than once with the same email address
2022-12-06 17:12:12 -05:00
Antonio Scandurra
1920de81d9
Merge pull request #1938 from zed-industries/fix-metrics
...
Query project count as `i64` instead of `i32` when gathering metrics
2022-12-06 15:04:27 +01:00
Antonio Scandurra
3b5b48c043
Query project count as i64 instead of i32 when gathering metrics
...
Using the latter will cause a type mismatch when performing the query.
2022-12-06 15:00:32 +01:00
Antonio Scandurra
2080d3efff
Merge pull request #1937 from zed-industries/fix-accepted-contact-busy-status
...
Fix busy status when accepting a contact request
2022-12-06 10:29:58 +01:00
Antonio Scandurra
fc7b01b74e
Fix busy status when accepting a contact request
...
Previously, we would send an contact update when accepting a request
using the same `busy` status for both the requester and the responder.
This was obviously wrong and caused the requester to see their own
busy status as the newly-added responder contact's status.
2022-12-06 10:19:34 +01:00
Antonio Scandurra
f1b35981c2
Merge pull request #1935 from zed-industries/reconnections-2
...
Move in-memory server state to the database
2022-12-06 09:22:59 +01:00
Antonio Scandurra
744714b478
Remove unused UserId import from seed script
2022-12-06 09:07:25 +01:00
Max Brunsfeld
35549ffabe
Merge pull request #1936 from zed-industries/c-outline-pointers
...
Include outline items for c/c++ functions returning pointers
2022-12-05 14:03:49 -08:00
Max Brunsfeld
855f17c378
Include outline items for c/c++ functions returning pointers-to-pointers, references
...
Co-authored-by: Julia Risley <julia@zed.dev >
2022-12-05 13:56:21 -08:00
Mikayla Maki
f23f294b86
Merge pull request #1858 from zed-industries/add-lisp
...
Added tree sitter support for scheme and racket
2022-12-05 11:40:52 -08:00
Mikayla Maki
0921178b42
Got tree sitter integration to a shippable place
2022-12-05 11:31:52 -08:00
Mikayla Maki
30872d3992
Added experimental support for scheme, racket, and commonlisp
2022-12-05 11:31:49 -08:00
Antonio Scandurra
cd08d289aa
Fix warnings
2022-12-05 19:45:56 +01:00
Antonio Scandurra
9a62150dce
Merge branch 'main' into reconnections-2
2022-12-05 19:18:40 +01:00
Antonio Scandurra
7bbd97cfb9
Send diagnostic summaries synchronously
2022-12-05 19:07:06 +01:00
Antonio Scandurra
5443d9cffe
Return project collaborators and connection IDs in a RoomGuard
2022-12-05 18:37:01 +01:00
Antonio Scandurra
be3fb1e985
Update sea-orm to fix bug on failure to commit transactions
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-12-05 18:36:25 +01:00
Antonio Scandurra
b97c35a468
Remove project_id foreign key from room_participants
2022-12-05 15:16:06 +01:00
Antonio Scandurra
eec3df09be
Upgrade sea-orm
2022-12-05 14:56:01 +01:00
Antonio Scandurra
d3c411677a
Remove random pauses to prevent the database from deadlocking
2022-12-05 12:03:45 +01:00
Antonio Scandurra
d97a8364ad
Retry transactions if there's a serialization failure during commit
2022-12-05 10:49:53 +01:00
Antonio Scandurra
0ed731780a
Remove duplication between transaction and room_transaction
2022-12-05 09:46:03 +01:00
Julia
11c1254e71
Merge pull request #1924 from zed-industries/simon-says-dont-move
...
Do not reorder tab opened by follower to end of item list
2022-12-04 13:00:07 -05:00
Mikayla Maki
6ba225f3a5
Merge pull request #1798 from zed-industries/serializing-workspaces
...
Serializing workspaces
2022-12-03 16:56:02 -08:00
Mikayla Maki
55eb0a3742
Fixed and error message and properly initialized the DB
2022-12-03 16:46:35 -08:00
Mikayla Maki
1ce0863158
Removed old code
2022-12-03 16:27:45 -08:00
Mikayla Maki
d609237c32
Found db parallelism problem :(
2022-12-03 16:26:37 -08:00
Mikayla Maki
4288f10873
And library change
2022-12-03 16:13:02 -08:00
Mikayla Maki
80e035cc2c
Fixed bad rebase
2022-12-03 16:12:07 -08:00
Mikayla Maki
a1f273278b
Added user notifications
2022-12-03 16:06:02 -08:00
Mikayla Maki
ffcad4e4e2
WIP fixing dock problems
2022-12-03 16:06:02 -08:00
Mikayla Maki
5262e8c77e
CHANGE LOCK TO NOT BE DROPPED INSTANTLY. DANG U RUST
...
co-authored-by: kay@zed.dev
2022-12-03 16:06:02 -08:00
Mikayla Maki
5e240f98f0
Reworked thread safe connection be threadsafer,,,, again
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:06:02 -08:00
Mikayla Maki
189a820113
First draft of graceful corruption restoration
2022-12-03 16:06:02 -08:00
Mikayla Maki
b8d423555b
Added side bar restoration
2022-12-03 16:06:02 -08:00
Kay Simmons
8a48567857
Reactivate the correct item in each pane when deserializing
2022-12-03 16:06:01 -08:00
Kay Simmons
f68e8d4664
Address some issues with the sqlez_macros
2022-12-03 16:06:01 -08:00
Kay Simmons
1b225fa37c
fix test failures
2022-12-03 16:06:01 -08:00
Kay Simmons
a29ccb4ff8
make thread safe connection more thread safe
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-12-03 16:06:01 -08:00
Mikayla Maki
9cd6894dc5
Added multi-threading problem test
2022-12-03 16:06:01 -08:00
Kay Simmons
dd9d20be25
Added sql! proc macro which checks syntax errors on sql code and displays them with reasonable underline locations
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-12-03 16:06:01 -08:00
Mikayla Maki
260164a711
Added basic syntax checker to sqlez
2022-12-03 16:06:01 -08:00
Kay Simmons
359b8aaf47
rename sql_method to query and adjust the syntax to more closely match function definitions
2022-12-03 16:06:01 -08:00
Kay Simmons
1cc3e4820a
working serialized writes with panics on failure. Everything seems to be working
2022-12-03 16:06:01 -08:00
Mikayla Maki
b01243109e
Removed database test files
2022-12-03 16:06:01 -08:00
Mikayla Maki
3e0f9d27a7
Made dev tools not break everything about the db
...
Also improved multi statements to allow out of order parameter binding in statements
Ensured that all statements are run for maybe_row and single, and that of all statements only 1 of them returns only 1 row
Made bind and column calls add useful context to errors
Co-authored-by: kay@zed.dev
2022-12-03 16:06:01 -08:00
Mikayla Maki
2dc1130902
Added extra sql methods
2022-12-03 16:06:01 -08:00
Mikayla Maki
37174f45f0
Touched up sql macro
2022-12-03 16:06:01 -08:00
Mikayla Maki
76c42af62a
Finished terminal working directory restoration
2022-12-03 16:06:01 -08:00
Mikayla Maki
cf4c103660
Fixed workspace tests
2022-12-03 16:06:01 -08:00
Mikayla Maki
e1eff3f4cd
WIP: Some bugs switching to database provided IDs, terminal titles don't reload when restored from serialized, workspace tests are no longer passing but should be easy to fix when it isn't 11:44
2022-12-03 16:06:01 -08:00
Mikayla Maki
a47f2ca445
Added UUID based, stable workspace ID for caching on item startup. Completed first sketch of terminal persistence. Still need to debug it though....
2022-12-03 16:06:01 -08:00
Mikayla Maki
e659823e6c
WIP termial implementation. need some way of getting the currently valid workspace ID
2022-12-03 16:06:01 -08:00
Mikayla Maki
a8ed95e1dc
Implementing persistence for the terminal working directory, found an issue with my current data model. :(
2022-12-03 16:06:01 -08:00
Kay Simmons
cb1d2cd1f2
WIP serializing and deserializing editors
2022-12-03 16:06:01 -08:00
Mikayla Maki
9077b058a2
removed test file
2022-12-03 16:06:01 -08:00
Mikayla Maki
7ceb5e815e
workspace level integration of serialization complete! Time for item level integration....
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:06:01 -08:00
Mikayla Maki
992b94eef3
Rebased to main
2022-12-03 16:06:01 -08:00
Mikayla Maki
a0cb6542ba
Polishing workspace data structures
...
Co-authored-by: kay@zed.dev
2022-12-03 16:06:01 -08:00
Mikayla Maki
6530658c3e
Added center group deserialization
2022-12-03 16:06:01 -08:00
Kay Simmons
75d3d46b1b
wip serialize editor
2022-12-03 16:06:01 -08:00
Kay Simmons
d20d21c6a2
Dock persistence working!
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-12-03 16:06:01 -08:00
Kay Simmons
c1f7902309
wip
2022-12-03 16:06:01 -08:00
Mikayla Maki
4798161118
Distributed database pattern built.
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:06:01 -08:00
Mikayla Maki
2a5565ca93
WIP
2022-12-03 16:06:00 -08:00
Mikayla Maki
a5edac312e
Moved to workspaces crate... don't feel great about it
2022-12-03 16:05:26 -08:00
Mikayla Maki
e578f2530e
WIP commit, migrating workspace serialization code into the workspace
2022-12-03 16:05:25 -08:00
Mikayla Maki
c84201fc9f
Done first draft of strongly typed migrations
2022-12-03 16:05:25 -08:00
Kay Simmons
4a00f0b062
Add typed statements
2022-12-03 16:05:25 -08:00
Mikayla Maki
64ac84fdf4
Re-use big union statement for get_center_pane
2022-12-03 16:05:25 -08:00
Mikayla Maki
f27a9d77d1
Finished the bulk of workspace serialization. Just items and wiring it all through.
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:05:25 -08:00
Mikayla Maki
0186289420
Refined sqlez, implemented 60% of workspace serialization sql
2022-12-03 16:05:25 -08:00
Mikayla Maki
6b214acbc4
Got Zed compiling again 🥰
2022-12-03 16:05:25 -08:00
Kay Simmons
d419f27d75
replace worktree roots table with serialized worktree roots list
2022-12-03 16:05:25 -08:00
Kay Simmons
eb0598dac2
more refactoring and slightly better api
2022-12-03 16:05:25 -08:00
Mikayla Maki
aa7b909b7b
WIP3
2022-12-03 16:05:25 -08:00
Mikayla Maki
b552f1788c
WIP2
2022-12-03 16:05:25 -08:00
Mikayla Maki
d492cbced9
WIP
2022-12-03 16:05:25 -08:00
Mikayla Maki
19aac6a57f
Moved docks to a better position
2022-12-03 16:05:25 -08:00
Kay Simmons
685bc9fed3
impl bind and column and adjust pane tables
2022-12-03 16:05:25 -08:00
Mikayla Maki
406663c75e
Converted to sqlez, so much nicer
2022-12-03 16:05:25 -08:00
Mikayla Maki
c8face33fa
WIP, incorporating type parsing using new sqlez patterns
2022-12-03 16:05:25 -08:00
Mikayla Maki
3c1b747f64
WIP almost compiling with sqlez
2022-12-03 16:05:25 -08:00
Mikayla Maki
777f05eb76
Finished implementing the workspace stuff
2022-12-03 16:05:25 -08:00
Mikayla Maki
395070cb92
remove submodule
2022-12-03 16:05:25 -08:00
Mikayla Maki
a4a1859dfc
Added sqlez api
2022-12-03 16:05:25 -08:00
Kay Simmons
e3fdfe02e5
WIP switching to sqlez
2022-12-03 16:05:24 -08:00
Mikayla Maki
7744c9ba45
Abandoning rusqlite, the API is miserable
2022-12-03 16:04:10 -08:00
Mikayla Maki
e6ca0adbcb
Fixed failing serialization issues
2022-12-03 16:04:10 -08:00
Mikayla Maki
c105f41487
Started working on dock panes
...
co-authored-by: kay@zed.dev
2022-12-03 16:04:10 -08:00
Mikayla Maki
ddecba143f
Refactored workspaces API and corrected method headers + fixed bug caused by migration failures
...
co-authored-by: kay@zed.dev
2022-12-03 16:04:10 -08:00
Mikayla Maki
3451a3c7fe
Rebase - Got Zed compiling and fixed a build error due to conflicting dependencies that cargo didn't catch :(
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:04:10 -08:00
Mikayla Maki
b9cbd4084e
WIP: fixing up behavior of workspace initialization
2022-12-03 16:04:10 -08:00
Mikayla Maki
5505a776e6
Figured out a good schema for the pane serialization stuff
2022-12-03 16:04:10 -08:00
Mikayla Maki
46ff0885f0
WIP: Writing tests
2022-12-03 16:04:10 -08:00
Mikayla Maki
a9dc46c950
added stubs for more tests
2022-12-03 16:04:10 -08:00
Mikayla Maki
7d33520b2c
Tidied up code, managed errors, etc.
2022-12-03 16:04:10 -08:00
Mikayla Maki
e9ea751f3d
All workspace tests passing :D
2022-12-03 16:04:10 -08:00
Mikayla Maki
d7bbfb82a3
Rebase - Successfully detecting workplace IDs :D
2022-12-03 16:04:10 -08:00
Mikayla Maki
500ecbf915
Rebase fix + Started writing the real SQL we're going to need
2022-12-03 16:04:10 -08:00
K Simmons
e5c6393f85
rebase fix - almost have serialize_workspace piped to the workspace constructor. Just a few compile errors left
2022-12-03 16:04:10 -08:00
K Simmons
73f0459a0f
wip
2022-12-03 16:04:10 -08:00
K Simmons
0c466f806c
WIP
2022-12-03 16:04:10 -08:00
Mikayla Maki
b48e28b555
Built first draft of workspace serialization schemas, started writing DB tests
...
Co-Authored-By: kay@zed.dev
2022-12-03 16:04:10 -08:00
Mikayla Maki
60ebe33518
Rebase fix - Reworking approach to sql for take
2022-12-03 16:04:10 -08:00
Mikayla Maki
72c1ee904b
Fix rebase - Broken tab
2022-12-03 16:04:10 -08:00
Julia
57e10b7dd5
Cleanup dbg
2022-12-02 16:42:49 -05:00
Julia
4bc1d77535
Fix tab following order test to wait for file open to propagate
...
Now it can actually repro the original bug
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-12-02 16:09:37 -05:00
Antonio Scandurra
d96f524fb6
WIP: Manually rollback transactions to avoid spurious savepoint failure
...
TODO:
- Avoid unwrapping transaction after f(tx)
- Remove duplication between `transaction` and `room_transaction`
- Introduce random delay before and after committing a transaction
- Run lots of randomized tests
- Investigate diverging diagnostic summaries
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-12-02 20:36:50 +01:00
Antonio Scandurra
1c30767592
Remove stale Error variant
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-12-02 19:20:51 +01:00
Antonio Scandurra
969c314315
Merge branch 'main' into reconnections-2
2022-12-02 19:09:33 +01:00
Antonio Scandurra
568de814aa
Delete empty rooms
2022-12-02 16:56:41 +01:00
Antonio Scandurra
27f6ae945d
Clear stale data on startup
...
This is a stopgap measure until we introduce reconnection support.
2022-12-02 16:30:00 +01:00
Antonio Scandurra
1b46b7a7d6
Move modules into collab library as opposed to using the binary
...
This ensures that we can use collab's modules from the seed script
as well.
2022-12-02 14:37:52 +01:00
Antonio Scandurra
7502558631
Make all tests pass again after migration to sea-orm
2022-12-02 14:22:36 +01:00
Antonio Scandurra
48b6ee313f
Use i32 to represent Postgres INTEGER types in Rust
2022-12-02 13:58:54 +01:00
Antonio Scandurra
dec5f37e4e
Finish porting remaining db methods to sea-orm
2022-12-02 13:58:23 +01:00
Julia
239a04ea5b
Add test that should have exercised tab reordering while following
...
Except it doesn't, it passes both with and without the prior commit.
Investigate further
2022-12-02 00:31:16 -05:00
Joseph T. Lyons
ea03b48243
Merge pull request #1876 from zed-industries/update-release-urls-to-match-new-zed.dev-url-format
...
Update release urls to match new zed.dev url format
2022-12-01 20:32:14 -05:00
Max Brunsfeld
82824f78b6
Make each Zed instance use half the screen in 'start-local-collaboration' script
2022-12-01 16:43:39 -08:00
Max Brunsfeld
e4507c1d74
Fetch missing buffers when adding excerpts to a multibuffer while following
...
Make FollowableItem::apply_update_proto asynchronous. Use a single
task per workspace to process all leader updates, to prevent updates
from being interleaved.
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-12-01 15:17:51 -08:00
Antonio Scandurra
585ac3e1be
WIP
2022-12-01 18:39:24 +01:00
Antonio Scandurra
29a4baf346
Replace i32 with u32 for database columns
...
We never expect to return signed integers and so we shouldn't use
a signed type. I think this was a limitation of sqlx.
2022-12-01 17:47:51 +01:00
Antonio Scandurra
cfdf0a57b8
Implement Database::update_project
2022-12-01 17:36:36 +01:00
Antonio Scandurra
944d6554de
Implement Database::unshare_project
2022-12-01 16:26:13 +01:00
Antonio Scandurra
e3ac67784a
Implement Database::project_guest_connection_ids
2022-12-01 16:23:29 +01:00
Antonio Scandurra
62624b81d8
Avoid using col_expr whenever possible
...
...and use the more type-safe `::set`.
2022-12-01 16:17:27 +01:00
Antonio Scandurra
256e3e8e0f
Get basic calls working again with sea-orm
2022-12-01 16:17:24 +01:00
Antonio Scandurra
aebc6326a9
Implement Database::create_room
2022-12-01 15:22:20 +01:00
Antonio Scandurra
db1d93576f
Go back to a compiling state, panicking on unimplemented db methods
2022-12-01 15:13:57 +01:00
Antonio Scandurra
d2385bd6a0
Start using the new sea-orm backed database
2022-12-01 14:41:59 +01:00
Antonio Scandurra
19d14737bf
Implement signups using sea-orm
2022-12-01 11:58:07 +01:00
Antonio Scandurra
4f864a20a7
Implement invite codes using sea-orm
2022-12-01 11:10:51 +01:00
Antonio Scandurra
2375741bdf
Implement db2::Database::fuzzy_search_users
2022-12-01 10:09:53 +01:00
Julia
46f1d5f5c2
Avoid moving tab when leader item updates
2022-12-01 00:29:58 -05:00
Max Brunsfeld
d70996bb99
collab 0.2.5
2022-11-30 14:10:10 -08:00
Max Brunsfeld
9314c0e313
Replicate multibuffer excerpt additions and removals to followers
2022-11-30 13:20:13 -08:00
Julia
5a0c39cbed
Merge pull request #1922 from zed-industries/dont-panic-clip-instead
...
Dont panic in point conversion, clip instead
2022-11-30 13:28:10 -05:00
Julia
41b2fde10d
Style
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-30 13:11:08 -05:00
Julia
023ecd595b
Change verify macro to debug panic
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-30 13:03:15 -05:00
Julia
2b979d3b88
Don't panic rope point conversions
2022-11-30 12:43:43 -05:00
Julia
5965113fc8
Add verify macros & use in one location for point conversion
2022-11-30 12:43:43 -05:00
Max Brunsfeld
a48cd9125b
Start-local-collaboration script: put peers' windows at different positions
2022-11-30 09:29:49 -08:00
Antonio Scandurra
4c04d512db
Implement db2::Database::remove_contact
2022-11-30 17:39:17 +01:00
Antonio Scandurra
d1a44b889e
Implement contacts using sea-orm
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-30 17:36:25 +01:00
Antonio Scandurra
04d553d4d3
Implement db2::Database::get_user_metrics_id
2022-11-30 15:06:04 +01:00
Antonio Scandurra
2e24d128db
Implement access tokens using sea-orm
2022-11-30 14:47:03 +01:00
Antonio Scandurra
9e59056e7f
Implement db2::Database::get_user_by_github_account
2022-11-30 14:18:46 +01:00
Antonio Scandurra
d9a892a423
Make some db tests pass against the new sea-orm implementation
2022-11-30 12:13:16 +01:00
Joseph T. Lyons
3a1cd6ed3a
Merge pull request #1913 from zed-industries/Add-column-to-signups-for-added-to-mailing-list
...
Add "added_to_mailing_list" column on signups table
2022-11-29 19:30:11 -05:00
Max Brunsfeld
6120d6488b
Start work on following in multi-buffers
2022-11-29 14:50:43 -08:00
Max Brunsfeld
82abf31ef1
Add start-local-collaboration script
2022-11-29 14:50:12 -08:00
Joseph T. Lyons
9f9398476d
Merge pull request #1920 from zed-industries/order-invites-by-creation-time
...
Order invites by creation time
2022-11-29 14:28:53 -05:00
Antonio Scandurra
b7294887c7
WIP: move to a non-generic test database struct
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
Co-Authored-By: Julia Risley <julia@zed.dev >
2022-11-29 19:20:11 +01:00
Joseph Lyons
049c0f8ba4
Order invites by creation time
2022-11-29 12:57:51 -05:00
Antonio Scandurra
11a39226e8
Start on a new db2 module that uses SeaORM
2022-11-29 16:49:04 +01:00
Antonio Scandurra
ac24600a40
Start moving towards using sea-query to construct queries
2022-11-29 13:55:08 +01:00
Antonio Scandurra
d525cfd697
Increase probability of creating new files in randomized test
2022-11-29 11:02:14 +01:00
Joseph Lyons
4436ec48eb
Add "added_to_mailing_list" column on signups table
2022-11-29 02:13:13 -05:00
Joseph T. Lyons
5a9a0f9fa5
Merge pull request #1918 from zed-industries/remove-sign-in-telemetry-event
...
Remove sign in telemetry event
2022-11-29 01:59:33 -05:00
Max Brunsfeld
6d9b55a654
Send full multibuffer anchors to following peers
2022-11-28 18:00:38 -08:00
Max Brunsfeld
3eac3e20d5
Emit events from a multibuffer when adding/removing excerpts
2022-11-28 17:57:55 -08:00
Joseph Lyons
d2cd9c94f7
Remove sign in telemetry event
2022-11-28 18:56:27 -05:00
Max Brunsfeld
3adc0b947f
Merge pull request #1917 from zed-industries/integer-excerpt-ids
...
Use integers for excerpt ids, map them to locators internally
2022-11-28 14:27:35 -08:00
Max Brunsfeld
718f802157
Implement Copy for multibuffer anchors
2022-11-28 14:18:49 -08:00
Max Brunsfeld
f71145bb32
Add a layer of indirection between excerpt ids and locators
2022-11-28 14:18:49 -08:00
Antonio Scandurra
cd2a8579b9
Capture runnable backtraces only when detecting nondeterminism
2022-11-28 19:35:33 +01:00
Antonio Scandurra
d0709e7bfa
Error if project is disconnected after getting completions response
2022-11-28 19:19:24 +01:00
Antonio Scandurra
fa3f100eff
Introduce a new detect_nondeterminism = true attribute to gpui::test
2022-11-28 19:01:28 +01:00
Antonio Scandurra
f0a721032d
Remove non-determinism caused by random entropy when reconnecting
2022-11-28 18:56:11 +01:00
Antonio Scandurra
0a565c6bae
💄
2022-11-28 17:44:18 +01:00
Antonio Scandurra
af2a2d2494
Return error when waiting on a worktree snapshot after disconnecting
2022-11-28 17:43:40 +01:00
Antonio Scandurra
cd0b663f62
Introduce per-room lock acquired before committing a transaction
2022-11-28 17:00:47 +01:00
Antonio Scandurra
2a0ddd99d2
Error if project is disconnected after getting code actions response
2022-11-28 15:05:34 +01:00
Antonio Scandurra
5581674f8f
After completing LSP request, return an error if guest is disconnected
2022-11-28 14:39:27 +01:00
Antonio Scandurra
b0e1d6bc7f
Fix integration test incorrectly assuming a certain ordering
2022-11-28 13:57:15 +01:00
Antonio Scandurra
ae11e4f798
Check the correct serialization failure code when retrying transaction
2022-11-28 13:56:03 +01:00
Max Brunsfeld
0b0fe91545
Merge pull request #1912 from zed-industries/matching-brackets-must-contain-range
...
Fix enclosing-bracket bug that appeared in JS for loops
2022-11-23 13:44:48 -08:00
Max Brunsfeld
aeea47323a
Fix enclosing-bracket bug that appeared in JS for loops
...
Previously, we were relying on the tree-sitter query's range restriction to
avoid returning brackets that did not contain the given range. But the
query's range restriction only guarantees that we don't descend into parent
nodes unless they intersect the range.
2022-11-23 13:37:22 -08:00
Julia
e4185f38cf
Merge pull request #1910 from zed-industries/lsp-coordinate-clamp
...
Don't trust LSP coordinates to be within document bounds
2022-11-23 14:07:37 -05:00
Julia
09e6d44873
Move Unclipped into separate file
2022-11-23 14:02:11 -05:00
Julia
525d84e5bf
Remove spurious lifetimes
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-23 13:52:39 -05:00
Julia
55ca085d7d
Consistency in prefix/suffix/signature of UTF16 point to point conversion
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-23 13:52:18 -05:00
Julia
03cfd23ac5
Bump protocol version back down as proto changes are non-breaking
2022-11-23 13:40:49 -05:00
Julia
a666ca3e40
Collapse proto Point into the one kind of use case, utf-16 coords
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-23 13:28:44 -05:00
Julia
b58ae8bdd7
Clip diagnostic range before and during empty range expansion
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-23 13:21:05 -05:00
Max Brunsfeld
5e7652698d
v0.67.x dev
2022-11-23 09:56:06 -08:00
Julia
e51cbf67ab
Fixup compile errors
2022-11-22 02:49:47 -05:00
Julia
8c75df30cb
Wrap a bunch of traits for Unclipped<T>
2022-11-21 15:58:44 -05:00
Julia
1c84e77c37
Start adding concept of Unclipped text coordinates
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-21 15:48:25 -05:00
Max Brunsfeld
b3a92979a3
Merge pull request #1911 from zed-industries/single-file-worktree-event-extension
...
Fix file extension retrieval for single-file worktrees
2022-11-21 12:41:35 -08:00
Max Brunsfeld
55d3c09b6b
Fix file extension retrieval for single-file worktrees
...
Previously, we used the file's 'path' method, which only returns the relative
path from the worktree root.
2022-11-21 12:34:36 -08:00
Julia
436c89650a
Rename clamped -> clipped
2022-11-21 15:23:00 -05:00
Julia
4ead1ecbbf
Simply logic of this method
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-21 14:25:01 -05:00
Julia
074e3cfbd6
Clamp UTF-16 to point conversions
2022-11-21 14:25:01 -05:00
Julia
bb32599ded
Clamp for all UTF-16 to offset conversions which used to use ToOffset
2022-11-21 14:25:01 -05:00
Julia
f9cbed5a1f
Clamp UTF-16 coordinate while performing LSP edits rather than panicing
2022-11-21 11:48:13 -05:00
Kay Simmons
0078bea877
change bump-version to install jq if its not already installed
2022-11-18 13:42:46 -08:00
Kay Simmons
bb80cee19e
Merge pull request #1814 from zed-industries/golden-ratio
...
Active Pane Magnification
2022-11-18 13:14:03 -08:00
Kay Simmons
0c50c0959d
Merge pull request #1906 from zed-industries/mouse-down-capture-on-click-fix
...
Fix mouse down falling through popovers
2022-11-18 13:10:50 -08:00
Kay Simmons
75b8a12ab3
address issue where mouse down events weren't getting captured after the multiple handlers change
2022-11-18 13:04:27 -08:00
Antonio Scandurra
4c1b4953c1
Remove version from Room
...
We won't need it once we add the per-room lock.
2022-11-18 20:18:48 +01:00
Antonio Scandurra
c3d556d9bd
Don't take an Arc<Server> in message handlers
2022-11-18 11:45:42 +01:00
Max Brunsfeld
d090d230e2
Merge pull request #1903 from zed-industries/override-pyright-completion-sorting
...
Add LspAdapter hook for processing completions, fix completion sorting from Pyright
2022-11-17 15:30:07 -08:00
Max Brunsfeld
bca635e5d3
Add LspAdapter hook for processing completions, fix completion sorting from Pyright
2022-11-17 15:26:46 -08:00
Julia
3938adf60a
Merge pull request #1902 from zed-industries/event-handlers-are-multitude
...
Allow having multiple mouse event handlers of the same kind
2022-11-17 17:19:32 -05:00
Julia
6537def97e
Allow having multiple mouse event handlers of the same kind
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-11-17 17:01:34 -05:00
Max Brunsfeld
5020c70a04
collab 0.2.4
2022-11-17 11:44:29 -08:00
Mikayla Maki
0a63d2e3e1
Merge pull request #1900 from zed-industries/fix-terminal-performance
...
Check for wakeups correctly
2022-11-17 11:17:13 -08:00
Mikayla Maki
ce0dfde8ee
Check for wakeups correctly
2022-11-17 11:14:31 -08:00
Antonio Scandurra
44bb2ce024
Rename Store to ConnectionPool
2022-11-17 19:03:59 +01:00
Antonio Scandurra
6c83be3f89
Remove obsolete code from Store
2022-11-17 18:46:39 +01:00
Antonio Scandurra
0a4517f97e
WIP: Introduce a db field to Session
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-17 17:30:26 +01:00
Antonio Scandurra
c34a5f3177
Introduce a new Session struct to server message handlers
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-17 17:11:06 +01:00
Antonio Scandurra
4f39181c4c
Revert "Don't replace newer diagnostics with older ones"
...
This reverts commit 71eeeedc05 .
2022-11-17 16:57:40 +01:00
Antonio Scandurra
e7e45be6e1
Revert "Wait for previous UpdateFollowers message ack before sending new ones"
...
This reverts commit fe93263ad4 .
2022-11-17 16:57:32 +01:00
Antonio Scandurra
8621c88a3c
Use int8 for scan_id and inode in Postgres
2022-11-17 16:56:43 +01:00
Antonio Scandurra
7dae21cb36
🎨
2022-11-17 15:35:18 +01:00
Antonio Scandurra
0f4598a243
Fix seed script
2022-11-17 15:34:35 +01:00
Antonio Scandurra
6415809b61
Fix errors in Postgres schema
2022-11-17 15:34:12 +01:00
Antonio Scandurra
fe93263ad4
Wait for previous UpdateFollowers message ack before sending new ones
2022-11-17 14:12:00 +01:00
Antonio Scandurra
3b34d858b5
Remove unwrap from Server::share_project
2022-11-17 13:33:26 +01:00
Antonio Scandurra
71eeeedc05
Don't replace newer diagnostics with older ones
2022-11-17 12:21:51 +01:00
Antonio Scandurra
532a599239
Use Db::get_guest_connection_ids in other db methods
2022-11-17 11:38:00 +01:00
Nathan Sobo
9eee22ff0a
Fix column name in query
2022-11-16 19:40:53 -07:00
Nathan Sobo
94fe93c6ee
Move unshare_project to db module
2022-11-16 18:28:45 -07:00
Joseph Lyons
93824dd239
Fix top-level header in discord webhook action
2022-11-16 20:02:15 -05:00
Nathan Sobo
e5f05c9f3b
Move leave_project from Store to db module
2022-11-16 17:45:47 -07:00
Nathan Sobo
bdb521cb6b
Fix typo in query
2022-11-16 16:52:05 -07:00
Joseph Lyons
c613c98e37
Move comment to correct location
2022-11-16 17:28:50 -05:00
Max Brunsfeld
4e4299d500
v0.66.x dev
2022-11-16 14:22:18 -08:00
Antonio Scandurra
c1291a093b
WIP: Allow subscribing to remote entity before creating a model
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-16 19:51:24 +01:00
Mikayla Maki
ccc8c247a1
Merge pull request #1894 from zed-industries/opt-as-meta-fix
...
Fix small terminal bugs
2022-11-16 10:50:02 -08:00
Mikayla Maki
8e6c5dbc3b
Fix unscaled scrolling when using an imprecise mouse wheel
2022-11-16 10:44:13 -08:00
Mikayla Maki
3c53fcdb43
Added alt-left: move word left and alt-right: move word right in the terminal for for antonio
2022-11-16 09:59:23 -08:00
Antonio Scandurra
adf43c87dd
Batch some of the new queries in Db
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-16 17:19:06 +01:00
Antonio Scandurra
faf265328e
Wait for acknowledgment before sending the next diagnostic summary
2022-11-16 16:03:01 +01:00
Antonio Scandurra
9bc57c0c61
Move Store::start_language_server to Db
2022-11-16 15:48:26 +01:00
Antonio Scandurra
95369f92eb
Move Store::update_diagnostic_summary to Db
2022-11-16 15:41:33 +01:00
Antonio Scandurra
117458f4f6
Send worktree updates after project metadata has been sent
2022-11-16 14:58:11 +01:00
Antonio Scandurra
eeb32fa888
Improve queries for composite primary keys
2022-11-16 11:07:39 +01:00
Antonio Scandurra
f9567ae116
Cascade deletes when project is deleted
2022-11-16 10:41:36 +01:00
Antonio Scandurra
c151c87e12
Correctly leave projects when leaving room
2022-11-16 10:36:48 +01:00
Antonio Scandurra
3190236396
Update worktree entry instead of erroring when it already exists
2022-11-16 08:57:19 +01:00
Joseph T. Lyons
17dfbb91ba
Merge pull request #1897 from zed-industries/allow-users-to-sign-up-multiple-times
2022-11-15 20:13:43 -05:00
Joseph Lyons
c3cf056fc5
allow users to sign up multiple times without throwing a 500
2022-11-15 20:04:56 -05:00
Nathan Sobo
275f0ae492
collab 0.2.3
2022-11-15 15:45:04 -07:00
Nathan Sobo
f4e9759f26
Merge pull request #1896 from zed-industries/fix-invites
...
Once we email someone an invite, honor the invitation
2022-11-15 15:43:30 -07:00
Nathan Sobo
fdf758e050
Once we email someone an invite, honor the invitation
...
Previously, we were waiting to decrement the invite_count until a user
confirmed their email address, which created weird situations where we would
email people only to have them get a 500 when trying to sign up. Now, we
decrement the invite_count upon sending the email and always honor the
invitation.
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-11-15 15:36:59 -07:00
Max Brunsfeld
0dfacd7ffa
Merge pull request #1895 from zed-industries/ruby-solargraph
...
Add ruby LSP support via SolarGraph
2022-11-15 12:45:54 -08:00
Max Brunsfeld
36c07f940c
Add ruby LSP support via SolarGraph
2022-11-15 12:34:43 -08:00
Mikayla Maki
01929037f1
fixed clear problem
2022-11-15 12:02:09 -08:00
Antonio Scandurra
0817f905a2
Fix syntax error in schema
2022-11-15 18:02:07 +01:00
Antonio Scandurra
ad67f5e4de
Always use the database to retrieve collaborators for a project
2022-11-15 17:49:37 +01:00
Antonio Scandurra
e9eadcaa6a
Move Store::update_worktree to Db::update_worktree
2022-11-15 17:18:28 +01:00
Antonio Scandurra
4b1dcf2d55
Always use strings to represent paths over the wire
...
Previously, the protocol used a mix of strings and bytes without any consistency.
When we go to multiple platforms, we won't be able to mix encodings of paths anyway.
We don't know this is the right approach, but it at least makes things consistent
and easy to read in the database, on the wire, etc. Really, we should be using entry
ids etc to refer to entries on the wire anyway, but there's a chance this is the
wrong decision.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-15 16:46:17 +01:00
Antonio Scandurra
974ef967a3
Move Store::join_project to Db::join_project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-15 16:37:51 +01:00
Antonio Scandurra
be523617c9
Start reworking join_project to use the database
2022-11-15 11:44:26 +01:00
Antonio Scandurra
6cbf197226
Determine whether a contact is busy via the database
2022-11-15 10:41:21 +01:00
Antonio Scandurra
3e8fcb04f7
Finish implementing Db::update_project
2022-11-15 09:01:51 +01:00
Antonio Scandurra
42bb5f0e9f
Add random delay after returning results from the database
2022-11-15 08:48:16 +01:00
Max Brunsfeld
e401caff7c
Merge pull request #1863 from zed-industries/erb
...
Add support for ERB
2022-11-14 16:59:51 -08:00
Max Brunsfeld
b222e8eb5a
Use a longer example text in random combined injections test
2022-11-14 16:56:21 -08:00
Max Brunsfeld
fb35631337
Bump tree-sitter after merging included-ranges PR
2022-11-14 16:56:09 -08:00
Max Brunsfeld
6659dac2e5
Fix compile errors in seed script, ensure it is compiled on CI
...
Co-authored-by: Nate Butler <nate@zed.dev >
2022-11-14 11:12:25 -08:00
Antonio Scandurra
b9af2ae66e
Switch to serializable isolation
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-11-14 19:39:12 +01:00
Mikayla Maki
0dcdd6ea39
Merge pull request #1889 from zed-industries/terminal-bugs
...
Refactored rendering to squash all wakeups into 1
2022-11-14 10:29:00 -08:00
Mikayla Maki
a66aa9c09c
Refactored rendering to squash all wakeups into 1
2022-11-14 10:20:55 -08:00
Kay Simmons
e6c5079a49
Merge pull request #1873 from zed-industries/drag-project-entry-to-pane
...
Drag and Drop Project Entries Between Folders
2022-11-14 09:55:56 -08:00
Antonio Scandurra
d7369ace6a
Skip applying room updates if they're older than the local room state
2022-11-14 15:35:39 +01:00
Antonio Scandurra
40073f6100
Wait for acknowledgment before sending the next project update
2022-11-14 15:32:49 +01:00
Antonio Scandurra
65c5adff05
Automatically decline call when user drops their last connection
2022-11-14 11:32:26 +01:00
Antonio Scandurra
59e8600e4c
Implement Db::cancel_call
2022-11-14 11:12:23 +01:00
Antonio Scandurra
0310e27347
Fix query errors in Db::share_project
2022-11-14 10:53:11 +01:00
Antonio Scandurra
9902211af1
Leave room when connection is dropped
2022-11-14 10:13:36 +01:00
Joseph Lyons
1da5be6e8f
Update release urls to match new zed.dev url format
2022-11-12 21:39:08 -05:00
Max Brunsfeld
ee66adbb49
SyntaxMap - Don't ignore deletions at the boundaries of layers
2022-11-11 16:43:57 -08:00
Max Brunsfeld
3612c46d6d
Bump tree-sitter for included range bugfix
2022-11-11 16:36:04 -08:00
Julia
bf9c9b0103
Merge pull request #1875 from zed-industries/fix-code-actions-regression
...
Use `EMPTY` code action kind to get more RA actions without breaking TS
2022-11-11 15:34:40 -05:00
Julia
ea8778921b
Use EMPTY code action kind to get more RA actions without breaking TS
2022-11-11 15:26:12 -05:00
Julia
2ef2b5a053
Merge pull request #1874 from zed-industries/propagate-mouse-up-through-drop-receiver
...
Propagate mouse up event through drop receiver in early return
2022-11-11 14:05:07 -05:00
Julia
5bb7701de7
Propagate mouse up event through drop receiver in early return
2022-11-11 14:00:01 -05:00
Antonio Scandurra
2145965749
WIP
2022-11-11 19:36:20 +01:00
Antonio Scandurra
11caba4a4c
Remove stray log statement
2022-11-11 18:54:08 +01:00
Antonio Scandurra
9f39dcf7cf
Get basic calls test passing again
2022-11-11 18:53:23 +01:00
Antonio Scandurra
1135aeecb8
WIP: Move Store::leave_room to Db::leave_room
2022-11-11 16:59:54 +01:00
Julia
b6f78cd5dc
Merge pull request #1871 from zed-industries/skip-additional-edit-within-primary
...
Skip LSP additional completion edits which fall within primary edit
2022-11-11 10:31:41 -05:00
Antonio Scandurra
a6198c9a1a
Merge pull request #1870 from zed-industries/fix-remote-abs-paths
...
Fix bug where absolute paths of worktrees were not being stored on the server
2022-11-11 15:28:17 +00:00
Julia
ad698fd110
Test for filtering out of faulty LSP completion additional edits
2022-11-11 10:28:07 -05:00
Antonio Scandurra
0d1d267213
Move Store::decline_call to Db::decline_call
2022-11-11 15:41:56 +01:00
Antonio Scandurra
c213c98ea4
Remove calls table and use just room_participants
2022-11-11 15:22:04 +01:00
Antonio Scandurra
cc58607c3b
Move Store::join_room into Db::join_room
2022-11-11 14:43:40 +01:00
Antonio Scandurra
58947c5c72
Move incoming calls into Db
2022-11-11 14:28:26 +01:00
Antonio Scandurra
6871bbbc71
Start moving Store state into the database
2022-11-11 12:06:43 +01:00
Antonio Scandurra
28aa1567ce
Include sender_user_id when handling a server message/request
2022-11-11 11:45:58 +01:00
Antonio Scandurra
f639c4c3d1
Add schema for reconnection support
2022-11-11 10:41:44 +01:00
Kay Simmons
d61c0fb24c
Allow dragging and dropping project entries
2022-11-10 20:43:55 -08:00
Kay Simmons
3d5a3634cf
Merge pull request #1867 from zed-industries/drag-project-entry-to-pane
...
Drag project entry to pane
2022-11-10 17:25:22 -08:00
Max Brunsfeld
9ad8731897
Fix boundary condition where injection was not found after an edit
2022-11-10 17:04:40 -08:00
Julia
44c3cedc48
Skip additional completions on any kind of overlap with primary edit
2022-11-10 18:53:37 -05:00
Max Brunsfeld
eeeaf6d9a2
Merge pull request #1872 from zed-industries/tests-use-real-db
...
Run integration tests with an in-memory sqlite database instead of a hand-coded fake database
2022-11-10 15:15:52 -08:00
Max Brunsfeld
2d4deaafcd
Use upstream sqlx git repository
2022-11-10 15:13:32 -08:00
Max Brunsfeld
c839ab2028
Add missing cfg(test) attribute to sqlite RowsAffected
2022-11-10 15:04:57 -08:00
Max Brunsfeld
5d17347a45
Use our fork of sqlx, for now
2022-11-10 14:58:05 -08:00
Max Brunsfeld
9ce3524eb8
Run db tests against both postgres and sqlite
2022-11-10 14:29:03 -08:00
Julia
03115c8d71
Skip LSP additional completion edits which fall within primary edit
2022-11-10 15:28:11 -05:00
Max Brunsfeld
dafdc4b4a5
Run tests with an in-memory sqlite database
2022-11-10 12:18:35 -08:00
Max Brunsfeld
05a6bd914d
Get integration tests passing with sqlite
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-11-10 11:03:52 -08:00
Nathan Sobo
fb03eb7a3c
Store absolute path on server when sharing worktree
...
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2022-11-10 09:34:16 -07:00
Nathan Sobo
8e70e1934a
Avoid unwrapping when computing tab description
...
A bug caused the assumptions of this method to be violated. We will fix that in the next commit, but we want to be more conservative in our assumptions here going forward.
Co-Authored-By: Antonio Scandurra <me@as-cii.com >
2022-11-10 09:33:57 -07:00
Antonio Scandurra
1bb41b6f54
Go back to a compiling state and start running tests again
2022-11-10 15:24:49 +01:00
Antonio Scandurra
90d1d9ac82
WIP: add more trait bounds
2022-11-10 12:24:56 +01:00
Max Brunsfeld
bed06346d1
Total WIP - try making Db a generic struct instead of a trait
2022-11-09 19:28:06 -08:00
Max Brunsfeld
7e02ac772a
Start work on using sqlite in tests
2022-11-09 19:26:29 -08:00
Nate Butler
c0d67d9522
Merge pull request #1868 from zed-industries/readd-search-match-highlight
...
Update search match highlight and occurrence style
2022-11-09 18:37:17 -05:00
Max Brunsfeld
d14dd27cdc
Use a real database in tests, but block on db calls
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-11-09 15:22:50 -08:00
Nate Butler
6b4dd2a5de
Update search match highlight and occurrence style
2022-11-09 18:17:00 -05:00
Max Brunsfeld
9355d501bc
Fetch release branches before bumping zed minor versions
2022-11-09 14:02:46 -08:00
Max Brunsfeld
335db5d03d
v0.65.x dev
2022-11-09 13:18:23 -08:00
Julia
98461ea0cd
Merge pull request #1865 from zed-industries/do-not-restrict-code-action-kinds
...
Don't restrict which kind of code actions we ask the LSP server for
2022-11-09 09:49:47 -05:00
Kay Simmons
5707bae9b9
Merge pull request #1866 from zed-industries/tweak-restart-zed-message
...
Remove restart to update zed icon
2022-11-08 14:38:10 -08:00
Kay Simmons
bbeb685769
remove unused comment
2022-11-08 14:26:55 -08:00
Kay Simmons
cea103e47c
remove dead comment
2022-11-08 14:24:51 -08:00
Kay Simmons
ad31c284c7
remove restart to update zed icon because it clashes with the no diagnostics icon
2022-11-08 14:22:11 -08:00
Kay Simmons
738893c527
Split and move to pane working
2022-11-08 14:19:31 -08:00
Max Brunsfeld
6da04d0eee
Fix failure to load .env.toml in bootstrap script
2022-11-08 14:09:17 -08:00
Julia
7482660456
Don't restrict which kind of code actions we ask the LSP server for
2022-11-08 16:23:31 -05:00
Mikayla Maki
00123ffe2b
Merge pull request #1864 from zed-industries/add-more-move-cursor
...
Added more autoscroll behaviors
2022-11-08 11:57:09 -08:00
Mikayla Maki
53f8744794
Tried alternate stratergy
2022-11-08 11:54:26 -08:00
Mikayla Maki
537d4762f6
Added more autoscroll behaviors
2022-11-08 11:35:12 -08:00
Max Brunsfeld
2f5004c238
Add highlight query for ERB
2022-11-08 11:29:57 -08:00
Max Brunsfeld
7dcd6c920f
Add randomized test for syntax map with combined injections
2022-11-08 11:29:23 -08:00
Max Brunsfeld
ea42bc3c9b
Rename some sum_tree seek targets in SyntaxMap
2022-11-08 10:36:44 -08:00
Antonio Scandurra
d3ba769291
Merge pull request #1862 from zed-industries/fix-catalina
...
Weakly link ReplayKit to ensure this library can be used on macOS 10.15
2022-11-08 15:07:09 +00:00
Antonio Scandurra
3f1b95927f
Move weak linking into zed's build.rs
2022-11-08 16:04:55 +01:00
Antonio Scandurra
c183e854d7
Weakly link ReplayKit to ensure this library can be used on macOS 10.15
2022-11-08 13:44:31 +01:00
Max Brunsfeld
86f51ade60
Fix panic in handling edits to combined injections
2022-11-07 17:32:15 -08:00
Max Brunsfeld
c838a7d973
Get combined injections basically working
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2022-11-07 16:58:12 -08:00
Julia
9abfa037fd
Handle project entry drop render & start fixing drag cancel issues
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-11-07 18:17:36 -05:00
Max Brunsfeld
5efe2ed6d3
Start work on handling combined injections in SyntaxMap
2022-11-07 14:45:17 -08:00
Julia
847376a4f5
Start dragging project panel entries
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-11-07 17:00:01 -05:00
Kay Simmons
1d6af4cf20
Merge pull request #1857 from zed-industries/fix-unicode-vim-left
...
fixes issue with left motion in vim mode clipping incorrectly
2022-11-04 15:24:17 -07:00
Kay Simmons
b6c5c7871e
Addresses issue where left motion in vim mode would clip in the wrong direction
2022-11-04 15:21:29 -07:00
Nate Butler
5acae094bd
Swap the color of diagnostic underlines to fix low contrast issue.
2022-11-04 18:02:10 -04:00
Kay Simmons
4d7425f4bf
Merge pull request #1845 from zed-industries/vim-dd-fix
...
Vim dd fix
2022-11-04 14:57:21 -07:00
Joseph T. Lyons
2497e7c008
Merge pull request #1855 from zed-industries/make-app-a-user-property-in-mixpanel
...
Make `App` a user property in Mixpanel
2022-11-04 14:43:46 -04:00
Joseph T Lyons
474a5dd4f2
Make App a user property in Mixpanel
...
Currently, we cannot take advantage of Mixpanel's virtual session end events because they are associated with users, not events; this change moves the property onto users.
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2022-11-04 14:16:12 -04:00
Max Brunsfeld
18ff459014
collab 0.2.2
2022-11-04 10:04:14 -07:00
Max Brunsfeld
927cfa44db
Use Rust 1.65 in collab docker image
2022-11-04 10:03:47 -07:00
Max Brunsfeld
be6ee3cbff
Start work on ERB language support
2022-11-04 09:33:59 -07:00
Antonio Scandurra
7301ab4f44
Merge pull request #1854 from zed-industries/command-palette-improvements
...
Improve styling of command palettes
2022-11-04 14:09:55 +00:00
Antonio Scandurra
0b231e58fd
Show placeholder text for pickers
2022-11-04 10:18:47 +01:00
Antonio Scandurra
08b84416d2
Avoid showing "No matches" when query is empty if there are no matches
2022-11-04 10:18:47 +01:00
Antonio Scandurra
aec8aec800
Show the cursor right away when opening opening/focusing editors
2022-11-04 10:18:47 +01:00
Max Brunsfeld
5bcf9916c9
Merge pull request #1853 from zed-industries/diagnostics-focus-loop
...
Fix infinite focus transfer loop in project diagnostics
2022-11-03 18:01:14 -07:00
Max Brunsfeld
6076a3fc61
Fix infinite focus transfer loop in project diagnostics
...
Co-authored-by: Kay Simmons <kay@zed.dev >
2022-11-03 17:53:36 -07:00
Max Brunsfeld
05389dc239
Merge pull request #1844 from zed-industries/ruby
...
Add support for Ruby
2022-11-03 15:59:11 -07:00
Max Brunsfeld
d222904471
Add basic support for ruby
...
Co-authored-by: Kay Simmons <kay@zed.dev >
2022-11-03 15:52:33 -07:00
Max Brunsfeld
9f3ea0c87f
Merge pull request #1851 from zed-industries/rust-let-else
...
Bump tree-sitter-rust for let-else, let-chains
2022-11-03 12:39:37 -07:00
Max Brunsfeld
601ec40ddc
Bump tree-sitter-rust for let-else, let-chains
2022-11-03 12:35:12 -07:00
Joseph T. Lyons
adc4a5984e
Merge pull request #1850 from zed-industries/add-automatic-annotations-for-mixpanel
...
Add automatic annotations for mixpanel
2022-11-03 13:26:15 -04:00
Joseph T Lyons
0f78174d78
Use folded style to make arguments easier to read
2022-11-03 13:06:19 -04:00
Joseph T Lyons
ad67a1b744
Add automatic annotations for mixpanel
2022-11-03 01:48:49 -04:00
Nate Butler
edc2966651
Merge pull request #1847 from zed-industries/readd-abruzzo-theme
...
Re-add Abruzzo theme to experimental themes
2022-11-02 22:34:04 -04:00
Joseph T. Lyons
eacfa856cf
Merge pull request #1848 from zed-industries/fix-markdown-rendering-of-discord-release-notes-webhook
...
Fix markdown rendering of discord release notes webhook
2022-11-02 16:12:29 -04:00
Max Brunsfeld
fe4862d756
Fix error in bump-zed-patch-version script
2022-11-02 12:18:14 -07:00
Max Brunsfeld
8312d974ac
Fix release channel on stable
2022-11-02 12:18:07 -07:00
Max Brunsfeld
6d3bd495fc
Fix error case in what-is-deployed script
2022-11-02 12:05:37 -07:00
Joseph T Lyons
576e350bea
Fix markdown rendering of discord release notes webhook
2022-11-02 14:55:27 -04:00
Max Brunsfeld
cc1325d6f9
Adjust script for getting changes to put in release notes
...
Now, this script is only useful for the preview channel's releases. The
stable channel's release notes can be mostly copied from the existing
preview releases notes.
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2022-11-02 10:55:48 -07:00
Max Brunsfeld
c411cb7eef
collab 0.2.1
2022-11-02 10:27:26 -07:00
Max Brunsfeld
c9ba41d002
Fix errors in bump-zed-minor-versions script
...
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2022-11-02 10:25:20 -07:00
Joseph T Lyons
3caa7a4916
v0.64.x dev
2022-11-02 12:57:53 -04:00
Joseph T. Lyons
370a6f3dbd
Merge pull request #1842 from zed-industries/telemetry-corrections
...
Telemetry corrections
2022-11-02 12:36:48 -04:00
Joseph T Lyons
d8685baa47
Revert "Differentiate between first time app starts and subsequent ones"
2022-11-02 12:22:46 -04:00
Nate Butler
4f344f1ac1
Re-add Abruzzo theme to experimental themes
2022-11-02 11:28:43 -04:00
Nate Butler
6a07f59d34
Merge pull request #1831 from zed-industries/theme-tweaks
...
Theme tweaks
2022-11-02 10:04:55 -04:00
Nate Butler
7981cd45ed
Increase scrollbar width
2022-11-02 09:58:15 -04:00
Antonio Scandurra
66b1283c95
Merge pull request #1846 from zed-industries/dont-focus-notification-windows
...
Don't focus incoming call and project shared notification windows
2022-11-02 13:21:18 +00:00
Antonio Scandurra
d275474b23
Don't focus incoming call and project shared notification windows
2022-11-02 14:17:16 +01:00
Antonio Scandurra
86057ab071
Merge pull request #1843 from zed-industries/call-randomized-test
...
Model calls in randomized collaboration test
2022-11-02 13:03:34 +00:00
Kay Simmons
4977acf6a5
fix some vim mode bugs around deletions and failed motions
2022-11-02 01:20:11 -07:00
Joseph T Lyons
aafc3a9584
Make event name casing consistent with other event names
2022-11-01 23:19:55 -04:00
Joseph T Lyons
dc657a647e
Remove Amplitude event tracking
2022-11-01 20:49:49 -04:00
Joseph T Lyons
e5f0965138
Differentiate between first time app starts and subsequent ones
2022-11-01 20:36:18 -04:00
Kay Simmons
0cd2d9a9c8
added new supported feature
2022-11-01 13:15:14 -07:00
Julia
b2b25acc4c
Merge pull request #1841 from zed-industries/tab-activation-history
...
Avoid reordering items by adding an activation history to panes, and remove tab reordering hack
2022-11-01 14:46:45 -04:00
Antonio Scandurra
0b79950510
Don't hold the lock while yielding back to the executor in Client
2022-11-01 19:16:02 +01:00
Antonio Scandurra
d6d1e20f07
Ensure declining call doesn't accidentally leave a room
2022-11-01 18:48:08 +01:00
Julia
c58abf1b0b
Add test for new tab order history behavior
2022-11-01 13:29:21 -04:00
Antonio Scandurra
88d2e2e277
Introduce calls to randomized collaboration test
2022-11-01 15:44:00 +01:00
Antonio Scandurra
946c92667f
Don't drop fake LSP adapter's receiver before simulate ends
2022-11-01 14:28:01 +01:00
Antonio Scandurra
f54f653d42
Don't return an error when failing to send AddProjectCollaborator
...
This can happen when a peer has disconnected but we haven't yet been
able to acquire a lock to the store to clean up the state associated
with it.
2022-11-01 11:21:40 +01:00
Antonio Scandurra
ef72c75fab
Honor MAX_PEERS env variable in randomized test
2022-11-01 10:24:26 +01:00
Antonio Scandurra
c6e52dbef7
Fix hang due to acquiring rng lock twice
2022-11-01 09:35:53 +01:00
Antonio Scandurra
62547e87dd
Prevent randomized test from failing if another guest disconnects
2022-11-01 09:27:51 +01:00
Antonio Scandurra
eb6b545eeb
Fix outstanding compiler errors in randomized collaboration test
2022-11-01 08:40:31 +01:00
Antonio Scandurra
4c4ebbfa19
Start removing distinction between host and guest in random collab test
2022-11-01 08:40:08 +01:00
Joseph T Lyons
61f31bf010
Fill in missing "app" field names on Mixpanel events
2022-10-31 19:18:35 -04:00
Joseph T Lyons
495fd151f5
Revert Amplitude's "app" name back to "platform"
...
This was unintentional. We only want to rename the Mixpanel telemetry "platform" field to "app." We want to keep it as "platform" on Amplitude because we want to keep using Amplitude for a bit, and the event fields should be the same.
2022-10-31 19:18:03 -04:00
Max Brunsfeld
482a5bb02a
Merge pull request #1840 from zed-industries/build-themes-in-assets-crate
...
Generate themes before compiling the 'assets' crate
2022-10-31 14:18:28 -07:00
Kay Simmons
4e35b26365
Avoid reordering items by adding an activation history to panes, and remove tab reordering hack
...
Co-Authored-By: Julia Risley <julia@zed.dev >
2022-10-31 14:10:34 -07:00
Joseph T. Lyons
c180137e02
Merge pull request #1829 from zed-industries/add-release-channel-information-to-telemetry-events
...
Add release channel information to telemetry events
2022-10-31 16:42:28 -04:00
Max Brunsfeld
ef837232bc
Generate themes before compiling the 'assets' crate
2022-10-31 13:25:12 -07:00
Max Brunsfeld
d0aa9f1c57
Merge pull request #1839 from zed-industries/contact-list-project-color
...
Don't use 'on' background color for projects in the contact list
2022-10-31 12:39:17 -07:00
Max Brunsfeld
aa549d1da7
Don't use 'on' color for projects in the contact list
2022-10-31 12:28:25 -07:00
Julia
259a758849
Merge pull request #1800 from zed-industries/go-to-diff-hunk
...
Add action to go to next/previous git diff in editor
2022-10-31 14:38:52 -04:00
Julia
7ac45379eb
Layout git gutters inclusively
2022-10-31 14:35:42 -04:00
Max Brunsfeld
0940482c62
Merge pull request #1838 from zed-industries/tab-panic
...
Fix panic when hitting tab at the beginning of a line with mixed tab/…
2022-10-31 10:55:48 -07:00
Max Brunsfeld
9cbb698b96
Fix panic when hitting tab at the beginning of a line with mixed tab/space indent
2022-10-31 10:51:20 -07:00
Mikayla Maki
1820be4990
Adds a little spacing between the share button and the screenshare icon
2022-10-31 10:19:06 -07:00
Mikayla Maki
37ca232548
Remove annoyoing debug
2022-10-31 10:02:17 -07:00
Mikayla Maki
ea9b009a22
Fixed bug with cut entry active states
2022-10-31 09:55:52 -07:00
Nate Butler
dbc804669c
Update ignored, cut entry styles in the project panel
2022-10-31 10:30:58 -04:00
Julia
c8fbc0d348
Slightly expand region hunk layout checks for folds
2022-10-28 19:05:29 -04:00
Julia
8361b4d47a
Add test for go-to hunk and fix discovered bugs
2022-10-28 15:08:13 -04:00
Julia
ae2021e073
WIP start setting up test infrastructure for editor diff actions
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-28 15:08:13 -04:00
Julia
c4b21a0ab5
Add action to go to next/previous git diff in editor
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-28 15:08:13 -04:00
Mikayla Maki
8a095d0a55
Merge pull request #1833 from zed-industries/add-channel-to-db
...
Added channel info to database directories
2022-10-28 11:54:46 -07:00
Mikayla Maki
c0bf8fd6a8
Added channel to database directories
2022-10-28 11:50:26 -07:00
Mikayla Maki
14329980e1
Merge pull request #1832 from zed-industries/upgrade-migration-lib
...
Upgraded migration library to remove panic
2022-10-28 11:41:31 -07:00
Mikayla Maki
950626fe9e
Upgraded migration library to remove panic
2022-10-28 11:36:41 -07:00
Mikayla Maki
8b7e587467
Removed stray test file
2022-10-28 10:48:54 -07:00
Mikayla Maki
552ebc0f29
Implemented direct styling for ignored and cut project panel entries
2022-10-28 10:45:45 -07:00
Nate Butler
9148e1d30a
Update icons
...
- `x_mark_thin` combined into `x_mark`
- updated many icons
- remove unused icons
2022-10-28 12:59:05 -04:00
Max Brunsfeld
9156d488ca
Merge pull request #1830 from zed-industries/auto-update-filename
...
Make auto-update handle an app bundle name other than 'Zed.app'
2022-10-27 16:47:34 -07:00
Max Brunsfeld
e1ac1675ea
Avoid hard-coding app bundle filename in auto-updater
2022-10-27 16:44:07 -07:00
Max Brunsfeld
863250904b
Avoid posting in Discord about preview releases (for now)
...
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2022-10-27 15:43:00 -07:00
Joseph T Lyons
8a926c4a23
Make release_channel optional to fix tests
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2022-10-27 18:06:34 -04:00
Kay Simmons
760cceb378
Merge pull request #1827 from zed-industries/fix-keymap-resolution-fallback
...
Keymap resolution fallbacks
2022-10-27 13:50:38 -07:00
K Simmons
c5650f9334
remove unnecessary comment
2022-10-27 13:29:57 -07:00
K Simmons
bf968707df
upgrade existing test to match new expected behavior
2022-10-27 13:28:49 -07:00
Max Brunsfeld
31fa7ca90c
Add livekit to the Procfile, update the README
2022-10-27 13:24:35 -07:00
Joseph T Lyons
309f401015
Rename all keys, in telemetry events, to be consistent with Mixpanels conventions
2022-10-27 16:19:21 -04:00
Max Brunsfeld
33d02cedd7
Run CI when pushing to release branches (e.g. 'v0.62.x')
2022-10-27 13:03:35 -07:00
Joseph T Lyons
daa75b5282
Add missing struct field
...
This must've gotten lost on the merging of main into this branch
2022-10-27 15:59:22 -04:00
Joseph T Lyons
36c64045ae
Merge branch 'main' into add-release-channel-information-to-telemetry-events
2022-10-27 15:57:17 -04:00
Joseph T Lyons
93e1e30323
Add release channel information to telemetry events
2022-10-27 15:53:14 -04:00
Max Brunsfeld
9b69f9a3ff
Merge pull request #1828 from zed-industries/following-scrollbar
...
Show scrollbar when scrolling while following
2022-10-27 12:46:14 -07:00
Max Brunsfeld
d5fbb59656
Show scrollbar when scrolling while following
2022-10-27 12:42:34 -07:00
Max Brunsfeld
7ba95d5d6c
🔥 stray dbg
2022-10-27 12:42:20 -07:00
Max Brunsfeld
d79aeba2c1
Avoid spurious log messages in development builds
2022-10-27 12:42:03 -07:00
K Simmons
672b445676
minor tweak to keymap code
2022-10-27 12:36:53 -07:00
K Simmons
e02199fa2a
fixed binding fallback
2022-10-27 12:33:51 -07:00
Max Brunsfeld
9e55051811
Tweak version-bumping scripts
2022-10-27 12:10:09 -07:00
Max Brunsfeld
7db176a763
Remove stale docs folder
2022-10-27 12:08:55 -07:00
Nate Butler
92886236a2
Refine editor styles
...
- Update active line backgrounds and line numbers
- Add a higher contrast border between the dock and panes
2022-10-27 14:59:50 -04:00
Mikayla Maki
8d94de8eb2
WIP: Change to matches to vec
2022-10-27 11:27:26 -07:00
Max Brunsfeld
eaebec88c0
Merge pull request #1825 from zed-industries/update-notification-release-channel
...
Indicate release channel in auto-update notification
2022-10-27 11:00:16 -07:00
Max Brunsfeld
22fa6c07dd
Indicate release channel in auto-update notification
2022-10-27 10:57:59 -07:00
Joseph T. Lyons
afe9ab9d8c
Merge pull request #1824 from zed-industries/change-telemetry-event-field-name-to-app
...
Change telemetry event field name to app
2022-10-27 13:16:45 -04:00
Max Brunsfeld
16139cc6b6
Merge pull request #1822 from zed-industries/dont-bundle-app-on-prs
...
Don't bundle the app on CI for PRs
2022-10-27 10:10:29 -07:00
Joseph T Lyons
31a904d370
Change telemetry event field name to app
2022-10-27 12:35:35 -04:00
Max Brunsfeld
02cf7679a3
0.63.x dev
2022-10-26 23:04:36 -07:00
Max Brunsfeld
df708465d1
Ensure only the just-built app bundle is included in the DMG
2022-10-26 21:06:06 -07:00
Kay Simmons
aa9ccf3411
Merge pull request #1823 from zed-industries/reduce-cursor-blink-load
...
Reduce Cursor Blink CPU Load
2022-10-26 17:58:56 -07:00
Max Brunsfeld
6410fdc474
Clear out bundle directory before creating a new app bundle
2022-10-26 17:49:03 -07:00
Kay Simmons
499d947e69
Merge pull request #1821 from zed-industries/better-pending-bindings
...
Better pending bindings
2022-10-26 17:42:56 -07:00
K Simmons
c093516351
fix minor warning
2022-10-26 17:42:03 -07:00
K Simmons
41699224ff
fix typo in blink manager disable which didn't properly disable, and start editors with the blink manager disabled
2022-10-26 17:39:17 -07:00
Max Brunsfeld
8886cb5786
Fix environment variable reference in bundle app job
2022-10-26 17:34:53 -07:00
Max Brunsfeld
d85d4de218
Don't bundle the app on CI for PRs
...
Just run that job on main and for release tags
2022-10-26 17:26:16 -07:00
Max Brunsfeld
f56f0b7bbb
Fix error in bundle app CI job
2022-10-26 17:21:31 -07:00
K Simmons
ae79b50101
Disallow new keybindings when there are any pending
2022-10-26 16:57:23 -07:00
Max Brunsfeld
fcfc4a4298
Dev 0.62.0
2022-10-26 16:38:38 -07:00
Max Brunsfeld
d355bd3372
Merge pull request #1813 from zed-industries/preview-channel
...
Create preview channel
2022-10-26 16:34:14 -07:00
Max Brunsfeld
2bfd46d48c
Fix setting of preview param in RPC URL
2022-10-26 16:19:19 -07:00
Max Brunsfeld
f1b41389b3
Allow overriding release channel at runtime via env var
2022-10-26 16:19:19 -07:00
Max Brunsfeld
92a4998ddc
Check invariants before changing git state in railcar script
2022-10-26 16:19:19 -07:00
Max Brunsfeld
23d7209f82
Handle different app names in bundle script
2022-10-26 16:19:19 -07:00
Max Brunsfeld
cf3c610eba
Add railcar script
2022-10-26 16:19:19 -07:00
Max Brunsfeld
6a010f58be
Account for current release channel in bump-app-version script
2022-10-26 16:19:19 -07:00
Max Brunsfeld
0f1b0a4a78
Use a separate icon for preview releases
2022-10-26 16:19:19 -07:00
Max Brunsfeld
a4a8596a29
Store current release channel name in a file in the zed crate
2022-10-26 16:19:19 -07:00
Max Brunsfeld
1cdd3c0e28
Differentiate preview channel in 'about zed' dialog
2022-10-26 16:19:19 -07:00
Max Brunsfeld
22db5bffe8
Update DO SSL certificate id in kube manifest
2022-10-26 16:19:19 -07:00
Max Brunsfeld
a61f3b715b
Create preview channel
2022-10-26 16:19:19 -07:00
K Simmons
949a28d49c
wip
2022-10-26 15:57:42 -07:00
Kay Simmons
88be4fe77e
Merge pull request #1804 from zed-industries/vim-go-to-line
...
fix jump to line number in vim mode
2022-10-26 11:43:27 -07:00
Julia
625a62626e
Merge pull request #1820 from zed-industries/allow-mouse-move-through-dragged-item-receiver
...
Propagate mouse move event through dragged-item-receiver if not dragging
2022-10-26 12:22:30 -04:00
Julia
ee440cf300
Propagate mouse move event through dragged-item-receiver if not dragging
2022-10-26 12:06:32 -04:00
Antonio Scandurra
cf2ec99a4d
Merge pull request #1819 from zed-industries/remote-renames
...
Assign a new language when remote buffer is renamed
2022-10-26 16:58:45 +01:00
Antonio Scandurra
bb0f6e85a8
Assign a new language when remote buffer is renamed
2022-10-26 17:52:39 +02:00
Antonio Scandurra
4412217f51
Merge pull request #1817 from zed-industries/show-notifications-on-all-screens
...
Show call notifications on all screens
2022-10-26 13:45:31 +01:00
Antonio Scandurra
1e85361914
Log instead of panicking when we can't retrieve a drawable
2022-10-26 14:30:48 +02:00
Antonio Scandurra
f611b443c0
Convert window frame rect to screen coordinates
2022-10-26 14:27:53 +02:00
Antonio Scandurra
5984be3d84
Display call notifications on all screens
2022-10-26 12:05:56 +02:00
Antonio Scandurra
5a8061ac7b
Add the ability to open a window on a given screen
...
This is done by supplying the screen in the `WindowOptions` struct.
Note that it's optional, and we will let the operating system choose
which screen to show the window on when `screen` is not provided, as
we did before this change.
2022-10-26 12:04:45 +02:00
Antonio Scandurra
509c327b3b
Merge pull request #1816 from zed-industries/letterbox-background
...
Use the same background color as the editor for `SharedScreen`
2022-10-26 10:37:15 +01:00
Antonio Scandurra
56a66b348d
Use the same background color as the editor for SharedScreen
2022-10-26 08:33:32 +02:00
K Simmons
e2ba8d6df7
Add active pane magnification setting which grows the active pane making it easier to see it's contents
2022-10-25 17:24:19 -07:00
Joseph T. Lyons
a7d86a164c
Merge pull request #1812 from zed-industries/fix-500-error-on-user-join
...
Fix duplicate key error that occurs when a user joins that is already in the db
2022-10-25 16:55:25 -04:00
Joseph T Lyons
383334633f
Fix duplicate key error that occurs when a user joins that is already in the db
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2022-10-25 16:09:36 -04:00
Max Brunsfeld
6a2dc444c6
Merge pull request #1802 from zed-industries/autoclose-with-same-start-and-end
...
Fix autoclose skipping when start and end are the same character
2022-10-25 12:33:04 -07:00
Max Brunsfeld
e9073310c4
Add test for autoclosing w/ matching start and end char
2022-10-25 12:22:19 -07:00
Antonio Scandurra
3b67602b13
Merge pull request #1810 from zed-industries/contacts-scroll-position
...
Maintain scroll position in contacts list
2022-10-25 19:43:37 +01:00
Antonio Scandurra
04477e9f97
Explicitly list cargo workspace members
...
This prevents build failures when there are stale subfolders under
`crates/`.
2022-10-25 19:31:58 +02:00
Antonio Scandurra
990c83eabd
Embed live_kit_client's .gitignore into top-level .gitignore
...
Co-authored-by: Max Brunsfeld <max@zed.dev >
2022-10-25 18:54:34 +02:00
Antonio Scandurra
ddc71653ad
Maintain scroll position in contacts list
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-25 18:36:33 +02:00
Antonio Scandurra
e5e5cf1314
Merge pull request #1809 from zed-industries/contacts-popover-z-index
...
Prevent expanded dock from hiding contacts popover
2022-10-25 13:02:51 +01:00
Antonio Scandurra
f364a15d89
Prevent expanded dock from hiding contacts popover
2022-10-25 13:47:37 +02:00
Antonio Scandurra
2b4fd53202
Rename height to z-index
2022-10-25 13:47:12 +02:00
Antonio Scandurra
dfe2fd0386
Allow specifying a custom height for stacking contexts
2022-10-25 13:41:47 +02:00
Antonio Scandurra
2055f05b09
💄
2022-10-25 12:19:25 +02:00
Antonio Scandurra
33ebfc3f10
Rename depth to height when referring to stacking contexts
2022-10-25 12:18:23 +02:00
Antonio Scandurra
6a4f3aaa56
Create a SceneBuilder and sort stacking contexts when calling build
2022-10-25 12:16:09 +02:00
Antonio Scandurra
c1f7ac0d8c
Merge pull request #1808 from zed-industries/fix-diagnostics-on-rust
...
Match progress token's prefix to detect disk-based diagnostic progress
2022-10-25 10:46:59 +01:00
Antonio Scandurra
19adfdf8bb
Match progress token's prefix to detect disk-based diagnostic progress
...
The new version of rust-analyzer changed the disk-based diagnostic token
to `rust-analyzer/checkOnSave/0`. The trailing number could be different
from 0 when there are multiple Rust projects open using the same rust-analyzer
instance.
As such, with this commit we will perform a prefix match as opposed to a strict
equality check when detecting a disk-based diagnostics progress token.
2022-10-25 11:35:59 +02:00
Antonio Scandurra
af74d5409a
Merge pull request #1806 from zed-industries/pending-state-when-calling
...
Show a `Calling` indicator right away when initiating a call
2022-10-25 10:10:44 +01:00
Antonio Scandurra
2a3773240d
Show a Calling indicator right away when initiating a call
2022-10-25 11:05:57 +02:00
K Simmons
782676dc67
fix jump to line number in vim mode
2022-10-25 00:39:40 -07:00
Kay Simmons
68717d0fe8
Merge pull request #1792 from zed-industries/fn-modifier
...
Add fn modifier
2022-10-25 00:35:00 -07:00
Kay Simmons
8bd9577318
Merge pull request #1791 from zed-industries/drag-tabs-more-places
...
Drag tabs more places
2022-10-25 00:34:50 -07:00
K Simmons
2ac537393d
fix failing test
2022-10-25 00:11:59 -07:00
K Simmons
82956b618a
remove derive_more
2022-10-25 00:06:43 -07:00
K Simmons
a725ded95e
Add fn modifier to modifier keys in gpui and refactor platform events to use a single modifiers struct
2022-10-24 23:50:39 -07:00
K Simmons
113b7f6f97
tweak drop target overlay color and make stack fully constraint children by the first child
...
's size
2022-10-24 23:47:43 -07:00
K Simmons
aed085b168
remove unnecessary Move branch in dispatch_events
2022-10-24 23:32:01 -07:00
K Simmons
345544646a
remove more notify on moves
2022-10-24 23:32:01 -07:00
K Simmons
4520227e98
remove mouse position from render params
2022-10-24 23:32:01 -07:00
K Simmons
f5795ffc6f
roll back mouse position in mouse_state struct in favor of using the dragged element position
2022-10-24 23:32:01 -07:00
K Simmons
8cde64d3f6
extract dragged item target
2022-10-24 23:32:00 -07:00
K Simmons
d7b8a189e4
fix issue where empty pane is created
2022-10-24 23:32:00 -07:00
K Simmons
cfde3e348c
Add pane splitting by dragged item. Works, but the overlay doesn't clear quite right
2022-10-24 23:31:58 -07:00
K Simmons
70e2951e35
add mouse region handler bool for adding the handler above the child
2022-10-24 23:30:35 -07:00
Julia
ba35536664
Add action to move active item into the dock
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-24 23:30:35 -07:00
Julia
b9f9819637
Handle tab drag end on pane items to insert after active item
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-24 23:30:35 -07:00
Kay Simmons
076d353e84
Merge pull request #1803 from zed-industries/fix-vim-motion-panic
...
Add more explicit neovim testcase exemptions
2022-10-24 23:30:06 -07:00
K Simmons
64e9b9f893
remove mode after which is unused
2022-10-24 18:31:26 -07:00
K Simmons
21ad375b42
Fix panic in vim motion when not listed as exclusive and add features enum to capture why tests are ignored
2022-10-24 18:27:56 -07:00
Max Brunsfeld
cb9534eae0
Fix autoclose skipping when start and end are the same character
2022-10-24 17:46:06 -07:00
Max Brunsfeld
8b43368bf9
Checkout submodules on CI when publishing collab images
2022-10-24 17:13:20 -07:00
Max Brunsfeld
c96c8fd782
collab 0.2.0
2022-10-24 17:06:54 -07:00
Mikayla Maki
c295f943ba
Merge pull request #1799 from zed-industries/fix-project-panel-notify
...
Fix project panel not showing files / folders
2022-10-24 13:28:26 -07:00
Mikayla Maki
e527474dd9
removed dev file
2022-10-24 13:20:45 -07:00
Mikayla Maki
73f267167f
Delete generate-db.rs
2022-10-24 13:19:30 -07:00
Mikayla Maki
40290a9a42
Added notify call
2022-10-24 13:18:02 -07:00
Max Brunsfeld
bd35468d18
Merge pull request #1785 from zed-industries/auto-deploy-collab
...
Automatically build collab server docker images based on git tags
2022-10-24 12:07:35 -07:00
Max Brunsfeld
c80395fc18
Merge branch 'main' into auto-deploy-collab
2022-10-24 12:01:32 -07:00
Max Brunsfeld
95be2c6070
Add version bump scripts
2022-10-24 08:58:14 -07:00
Antonio Scandurra
fb7a92242b
Merge pull request #1793 from zed-industries/screen-sharing
...
Introduce screen-sharing
2022-10-24 16:53:05 +01:00
Nathan Sobo
8c2ff69515
Render a tooltip on toggle screen sharing button
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-10-24 09:44:05 -06:00
Antonio Scandurra
011085a93f
Revert "Temporarily upload app bundle as CI artifact"
...
This reverts commit 2b5ac535b9 .
2022-10-24 17:36:19 +02:00
Antonio Scandurra
dce21900a7
Bump protocol version
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 17:06:40 +02:00
Antonio Scandurra
2b5ac535b9
Temporarily upload app bundle as CI artifact
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 17:04:33 +02:00
Antonio Scandurra
484c8f7cbe
Provide LiveKit environment variables on Kubernetes
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 17:03:18 +02:00
Antonio Scandurra
7e4d582d1e
Replace Screen Sharing label with Screen
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-24 16:50:56 +02:00
Antonio Scandurra
50c4783333
Add test for screen-sharing
2022-10-24 15:17:25 +02:00
Antonio Scandurra
9860dbbbea
Set location on ActiveCall even before there's a room
...
We will automatically call `Room::set_location` once a room has been
assigned.
2022-10-24 15:07:25 +02:00
Antonio Scandurra
874a3605f8
Init submodules on CI
2022-10-24 14:28:58 +02:00
Antonio Scandurra
088c5bac1f
Remove stray log statement
2022-10-24 11:02:41 +02:00
Antonio Scandurra
e135b982c1
Focus shared screen item when clicking on it
2022-10-24 11:02:10 +02:00
Antonio Scandurra
a8bd234aa4
Simplify room events
2022-10-24 10:53:44 +02:00
Antonio Scandurra
f99d70500c
Allow opening shared screen via the contacts popover
2022-10-24 10:47:47 +02:00
Antonio Scandurra
476020ae84
Show shared screen as a pane item
2022-10-24 10:04:08 +02:00
Max Brunsfeld
2f1ddc0d0f
Improve deploy scripts
2022-10-21 15:50:14 -07:00
Nate Butler
ef5844bc79
Merge pull request #1783 from zed-industries/add-new-internal-themes
...
Add new internal themes
2022-10-21 18:31:02 -04:00
Max Brunsfeld
0c9ceb51e6
Add what-is-deployed-script
2022-10-21 14:28:55 -07:00
Max Brunsfeld
cedc0f64d5
Run migrations via a collab subcommand
2022-10-21 14:28:55 -07:00
Max Brunsfeld
9952f08cce
Publish collab docker images on CI, deploy pre-built images
2022-10-21 14:24:43 -07:00
Max Brunsfeld
efa6745035
Add more paths to dockerignore
2022-10-21 14:24:43 -07:00
Joseph T. Lyons
4816a587c3
Merge pull request #1781 from zed-industries/switch-to-mixpanel
...
Switch to mixpanel
2022-10-21 15:26:08 -04:00
Nate Butler
6514eb5209
Make the assets/themes folder if it doesn't exist
...
- Also only run clearThemes if the folder exists
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2022-10-21 13:19:44 -04:00
Nate Butler
2a38c4938d
Update gitignore because of macOS case sensitive weirdness
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2022-10-21 13:05:59 -04:00
Nate Butler
b015761131
WIP Re-case internal and experiment theme folders
...
Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com >
2022-10-21 13:04:24 -04:00
Nate Butler
99e6ecc466
Update Zenburn license
2022-10-21 13:03:54 -04:00
Antonio Scandurra
7e411ae098
Merge branch 'main' into screen-sharing
...
# Conflicts:
# crates/collab/src/integration_tests.rs
# crates/collab/src/main.rs
# styles/src/styleTree/workspace.ts
2022-10-21 14:29:45 +02:00
Antonio Scandurra
1bbb7dd126
Leave Zed room when LiveKit room disconnects
2022-10-21 14:21:45 +02:00
Antonio Scandurra
78969d0938
Switch back to using the legacy screen capturing API
...
The new API is buggy and inconsistent, so I think we should move on
for now.
2022-10-21 11:54:52 +02:00
Antonio Scandurra
bac3dc1ccd
Re-build live_kit_client when MACOSX_DEPLOYMENT_TARGET changes
2022-10-21 10:18:03 +02:00
Antonio Scandurra
ae44a38285
Remove unused LKDisplays API
2022-10-21 10:12:24 +02:00
Nathan Sobo
77b13b1356
Merge pull request #1788 from zed-industries/style
...
Apply a slight stylistic tweak
2022-10-20 18:43:50 -06:00
Nathan Sobo
2e97e2dbfd
Apply a slight stylistic tweak
2022-10-20 18:38:27 -06:00
Kay Simmons
75ec5c3b1b
Merge pull request #1784 from zed-industries/fix-keymap-panic
...
Fix panic in keymap parsing
2022-10-20 16:39:38 -07:00
K Simmons
3a456b09cb
catch keymap string only modifiers and no key
2022-10-20 16:30:07 -07:00
Joseph T Lyons
022f70b1de
Temporarily restore integration with Amplitude
...
This will be reverted later, once we fully switch to Mixpanel
2022-10-20 19:27:55 -04:00
Nate Butler
c1e23fc6d9
Update tokyo night meta
2022-10-20 18:22:34 -04:00
Nate Butler
a6e9d0d061
Merge branch 'main' into add-new-internal-themes
2022-10-20 18:19:21 -04:00
Nate Butler
b700ea84a5
Add metadata to all themes and organize
...
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-20 17:08:09 -04:00
Nathan Sobo
0ef62fc334
Preserve symlinks in WebRTC.framework to avoid bundle signing failure
2022-10-20 14:37:04 -06:00
Nate Butler
c3900565b9
Fix a few incorrectly named themes
...
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-20 16:28:08 -04:00
Nate Butler
a86756ed20
Update gruvbox to use manual accent ramps
...
Also updated it's neutral to contain more values sourced from the gruvbox repo
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-20 16:25:54 -04:00
Nate Butler
e3ef6d35ab
Add a range of new themes as internal themes for testing
2022-10-20 15:32:56 -04:00
Nate Butler
038670cc6f
Add brush trees as a experimental theme
2022-10-20 15:32:40 -04:00
Nate Butler
5d87a04dc3
Remove old theme template
2022-10-20 15:32:20 -04:00
Nate Butler
fbfe8a2311
WIP Update theme metadata and add license information
2022-10-20 15:32:13 -04:00
Nate Butler
bd8509990a
Rename One theme and update Zed default theme
2022-10-20 15:31:17 -04:00
Nathan Sobo
6bdb08ab9c
Fix crash loading Swift symbol (I think associated with concurrency)
...
I add /usr/lib/swift as an rpath, which seems to fix the issue even though
there doesn't seem to be a relevant library at that location on my machine.
Based on my research, wondering if `-Wl,-weak-lswiftCompatibilityConcurrency`
is also required for this to work on older OSes, but holding back for now.
2022-10-20 13:18:53 -06:00
Antonio Scandurra
db8b8ef66b
WIP
2022-10-20 20:17:54 +02:00
Joseph T Lyons
ac5d5e2451
Merge branch 'main' into switch-to-mixpanel
2022-10-20 13:53:39 -04:00
Max Brunsfeld
fad6cfef05
Merge pull request #1782 from zed-industries/idempotent-redemption
...
Return an optional response when creating users via invites
2022-10-20 10:46:50 -07:00
Nate Butler
c83cae60f6
Add Ayu to iternal themes
2022-10-20 13:28:50 -04:00
Antonio Scandurra
9b8e6cce02
WIP: Try using the new ScreenCaptureKit API when possible
2022-10-20 19:28:21 +02:00
Nathan Sobo
9858906463
Return an optional response when creating users via invites
...
If the user already exists, we return none. This will allow the web frontend
to avoid reporting a "join alpha" user event but also not error.
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Joseph Lyons <joseph@zed.dev >
2022-10-20 10:52:34 -06:00
Antonio Scandurra
be1dc01d9e
Add 5s timeout to LiveKit API requests
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-20 18:01:47 +02:00
Antonio Scandurra
de24b4b4e8
Bump minimum macOS version to 10.15.7
...
This solves an issue with loading Swift libraries when running the
x86_64 binary.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-20 18:01:41 +02:00
Antonio Scandurra
629d3d473c
Copy WebRTC into Zed.app/Contents/Frameworks when bundling the app
2022-10-20 15:38:54 +02:00
Antonio Scandurra
5dc82d3df8
Delete all live-kit rooms when server is shut down
2022-10-20 14:34:05 +02:00
Antonio Scandurra
76a1b81e45
Update live-kit to the latest version
2022-10-20 14:03:26 +02:00
Antonio Scandurra
99aa1219d2
Simplify renderer interface for live-kit-client
2022-10-20 09:51:55 +02:00
Nathan Sobo
69472f7823
Ensure we can send a second frame
2022-10-19 19:21:09 -06:00
Nathan Sobo
723fa83909
Use fake LiveKit server to test we can send frames when screen sharing
2022-10-19 19:14:55 -06:00
Joseph T Lyons
2f064d5ccc
Remove debug prints
2022-10-19 17:30:00 -04:00
Nate Butler
ae9a0a99ea
Add new internal themes
2022-10-19 17:02:23 -04:00
Kay Simmons
c2b9b08944
Merge pull request #1665 from zed-industries/elevations
...
Tracking PR: Elevations
2022-10-19 13:59:34 -07:00
K Simmons
2aa2e5af7a
fix issue with text component and adjust layer selections some more
2022-10-19 13:45:00 -07:00
K Simmons
b7c439f4c4
Fixup some theme inconsistencies and incorrect layer selections
2022-10-19 13:39:46 -07:00
Max Brunsfeld
e6b29086a9
Merge pull request #1777 from zed-industries/impersonate-via-secret-token
...
Impersonate via secret token
2022-10-19 13:32:40 -07:00
Max Brunsfeld
83e4e26989
Allow setting ZED_SERVER_URL to URL of a collab server
2022-10-19 13:27:14 -07:00
K Simmons
caec9c1f45
fixed issue in testbench
2022-10-19 13:13:50 -07:00
K Simmons
e3809c267d
flattened layers and elevations
2022-10-19 13:02:51 -07:00
Nate Butler
0d9eecd2ed
WIP command palette changes
2022-10-19 14:55:22 -04:00
Joseph T Lyons
d7915840d0
Switch to Mixpanel analytics
...
Co-Authored-By: Max Brunsfeld <maxbrunsfeld@gmail.com >
2022-10-19 14:53:48 -04:00
Mikayla Maki
8098697847
Re-removed chat panel
2022-10-19 11:45:20 -07:00
Mikayla Maki
4c2f8406c7
Restored chat_panel, just in case
2022-10-19 11:42:29 -07:00
Nate Butler
e0a477265d
Use lab color interpolation to improve the dark end of accent ramps
2022-10-19 14:35:09 -04:00
Nate Butler
364c3f2f00
Contrast rebalances
2022-10-19 13:03:58 -04:00
Nate Butler
75c79d60fe
Improve contrast/scanability of constants
2022-10-19 13:03:34 -04:00
Nate Butler
5b2dd8e4d0
build-themes -> build to fix building themes on save
2022-10-19 13:03:09 -04:00
Nate Butler
9e8e227b46
Rebalance rose-pine-dawn
2022-10-19 13:02:34 -04:00
Julia
adf7578007
Merge pull request #1778 from zed-industries/trackpad-scroll-snap-lock
...
Lock trackpad scrolling in buffers to axis until broken free
2022-10-19 12:02:59 -04:00
Antonio Scandurra
b6e5aa3bb0
Use live_kit_client::TestServer in integration tests
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-19 16:35:34 +02:00
Antonio Scandurra
288c039929
Start on implementing a fake live-kit server
2022-10-19 14:58:50 +02:00
Antonio Scandurra
fb5c6493cf
WIP: Start on a fake implementation of live-kit
2022-10-19 13:53:40 +02:00
Antonio Scandurra
3160d07b9c
Model pending screen share in Room
2022-10-19 11:38:24 +02:00
Antonio Scandurra
e49fc9f4b1
Prevent Room from screen-sharing twice
2022-10-19 10:45:51 +02:00
Antonio Scandurra
ed6f482e68
Exercise unpublish_track in live_kit_client
2022-10-19 10:39:48 +02:00
Antonio Scandurra
773f569385
Add control to toggle screen-sharing
2022-10-19 10:19:20 +02:00
Antonio Scandurra
219793afcc
Merge remote-tracking branch 'origin/main' into screen-sharing
2022-10-19 10:04:56 +02:00
Mikayla Maki
571636c526
Fixed cursor color being black
2022-10-18 22:26:14 -07:00
Julia
cbc15b6b58
Lock trackpad scrolling in buffers to axis until broken free
2022-10-19 01:00:13 -04:00
Max Brunsfeld
c410935c9c
Allow impersonating users via the api token, bypassing oauth
2022-10-18 17:36:54 -07:00
K Simmons
79cf5dbd4b
remove rocksdb
2022-10-18 17:21:15 -07:00
Kay Simmons
da5203011c
Merge pull request #1773 from zed-industries/rusqlite
...
Swap to sqlite for client persistence
2022-10-18 16:11:54 -07:00
Mikayla Maki
84c7aa9cad
Finished up initial sqlite implemention
...
Co-Authored-By: kay@zed.dev
2022-10-18 15:58:05 -07:00
Nathan Sobo
f8e5a08324
Merge pull request #1764 from zed-industries/gpui-events
...
Eliminate dispatch_event on Element trait
2022-10-18 15:24:13 -06:00
Max Brunsfeld
5e57a33df7
Store entire Config struct on collab AppState
2022-10-18 13:58:03 -07:00
Max Brunsfeld
38bdf7ad92
Remove unused env vars from collab k8s manifest
2022-10-18 13:58:03 -07:00
Max Brunsfeld
5447f63e9d
Fix error in changes-since-last-release script on PRs with no body
2022-10-18 13:12:27 -07:00
Max Brunsfeld
50ba8bdc9b
0.61.0
2022-10-18 13:05:16 -07:00
Max Brunsfeld
6f279c0239
Merge pull request #1776 from zed-industries/tabbar-scroll
...
Scroll horizontal flex lists by whichever scroll delta dimension is g…
2022-10-18 13:04:28 -07:00
Max Brunsfeld
26ccd70e77
Scroll horizontal flex lists by whichever scroll delta dimension is greater
2022-10-18 12:59:04 -07:00
K Simmons
b0ddbeb0ad
Merge branch 'main' into elevations
2022-10-18 12:47:15 -07:00
Julia
826eb113e7
Merge pull request #1775 from zed-industries/drag-on-context-menu-still-click
...
Don't allow drag event to fall through context menu
2022-10-18 15:24:38 -04:00
Julia
2661a9cc98
Don't allow drag event to fall through context menu
2022-10-18 15:00:49 -04:00
K Simmons
b06366ebb7
Get rusqlite more shippable
2022-10-18 11:43:18 -07:00
Antonio Scandurra
c7a629ba6b
Merge pull request #1774 from zed-industries/stale-connections
...
Correctly handle disconnect when a different client for the same user is on a call
2022-10-18 18:37:43 +01:00
Antonio Scandurra
d155c11729
Fix client unit test by sending Hello in FakeServer
2022-10-18 19:33:38 +02:00
Antonio Scandurra
0c3c1e1f68
WIP
2022-10-18 19:30:45 +02:00
Antonio Scandurra
6c322dc835
Clear out incoming call when removing last connection for a user
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-18 19:15:14 +02:00
K Simmons
6019e4c37b
remove items migration
2022-10-18 10:13:47 -07:00
K Simmons
9c8dd66b20
dont reference db items
2022-10-18 10:13:04 -07:00
Antonio Scandurra
0c0e8688ed
Use PeerId in TestServer::disconnect_client
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-18 19:05:37 +02:00
Antonio Scandurra
6146923dbb
WIP: Start on test to ensure incoming calls cancel upon recipient disconnection
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-18 18:45:50 +02:00
Antonio Scandurra
2c4f003897
Tell clients their peer id on connection in Hello message
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-18 18:42:55 +02:00
Antonio Scandurra
0491747eed
Only leave room on connections that are associated with the active call
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-18 17:42:10 +02:00
Antonio Scandurra
29b9651ebd
Use CFRelease instead of a custom LKRelease
2022-10-18 15:47:56 +02:00
Antonio Scandurra
48a1dd1588
Delete room when no participants are left
2022-10-18 14:59:12 +02:00
Antonio Scandurra
9cf39b1da6
Disconnect from live-kit Room on drop
2022-10-18 14:50:03 +02:00
Antonio Scandurra
47be340cac
Fix invoking RemoveParticipant on live-kit server
2022-10-18 14:35:06 +02:00
Antonio Scandurra
bf98300547
Render remote participant's screen preserving aspect ratio
2022-10-18 14:16:19 +02:00
Antonio Scandurra
46635956f4
Emit Frame event when new frames are generated for a remote track
2022-10-18 12:18:49 +02:00
Antonio Scandurra
8c6de99159
Use participant identity and track sid everywhere
2022-10-18 12:05:59 +02:00
Nathan Sobo
a42a703b35
Pass tracks to Rust unretained
...
We always call CFRetain when constructing a track on the Rust side.
2022-10-17 23:56:41 -06:00
Nathan Sobo
59fab0bb2d
WIP
2022-10-17 23:47:55 -06:00
Nathan Sobo
c73e2c2d0f
Get test_app running without crashing
2022-10-17 23:38:43 -06:00
Nathan Sobo
8c1c98a0bf
WIP
2022-10-17 23:25:04 -06:00
K Simmons
d99a074bc0
revert workspace changes
2022-10-17 17:05:08 -07:00
K Simmons
05b4b443d9
working items schema
2022-10-17 17:04:30 -07:00
Mikayla Maki
4b09f77950
WIP
2022-10-17 17:04:30 -07:00
Mikayla Maki
dbea3cf20c
Converted to using rusqlite
2022-10-17 17:04:30 -07:00
K Simmons
aa8fa4a6d5
more wip
2022-10-17 17:04:29 -07:00
K Simmons
dbc03e2668
wip
2022-10-17 17:04:19 -07:00
Mikayla Maki
4ef69c8361
Merge pull request #1769 from zed-industries/breadcrumbs
...
Fix breadcrumbs
2022-10-17 17:02:56 -07:00
Mikayla Maki
895aeb033f
Merge branch 'main' into breadcrumbs
2022-10-17 16:51:38 -07:00
Kay Simmons
e15cc376b0
Merge pull request #1763 from zed-industries/cursor-blink-setting
...
Adds the ability to disable cursor blinking and replicates cursor shape to collaborators
2022-10-17 16:51:20 -07:00
K Simmons
54428ca6f6
swap to using vercel to run the local zed.dev server
2022-10-17 16:49:34 -07:00
K Simmons
54cf6fa838
Pull blink functionality out of editor and into blink manager. Make blink manager subscribe to settings changes in order to start blinking properly when it is re-enabled.
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-10-17 16:20:51 -07:00
K Simmons
09a0b3eb55
increment protocol version
2022-10-17 16:20:51 -07:00
K Simmons
40c3e925ad
Add cursor blink setting and replicate cursor shape to remote collaborators
2022-10-17 16:20:47 -07:00
Mikayla Maki
5ef5147780
Merge branch 'main' into gpui-events
2022-10-17 15:43:41 -07:00
Mikayla Maki
318b923bac
Merge pull request #1765 from zed-industries/fix-terminal-hyperlinks
...
Open hyperlinks on up, not down, and disable them when dragging.
2022-10-17 15:41:40 -07:00
Mikayla Maki
93a30ea940
Removed breadcrumb scrollable
2022-10-17 15:29:51 -07:00
Mikayla Maki
5bb2edca8b
Added absolute path info to remote worktrees (updated protocol version)
2022-10-17 15:27:46 -07:00
Mikayla Maki
1789dfb8b1
Fixed tests
2022-10-17 14:53:52 -07:00
Mikayla Maki
f473eadf2d
Fixed failing test, now to make breadcrumbs scrollable...
2022-10-17 13:57:29 -07:00
Mikayla Maki
1f161b9aa1
Show full, absolute paths when displaying a local worktree
2022-10-17 13:35:45 -07:00
Mikayla Maki
354fefe61b
Resovled behavioral inconsistency with how projects with multiple roots are handled
2022-10-17 13:08:05 -07:00
Mikayla Maki
19c98bb5ad
fixed a bug where files outside of the project would show 'untitled' in the search bar
2022-10-17 12:58:48 -07:00
Julia
2149c17a0a
Merge pull request #1768 from zed-industries/git-gutter-meets-code-folding
...
Git gutter meets code folding (and word wrap fixes)
2022-10-17 14:51:47 -04:00
Julia
1716aff969
Cleanup
2022-10-17 14:41:16 -04:00
Julia
2a5d7ea2de
Inclusively check for hunk in fold range
2022-10-17 13:11:11 -04:00
Julia
be34c50c72
Deduplicate identical hunk layouts
2022-10-17 12:41:20 -04:00
Julia
50ae3e03f7
More concrete usage of display map to handle diff hunk gutter layout
2022-10-17 12:28:44 -04:00
Antonio Scandurra
499b8f5f55
WIP
2022-10-17 18:00:54 +02:00
Antonio Scandurra
81d83841ab
WIP: Start integrating screen-sharing
2022-10-17 14:50:05 +02:00
Antonio Scandurra
cce00526b9
Remove participants from live-kit rooms when they leave zed rooms
2022-10-17 14:03:44 +02:00
Antonio Scandurra
c9225bb87c
WIP: Start integrating with LiveKit when creating/joining rooms
2022-10-17 12:20:55 +02:00
Antonio Scandurra
75c339851f
Add live_kit_server::api::Client::{create,delete}_room
2022-10-17 11:24:09 +02:00
Antonio Scandurra
e39c7c62e4
Update livekit_client
2022-10-17 10:48:09 +02:00
Antonio Scandurra
b6bb2985f5
Merge pull request #1767 from zed-industries/notify-on-auto-update
...
Notify `ActivityIndicator` when `AutoUpdater` changes
2022-10-17 09:10:57 +01:00
Antonio Scandurra
6bdbab2faf
Notify ActivityIndicator when AutoUpdater changes
...
This fixes a bug that caused the status bar to not update when the
auto-update system changed its status.
2022-10-17 10:05:38 +02:00
Antonio Scandurra
f09d6b7b95
WIP
2022-10-17 09:59:16 +02:00
Nathan Sobo
19a2752674
WIP: Update token module to support server api
2022-10-17 09:59:16 +02:00
Antonio Scandurra
5d433b1666
WIP: start on live_kit_server
2022-10-17 09:59:16 +02:00
Antonio Scandurra
caeae38e3a
Move live_kit to live_kit_client and add live_kit_server
2022-10-17 09:59:16 +02:00
Antonio Scandurra
c25acc155d
Move ownership of MacOSDisplay to the rust side
2022-10-17 09:59:16 +02:00
Antonio Scandurra
4222f86537
Temporarily use legacy screen capture API
2022-10-17 09:59:16 +02:00
Nathan Sobo
9569323f93
WIP: Getting a big black window, then a crash
2022-10-17 09:59:16 +02:00
Nathan Sobo
0bbba90f30
Use ScreenCaptureKit-enabled LiveKit SDK and add display_sources function
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-10-17 09:59:16 +02:00
Mikayla Maki
f1ff557a25
Rearranged mouse handling
2022-10-16 17:31:19 -07:00
Joseph T. Lyons
23d7143298
Merge pull request #1666 from zed-industries/settings-for-journal
...
Settings for journal
2022-10-16 19:55:27 -04:00
Nathan Sobo
12eab6551f
Remove dispatch_event from Element trait
2022-10-16 13:08:25 -06:00
Nathan Sobo
d25c6b15a6
Move Terminal key down event handling from element to View::key_down method
2022-10-16 12:55:02 -06:00
Nathan Sobo
b9308ad80d
Move handling of modifier changes to new View hook
2022-10-16 12:47:48 -06:00
Nathan Sobo
6e363e464c
Start on view-level dispatch approach for keyboard events
2022-10-16 11:46:31 -06:00
Nathan Sobo
6e53deb1b2
Refine mouse event naming
2022-10-16 11:18:58 -06:00
Joseph T Lyons
0717c168d9
Derive Serialize on HourFormat
2022-10-16 12:51:48 -04:00
Joseph T Lyons
6d020a3ee9
Do not derive Default on JournalSettings
2022-10-16 12:51:34 -04:00
Joseph T Lyons
9a381c1803
Merge branch 'main' into settings-for-journal
2022-10-16 12:42:18 -04:00
Nathan Sobo
3e23d1f48d
Merge pull request #1762 from zed-industries/less-click-and-hover-invalidation
...
Reduce unnecessary view invalidations related to mouse events
2022-10-16 10:23:54 -06:00
Nathan Sobo
1750fcf833
Merge pull request #1761 from zed-industries/mouse-region-view-invalidation
...
Remove unconditional invalidation when calling mouse region handlers
2022-10-14 18:31:23 -06:00
Nathan Sobo
646d344a11
Avoid re-rendering editor on mouse move
...
Only notify editor when clearing highlights if there were highlights to
begin with.
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-14 18:27:55 -06:00
Nathan Sobo
bc03592912
Only invalidate parent view on click/hover if we read that state when rendering
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-14 18:09:15 -06:00
Max Brunsfeld
a4b518ec72
Merge pull request #1760 from zed-industries/invite-unknown-platform
...
Include waitlist entries w/ unknown platform when summarizing and sending invites
2022-10-14 16:24:48 -07:00
Max Brunsfeld
b541ac313c
Revert unnecessary logic for fetching invites' platform_unknown flag
2022-10-14 16:13:38 -07:00
Nathan Sobo
934474f87e
Remove unconditional invalidation when calling mouse region handlers
...
We want invalidation to opt-in as much as possible.
If you want a view to re-render, you need to call `cx.notify`.
2022-10-14 17:06:46 -06:00
Max Brunsfeld
3a4e802093
Include waitlist entries w/ unknown platform when summarizing and sending invites
2022-10-14 15:20:23 -07:00
Julia
b3eb5f7cdf
WIP
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
2022-10-14 17:14:33 -04:00
Mikayla Maki
c21e0e916c
Merge pull request #1759 from zed-industries/move-page-up-down
...
Move page up / down
2022-10-14 14:02:27 -07:00
Mikayla Maki
d301a215f7
Finished implementing vscode, emacs, and mac style pageup/down. Added keybindings ctrl-v, alt-v for emacs up/down and shift-pageup, shift-pagedown for vscode style. Also improved incorporated pageup/down into context menus
2022-10-14 13:52:30 -07:00
Max Brunsfeld
8044beffc7
v0.60.4
2022-10-14 12:44:22 -07:00
Max Brunsfeld
8df84e0341
Add MovePageUp and MovePageDown editor commands
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2022-10-14 12:36:46 -07:00
Max Brunsfeld
137a9cefbd
Enable auto-scroll when moving cursors in Editor::handle_input
...
Co-authored-by: Mikayla Maki <mikayla@zed.dev >
2022-10-14 11:32:22 -07:00
Max Brunsfeld
55576f879b
Merge pull request #1758 from zed-industries/editor-paint-panic
...
Consolidate calculation of editor's visible row range
2022-10-14 10:47:16 -07:00
Max Brunsfeld
78aee53411
Merge pull request #1757 from zed-industries/detect-unshare
...
Clear project's shared state upon every disconnection
2022-10-14 10:44:35 -07:00
Max Brunsfeld
864020463f
Consolidate calculation of editor's visible row range
...
We think this will fix a panic that was occuring in `paint_highlighted_range`
due to an out-of-bounds read into the line layouts. We think doing essentially the same
calculation in two different ways with floating point numbers might have
caused a different end row to be calculated in 2 different code paths.
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-10-14 10:37:44 -07:00
Max Brunsfeld
2d3d07d4d7
Clear project's shared state upon every disconnection
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
Co-authored-by: Antonio Scandurra <as-cii@zed.dev >
2022-10-14 10:17:59 -07:00
Max Brunsfeld
ad6f9b2499
0.60.3
2022-10-14 09:35:57 -07:00
Max Brunsfeld
330968434f
Merge pull request #1756 from zed-industries/autoclose-wrong-closing-bracket
...
Avoid skipping over a different closing bracket in autoclose
2022-10-14 09:34:33 -07:00
Max Brunsfeld
4b12fb6b3b
Avoid skipping over a different closing bracket in autoclose
2022-10-14 09:30:30 -07:00
Nathan Sobo
eef086f60f
0.60.2
2022-10-13 16:26:26 -06:00
Nathan Sobo
6ac0b81778
Merge pull request #1754 from zed-industries/fix-list-scroll
...
Pass the current view id when painting List's mouse region instead of 10
2022-10-13 16:24:55 -06:00
Nathan Sobo
8d82702da2
Pass the current view id value when painting List's mouse region
...
Previously, a dummy value was being passed. I think this slipped in accidentally.
2022-10-13 15:57:19 -06:00
Julia
dde3dfdbf6
Quick cut of using display point conversion to layout hunks
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-13 16:34:34 -04:00
Julia
8d609959f1
Clean
2022-10-13 15:23:41 -04:00
Julia
16f854b636
Expand diff gutter indicator to cover all of a wrapped line
2022-10-13 14:05:57 -04:00
Julia
9c47325c25
Use correct range to get diff hunks in the presence of wrapped lines
2022-10-13 13:52:44 -04:00
Max Brunsfeld
cf499abf31
v0.60.1
2022-10-13 10:00:07 -07:00
Antonio Scandurra
86ddbc6d26
Merge pull request #1752 from zed-industries/allow-inviting-users-to-another-guest-project
...
Allow inviting users to a project that was shared by someone else
2022-10-13 17:58:22 +01:00
Antonio Scandurra
b8bc5a282e
Allow inviting users to a project that was shared by someone else
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-13 18:48:14 +02:00
Antonio Scandurra
f5db02a605
Merge pull request #1749 from zed-industries/child-view-panic
...
Prevent `ChildView` from retaining an otherwise dropped view
2022-10-13 15:45:53 +01:00
Antonio Scandurra
9ebd586350
Improve error message when rendering a child view for a dropped view
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-13 16:40:52 +02:00
Antonio Scandurra
1bec8087ee
Add unit test for ChildView
2022-10-13 15:59:52 +02:00
Antonio Scandurra
a5a60eb854
Log view name alongside error in ChildView
2022-10-13 15:44:01 +02:00
Antonio Scandurra
edb61a9c8f
Avoid panicking if child view points to a view that was not rendered
2022-10-13 15:11:57 +02:00
Antonio Scandurra
06dfb74663
Prevent ChildView from retaining an otherwise dropped view
2022-10-13 15:04:57 +02:00
Antonio Scandurra
26b03afa60
Merge pull request #1747 from zed-industries/fix-clangd-error
...
Fix error on clangd when `compile-commands.json` is present
2022-10-13 10:16:10 +01:00
Antonio Scandurra
c4680e66ff
Fix error on clangd when compile-commands.json is present
...
The language server was failing because we were forgetting to provide
a `jsonrpc` field for responses to requests coming from the lsp.
2022-10-13 11:10:23 +02:00
Antonio Scandurra
06e9b8276f
Merge pull request #1745 from zed-industries/contact-popover-focus
...
Fix some issues with contact popover focus
2022-10-13 08:37:14 +01:00
Antonio Scandurra
ad975da8bd
Merge pull request #1746 from zed-industries/maintain-buffer-identity-across-renames
...
Preserve buffer identity when underlying entry temporarily disappears
2022-10-13 08:36:21 +01:00
Antonio Scandurra
37a0fd33c5
Use fake file system for buffer identity test
2022-10-13 09:33:55 +02:00
Antonio Scandurra
f28cc5ca0c
Preserve buffer identity when underlying entry temporarily disappears
2022-10-13 09:10:10 +02:00
Antonio Scandurra
0a1aea6cb8
Add test to ensure buffer identity is kept across Project::rename
2022-10-13 08:17:35 +02:00
Julia
a6a7e85894
Misc fixes, still broken soft wrap
2022-10-13 02:02:29 -04:00
Julia
e75dcc853b
Include deletion hunks in fold regardless of end
2022-10-13 00:42:53 -04:00
Max Brunsfeld
b5786cbf30
Dismiss contacts popover when clicking outside, even w/o focus change
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-10-12 17:55:11 -07:00
Max Brunsfeld
513c02e67f
Remove spurious focus of contact popover when opening it
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
2022-10-12 17:39:44 -07:00
Mikayla Maki
51c0a140c6
Merge pull request #1743 from zed-industries/new-settings-writing
...
Improved settings writing to be strongly typed and based on settings file content diffs
2022-10-12 17:18:48 -07:00
Mikayla Maki
e73270085b
Fixed settings
2022-10-12 17:11:47 -07:00
Mikayla Maki
dd1320e6d1
Improved settings writing to be strongly typed and based on settings file content diffs
...
Co-Authored-By: kay@zed.dev
2022-10-12 17:05:23 -07:00
Kay Simmons
d42bf8eebe
Merge pull request #1740 from zed-industries/fix-dock-focus-issues
...
Fix Dock infinite loop
2022-10-12 16:19:09 -07:00
K Simmons
2a1dbd6fb5
Update gpui focus test to match the new removal of intermediate focus filtering
2022-10-12 15:57:29 -07:00
Max Brunsfeld
9760eb0081
Merge pull request #1742 from zed-industries/deps-fixes
...
Re-export basic text types from text and language crates, remove unused deps from collab
2022-10-12 15:56:55 -07:00
Max Brunsfeld
6cdf4e98fc
Re-export basic text types from text and language crates
...
Also avoid production dependencies on fs and rope in collab
2022-10-12 15:48:19 -07:00
K Simmons
2ff6ffff58
fix lock merge error
2022-10-12 15:39:04 -07:00
Kay Simmons
27a87c3d9e
Merge branch 'main' into fix-dock-focus-issues
2022-10-12 15:18:28 -07:00
K Simmons
1d8717f4de
Remove focus filtering from gpui so all focus events result in focus-in and focus-out calls
...
Remove pane focused event in favor of focus_in at the workspace level
Added is_child to ViewContext to determine if a given view is a child of the current view
Fix issue where dock would get in a infinite loop when activated after dragging an item out of it
Fix issue where the last focused view in an item was not correctly refocused when a pane is focused after switching active tabs
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-10-12 15:10:00 -07:00
Max Brunsfeld
fedec68d39
Update Dockerfiles to use Rust 1.64
2022-10-12 14:25:40 -07:00
Max Brunsfeld
490a608663
v0.60.0
2022-10-12 14:18:40 -07:00
Max Brunsfeld
94a5bbc0ab
Merge pull request #1739 from zed-industries/collab-menu-key-binding
...
Allow toggling collaboration menu from the keyboard
2022-10-12 14:17:51 -07:00
Max Brunsfeld
89f05ada0b
Allow toggling collaboration menu from the keyboard
2022-10-12 14:14:03 -07:00
Max Brunsfeld
3bb1f0097f
Merge pull request #1738 from zed-industries/out-of-sync-diagnostics
...
Fix bugs that caused guests to see different diagnostics than host
2022-10-12 14:13:16 -07:00
Max Brunsfeld
69dcfbb423
Send guests DiskBasedDiagnosticsFinished messages when they join a project
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-10-12 13:49:09 -07:00
Julia
e744520d90
Correctly offset diff hunk layouts
2022-10-12 16:40:19 -04:00
Max Brunsfeld
3c3671a193
Avoid sending stale diagnostics after sharing a worktree
...
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-10-12 11:33:19 -07:00
Max Brunsfeld
cbf31e6d27
Merge pull request #1734 from zed-industries/fix-layout-crash
...
Fix rounding error in computing editor's row range during layout
2022-10-12 09:38:47 -07:00
Mikayla Maki
b3567a7240
Merge pull request #1736 from zed-industries/fix-terminal-bold
...
Fix a bug in how I parse alacritty's styles
2022-10-12 09:38:27 -07:00
Mikayla Maki
296656570e
Merge pull request #1735 from zed-industries/rollback-dock-anchor-setting
...
Stops the dock anchor from being written to settings
2022-10-12 09:34:27 -07:00
Mikayla Maki
aac24938f5
Fix a bug in how I parse alacritty's styles
2022-10-12 09:34:17 -07:00
Mikayla Maki
47332f97c7
Stops the dock anchor from being written to settings
2022-10-12 09:28:55 -07:00
Max Brunsfeld
1179f8f7be
Fix rounding error in computing editor's row range during layout
...
Co-authored-by: Nathan Sobo <nathan@zed.dev >
Co-authored-by: Antonio Scandurra <antonio@zed.dev >
2022-10-12 09:19:29 -07:00
Antonio Scandurra
bd146306c6
Merge pull request #1729 from zed-industries/connection-timeout
...
Introduce client-side timeout when trying to connect
2022-10-12 14:43:35 +01:00
Antonio Scandurra
c4dde0f4e2
💄
2022-10-12 15:35:28 +02:00
Antonio Scandurra
ec19f0f8e9
Remove unnecessary async from Peer::add_connection
2022-10-12 15:32:39 +02:00
Antonio Scandurra
cc56fa9ea6
Introduce client-side timeout when trying to connect
2022-10-12 15:32:30 +02:00
Antonio Scandurra
a19783919c
Merge pull request #1728 from zed-industries/plain-text-leaks
...
Clear auto-indent requests if they couldn't be computed
2022-10-12 10:38:44 +01:00
Antonio Scandurra
83d3fad80d
Clear auto-indent requests if they couldn't be computed
2022-10-12 10:53:44 +02:00
Antonio Scandurra
202950aa98
Merge pull request #1726 from zed-industries/rejoining-projects
...
Fix opening a buffer after leaving and joining the same project
2022-10-12 09:37:50 +01:00
Antonio Scandurra
9adbab5d99
Fix opening a buffer after leaving and joining the same project
...
This bug existed prior to #1700 and was caused by not clearing the
buffers that were already shared with a peer that left and opened
a project using the same connection. When such peer would re-join
the project and open a buffer that it had opened previously, the
host assumed the peer had already seen that buffer and wouldn't bother
sending it again.
2022-10-12 10:31:06 +02:00
Julia
a6910584b6
Something's happening, nothing correct, but something
2022-10-12 00:39:56 -04:00
Mikayla Maki
e24a69b838
Merge pull request #1723 from zed-industries/test-branch
...
Writing settings
2022-10-11 20:33:03 -07:00
Mikayla Maki
b1f64d9550
Updated new vim tests with new rope crate
2022-10-11 20:25:39 -07:00
Mikayla Maki
41590ef64b
Merge branch 'main' into test-branch
2022-10-11 19:55:32 -07:00
Mikayla Maki
e7b6d1befe
Added theme and dock anchor saving :D
2022-10-11 19:18:29 -07:00
Max Brunsfeld
76a86b7e5e
Merge pull request #1721 from zed-industries/scrollbar-fix
...
Fix scrollbar's range of motion in large files
2022-10-11 19:14:49 -07:00
Max Brunsfeld
7eceff1d7b
Impose min scrollbar height in a way that doesn't impede scrollbar's movement
...
Also, fix the editor's scroll max so that you can scroll to the last
display row.
2022-10-11 18:50:04 -07:00
Kay Simmons
81a3a22379
Merge pull request #1685 from zed-industries/vim-text-objects
...
Vim Text Objects and Numeric Repitions
2022-10-11 16:36:19 -07:00
K Simmons
d1f1eb9a29
Add count argument to motion functions and add ability to jump to a given line
2022-10-11 16:27:54 -07:00
Mikayla Maki
5487f99ac7
Moved settings_file.rs into settings crate. Should be ready to start now :D
2022-10-11 16:03:38 -07:00
Joseph T Lyons
bc2a6e429c
Use tag_name for Discord release message
2022-10-11 18:31:17 -04:00
Mikayla Maki
0beb97547e
Finished refactoring out fs and rope
2022-10-11 15:25:54 -07:00
Joseph T. Lyons
941f4097fe
Add amplitude release ( #1720 )
...
Co-authored-by: Max Brunsfeld <maxbrunsfeld@gmail.com >
2022-10-11 18:25:36 -04:00
K Simmons
673041d1f5
working quote and bracket text objects
2022-10-11 15:17:29 -07:00
Nate Butler
6dfa34fcf8
Remove a few Zed default themes
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
2022-10-11 17:40:45 -04:00
Nate Butler
b626ec3bf9
Use different dark and light ramps for cave
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
2022-10-11 17:39:38 -04:00
Nate Butler
5708879b5a
Style elevations & update styleTrees
...
Also rename `info` -> `accent`
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
2022-10-11 17:38:28 -04:00
Max Brunsfeld
638e9f9477
Merge pull request #1715 from zed-industries/scrollbars
...
Add scrollbars
2022-10-11 13:34:15 -07:00
Max Brunsfeld
acc85ad03c
Impose a minimum height on the scrollbar
2022-10-11 13:18:33 -07:00
Mikayla Maki
0a8e2f6bb0
Moved fs to it's own crate, build failing due to cyclic dependency on rope
2022-10-11 13:03:36 -07:00
Max Brunsfeld
9bdcd37f60
Merge pull request #1718 from zed-industries/dont-wait-for-project-upload
...
Proceed with share while project state uploads
2022-10-11 12:48:33 -07:00
Mikayla Maki
a833652077
Undid change to paths variables and cleaned up leftovers
2022-10-11 12:48:30 -07:00
Mikayla Maki
7ce758b343
Added notes from working with Nathan
2022-10-11 12:48:30 -07:00
Mikayla Maki
cc8ae45012
Added theme writing code, really bad race condition
2022-10-11 12:48:30 -07:00
Max Brunsfeld
65b8c512fe
Allow opening other local projects via contacts list
2022-10-11 12:37:00 -07:00
Max Brunsfeld
0e695eaae8
Wait for project sharing to complete in LSP status integration test
2022-10-11 12:15:54 -07:00
Max Brunsfeld
1f0a9ce418
Proceed with share while project state uploads
...
Co-authored-by: Antonio Scandurra <as-cii@zed.dev >
2022-10-11 10:17:20 -07:00
Antonio Scandurra
a656047c15
Merge pull request #1700 from zed-industries/room
...
Introduce call-based collaboration
2022-10-11 17:40:44 +01:00
Antonio Scandurra
f26695ea8c
💄
2022-10-11 18:34:04 +02:00
Max Brunsfeld
f4306d977f
Refresh scrollbar auto-hide setting when opening a new editor
2022-10-11 09:28:17 -07:00
Max Brunsfeld
d93e75bf5f
Make scrollbars a little bit narrower
2022-10-11 09:26:31 -07:00
Max Brunsfeld
67a32de7d4
Hide the scrollbar track, not just the thumb
2022-10-11 09:26:19 -07:00
Antonio Scandurra
ba6c5441c0
Always show invite link in contacts popover
2022-10-11 18:22:00 +02:00
Max Brunsfeld
e2700ff8c6
Enable/disable scrollbar auto-hide based on OS setting
2022-10-11 09:13:34 -07:00
Antonio Scandurra
f83de0a91c
Respect contacts popover size
2022-10-11 17:30:17 +02:00
Antonio Scandurra
4c07a0782b
Allow active call to be optional on workspace
...
This prepares us for a future where the workspace is unaware of the
active call and doesn't require all tests to invoke `call::init`.
2022-10-11 17:27:37 +02:00
Antonio Scandurra
ee2587d3e5
Fix integration tests
2022-10-11 17:09:54 +02:00
Antonio Scandurra
45d118f96f
Decide whether to clip to visible bounds on a per-element basis
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-11 17:05:13 +02:00
Antonio Scandurra
eb711cde53
Polish styling of contacts popover
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-11 16:52:20 +02:00
Antonio Scandurra
4504b36c8f
Show a different message when participant is active on unshared project
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-11 15:24:31 +02:00
Antonio Scandurra
29c3b81a0a
Show prompt when closing last window while there's an active call
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-11 14:52:47 +02:00
Antonio Scandurra
feb17c29ec
Show participant projects in contacts popover
2022-10-11 12:23:15 +02:00
Antonio Scandurra
8e7f96cebc
Update contacts when automatically canceling calls
2022-10-11 11:55:15 +02:00
Antonio Scandurra
0a306808da
Dismiss project shared notifications when a project was unshared
2022-10-11 11:44:31 +02:00
Antonio Scandurra
1d4bdfc4a1
Cancel calls automatically when caller hangs up or disconnects
2022-10-11 11:28:27 +02:00
Antonio Scandurra
9ec62d4c1f
Foreground app when accepting calls and project shares
2022-10-11 11:03:49 +02:00
Antonio Scandurra
bf0a04ab50
Dismiss popover when contact finder is unfocused
2022-10-11 11:01:38 +02:00
Antonio Scandurra
bf488f2027
Show project root names when displaying incoming call notification
2022-10-11 10:59:36 +02:00
Max Brunsfeld
b229bc69b9
Tweak scrollbar styling
2022-10-10 17:54:40 -07:00
Max Brunsfeld
7b084199be
Auto-hide scrollbars
2022-10-10 17:54:29 -07:00
Nathan Sobo
e0b6b0df2a
Rename Join button to Open, rework message slightly
2022-10-10 18:12:00 -06:00
Max Brunsfeld
6dcf638322
Represent scrollbar range with f32s
2022-10-10 17:06:48 -07:00
Nathan Sobo
b8c2acf0f2
Show worktree root names when sharing additional projects on a call
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-10-10 17:56:03 -06:00
Max Brunsfeld
eedcc585af
Add scrollbars to editors
2022-10-10 16:20:47 -07:00
Kay Simmons
7528bf8f32
Merge pull request #1714 from zed-industries/fix-autoclose
...
Don't autoclose brackets when `close` is false
2022-10-10 15:35:47 -07:00
K Simmons
0d31ea7cf2
fix minor issue where undo is not available in visual mode
2022-10-10 15:34:40 -07:00
K Simmons
6a237deb21
Add some tests for portions of visual text objects. Note: they are slightly broken currently as described in the tests
2022-10-10 15:32:12 -07:00
Nate Butler
95bc18a995
Fix color ramps to use colored fg
2022-10-10 17:50:41 -04:00
K Simmons
d2494822b0
Add assertion context manager to TestAppContext and convert existing vim tests to use neovim backed test context
2022-10-10 14:46:07 -07:00
Nate Butler
61dc703a58
Improve feedback button hover state
2022-10-10 17:42:23 -04:00
Nate Butler
a87d9d3578
Make code actions/autocomplete match contextMenu style
2022-10-10 17:35:12 -04:00
Nathan Sobo
425e540c9a
Fix tests by providing close: true
2022-10-10 15:29:24 -06:00
Nathan Sobo
3ae96f2c6e
Don't autoclose brackets when is false
2022-10-10 15:15:43 -06:00
Nate Butler
fc770c6ea5
Merge pull request #1713 from zed-industries/elevations-dynamic-layers
...
(Elevations) Dynamic StyleSets
2022-10-10 16:59:22 -04:00
Nate Butler
0c68abbe17
Revert tab bar to pre-elevation style
2022-10-10 16:53:38 -04:00
Mikayla Maki
576581c20d
Merge pull request #1699 from zed-industries/page-up
...
Implemented page up and page down for the editor
2022-10-10 11:43:35 -07:00
Mikayla Maki
1d2495d57b
Re-arrange how lines are set
2022-10-10 11:38:28 -07:00
Julia
7d6690335f
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
Julia
2f96a09c46
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
Antonio Scandurra
94c68d246e
📝
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-10 19:18:05 +02:00
Antonio Scandurra
8dc99d42ff
Remove menu bar extra
2022-10-10 18:21:11 +02:00
Antonio Scandurra
04fcd18c75
Show contacts popover when clicking on menu bar extra
2022-10-10 16:30:02 +02:00
Antonio Scandurra
d9d99e5e04
Fix seed script
2022-10-10 16:05:22 +02:00
Antonio Scandurra
5f9cedad23
Add margin to picker in contacts popover
2022-10-10 16:05:09 +02:00
Antonio Scandurra
afaacba41f
Merge remote-tracking branch 'origin/main' into room
2022-10-10 15:43:38 +02:00
Antonio Scandurra
3396a98978
💄
2022-10-10 14:41:18 +02:00
Antonio Scandurra
7cfe435e62
Style project shared notifications
2022-10-10 14:37:51 +02:00
Antonio Scandurra
9d990ae329
Show all room participants in titlebar
...
...and allow following them into external projects.
2022-10-10 14:20:45 +02:00
Antonio Scandurra
25ff5959fb
Superimpose external location message on active view
2022-10-10 12:23:50 +02:00
Antonio Scandurra
d7bac3cea6
Style incoming call notification
2022-10-10 11:36:39 +02:00
Antonio Scandurra
79748803a9
Add leave button on active call header
2022-10-10 10:30:51 +02:00
Antonio Scandurra
6f4edf6df5
Move contact finder into contacts popover
2022-10-10 09:56:21 +02:00
Mikayla Maki
1af4b263b2
Implemented page up and page down for the editor
2022-10-09 19:19:40 -07:00
Nate Butler
2d25e25ec3
WIP + Format
2022-10-09 19:43:06 -04:00
Nate Butler
c4028ef116
Calculate styles dynamically
2022-10-09 16:11:02 -04:00
Nate Butler
393d728769
wip
2022-10-09 15:27:39 -04:00
K Simmons
5fec8c8bfd
Enable verifying of visual mode selections in neovim backed tests
2022-10-09 01:19:22 -07:00
K Simmons
f90b693ed5
fix some warnings and merge errors
2022-10-08 23:49:04 -07:00
K Simmons
515c1ea123
Fixed some neovim test context issues, added repeated commands in vim mode, and ported some tests to use the neovim testing strategy
2022-10-08 21:52:07 -07:00
K Simmons
b82db3a254
Adds word and sentence text objects along with a new vim testing system which uses cached neovim data to verify our test accuracy
2022-10-08 21:51:49 -07:00
Antonio Scandurra
34cb742db1
Set current location after calling another user
2022-10-08 14:47:40 +02:00
Antonio Scandurra
59aaf4ce1b
Call contact on enter
2022-10-08 14:43:41 +02:00
Antonio Scandurra
d14744d02f
Show current user in active call
2022-10-08 14:38:17 +02:00
Max Brunsfeld
e96abf1429
0.59.0
2022-10-07 14:51:18 -07:00
Mikayla Maki
2758234e03
Merge pull request #1693 from zed-industries/terminal-tidying
...
Terminal Tidying
2022-10-07 13:11:43 -07:00
Max Brunsfeld
00188511cb
Merge pull request #1697 from zed-industries/css-highlighting-fixes
...
Highlighting fixes
2022-10-07 12:56:31 -07:00
Julia
4456e81163
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
6ecf870c66
Tweak SCREAMING_SNAKE_CASE regexes in highlight queries
2022-10-07 12:46:49 -07:00
Max Brunsfeld
95cb9ceac9
Collapse variant and type into the same color
2022-10-07 12:44:55 -07:00
Max Brunsfeld
fcf13b44fb
CSS: color '#' the same as the rest of the color
2022-10-07 12:44:39 -07:00
Max Brunsfeld
070c4bc503
Add color for 'variable.special' and use it in highlight queries
2022-10-07 12:44:20 -07:00
Julia
e15f27106d
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
15595a67fa
Added a horrible hacky way of doing cmd-k correctly.
2022-10-07 12:04:26 -07:00
Mikayla Maki
bf50a8ad8e
Implemented a simplistic version of correct cmd-k behavior
2022-10-07 11:37:39 -07:00
Mikayla Maki
188b775fa6
Fixed non-block terminal cursors being displayed incorrectly
2022-10-07 10:03:09 -07:00
Max Brunsfeld
ec76146a23
Merge pull request #1692 from zed-industries/avoid-duplicate-autoformat-edits
...
Avoid duplicate autoformat edits
2022-10-07 09:35:10 -07:00
Antonio Scandurra
f9fb3f78b2
WIP: Render active call in contacts popover
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-10-07 17:01:48 +02:00
Antonio Scandurra
96c5bb8c39
Fix flicker due to adding and removing menu bar extra unnecessarily
2022-10-07 15:07:09 +02:00
Antonio Scandurra
560d8a8004
Don't leave the room if there's a pending room update
2022-10-07 14:52:39 +02:00
Antonio Scandurra
251e06c50f
💄
2022-10-07 14:51:04 +02:00
Antonio Scandurra
6fb5901d69
Ensure sharing the same project twice is idempotent
2022-10-07 14:47:06 +02:00
Antonio Scandurra
d3cddfdced
Fix styling for busy contacts
2022-10-07 14:42:18 +02:00
Antonio Scandurra
386de03f46
Fix room disconnection problems when creating room and sharing project
2022-10-07 14:39:11 +02:00
Antonio Scandurra
4aaf3df8c7
Show contact status
2022-10-07 13:56:28 +02:00
Antonio Scandurra
d7cea646fc
Include a busy field in proto::Contact
2022-10-07 12:21:56 +02:00
Antonio Scandurra
e82320cde8
Never set a room on active call if it is offline
2022-10-07 12:00:23 +02:00
Antonio Scandurra
669406d5af
Leave room when client is the only participant
2022-10-07 11:58:49 +02:00
Antonio Scandurra
b479c8c8ba
Move project sharing into Room
2022-10-07 10:14:17 +02:00
Antonio Scandurra
3d467a9491
Unset room on active call when disconnecting
2022-10-07 09:23:25 +02:00
Julia
8fb8fff61b
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
d67fad8dca
Extend a test to cover repos not at worktree root
2022-10-06 22:20:10 -04:00
Nate Butler
431ac1267a
Update contextMenu.ts
2022-10-06 21:08:53 -04:00
Max Brunsfeld
47a8e4222a
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
4508d94a3e
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
8411d886ac
Fix multi-line string formatting in editor_test.rs
2022-10-06 15:13:29 -07:00
Max Brunsfeld
17ed80f74d
Merge pull request #1691 from zed-industries/move-tests
...
Organize buffer and editor tests
2022-10-06 13:39:54 -07:00
Max Brunsfeld
63e1c839fe
Rename language::tests -> language::buffer_tests
2022-10-06 13:32:49 -07:00
Max Brunsfeld
b6525e9164
Extract editor tests to their own file
2022-10-06 13:32:34 -07:00
Max Brunsfeld
c0ee8dc007
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
fe7a39ba5c
Apply buffer diff edits as a single batch
2022-10-06 11:54:28 -07:00
Max Brunsfeld
51fa06cc8d
Merge pull request #1404 from zed-industries/html-support
...
Basic html support
2022-10-06 10:32:44 -07:00
Julia
771215d254
Reload git index on file events to catch new contents
2022-10-06 12:01:21 -04:00
Antonio Scandurra
9f81699e01
WIP: start on menu bar extra
2022-10-06 16:10:45 +02:00
Antonio Scandurra
95e08edbb8
Always include room id in protos
...
This is redundant, but it futures-proof the ability to talk about
multiple rooms at any given time and feels safer in terms of race
conditions.
2022-10-06 15:20:49 +02:00
Antonio Scandurra
baf6097b49
Remove stale contacts panel reference
2022-10-06 15:17:02 +02:00
Antonio Scandurra
4cb306fbf3
Implement call cancellation
2022-10-06 15:12:27 +02:00
Antonio Scandurra
2e84fc6737
Delete rooms without pending users or participants
2022-10-06 14:20:40 +02:00
Antonio Scandurra
c43956d70a
Move contacts panel styles into contacts popover
2022-10-06 14:07:21 +02:00
Antonio Scandurra
40163da679
Move contacts panel features into collab_ui
2022-10-06 14:00:14 +02:00
Antonio Scandurra
7763acbdd5
Move IncomingCall into call crate
2022-10-06 09:52:03 +02:00
Antonio Scandurra
55cc142319
Move incoming calls into ActiveCall
2022-10-06 09:50:26 +02:00
Joseph T. Lyons
edf4c3ec00
Add Discord webhook for published releases ( #1684 )
2022-10-05 21:22:53 -04:00
Max Brunsfeld
b7e115a6a1
Add a test for multi-language auto-indent
2022-10-05 17:59:31 -07:00
Max Brunsfeld
7fb5fe036a
Derive indent size from the language at the cursor when auto-indenting
2022-10-05 17:07:35 -07:00
Max Brunsfeld
8b86781ad1
Remove last usages of MultiBufferSnapshot::language
2022-10-05 14:44:34 -07:00
Julia
3f4be5521c
Load diff base from correct relative path
2022-10-05 16:04:55 -04:00
Max Brunsfeld
aa86806408
Finish generalizing ToggleComments to support block comments
2022-10-05 12:25:32 -07:00
Nate Butler
5bc074005c
WIP
2022-10-05 12:40:38 -04:00
Antonio Scandurra
fa31c9659b
Check room invariants in Store::check_invariants
2022-10-05 16:29:22 +02:00
Antonio Scandurra
5ef342f8c4
Enhance integration test to verify creating rooms while busy
2022-10-05 16:20:01 +02:00
Antonio Scandurra
5b811e4304
Add integration test verifying calls to busy users
2022-10-05 16:14:40 +02:00
Antonio Scandurra
183ca5da6f
Allow following users into external projects
2022-10-05 15:32:55 +02:00
Antonio Scandurra
8f8843711f
Move logic for joining project into a global action in collab_ui
2022-10-05 15:04:03 +02:00
Antonio Scandurra
383c21046f
Set room location when active workspace changes
2022-10-05 15:03:40 +02:00
Antonio Scandurra
78e3370c1e
Set room only after project has been shared to avoid flicker
2022-10-05 11:19:44 +02:00
Antonio Scandurra
84eebbe24a
Always open project when added to a call via the + button
2022-10-05 11:01:28 +02:00
Antonio Scandurra
087760dba0
Use AppContext instead of MutableAppContext for ActiveCall::global
2022-10-05 10:51:51 +02:00
Max Brunsfeld
d9fb8c90d8
Start work on toggling block comments for HTML
2022-10-04 17:27:03 -07:00
Julia
836b536a90
Merge pull request #1632 from zed-industries/git-gutter
...
Tracking PR: Git gutter
2022-10-04 15:12:28 -04:00
Julia
2bd947d4d0
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
Nate Butler
4a61b1011e
Minor one dark improvements
...
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-04 14:53:06 -04:00
Nate Butler
84847ff181
Remap theme ramp domains
...
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-04 14:49:57 -04:00
Max Brunsfeld
b5d941b10c
0.58.0
2022-10-04 11:43:52 -07:00
Nate Butler
0bbc02e10d
Add bottom padding and spacing between items to pickers
...
Co-Authored-By: gibusu <95764254+gibusu@users.noreply.github.com >
2022-10-04 13:55:01 -04:00
Antonio Scandurra
fceba6814f
Automatically share project when creating the room
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-04 19:25:48 +02:00
Nate Butler
0ed811b81b
Update palettes
2022-10-04 13:16:11 -04:00
Nate Butler
ce2112df43
Update offline indicator
2022-10-04 12:36:31 -04:00
Antonio Scandurra
678b013da6
Don't show share button for remote projects
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-10-04 18:35:54 +02:00
Antonio Scandurra
ebee2168fc
Re-emit notifications and events from ActiveCall
...
This lets us only observe and subscribe to the active call without
needing to track the underlying `Room` if it changes, which implies
writing the same boilerplate over and over.
2022-10-04 18:15:56 +02:00
Antonio Scandurra
41240351d3
Simplify Collaborator to stop including the user
...
It can be retrieved from the `Room` and we're guaranteed to have
a room in order to have collaborators in a project.
2022-10-04 18:00:54 +02:00
Antonio Scandurra
debedaf004
Show notification when a new project is shared and allow joining it
2022-10-04 16:55:41 +02:00
Antonio Scandurra
57930cb88a
Show Share button for unshared projects when inside of a room
2022-10-04 15:56:20 +02:00
Antonio Scandurra
de917c4678
Use a different style for inactive participants
2022-10-04 15:06:20 +02:00
Antonio Scandurra
456dde200c
Implement Room::set_location
2022-10-04 11:46:01 +02:00
Max Brunsfeld
218ba81013
Fix autoclose error when cursor was at column 0
2022-10-03 17:44:18 -07:00
Mikayla Maki
499e95d16a
Removed debugs, simplified settings
2022-10-03 17:43:05 -07:00
Mikayla Maki
6f7547d28f
Fixed a couple bugs in tests and worktree path handling
2022-10-03 17:18:38 -07:00
Max Brunsfeld
c354b9b959
Add assertions to test for autoclose with embedded languages
2022-10-03 13:24:37 -07:00
Max Brunsfeld
841ba405f0
Merge pull request #1680 from zed-industries/telemetry-tweaks
...
Telemetry tweaks
2022-10-03 13:08:05 -07:00
Julia
6f6d72890a
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
f3d83631ef
Remove unnecessary min_id_length option from amplitude requests
2022-10-03 12:13:27 -07:00
Julia
e6487de069
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
Julia
a5c2f22bf7
Move git gutter settings out of editor settings
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-10-03 14:53:33 -04:00
Nate Butler
7080dc9c23
WIP
2022-10-03 14:08:01 -04:00
Max Brunsfeld
06813be5c8
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
Julia
8f4b3c3493
Store repo content path as absolute
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-10-03 14:00:58 -04:00
Max Brunsfeld
4477f95ee6
Set staff user property in telemetry
...
Co-authored-by: Joseph Lyons <joseph@zed.dev >
2022-10-03 10:52:57 -07:00
Julia
9427bb7553
Be clearer about using GitFilesIncluded setting
2022-10-03 11:58:48 -04:00
Antonio Scandurra
1e45198b9f
Emit event on Room when a user shares a new project
2022-10-03 17:12:07 +02:00
Antonio Scandurra
ad323d6e3b
Automatically fetch remote participant users in Room
2022-10-03 16:09:49 +02:00
Antonio Scandurra
da6106db8e
Prevent calls from users who aren't contacts
2022-10-03 15:54:20 +02:00
Antonio Scandurra
bec6b41448
Fix randomized integration test failure
2022-10-03 15:50:47 +02:00
Antonio Scandurra
6426037653
Adapt integration tests to always pass a room id to Project::share
...
Randomized test is failing, so we'll look into that next.
2022-10-03 15:44:11 +02:00
Mikayla Maki
01176e04b7
Added clarification for git gutter settings
2022-10-02 18:42:03 -07:00
Mikayla Maki
c237075102
Touched up settings text
2022-10-02 18:35:19 -07:00
Mikayla Maki
0f1d71c38f
Merge branch 'main' into git-gutter
2022-10-02 18:03:50 -07:00
Mikayla Maki
56b4162023
Fix stray merge failure
2022-10-02 18:02:25 -07:00
Antonio Scandurra
fd42811ef1
Cache CGEventSource and avoid leaking CGEvent when handling events
2022-10-02 18:01:49 -07:00
Max Brunsfeld
34926abe83
0.57.0
2022-10-02 18:01:49 -07:00
Max Brunsfeld
1aa554f4c9
Fix FakeServer to expect new GetPrivateUserInfo request
2022-10-02 18:01:49 -07:00
Mikayla Maki
52dbf2f9b8
add proto stuff
2022-10-02 18:01:37 -07:00
Mikayla Maki
5769cdc354
made git diff rendering respect line wrap
2022-10-02 18:00:13 -07:00
Julia
7f84abaf13
Increment protocol version again for previous commit
2022-10-02 14:11:35 -04:00
Mikayla Maki
512f817e2f
Added proto messages for updating the head text
2022-10-01 18:18:35 -07:00
Mikayla Maki
8c24c858c9
Touched up comments
2022-09-30 17:36:22 -07:00
Mikayla Maki
a1299d9b68
Fixed 1 test
2022-09-30 17:34:14 -07:00
Mikayla Maki
af0974264c
Refactored git repository code to seperate out repository entry tracking data and git2 mocking code.
...
Co-authored-by: Max <max@zed.dev >
Co-authored-by: Julia <julia@zed.dev >
2022-09-30 17:33:34 -07:00
Julia
c95646a298
WIP Start refactoring separation of concerns for repo metadata
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-30 18:25:25 -04:00
Julia
42b7820dbb
Perform git diff on remote buffer open
2022-09-30 18:05:09 -04:00
Julia
ce7f6dd082
Start a test for remote git data updating
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-09-30 15:51:32 -04:00
Julia
6540936970
Fix some panics in tests
2022-09-30 13:51:54 -04:00
Julia
1c5d15b85e
Use sumtree instead of iterator linear search for diff hunks in range
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-30 13:32:54 -04:00
Antonio Scandurra
964a5d2db7
WIP: require sharing projects on a given Room
2022-09-30 18:21:47 +02:00
Julia
bce25918a0
Fix test build
2022-09-30 11:13:22 -04:00
Antonio Scandurra
074b8f18d1
Rip out project registration and use sharing/unsharing instead
2022-09-30 12:23:57 +02:00
Antonio Scandurra
be8990ea78
Remove project join requests
2022-09-30 11:35:50 +02:00
Antonio Scandurra
761ae3ae6f
Merge pull request #1673 from zed-industries/fix-cgevent-memory-leak
...
Cache `CGEventSource` and avoid leaking `CGEvent` when handling events
2022-09-30 09:04:25 +01:00
Antonio Scandurra
25bba396ef
Cache CGEventSource and avoid leaking CGEvent when handling events
2022-09-30 09:51:03 +02:00
Joseph T Lyons
3c62de34f7
Change journal location setting name to "path" and default to ~
2022-09-29 17:12:57 -04:00
Antonio Scandurra
b35e8f0164
Remove projects from contact updates
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-29 19:40:36 +02:00
Nate Butler
a6cccf82f7
Fix illegible rename text
2022-09-29 13:28:31 -04:00
Julia
fcf11b1181
Bump protocol version to be ahead of main
2022-09-29 13:16:02 -04:00
Julia
e865b85d9c
Track index instead of head for diffs
2022-09-29 13:16:02 -04:00
Mikayla Maki
9fe6a5e83e
made git stuff slightly more themable
2022-09-29 13:16:02 -04:00
Nate Butler
b395fbb3f2
wip
2022-09-29 13:16:02 -04:00
Nate Butler
8a2430090b
WIP Git gutter styling
2022-09-29 13:16:02 -04:00
Mikayla Maki
113d3b88d0
Added test, and fix, for changed_repos method on LocalWorktree
2022-09-29 13:16:02 -04:00
Julia
f7714a25d1
Don't pretend this is async
2022-09-29 13:16:02 -04:00
Mikayla Maki
71b2126eca
WIP, re-doing fs and fake git repos
2022-09-29 13:16:02 -04:00
Julia
d5fd531743
Move git related things into specialized git crate
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
bf3b3da6ed
Build again
2022-09-29 13:16:02 -04:00
Julia
7e5d49487b
WIP Notifying buffers of head text change
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
759b7f1e07
Update repo scan id when files under dot git dir events
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
d2b18790a0
Remove git repos from worktree when deleted on storage
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
4251e0f5f1
Find repos under worktree & return correct results for repo queries
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Mikayla Maki
c8e63d76a4
Get the test to failing,,, correctly
2022-09-29 13:16:02 -04:00
Mikayla Maki
6ac9308a03
Added git repository type infrastructure and moved git file system stuff into fs abstraction so we can test without touching the file system. Co-Authored-By: kay@zed.dev
2022-09-29 13:16:02 -04:00
Mikayla Maki
0d1b2a7e46
WIP - max & mikayla working on tests
2022-09-29 13:16:02 -04:00
Julia
bb8798a844
WIP pls amend me
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
8d2de1074b
Pull git indicator colors out of theme
...
Co-Authored-By: Kay Simmons <kay@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
632f47930f
Utilize initial file contents as head text by default
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
a679557e40
Avoid racing git diffs & allow for "as fast as possible" diff updating
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
b18dd8fcff
Fully qualify outside git-related code when a diff is a git diff
2022-09-29 13:16:02 -04:00
Julia
8edee9b2a8
Async-ify head text loading
2022-09-29 13:16:02 -04:00
Julia
6633c0b328
Perform initial file load git diff async
2022-09-29 13:16:02 -04:00
Julia
6825b6077a
Properly invalidate when async git diff completes
2022-09-29 13:16:02 -04:00
Julia
9c82954877
Changed diffs to be async and dropped git delay
2022-09-29 13:16:02 -04:00
Julia
c4da8c46f7
Disable unnecessary libgit2 cargo features
...
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
b9d84df127
Track buffer row divergence while iterating through diff lines
...
This allows for offsetting head row index of deleted lines to normalize
into buffer row space
2022-09-29 13:16:02 -04:00
Julia
446bf88655
Use row range while building buffer range during diff line iteration
2022-09-29 13:16:02 -04:00
Julia
03b6f3e0bf
Reorganize for for purely file level invalidation
2022-09-29 13:16:02 -04:00
Julia
e72e132ce2
Clear out commented code & once again perform full file diff on update
2022-09-29 13:16:02 -04:00
Julia
c1249a3d84
Handle deletions more robustly and correctly
2022-09-29 13:16:02 -04:00
Julia
96917a8007
Small clean
2022-09-29 13:16:02 -04:00
Julia
2f7283fd13
buffer_divergence doesn't seem to be a concept that needs to be tracked
2022-09-29 13:16:02 -04:00
Julia
e0ea932fa7
Checkpoint preparing for a more organized approach to incremental diff
2022-09-29 13:16:02 -04:00
Julia
4b2040a7ca
Move diff logic back into BufferDiff::update
2022-09-29 13:16:02 -04:00
Julia
a2e8fc79d9
Switch head range from row range to byte offset range
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
61ff24edc8
Move cloneable diff state into new snapshot type
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-09-29 13:16:02 -04:00
Julia
a86e93d46f
Checkpoint on incremental diff sumtree shenanigans
2022-09-29 13:16:02 -04:00
Julia
883d5b7a08
Update git gutter status after debounced delay
...
Co-authored-by: Max Brunsfeld <max@zed.com >
2022-09-29 13:16:02 -04:00
Julia
5157c71fa9
Render deletion gutter markers
2022-09-29 13:16:02 -04:00
Julia
fdda2abb78
Correct start/end of git diff hunks
2022-09-29 13:16:02 -04:00
Julia
641daf0a6e
Correct git gutter indicator scroll position & add rounded corner
2022-09-29 13:16:02 -04:00
Julia
55ca02351c
Start painting some sort of hunk info, it's wrong but it's close
...
Co-Authored-By: Max Brunsfeld <max@zed.dev >
2022-09-29 13:16:01 -04:00
Julia
6fa2e62fa4
Start asking Editors to update git after a debounced delay
2022-09-29 13:16:01 -04:00
ForLoveOfCats
2a14af4cde
Load a file's head text on file load just to get started
2022-09-29 13:16:01 -04:00
Antonio Scandurra
1898e813f5
Encapsulate Room interaction within ActiveCall
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-29 17:39:53 +02:00
Antonio Scandurra
e0db62173a
Rename room crate to call
...
Also, rename `client::Call` to `client::IncomingCall`.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-29 17:24:31 +02:00
Antonio Scandurra
1158911560
Wire up accepting/declining a call
2022-09-29 15:33:33 +02:00
Antonio Scandurra
634f9de7e6
Avoid using global for Room and extract that logic into ActiveCall
2022-09-29 10:48:51 +02:00
Joseph T Lyons
f8da5ab2e7
Remove "get" prefix from function names
2022-09-28 17:07:11 -04:00
Joseph T Lyons
fbe5f9225c
Add descriptions to journal settings
2022-09-28 16:52:15 -04:00
Max Brunsfeld
4f44375abd
Make Buffer::language_at fall back to Buffer::language
...
For languages with no grammar (plain text), there
will be no layers.
2022-09-28 13:38:54 -07:00
Joseph T Lyons
773423fcf4
Initial work to add settings to journal feature
2022-09-28 16:25:37 -04:00
Nate Butler
a62e2a38d7
Update projectPanel.ts
2022-09-28 16:04:15 -04:00
Nate Butler
48dcc465f2
WIP
2022-09-28 16:03:00 -04:00
Nate Butler
d0c50b4fbf
Style tab bar
2022-09-28 15:53:06 -04:00
Max Brunsfeld
2da32af340
Update EditorTestContext usage to reflect new synchronous constructor
2022-09-28 12:36:55 -07:00
Max Brunsfeld
2b0794f5ae
Restructure autoclosing to account for multi-language documents
2022-09-28 12:32:04 -07:00
Max Brunsfeld
67e188a015
Add Buffer::language_at, update MultiBuffer to use it
...
Co-authored-by: Julia Risley <floc@unpromptedtirade.com >
2022-09-28 12:32:04 -07:00
Max Brunsfeld
a2e57e8d71
Add basic syntax highlighting for CSS
2022-09-28 12:32:04 -07:00
Max Brunsfeld
21fb2b9bf1
Tweak HTML indents and highlights
2022-09-28 12:32:04 -07:00
Max Brunsfeld
e4f5e85c3c
Add JavaScript language injection in HTML
2022-09-28 12:32:04 -07:00
Isaac Clayton
a48995c782
Basic html highlighting + lsp support
2022-09-28 12:32:04 -07:00
Antonio Scandurra
04d194924e
WIP: Start on ActiveCall
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 19:50:13 +02:00
Antonio Scandurra
46b61feb9a
Open popup window when receiving a call
...
We still need to style and allow people to accept the call but this
is a good starting point.
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 19:35:24 +02:00
Antonio Scandurra
aa3cb8e35e
Rename collab_titlebar_item crate to collab_ui
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 19:14:31 +02:00
Nathan Sobo
8ff4f044b7
Start a call when clicking on a contact in the contacts popover
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-09-28 11:02:26 -06:00
Nate Butler
ab3a6f775e
WIP Titlebar styling
2022-09-28 13:01:12 -04:00
Nathan Sobo
815cf44647
Rename AddParticipantPopover to ContactsPopover
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-09-28 09:10:01 -06:00
Nathan Sobo
f5b2d56efd
Remove contacts menu bar extra
...
Co-Authored-By: Antonio Scandurra <antonio@zed.dev >
2022-09-28 09:06:28 -06:00
Antonio Scandurra
1d1bd3975a
Remove current user from contacts
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
Co-Authored-By: Mikayla Maki <mikayla@zed.dev >
2022-09-28 11:33:38 +02:00
Antonio Scandurra
4b73239972
WIP: Start moving contacts panel into "add participants" popover
2022-09-28 11:33:38 +02:00
Antonio Scandurra
0a29e13d4a
Add active style when participant popover is open
2022-09-28 11:33:38 +02:00
Antonio Scandurra
0db6eb2fb8
Show add participant popover on click
2022-09-28 11:33:38 +02:00
Antonio Scandurra
782309f369
Rename contacts_titlebar_item to collab_titlebar_item
2022-09-28 11:33:38 +02:00
Antonio Scandurra
5a3a85b2c8
Introduce a + button in the titlebar
2022-09-28 11:33:38 +02:00
Antonio Scandurra
c8a48e8990
Extract contacts titlebar item into a separate crate
...
This allows us to implement a new contacts popover that uses the
`editor` crate.
2022-09-28 11:33:38 +02:00
Antonio Scandurra
80ab144bf3
Ring users upon connection if somebody was calling them before connecting
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 11:33:38 +02:00
Antonio Scandurra
6aa0f0b200
Leave room automatically on disconnection
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 11:33:38 +02:00
Antonio Scandurra
f0c45cbceb
Remove projects from basic calls test for now
2022-09-28 11:33:38 +02:00
Antonio Scandurra
e55e7e4844
Leave room when Room entity is dropped
2022-09-28 11:33:38 +02:00
Antonio Scandurra
573086eed2
Always rely on the server to cancel the incoming call
2022-09-28 11:33:38 +02:00
Antonio Scandurra
df285def59
💄
2022-09-28 11:33:38 +02:00
Antonio Scandurra
bb9ce86a29
Introduce the ability of declining calls
2022-09-28 11:33:38 +02:00
Antonio Scandurra
f4697ff4d1
Prevent the same user from being called more than once
2022-09-28 11:33:38 +02:00
Antonio Scandurra
55b095cbd3
Implement joining a room and sending updates after people join/leave
2022-09-28 11:33:38 +02:00
Antonio Scandurra
4a9bf8f4fe
Introduce call infrastructure
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 11:33:38 +02:00
Antonio Scandurra
ebb5ffcedc
Introduce the ability of creating rooms on the server
2022-09-28 11:33:38 +02:00
Antonio Scandurra
0b1e372d11
Start sketching out an integration test for calls
...
Co-Authored-By: Nathan Sobo <nathan@zed.dev >
2022-09-28 11:33:38 +02:00
Antonio Scandurra
8fec7da799
WIP
2022-09-28 11:33:38 +02:00
Antonio Scandurra
46019f8537
WIP
2022-09-28 11:33:38 +02:00
Nate Butler
0674ca14d9
Update the neutral ramp for Andromeda
2022-09-27 12:49:51 -04:00
Nate Butler
d0b35b5e19
WIP Update style trees
2022-09-26 22:51:00 -04:00
Nate Butler
01570504ad
WIP Allow applying domains to theme ramps
...
Co-Authored-By: Kay Simmons <3323631+Kethku@users.noreply.github.com >
2022-09-26 17:41:59 -04:00
Nate Butler
506c28d2b6
Fix incorrect import
2022-09-26 15:39:21 -04:00
Nate Butler
53f58f72f2
Add zed-pro as an internal theme
2022-09-26 15:15:35 -04:00
Nate Butler
c9786fe464
Create a baseline for ramps to start tweaking from
2022-09-26 15:07:24 -04:00
Nate Butler
c2ffc7086c
Minor styletree fixes
2022-09-26 15:07:11 -04:00
K Simmons
96f9ee784d
add more states to the theme testbench
2022-09-22 14:25:15 -07:00
K Simmons
962f087ac2
promote variant to its own styleset
2022-09-22 13:29:19 -07:00
Nate Butler
ebe8c952e4
WIP work on bottom and middle layer sets
2022-09-22 12:08:53 -04:00
K Simmons
eabd687cbc
More tweaks and add variant to theme testbench
2022-09-21 16:59:33 -07:00
K Simmons
593c7a8cd1
fix rebase error
2022-09-21 16:35:24 -07:00
K Simmons
79b9420017
minor tweaks
2022-09-21 16:32:44 -07:00
K Simmons
db5c83eb36
add theme testbench command
2022-09-21 16:32:44 -07:00
K Simmons
56f9543a95
reworked style tree to use colorScheme instead of old theme. Very limited style for now
2022-09-21 16:32:42 -07:00