progress (BROKEN)

src/vs/workbench/contrib/void/browser/editCodeService.ts

@@ -248,7 +248,7 @@ type StreamLocationMutable = { line: number, col: number, addedSplitYet: boolean
 
 export interface IEditCodeService {
 	readonly _serviceBrand: undefined;
-	startApplying(opts: StartApplyingOpts): number | undefined;
+	startApplying(opts: StartApplyingOpts): number | void;
 	interruptStreaming(diffareaid: number): void;
 	addCtrlKZone(opts: AddCtrlKOpts): number | undefined;
 	removeCtrlKZone(opts: { diffareaid: number }): void;
@@ -270,7 +270,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 	// only applies to diffZones
 	// streamingDiffZones: Set<number> = new Set()
-	private readonly _onDidChangeStreaming = new Emitter<{ uri: URI; diffareaid: number }>();
+	private readonly _onDidChangeStreaming = new Emitter<{ uri: URI }>();
 	private readonly _onDidAddOrDeleteDiffZones = new Emitter<{ uri: URI }>();
 
 
@@ -471,7 +471,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 				const buttonsWidget = new AcceptAllRejectAllWidget({
 					editor,
 					onAcceptAll: () => {
-						this.removeDiffAreas({ uri, behavior: 'accept', removeCtrlKs: false })
+						this.removeDiffAreas({ uri, behavior: 'keep', removeCtrlKs: false })
 						this._metricsService.capture('Accept All', {})
 					},
 					onRejectAll: () => {
@@ -918,6 +918,11 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		this._onDidAddOrDeleteDiffZones.fire({ uri: diffZone._URI })
 	}
 
+	private _deleteTrackingZone(trackingZone: TrackingZone<unknown>) {
+		delete this.diffAreaOfId[trackingZone.diffareaid]
+		this.diffAreasOfURI[trackingZone._URI.fsPath].delete(trackingZone.diffareaid.toString())
+	}
+
 	private _deleteCtrlKZone(ctrlKZone: CtrlKZone) {
 		this._clearAllEffects(ctrlKZone._URI)
 		ctrlKZone._mountInfo?.dispose()
@@ -1200,11 +1205,11 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		}
 
 		else if (opts.type === 'searchReplace') {
-			this._initializeSearchAndReplaceStream(opts)
-			return undefined
+			const addedDiffZone = this._initializeSearchAndReplaceStream(opts)
+			return addedDiffZone?.diffareaid
 		}
 
-		else return undefined
+		return undefined
 
 	}
 
@@ -1297,7 +1302,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			_removeStylesFns: new Set(),
 		}
 		const diffZone = this._addDiffArea(adding)
-		this._onDidChangeStreaming.fire({ uri, diffareaid: diffZone.diffareaid })
+		this._onDidChangeStreaming.fire({ uri })
 		this._onDidAddOrDeleteDiffZones.fire({ uri })
 
 		if (from === 'QuickEdit') {
@@ -1339,7 +1344,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 		const onDone = () => {
 			diffZone._streamState = { isStreaming: false, }
-			this._onDidChangeStreaming.fire({ uri, diffareaid: diffZone.diffareaid })
+			this._onDidChangeStreaming.fire({ uri })
 
 			if (from === 'QuickEdit') {
 				const ctrlKZone = this.diffAreaOfId[opts.diffareaid] as CtrlKZone
@@ -1414,14 +1419,14 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 
 
-	private async _initializeSearchAndReplaceStream({ applyStr }: { applyStr: string }) {
+	private _initializeSearchAndReplaceStream({ applyStr }: { applyStr: string }) {
 
 		const uri_ = this._getActiveEditorURI()
 		if (!uri_) return
 		const uri = uri_
 
 		// generate search/replace block text
-		const originalFileCode = await this._voidFileService.readFile(uri)
+		const originalFileCode = this._voidFileService.readModel(uri)
 		if (originalFileCode === null) return
 
 		const numLines = this._getNumLines(uri)
@@ -1439,6 +1444,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			{ role: 'user', content: userMessageContent },
 		]
 
+		// can use this as a proxy to set the diffArea's stream state requestId
 		let streamRequestIdRef: { current: string | null } = { current: null }
 
 		let { onFinishEdit } = this._addToHistory(uri)
@@ -1450,7 +1456,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			originalCode: string,
 		}
 
-		const addedDiffAreaOfBlockNum: TrackingZone<SearchReplaceDiffAreaMetadata>[] = []
+		const addedTrackingZoneOfBlockNum: TrackingZone<SearchReplaceDiffAreaMetadata>[] = []
 
 		const adding: Omit<DiffZone, 'diffareaid'> = {
 			type: 'DiffZone',
@@ -1467,7 +1473,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			_removeStylesFns: new Set(),
 		}
 		const diffZone = this._addDiffArea(adding)
-		this._onDidChangeStreaming.fire({ uri, diffareaid: diffZone.diffareaid })
+		this._onDidChangeStreaming.fire({ uri })
 		this._onDidAddOrDeleteDiffZones.fire({ uri })
 
 
@@ -1482,7 +1488,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 			// adjust based on the changes by computing line offset
 			const [originalStart, originalEnd] = originalRange
 			let lineOffset = 0
-			for (const blockDiffArea of addedDiffAreaOfBlockNum) {
+			for (const blockDiffArea of addedTrackingZoneOfBlockNum) {
 				const {
 					startLine, endLine,
 					metadata: { originalBounds: [originalStart2, originalEnd2], },
@@ -1505,17 +1511,23 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		}
 
 
-
 		const onDone = () => {
 			diffZone._streamState = { isStreaming: false, }
-			this._onDidChangeStreaming.fire({ uri, diffareaid: diffZone.diffareaid })
+			this._onDidChangeStreaming.fire({ uri })
 			this._refreshStylesAndDiffsInURI(uri)
+
+			// delete the tracking zones
+			for (const trackingZone of addedTrackingZoneOfBlockNum)
+				this._deleteTrackingZone(trackingZone)
+
 			onFinishEdit()
+			shouldSendAnotherMessage = false
 		}
 
 		// refresh now in case onText takes a while to get 1st message
 		this._refreshStylesAndDiffsInURI(uri)
 
+		// stream style related
 		let latestStreamLocationMutable: StreamLocationMutable | null = null
 		let shouldUpdateOrigStreamStyle = true
 
@@ -1552,7 +1564,6 @@ class EditCodeService extends Disposable implements IEditCodeService {
 								if (typeof originalRange !== 'string') {
 									const [startLine, _] = convertOriginalRangeToFinalRange(originalRange)
 									diffZone._streamState.line = startLine
-									console.log('CURRENT LINE A', startLine)
 									shouldUpdateOrigStreamStyle = false
 								}
 							}
@@ -1563,7 +1574,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 
 						// if this is the first time we're seeing this block, add it as a diffarea so we can start streaming
-						if (!(blockNum in addedDiffAreaOfBlockNum)) {
+						if (!(blockNum in addedTrackingZoneOfBlockNum)) {
 							const originalBounds = findTextInCode(block.orig, originalFileCode)
 
 							// if error
@@ -1592,7 +1603,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 								},
 							}
 							const trackingZone = this._addDiffArea(adding)
-							addedDiffAreaOfBlockNum.push(trackingZone)
+							addedTrackingZoneOfBlockNum.push(trackingZone)
 							latestStreamLocationMutable = { line: startLine, addedSplitYet: false, col: 1, originalCodeStartLine: 1 }
 						} // <-- done adding diffarea
 
@@ -1606,7 +1617,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 						// if a block is done, finish it by writing all
 						if (block.state === 'done') {
-							const { startLine: finalStartLine, endLine: finalEndLine } = addedDiffAreaOfBlockNum[blockNum]
+							const { startLine: finalStartLine, endLine: finalEndLine } = addedTrackingZoneOfBlockNum[blockNum]
 							this._writeText(uri, block.final,
 								{ startLineNumber: finalStartLine, startColumn: 1, endLineNumber: finalEndLine, endColumn: Number.MAX_SAFE_INTEGER }, // 1-indexed
 								{ shouldRealignDiffAreas: true }
@@ -1621,7 +1632,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 						this._writeStreamedDiffZoneLLMText(uri, block.orig, block.final, deltaFinalText, latestStreamLocationMutable)
 						oldBlocks = blocks // oldblocks is only used if writingFinal
 
-						const { endLine: currentEndLine } = addedDiffAreaOfBlockNum[blockNum]
+						const { endLine: currentEndLine } = addedTrackingZoneOfBlockNum[blockNum]
 						diffZone._streamState.line = currentEndLine
 
 
@@ -1642,8 +1653,8 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 					// writeover the whole file
 					let newCode = originalFileCode
-					for (let blockNum = addedDiffAreaOfBlockNum.length - 1; blockNum >= 0; blockNum -= 1) {
-						const { originalBounds } = addedDiffAreaOfBlockNum[blockNum].metadata
+					for (let blockNum = addedTrackingZoneOfBlockNum.length - 1; blockNum >= 0; blockNum -= 1) {
+						const { originalBounds } = addedTrackingZoneOfBlockNum[blockNum].metadata
 						const finalCode = blocks[blockNum].final
 
 						if (finalCode === null) continue
@@ -1676,6 +1687,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		}
 
 
+		return diffZone
 	}
 
 
@@ -1689,7 +1701,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 		this._llmMessageService.abort(streamRequestId)
 
 		diffZone._streamState = { isStreaming: false, }
-		this._onDidChangeStreaming.fire({ uri, diffareaid: diffZone.diffareaid })
+		this._onDidChangeStreaming.fire({ uri })
 	}
 
 	_undoHistory(uri: URI) {
@@ -1737,7 +1749,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 
 	// remove a batch of diffareas all at once (and handle accept/reject of their diffs)
-	public removeDiffAreas({ uri, removeCtrlKs, behavior }: { uri: URI, removeCtrlKs: boolean, behavior: 'reject' | 'accept' }) {
+	public removeDiffAreas({ uri, removeCtrlKs, behavior }: { uri: URI, removeCtrlKs: boolean, behavior: 'reject' | 'keep' }) {
 
 		const diffareaids = this.diffAreasOfURI[uri.fsPath]
 		if (diffareaids.size === 0) return // do nothing
@@ -1750,7 +1762,7 @@ class EditCodeService extends Disposable implements IEditCodeService {
 
 			if (diffArea.type == 'DiffZone') {
 				if (behavior === 'reject') this._revertAndDeleteDiffZone(diffArea)
-				else if (behavior === 'accept') this._deleteDiffZone(diffArea)
+				else if (behavior === 'keep') this._deleteDiffZone(diffArea)
 			}
 			else if (diffArea.type === 'CtrlKZone' && removeCtrlKs) {
 				this._deleteCtrlKZone(diffArea)

src/vs/workbench/contrib/void/browser/react/src/markdown/ApplyBlockHoverButtons.tsx

@@ -43,7 +43,7 @@ const CopyButton = ({ codeStr }: { codeStr: string }) => {
 
 
 
-const ApplyButton = ({ codeStr }: { codeStr: string }) => {
+const ApplyButton = ({ codeStr, codeBoxId }: { codeStr: string, codeBoxId: string }) => {
 	const accessor = useAccessor()
 
 	const editCodeService = accessor.get('IEditCodeService')
@@ -51,13 +51,15 @@ const ApplyButton = ({ codeStr }: { codeStr: string }) => {
 
 
 	const onApply = useCallback(() => {
-
-		editCodeService.startApplying({
+		const diffareaid = editCodeService.startApplying({
 			from: 'ClickApply',
 			type: 'searchReplace',
 			applyStr: codeStr,
 		})
+
 		metricsService.capture('Apply Code', { length: codeStr.length }) // capture the length only
+
+
 	}, [metricsService, editCodeService, codeStr])
 
 	const isSingleLine = !codeStr.includes('\n')
@@ -76,9 +78,9 @@ const ApplyButton = ({ codeStr }: { codeStr: string }) => {
 
 
 
-export const ApplyBlockHoverButtons = ({ codeStr }: { codeStr: string }) => {
+export const ApplyBlockHoverButtons = ({ codeStr, codeBoxId }: { codeStr: string, codeBoxId: string | null }) => {
 	return <>
 		<CopyButton codeStr={codeStr} />
-		<ApplyButton codeStr={codeStr} />
+		{codeBoxId !== null && <ApplyButton codeBoxId={codeBoxId} codeStr={codeStr} />}
 	</>
 }

src/vs/workbench/contrib/void/browser/react/src/markdown/ChatMarkdownRender.tsx

@@ -13,7 +13,7 @@ import { ApplyBlockHoverButtons } from './ApplyBlockHoverButtons.js'
 
 type ApplyBoxLocation = ChatMessageLocation & { tokenIdx: string }
 
-const getApplyBoxId = ({ threadId, messageIdx, tokenIdx }: ApplyBoxLocation) => {
+const getCodeBoxId = ({ threadId, messageIdx, tokenIdx }: ApplyBoxLocation) => {
 	return `${threadId}-${messageIdx}-${tokenIdx}`
 }
 
@@ -45,10 +45,16 @@ const RenderToken = ({ token, nested = false, noSpace = false, chatMessageLocati
 
 	if (t.type === "code") {
 
+		const codeBoxId = chatMessageLocation ? getCodeBoxId({
+			threadId: chatMessageLocation.threadId,
+			messageIdx: chatMessageLocation.messageIdx,
+			tokenIdx: tokenIdx,
+		}) : null
+
 		return <BlockCode
 			initValue={t.text}
 			language={t.lang === undefined ? undefined : nameToVscodeLanguage[t.lang]}
-			buttonsOnHover={<ApplyBlockHoverButtons codeStr={t.text} />}
+			buttonsOnHover={<ApplyBlockHoverButtons codeBoxId={codeBoxId} codeStr={t.text} />}
 		/>
 	}
 

src/vs/workbench/contrib/void/common/voidFileService.ts

@@ -20,7 +20,7 @@ export interface IVoidFileService {
 	readonly _serviceBrand: undefined;
 
 	readFile(uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string>;
-
+	readModel(uri: URI, range?: { startLineNumber: number, endLineNumber: number }): string | null;
 }
 
 export const IVoidFileService = createDecorator<IVoidFileService>('VoidFileService');
@@ -39,7 +39,7 @@ export class VoidFileService implements IVoidFileService {
 	readFile = async (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string> => {
 
 		// attempt to read the model
-		const modelResult = await this._readModel(uri, range);
+		const modelResult = this.readModel(uri, range);
 		if (modelResult) return modelResult;
 
 		// if no model, read the raw file
@@ -71,7 +71,7 @@ export class VoidFileService implements IVoidFileService {
 	}
 
 
-	_readModel = async (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): Promise<string | null> => {
+	readModel = (uri: URI, range?: { startLineNumber: number, endLineNumber: number }): string | null => {
 
 		// read saved model (sometimes null if the user reloads application)
 		let model = this.modelService.getModel(uri);