Skip to content

Commit bdd7484

Browse files
authored
Revert "feat: Add experimental commit message generator (#2306)" (#3161)
This reverts commit 80dbffa. Context: https://sourcegraph.slack.com/archives/C05AGQYD528/p1707861341879059?thread_ts=1707832350.281989&cid=C05AGQYD528 Unfortunately, the API used by the feature has been removed from VS Code and no longer works in the stable version of VS Code: - microsoft/vscode#200012 - https://github.com/microsoft/vscode/blob/a776d5fe0a401a0b7dc3b58f28eef1887ad0c15e/extensions/git/src/api/api1.ts#L348-L353 cc @RXminuS we will add it back once the API has become publicly available again! ## Test plan <!-- Required. See https://sourcegraph.com/docs/dev/background-information/testing_principles. --> ![image](https://github.com/sourcegraph/cody/assets/68532117/26e54962-ad0b-4b91-bc3f-441a496c25b6)
1 parent cdb58b7 commit bdd7484

15 files changed

+5
-564
lines changed

lib/shared/src/configuration.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ export interface Configuration {
4646
/**
4747
* Experimental
4848
*/
49-
experimentalCommitMessage: boolean
5049
experimentalGuardrails: boolean
5150
experimentalSymfContext: boolean
5251
experimentalTracing: boolean

pnpm-lock.yaml

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vscode/CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ This is a log of all notable changes to Cody for VS Code. [Unreleased] changes a
66

77
### Added
88

9-
- Cody can now generate commit messages from your changes. Triggered through the input field in the VS Code "Source Control" sidebar. [pull/2306](https://github.com/sourcegraph/cody/pull/2306)
109
- Chat: Displays warnings for large @-mentioned files during selection. [pull/3118](https://github.com/sourcegraph/cody/pull/3118)
1110

1211
### Fixed

vscode/package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -853,12 +853,6 @@
853853
"markdownDescription": "Enable OpenTelemetry tracing",
854854
"default": false
855855
},
856-
"cody.experimental.commitMessage": {
857-
"order": 99,
858-
"type": "boolean",
859-
"default": true,
860-
"markdownDescription": "Enable Cody to appear in the Source Control input field, to generate a relevant commit message from your changes."
861-
},
862856
"cody.debug.enable": {
863857
"order": 99,
864858
"type": "boolean",
@@ -1085,7 +1079,6 @@
10851079
"lru-cache": "^10.0.0",
10861080
"mkdirp": "^3.0.1",
10871081
"os-browserify": "^0.3.0",
1088-
"parse-diff": "^0.11.1",
10891082
"socks-proxy-agent": "^8.0.1",
10901083
"unzipper": "^0.10.14",
10911084
"uuid": "^9.0.0",

vscode/src/chat/ContextProvider.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ export type Config = Pick<
3838
| 'useContext'
3939
| 'codeActions'
4040
| 'experimentalGuardrails'
41-
| 'experimentalCommitMessage'
4241
| 'commandCodeLenses'
4342
| 'experimentalSimpleChatContext'
4443
| 'experimentalSymfContext'

vscode/src/configuration.test.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ describe('getConfiguration', () => {
4141
return true
4242
case 'cody.experimental.guardrails':
4343
return true
44-
case 'cody.experimental.commitMessage':
45-
return true
4644
case 'cody.codeActions.enabled':
4745
return true
4846
case 'cody.commandHints.enabled':
@@ -125,7 +123,6 @@ describe('getConfiguration', () => {
125123
experimentalSymfContext: true,
126124
experimentalTracing: true,
127125
editorTitleCommandIcon: true,
128-
experimentalCommitMessage: true,
129126
experimentalGuardrails: true,
130127
codeActions: true,
131128
commandHints: true,

vscode/src/configuration.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export function getConfiguration(
118118
internalUnstable: getHiddenSetting('internal.unstable', isTesting),
119119

120120
autocompleteExperimentalGraphContext,
121-
experimentalCommitMessage: getHiddenSetting('experimental.commitMessage', true),
122121
experimentalSimpleChatContext: getHiddenSetting('experimental.simpleChatContext', true),
123122
experimentalSymfContext: getHiddenSetting('experimental.symfContext', true),
124123

vscode/src/extension.common.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import { ExtensionApi } from './extension-api'
1616
import type { LocalEmbeddingsConfig, LocalEmbeddingsController } from './local-context/local-embeddings'
1717
import type { SymfRunner } from './local-context/symf'
1818
import { start } from './main'
19-
import type { CommitMessageProvider } from './scm/CommitMessageProvider'
2019
import type { OpenTelemetryService } from './services/open-telemetry/OpenTelemetryService.node'
2120
import { captureException, type SentryService } from './services/sentry/sentry'
2221
import type { CommandsProvider } from './commands/services/provider'
@@ -39,7 +38,6 @@ export interface PlatformContext {
3938
createOpenTelemetryService?: (
4039
config: Pick<ConfigurationWithAccessToken, 'serverEndpoint' | 'experimentalTracing'>
4140
) => OpenTelemetryService
42-
createCommitMessageProvider?: Constructor<typeof CommitMessageProvider>
4341
onConfigurationChange?: (configuration: Configuration) => void
4442
}
4543

vscode/src/extension.node.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import {
1313
import { SymfRunner } from './local-context/symf'
1414
import { OpenTelemetryService } from './services/open-telemetry/OpenTelemetryService.node'
1515
import { NodeSentryService } from './services/sentry/sentry.node'
16-
import { CommitMessageProvider } from './scm/CommitMessageProvider'
1716
import { CommandsProvider } from './commands/services/provider'
1817
/**
1918
* Activation entrypoint for the VS Code extension when running VS Code as a desktop app
@@ -40,7 +39,6 @@ export function activate(context: vscode.ExtensionContext): Promise<ExtensionApi
4039
createBfgRetriever: () => new BfgRetriever(context),
4140
createSentryService: (...args) => new NodeSentryService(...args),
4241
createOpenTelemetryService: (...args) => new OpenTelemetryService(...args),
43-
createCommitMessageProvider: (...args) => new CommitMessageProvider(...args),
4442

4543
onConfigurationChange: setCustomAgent,
4644
})

vscode/src/main.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ import type { PlatformContext } from './extension.common'
3535
import { configureExternalServices } from './external-services'
3636
import { logDebug, logError } from './log'
3737
import { showSetupNotification } from './notifications/setup-notification'
38-
import type { CommitMessageProvider } from './scm/CommitMessageProvider'
39-
import { gitAPIinit, gitAPI as getGitAPI } from './repository/repositoryHelpers'
38+
import { gitAPIinit } from './repository/repositoryHelpers'
4039
import { SearchViewProvider } from './search/SearchViewProvider'
4140
import { AuthProvider } from './services/AuthProvider'
4241
import { showFeedbackSupportQuickPick } from './services/FeedbackOptions'
@@ -123,9 +122,9 @@ const register = async (
123122
disposables.push(manageDisplayPathEnvInfoForExtension())
124123

125124
// Set codyignore list on git extension startup
126-
const gitApiDisposable = await gitAPIinit()
127-
if (gitApiDisposable) {
128-
disposables.push(gitApiDisposable)
125+
const gitAPI = await gitAPIinit()
126+
if (gitAPI) {
127+
disposables.push(gitAPI)
129128
}
130129

131130
const isExtensionModeDevOrTest =
@@ -220,14 +219,6 @@ const register = async (
220219
guardrails
221220
)
222221

223-
const gitApi = getGitAPI()
224-
let commitMessageProvider: CommitMessageProvider | null = null
225-
if (gitApi && platform.createCommitMessageProvider) {
226-
commitMessageProvider = platform.createCommitMessageProvider({ chatClient, editor, gitApi })
227-
commitMessageProvider.onConfigurationChange(initialConfig)
228-
disposables.push(commitMessageProvider)
229-
}
230-
231222
const ghostHintDecorator = new GhostHintDecorator(authProvider)
232223
const editorManager = new EditManager({
233224
chat: chatClient,
@@ -252,7 +243,6 @@ const register = async (
252243
externalServicesOnDidConfigurationChange(newConfig)
253244
promises.push(configureEventsInfra(newConfig, isExtensionModeDevOrTest))
254245
platform.onConfigurationChange?.(newConfig)
255-
commitMessageProvider?.onConfigurationChange(newConfig)
256246
symfRunner?.setSourcegraphAuth(newConfig.serverEndpoint, newConfig.accessToken)
257247
enterpriseContextFactory.clientConfigurationDidChange()
258248
promises.push(

0 commit comments

Comments
 (0)