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

Rename Cody Inline Assist to Cody Inline Chat #53725

Merged
merged 2 commits into from
Jun 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client/cody/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Starting from `0.2.0`, Cody is using `major.EVEN_NUMBER.patch` for release versi
- Refactored authentication process. [pull/53434](https://github.com/sourcegraph/sourcegraph/pull/53434)
- New sign-in and sign-out flow. [pull/53434](https://github.com/sourcegraph/sourcegraph/pull/53434)
- Analytical logs are now displayed in the Output view. [pull/53870](https://github.com/sourcegraph/sourcegraph/pull/53870)
- Renamed Inline Assist to Inline Chat. [pull/53725](https://github.com/sourcegraph/sourcegraph/pull/53725)

## [0.2.5]

Expand Down
16 changes: 8 additions & 8 deletions client/cody/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
},
{
"id": "inline-assist",
"title": "Inline Assist (Experimental)",
"description": "Chat with Cody without leaving your file. Click the + button next to any line number in a file to bring up Inline Assist.\n[Enable in Settings](command:cody.walkthrough.enableInlineAssist)",
"title": "Inline Chat (Experimental)",
"description": "Chat with Cody without leaving your file. Click the + button next to any line number in a file to bring up Inline Chat.\n[Enable in Settings](command:cody.walkthrough.enableInlineAssist)",
"media": {
"markdown": "walkthroughs/inline-assist.md"
}
Expand Down Expand Up @@ -360,7 +360,7 @@
{
"command": "cody.walkthrough.enableInlineAssist",
"category": "Cody Walkthrough",
"title": "Show Inline Assist"
"title": "Show Inline Chat"
},
{
"command": "cody.walkthrough.enableCodeAutocomplete",
Expand All @@ -370,22 +370,22 @@
{
"command": "cody.comment.add",
"title": "Ask Cody",
"category": "Cody Inline Assist",
"category": "Cody Inline Chat",
"when": "cody.activated && cody.inline-assist.enabled",
"enablement": "!commentIsEmpty"
},
{
"command": "cody.comment.delete",
"title": "Remove Comment",
"category": "Cody Inline Assist",
"category": "Cody Inline Chat",
"when": "cody.activated && cody.inline-assist.enabled",
"enablement": "!commentThreadIsEmpty",
"icon": "$(trash)"
},
{
"command": "cody.comment.load",
"title": "Loading",
"category": "Cody Inline Assist",
"category": "Cody Inline Chat",
"when": "cody.activated && cody.inline-assist.enabled",
"enablement": "!commentThreadIsEmpty",
"icon": "$(sync~spin)"
Expand Down Expand Up @@ -827,9 +827,9 @@
},
"cody.experimental.inline": {
"order": 7,
"title": "Cody Inline Assist",
"title": "Cody Inline Chat",
"type": "boolean",
"markdownDescription": "Enables Cody Inline Assist, an inline way to explicitly ask questions and propose modifications to code.",
"markdownDescription": "Enables asking questions and requesting code changes directly from within the code editor. Use the + button next to any line of code to start an inline chat.",
"default": false
},
"cody.experimental.guardrails": {
Expand Down
2 changes: 1 addition & 1 deletion client/cody/src/editor/vscode-editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class VSCodeEditor implements Editor {
const config = vscode.workspace.getConfiguration('cody')
const isTesting = process.env.CODY_TESTING === 'true'
if (e.affectsConfiguration('cody')) {
// Inline Assist
// Inline Chat
const enableInlineAssist = (config.get('experimental.inline') as boolean) || isTesting
const inlineController = this.controllers.inline
void vscode.commands.executeCommand('setContext', 'cody.inline-assist.enabled', enableInlineAssist)
Expand Down
6 changes: 3 additions & 3 deletions client/cody/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ const register = async (
const disposables: vscode.Disposable[] = []

await updateEventLogger(initialConfig, localStorage)
// Controller for inline assist
// Controller for inline Chat
const commentController = new InlineController(context.extensionPath)
disposables.push(commentController.get())

Expand Down Expand Up @@ -166,7 +166,7 @@ const register = async (
const statusBar = createStatusBar()

disposables.push(
// Inline Assist Provider
// Inline Chat Provider
vscode.commands.registerCommand('cody.comment.add', async (comment: vscode.CommentReply) => {
const isFixMode = /^\/f(ix)?\s/i.test(comment.text.trimStart())
await commentController.chat(comment, isFixMode)
Expand Down Expand Up @@ -309,7 +309,7 @@ const register = async (
}
})

// Initiate inline assist when feature flag is on
// Initiate inline chat when feature flag is on
if (initialConfig.experimentalInline) {
commentController.get().commentingRangeProvider = {
provideCommentingRanges: (document: vscode.TextDocument) => {
Expand Down
2 changes: 1 addition & 1 deletion client/cody/src/services/StatusBar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export function createStatusBar(): CodyStatusBar {
c => c.autocomplete
),
createFeatureToggle(
'Inline Assist',
'Inline Chat',
'Beta',
'An inline way to explicitly ask questions and propose modifications to code',
'cody.experimental.inline',
Expand Down
2 changes: 1 addition & 1 deletion client/cody/test/e2e/inline-assist-file-touch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
import { sidebarExplorer, sidebarSignin } from './common'
import { test } from './helpers'

test.skip('start a fixup job from inline assist with valid auth', async ({ page, sidebar }) => {
test.skip('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
// Sign into Cody
await sidebarSignin(page, sidebar)

Expand Down
2 changes: 1 addition & 1 deletion client/cody/test/e2e/inline-assist.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { expect } from '@playwright/test'
import { sidebarExplorer, sidebarSignin } from './common'
import { test } from './helpers'

test('start a fixup job from inline assist with valid auth', async ({ page, sidebar }) => {
test('start a fixup job from inline chat with valid auth', async ({ page, sidebar }) => {
// Sign into Cody
await sidebarSignin(page, sidebar)

Expand Down
4 changes: 2 additions & 2 deletions client/cody/walkthroughs/inline-assist.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Inline Assist (Experimental)
## Inline Chat (Experimental)

<video autoPlay muted loop playsInline>
<source
Expand All @@ -7,4 +7,4 @@
/>
</video>

Talk to Cody directly within the context of your code. Use Inline Assist to ask Cody questions about lines of code while remaining in your editor flow. Want to make changes? Use the "/fix" command and Cody will automatically update the code for you.
Talk to Cody directly within the context of your code. Use Inline Chat to ask Cody questions about lines of code while remaining in your editor flow. Want to make changes? Use the "/fix" command and Cody will automatically update the code for you.
4 changes: 2 additions & 2 deletions doc/cody/client_feature_availability.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
|Chat | ChatGPT-like chat functionality |✅|✅|✅|✅|
|Code autocomplete | Start typing a line of code and Cody will suggest a completion|✅|✅|✖️|✖️|
|Mutli-line code autocomplete | Cody suggests multiple lines of a completion |✅|✖️|✖️|✖️|
|Inline assist | Prompt Cody within the lines of your IDE |✅|✖️|✖️|✖️|
|Inline chat | Start chats and fix code from within the code editor |✅|✖️|✖️|✖️|
|Recipes | Predefined prompts |✅|✅|✅|✖️|
|Mutli-repo context | Prompts can gather context from up to 10 repositories |✖️|✖️|✅|✅|
|Multi-repo context | Prompts can gather context from up to 10 repositories |✖️|✖️|✅|✅|
|Context selection | Specify repos you want the prompt to gather context from|✖️|✖️|✅|✅|

Loading