Revert "Cody: add support for neovim, cody-cli, eclipse, and visualstudio clients (#63854)

This reverts commit 00d812c176.

The motivation to revert this commit is because it wasn't a good fix and
I want to have an easy-to-cherry-pick commit with a good fix (which I
have ready in another branch).

<!-- PR description tips:
https://www.notion.so/sourcegraph/Write-a-good-pull-request-description-610a7fd3e613496eb76f450db5a49b6e
-->

## Test plan

Green CI.
<!-- REQUIRED; info at
https://docs-legacy.sourcegraph.com/dev/background-information/testing_principles
-->

## Changelog

<!-- OPTIONAL; info at
https://www.notion.so/sourcegraph/Writing-a-changelog-entry-dd997f411d524caabf0d8d38a24a878c
-->
This commit is contained in:
Ólafur Páll Geirsson 2024-07-16 16:27:16 +02:00 committed by GitHub
parent 59ec1e034e
commit ff7a08730b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 29 deletions

View File

@ -561,10 +561,6 @@ func checkClientCodyIgnoreCompatibility(ctx context.Context, db database.DB, r *
}
var cvc clientVersionConstraint
switch clientName {
case types.CodyClientEclipse:
case types.CodyClientVisualStudio:
case types.CodyClientNeovim:
case types.CodyClientCli:
case types.CodyClientWeb:
// Cody Web is of the same version as the Sourcegraph instance, thus no version constraint is needed.
return nil
@ -582,15 +578,7 @@ func checkClientCodyIgnoreCompatibility(ctx context.Context, db database.DB, r *
}
default:
return &codyIgnoreCompatibilityError{
reason: fmt.Sprintf("please use one of the supported clients: %s, %s, %s, %s, %s, %s, %s.",
types.CodyClientVscode,
types.CodyClientJetbrains,
types.CodyClientWeb,
types.CodyClientEclipse,
types.CodyClientCli,
types.CodyClientVisualStudio,
types.CodyClientNeovim,
),
reason: fmt.Sprintf("please use one of the supported clients: %s, %s, %s.", types.CodyClientVscode, types.CodyClientJetbrains, types.CodyClientWeb),
statusCode: http.StatusNotAcceptable,
}
}

View File

@ -84,15 +84,7 @@ func TestCheckClientCodyIgnoreCompatibility(t *testing.T) {
"client-name": []string{"sublime"},
},
want: &codyIgnoreCompatibilityError{
reason: fmt.Sprintf("please use one of the supported clients: %s, %s, %s, %s, %s, %s, %s.",
types.CodyClientVscode,
types.CodyClientJetbrains,
types.CodyClientWeb,
types.CodyClientEclipse,
types.CodyClientCli,
types.CodyClientVisualStudio,
types.CodyClientNeovim,
),
reason: fmt.Sprintf("please use one of the supported clients: %s, %s, %s.", types.CodyClientVscode, types.CodyClientJetbrains, types.CodyClientWeb),
statusCode: http.StatusNotAcceptable,
},
},

View File

@ -262,13 +262,9 @@ const (
type CodyClientName string
const (
CodyClientWeb CodyClientName = "web"
CodyClientVscode CodyClientName = "vscode"
CodyClientJetbrains CodyClientName = "jetbrains"
CodyClientEclipse CodyClientName = "eclipse"
CodyClientVisualStudio CodyClientName = "visualstudio"
CodyClientNeovim CodyClientName = "neovim"
CodyClientCli CodyClientName = "cody-cli"
CodyClientWeb CodyClientName = "web"
CodyClientVscode CodyClientName = "vscode"
CodyClientJetbrains CodyClientName = "jetbrains"
)
type CompletionRequest struct {