Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Supermaven #10788

Merged
merged 61 commits into from May 3, 2024
Merged

Supermaven #10788

merged 61 commits into from May 3, 2024

Conversation

rgbkrk
Copy link
Member

@rgbkrk rgbkrk commented Apr 19, 2024

Adds a supermaven provider for completions. There are various other refactors amidst this branch, primarily to make copilot no longer a dependency of project as well as show LSP Logs for global LSPs like copilot properly.

This feature is not enabled by default. We're going to seek to refine it in the coming weeks.

Release Notes:

  • N/A

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Apr 19, 2024
@rgbkrk rgbkrk force-pushed the supermaven branch 2 times, most recently from e81b729 to 4e7dc91 Compare April 23, 2024 16:09
crates/text/src/text.rs Outdated Show resolved Hide resolved
crates/zed/src/main.rs Outdated Show resolved Hide resolved
@rgbkrk rgbkrk force-pushed the supermaven branch 6 times, most recently from 83e10cc to f7a5acb Compare April 26, 2024 18:19
@rgbkrk rgbkrk force-pushed the supermaven branch 6 times, most recently from f34ccdc to 2c78ee2 Compare May 2, 2024 14:45
rgbkrk and others added 16 commits May 3, 2024 11:02
* Improve UI parity on icons with copilot provider
* Expose the service tier to `Supermaven` handler

Co-authored-by: Max <max@zed.dev>
Co-Authored-By: Max <max@zed.dev>
Co-Authored-By: Max <max@zed.dev>
… working again

Co-authored-by: Kyle <kylek@zed.dev>
Next, we'll rename the `copilot_ui` crate to make it provide a status
bar menu for both copilot and supermaven

Co-authored-by: Kyle <kylek@zed.dev>
Co-authored-by: Kyle <kylek@zed.dev>
Co-authored-by: Kyle <kylek@zed.dev>
Co-Authored-By: Nathan <nathan@zed.dev>
Co-Authored-By: Max <max@zed.dev>
@rgbkrk rgbkrk marked this pull request as ready for review May 3, 2024 19:46
@rgbkrk rgbkrk merged commit 6563330 into main May 3, 2024
8 checks passed
@rgbkrk rgbkrk deleted the supermaven branch May 3, 2024 19:50
@ThatOneCalculator
Copy link
Contributor

ThatOneCalculator commented May 5, 2024

Nice! I was able to enable Supermaven with the new "features": { "inline_completion_provider": "supermaven" } setting, but I can't seem to find a way to log in for Supermaven Pro?

Comment on lines +114 to +130
div().child(
popover_menu("copilot")
.menu(move |cx| {
Some(match status {
Status::Authorized => {
this.update(cx, |this, cx| this.build_copilot_context_menu(cx))
}
_ => this.update(cx, |this, cx| this.build_copilot_start_menu(cx)),
})
})
.anchor(AnchorCorner::BottomRight)
.trigger(
IconButton::new("copilot-icon", icon)
.tooltip(|cx| Tooltip::text("GitHub Copilot", cx)),
),
)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this introduced this bug #11537

SomeoneToIgnore added a commit that referenced this pull request May 8, 2024
Fixes prettier entries disappeared after
#10788

Release Notes:

- N/A
@lino-levan lino-levan mentioned this pull request May 15, 2024
1 task
osiewicz pushed a commit to RemcoSmitsDev/zed that referenced this pull request May 18, 2024
Fixes prettier entries disappeared after
zed-industries#10788

Release Notes:

- N/A
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants