Elgato_dark/void
1
0
Fork 0
mirror of https://github.com/voideditor/void synced 2026-05-23 17:38:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix streaming alignment

Browse source
This commit is contained in:
Andrew Pareles 2025-01-14 16:57:08 -08:00
parent 9f96ebcfc2
commit c7d5d5d183
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/workbench/contrib/void/browser/inlineDiffsService.ts
View file

@ -502,7 +502,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
domNode,
marginDomNode: document.createElement('div'),
suppressMouseDown: false,
showInHiddenAreas: true,
showInHiddenAreas: false,
};
let zoneId: string | null = null
@ -934,8 +934,16 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
// at the start, add a newline between the stream and originalCode to make reasoning easier
if (!latest.addedSplitYet) {
this._writeText(uri, '\n',
{ startLineNumber: latest.line, startColumn: latest.col, endLineNumber: latest.line, endColumn: latest.col, },
{ shouldRealignDiffAreas: true }
)
latest.addedSplitYet = true
}
// insert at latest line and col
// insert deltaText at latest line and col
this._writeText(uri, deltaText,
{ startLineNumber: latest.line, startColumn: latest.col, endLineNumber: latest.line, endColumn: latest.col },
{ shouldRealignDiffAreas: true }
@ -944,14 +952,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
const lastNewlineIdx = deltaText.lastIndexOf('\n')
latest.col = lastNewlineIdx === -1 ? latest.col + deltaText.length : deltaText.length - lastNewlineIdx
if (!latest.addedSplitYet) {
this._writeText(uri, '',
{ startLineNumber: latest.line, startColumn: latest.col, endLineNumber: latest.line, endColumn: latest.col, },
{ shouldRealignDiffAreas: true }
)
latest.addedSplitYet = true
}
// delete or insert to get original up to speed
if (latest.originalCodeStartLine < originalCodeStartLine) {
// moved up, delete
@ -962,7 +962,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
)
}
else if (latest.originalCodeStartLine > originalCodeStartLine) {
this._writeText(uri, '\n' + diffZone.originalCode.split('\n').slice((latest.originalCodeStartLine - 1), (originalCodeStartLine - 1) + 1).join('\n'),
this._writeText(uri, '\n' + diffZone.originalCode.split('\n').slice((originalCodeStartLine - 1), (latest.originalCodeStartLine - 1) - 1 + 1).join('\n'),
{ startLineNumber: latest.line, startColumn: latest.col, endLineNumber: latest.line, endColumn: latest.col },
{ shouldRealignDiffAreas: true }
)
@ -1215,6 +1215,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
diffZone._streamState = { isStreaming: false, }
if (featureName === 'Ctrl+K') {
const ctrlKZone = this.diffAreaOfId[opts.diffareaid] as CtrlKZone
ctrlKZone._linkedStreamingDiffZone = null // gets deleted next so not really needed...
this._deleteCtrlKZone(ctrlKZone)
}
this._refreshStylesAndDiffsInURI(uri)