Commit Graph
31406 Commits
Author SHA1 Message Date
Max Brunsfeld c861083f13 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
Max Brunsfeld ede99b06de collab 0.13.0 2023-06-07 09:29:58 -07:00
Joseph Lyons cce901d369 v0.91.x dev 2023-06-07 11:57:41 -04:00
Piotr Osiewicz 107c6e64dc 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
Antonio Scandurra 4e598f251c Fix assistant panel tests 2023-06-07 15:24:08 +02:00
Antonio Scandurra b9bd4b8efb Maintain scroll bottom when streaming assistant responses 2023-06-07 15:01:50 +02:00
Antonio Scandurra 9fcbdab38b Fix zed tests 2023-06-07 10:02:35 +02:00
Antonio Scandurra 85744fb68b Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-07 09:34:16 +02:00
Antonio Scandurra 8c966cf3e8 Allow search assistant editors 2023-06-07 09:24:18 +02:00
Max Brunsfeld c4a91f9d58 Improve log message on invalid LSP message from server's stdout 2023-06-06 17:13:59 -07:00
Max Brunsfeld e018579307 Remove stray println 2023-06-06 17:13:59 -07:00
Max Brunsfeld ce7f69513d Handle LSP codeActions capability set to false 2023-06-06 17:13:59 -07:00
Max Brunsfeld 6a31af8959 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 4a8319081d Fix the order of some patterns in elixir highlight query 2023-06-06 16:06:16 -07:00
Max Brunsfeld 3f42f45c84 Upgrade tree-sitter-elixir 2023-06-06 16:06:16 -07:00
Max Brunsfeld 77dfc1a803 Avoid panic when failing to load a language's queries 2023-06-06 16:06:16 -07:00
Max Brunsfeld ec45148b92 Don't apply the 'literal' color to entire markdown code blocks 2023-06-06 14:34:45 -07:00
Max Brunsfeld 4bfec02d3c Live-reload tree-sitter queries in development 2023-06-06 14:20:21 -07:00
Max Brunsfeld b6a053f0d0 Eliminate assets crate 2023-06-06 11:46:46 -07:00
Antonio Scandurra 82749a0483 Merge remote-tracking branch 'origin/main' into assistant-2 2023-06-06 19:18:22 +02:00
Antonio ScandurraandNathan Sobo c9bf2a1726 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 ScandurraandNathan Sobo cd54c3b048 Cycle message roles on click
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-06-06 18:45:08 +02:00
Antonio ScandurraandNathan Sobo 38bbad4bf6 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 579fe96e05 Show notification when attempting to open local settings in a project w/ no folders 2023-06-06 09:03:57 -07:00
Antonio ScandurraandNathan Sobo 5d092b4bce Simplify prompt
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
2023-06-06 17:45:58 +02:00
Antonio ScandurraandJulia Risley 3372e276ac 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 ScandurraandJulia Risley c656427838 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 350d955f48 Show the current model and allow clicking on it to change it 2023-06-06 13:13:44 +02:00
Antonio Scandurra 9b589a8490 Insert a user reply when hitting cmd-enter in an assistant message 2023-06-06 13:13:41 +02:00
Antonio Scandurra 6be252cbcf Add assertion to pinpoint how deletion works across excerpts 2023-06-06 12:36:26 +02:00
Antonio Scandurra e839eac008 Only remove excerpts when an edit touches them 2023-06-06 12:27:05 +02:00
Antonio Scandurra 37c5b86768 Prevent moving across excerpts on Editor::delete 2023-06-06 12:26:53 +02:00
Antonio Scandurra 35ffe5101d 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 90ff3b8067 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 e41e8ad0ba Populate created local settings file with an empty JSON object and comments 2023-06-05 18:20:02 -07:00
Max Brunsfeld 590536f026 Add Zed > Preferences > Local Settings to application menu 2023-06-05 17:45:42 -07:00
Max Brunsfeld 8554fbc19b 🎨 Move OpenSettings action back to the zed crate 2023-06-05 17:43:05 -07:00
Mikayla Makiandmax 032d8e4aa1 Improve test generation and implement status propogation
co-authored-by: max <max@zed.dev>
2023-06-05 17:30:12 -07:00
Mikayla Maki a6143e450d Silence not found errors 2023-06-05 15:19:59 -07:00
Max Brunsfeld 57e6d0deed 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 f04b161b1a Apply bounds to all windows when using start-local-collaboration script 2023-06-05 14:36:21 -07:00
Max Brunsfeld 21588a87c8 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 1bf7a087c4 Use local ids, not remote ids, to identify buffers to copilot 2023-06-05 14:12:19 -07:00
Mikayla Maki 066e23ec4e Add file and line number information to logs 2023-06-05 12:53:37 -07:00
Mikayla Maki af3189be5b WIP: Add status bubbling to project panel 2023-06-05 12:53:04 -07:00
Joseph Lyons bdc5fe76db Remove code sending zed events to mixpanel 2023-06-05 15:33:17 -04:00
Mikayla Maki 341fde871c Add postgres migration 2023-06-05 12:17:21 -07:00
Joseph Lyons 396846c973 Stop sending editor events to mixpanel 2023-06-05 15:09:47 -04:00
Mikayla Maki d478937043 Add statuses to test integration 2023-06-05 12:06:23 -07:00
Mikayla Maki 619cfe3cec Track git status changes with the changed_paths system 2023-06-05 11:50:23 -07:00