From acd711f93ba248d6a59e2ae0fc7e9a41bd42d681 Mon Sep 17 00:00:00 2001 From: Andrew Pareles Date: Wed, 19 Mar 2025 16:32:36 -0700 Subject: [PATCH] fix --- .../browser/react/src/markdown/ApplyBlockHoverButtons.tsx | 4 ++-- .../react/src/void-command-bar-tsx/VoidCommandBar.tsx | 1 + .../workbench/contrib/void/browser/voidCommandBarService.ts | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx index a4fe34bd..34d269c3 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx @@ -158,7 +158,7 @@ export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: stri const onClickSubmit = useCallback(async () => { if (isDisabled) return - if (getStreamState()) return + if (getStreamState() === 'streaming') return const [newApplyingUri, _] = await editCodeService.startApplying({ from: 'ClickApply', applyStr: codeStr, @@ -176,7 +176,7 @@ export const useApplyButtonHTML = ({ codeStr, applyBoxId, uri }: { codeStr: stri const onInterrupt = useCallback(() => { - if (!getStreamState()) return + if (getStreamState() !== 'streaming') return const uri = getUriBeingApplied() if (!uri) return diff --git a/src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx b/src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx index e97aa26a..97806775 100644 --- a/src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx +++ b/src/vs/workbench/contrib/void/browser/react/src/void-command-bar-tsx/VoidCommandBar.tsx @@ -55,6 +55,7 @@ const VoidCommandBar = ({ uri, editor }: { uri: URI | null, editor: ICodeEditor const [currUriIdx, setUriIdx] = useState(null) const [currUriHasChanges, setCurrUriHasChanges] = useState(false) useEffect(() => { + console.log('uri', uri?.fsPath, sortedCommandBarURIs) const i = sortedCommandBarURIs.findIndex(e => e.fsPath === uri?.fsPath) if (i !== -1) { setUriIdx(i) diff --git a/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts b/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts index 9fee88d8..479cf8ac 100644 --- a/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts +++ b/src/vs/workbench/contrib/void/browser/voidCommandBarService.ts @@ -131,9 +131,10 @@ export class VoidCommandBarService extends Disposable implements IVoidCommandBar // state updaters this._register(this._editCodeService.onDidAddOrDeleteDiffZones(e => { for (const uri of this._hooks) { - if (e.uri.fsPath !== uri.fsPath) return + if (e.uri.fsPath !== uri.fsPath) continue // --- sortedURIs: delete if empty, add if not in state yet const diffZones = this._getDiffZonesOnURI(uri) + console.log('addordelete diffzone', uri.fsPath, diffZones) if (diffZones.length === 0) { this._deleteURIEntryFromState(uri) this._onDidChangeState.fire({ uri }) @@ -323,7 +324,7 @@ export class VoidCommandBarService extends Disposable implements IVoidCommandBar if (i === -1) return this.sortedURIs = [ ...this.sortedURIs.slice(0, i), - ...this.sortedURIs.slice(i, Infinity), + ...this.sortedURIs.slice(i + 1, Infinity), ] // delete from state delete this.stateOfURI[uri.fsPath]