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

fix overlapping green styles

Browse source
This commit is contained in:
Andrew Pareles 2024-11-16 23:13:59 -08:00
parent 63778d2012
commit e6177d44c6
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/vs/workbench/contrib/void/browser/registerInlineDiffs.ts
View file

@ -10,7 +10,7 @@ import { sendLLMMessage } from './react/out/util/sendLLMMessage.js';
import { IVoidConfigStateService } from './registerConfig.js';
import { writeFileWithDiffInstructions } from './prompt/systemPrompts.js';
import { BaseDiff, findDiffs } from './findDiffs.js';
import { EndOfLinePreference, IModelDeltaDecoration, ITextModel } from '../../../../editor/common/model.js';
import { EndOfLinePreference, ITextModel } from '../../../../editor/common/model.js';
import { IRange } from '../../../../editor/common/core/range.js';
import { EditorOption } from '../../../../editor/common/config/editorOptions.js';
import { registerColor } from '../../../../platform/theme/common/colorUtils.js';
@ -262,10 +262,13 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
private _addInlineDiffZone = (model: ITextModel, redText: string, greenRange: IRange, type: 'insertion' | 'deletion' | 'edit', diffid: number) => {
const _addInlineDiffZoneToEditor = (editor: ICodeEditor) => {
// green decoration and gutter decoration
const greenDecoration: IModelDeltaDecoration[] = [{
range: greenRange,
options: {
let decorationId: string | null = null
editor.changeDecorations(accessor => {
if (type === 'deletion') return
decorationId = accessor.addDecoration(greenRange, {
className: 'void-greenBG line-insert', // .monaco-editor .line-insert
description: 'void-greenBG',
isWholeLine: true,
@ -277,9 +280,8 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
color: { id: 'editorOverviewRuler.addedForeground' },
position: 7
}
}
}];
const decorationsCollection = editor.createDecorationsCollection(greenDecoration)
})
})
// red in a view zone
@ -337,7 +339,7 @@ class InlineDiffsService extends Disposable implements IInlineDiffsService {
});
const dispose = () => {
decorationsCollection.clear()
editor.changeDecorations(accessor => { if (decorationId) accessor.removeDecoration(decorationId) })
editor.changeViewZones(accessor => { if (zoneId) accessor.removeZone(zoneId); });
}
return dispose