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

don't let ctrlK overlap

Browse source
This commit is contained in:
Andrew Pareles 2025-01-12 03:23:54 -08:00
parent be3128acb4
commit bcda1dbe2b
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,8 @@ import { IMetricsService } from '../../../../platform/void/common/metricsService
import { InlineDecorationType } from '../../../../editor/common/viewModel.js';
import { filenameToVscodeLanguage } from './helpers/detectLanguage.js';
import { BaseEditorSimpleWorker } from '../../../../editor/common/services/editorSimpleWorker.js';
import { Action2, registerAction2 } from '../../../../platform/actions/common/actions.js';
import { ServicesAccessor } from '../../../../editor/browser/editorExtensions.js';
const configOfBG = (color: Color) => {
return { dark: color, light: color, hcDark: color, hcLight: color, }
@ -952,6 +954,10 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
return
}
const overlappingDiffZone = this._findOverlappingDiffArea({ startLine, endLine, uri, filter: (diffArea) => diffArea.type === 'DiffZone' })
if (overlappingDiffZone)
return
const { onFinishEdit } = this._addToHistory(uri)
const adding: Omit<CtrlKZone, 'diffareaid'> = {
@ -1023,7 +1029,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
if (!uri_) return
uri = uri_
// reject all diffs on this URI, adding to history
// reject all diffareas on this URI, adding to history (there can't possibly be overlap after this)
this.removeDiffAreas({ uri, behavior: 'reject' })
// in ctrl+L the start and end lines are the full document
@ -1032,13 +1038,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
startLine = 1
endLine = numLines
// check if there's overlap with any other diffAreas and return early if there is
if (this._findOverlappingDiffArea({ startLine, endLine, uri })) {
// TODO add a message here that says this to the user too
console.error('Not diffing because found overlap:', this.diffAreasOfURI[uri.fsPath], startLine, endLine)
return
}
userMessage = opts.userMessage
}
else if (featureName === 'Ctrl+K') {
@ -1049,7 +1048,6 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
const { startLine: startLine_, endLine: endLine_, _URI, _mountInfo } = ctrlKZone
uri = _URI
startLine = startLine_
endLine = endLine_
@ -1507,3 +1505,18 @@ class AcceptRejectWidget extends Widget implements IOverlayWidget {
}
registerAction2(class extends Action2 {
constructor() {
super({
id: 'void.testDiff',
title: 'Void Test Diff',
});
}
async run(accessor: ServicesAccessor): Promise<void> {
const inlineDiffsService = accessor.get(IInlineDiffsService)
inlineDiffsService.startApplying
}
})