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

Fix cody autocomplete suggestions #2697

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Conversation

pkukielka
Copy link
Contributor

@pkukielka pkukielka commented Nov 27, 2024

Fixes https://linear.app/sourcegraph/issue/QA-182/jetbrains-autocomplete-is-not-working

Test plan

With autocomplete enabled:

  1. Open code file in IntelliJ
  2. Start typing
  3. Autocomplete suggestion should appear
  4. Click Esc to dismiss it
  5. Hit ⌥ Option + ⌘ Command + P to trigger autocomplete again
  6. Autocomplete suggestion should appear

With autocomplete disabled:

  1. Open code file in IntelliJ
  2. Start typing
  3. Autocomplete suggestion should NOT appear
    1. Hit ⌥ Option + ⌘ Command + P to trigger autocomplete
  4. Autocomplete suggestion should NOT appear

@pkukielka pkukielka enabled auto-merge (squash) November 27, 2024 11:20
@pkukielka pkukielka merged commit 37fcf91 into main Nov 27, 2024
15 of 16 checks passed
@pkukielka pkukielka deleted the pkukielka/fix-autocomplete branch November 27, 2024 12:11
@sourcegraph-release-bot

The backport to jb-v7.4.x failed at https://github.com/sourcegraph/jetbrains/actions/runs/12066432709:

Reviews may only be requested from collaborators. One or more of the teams you specified is not a collaborator of the sourcegraph/jetbrains repository.

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r jb-v7.4.x -p 2697
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-jb-v7.4.x jb-v7.4.x
# Navigate to the new working tree
cd .worktrees/backport-jb-v7.4.x
# Create a new branch
git switch --create backport-2697-to-jb-v7.4.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 37fcf91de690679f4a3586b432f98b6453153e78
# Push it to GitHub
git push --set-upstream origin backport-2697-to-jb-v7.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-jb-v7.4.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-2697-to-jb-v7.4.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-jb-v7.4.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is jb-v7.4.x and the compare/head branch is backport-2697-to-jb-v7.4.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@kalanchan
Copy link
Contributor

apologies for the noise, we're fixing the error messages

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants