Skip to content
Closed
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
22 changes: 16 additions & 6 deletions src/core/webview/ClineProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2094,9 +2094,13 @@ ${prompt}
sharingEnabled: sharingEnabled ?? false,
organizationAllowList,
// kilocode_change start
ghostServiceSettings: ghostServiceSettings ?? {
enableQuickInlineTaskKeybinding: true,
enableSmartInlineTaskKeybinding: true,
ghostServiceSettings: {
enableAutoTrigger: ghostServiceSettings?.enableAutoTrigger ?? true,
enableQuickInlineTaskKeybinding: ghostServiceSettings?.enableQuickInlineTaskKeybinding ?? true,
enableSmartInlineTaskKeybinding: ghostServiceSettings?.enableSmartInlineTaskKeybinding ?? true,
showGutterAnimation: ghostServiceSettings?.showGutterAnimation ?? false,
provider: ghostServiceSettings?.provider,
model: ghostServiceSettings?.model,
},
// kilocode_change end
organizationSettingsVersion,
Expand Down Expand Up @@ -2310,9 +2314,15 @@ ${prompt}
commitMessageApiConfigId: stateValues.commitMessageApiConfigId, // kilocode_change
terminalCommandApiConfigId: stateValues.terminalCommandApiConfigId, // kilocode_change
// kilocode_change start
ghostServiceSettings: stateValues.ghostServiceSettings ?? {
enableQuickInlineTaskKeybinding: true,
enableSmartInlineTaskKeybinding: true,
ghostServiceSettings: {
enableAutoTrigger: stateValues.ghostServiceSettings?.enableAutoTrigger ?? true,
enableQuickInlineTaskKeybinding:
stateValues.ghostServiceSettings?.enableQuickInlineTaskKeybinding ?? true,
enableSmartInlineTaskKeybinding:
stateValues.ghostServiceSettings?.enableSmartInlineTaskKeybinding ?? true,
showGutterAnimation: stateValues.ghostServiceSettings?.showGutterAnimation,
provider: stateValues.ghostServiceSettings?.provider,
model: stateValues.ghostServiceSettings?.model,
},
// kilocode_change end
experiments: stateValues.experiments ?? experimentDefault,
Expand Down
4 changes: 2 additions & 2 deletions src/services/ghost/GhostGutterAnimation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { GhostServiceSettings } from "@roo-code/types"
export class GhostGutterAnimation {
private state: "hide" | "active" = "hide"
private decorationActive: vscode.TextEditorDecorationType
private isEnabled: boolean = true
private isEnabled: boolean = false

public constructor(context: vscode.ExtensionContext) {
this.decorationActive = vscode.window.createTextEditorDecorationType({
Expand All @@ -15,7 +15,7 @@ export class GhostGutterAnimation {
}

public updateSettings(settings: GhostServiceSettings | undefined) {
this.isEnabled = settings?.showGutterAnimation !== false
this.isEnabled = settings?.showGutterAnimation === true
if (!this.isEnabled) {
this.clearDecorations()
}
Expand Down
4 changes: 2 additions & 2 deletions src/services/ghost/GhostServiceManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class GhostServiceManager {
enableAutoTrigger: false,
enableSmartInlineTaskKeybinding: false,
enableQuickInlineTaskKeybinding: false,
showGutterAnimation: true,
showGutterAnimation: false,
}
await this.saveSettings()
await this.load()
Expand All @@ -133,7 +133,7 @@ export class GhostServiceManager {
enableAutoTrigger: true,
enableSmartInlineTaskKeybinding: true,
enableQuickInlineTaskKeybinding: true,
showGutterAnimation: true,
showGutterAnimation: false,
}
await this.saveSettings()
await this.load()
Expand Down
2 changes: 1 addition & 1 deletion webview-ui/src/components/settings/DisplaySettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ export const DisplaySettings = ({
<div className="mt-6 pt-6 border-t border-vscode-panel-border">
<div className="flex flex-col gap-1">
<VSCodeCheckbox
checked={ghostServiceSettings?.showGutterAnimation !== false}
checked={ghostServiceSettings?.showGutterAnimation === true}
onChange={(e) => {
onShowGutterAnimationChange((e as any).target?.checked || false)
}}>
Expand Down
Loading