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

Use the same InlineAssist action between both assistant and assistant2 #22126

Merged
merged 1 commit into from
Dec 17, 2024

Conversation

maxdeviant
Copy link
Member

This PR makes it so assistant and assistant2 both use the same action for inline assist (zed_actions::InlineAssist).

This makes it so the keybindings to deploy the inline assist seamlessly swap based on the feature flag without needing to rebind them.

One minor caveat: if you're using assistant2 the action name in the command palette will be assistant: inline assist.

Release Notes:

  • N/A

@maxdeviant maxdeviant self-assigned this Dec 17, 2024
@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 17, 2024
@maxdeviant maxdeviant merged commit 3052fc2 into main Dec 17, 2024
12 checks passed
@maxdeviant maxdeviant deleted the marshall/assistant2-unify-inline-assist branch December 17, 2024 04:57
helgemahrt pushed a commit to helgemahrt/zed that referenced this pull request Dec 18, 2024
…stant2` (zed-industries#22126)

This PR makes it so `assistant` and `assistant2` both use the same
action for inline assist (`zed_actions::InlineAssist`).

This makes it so the keybindings to deploy the inline assist seamlessly
swap based on the feature flag without needing to rebind them.

One minor caveat: if you're using `assistant2` the action name in the
command palette will be `assistant: inline assist`.

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.

1 participant