Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #162047 (#175916)

Browse Source 
* Fixes #162047

* Fixes CI
This commit is contained in:
Henning Dieterichs
2023-03-03 15:56:06 +01:00
committed by GitHub
parent fa758a7cc5
commit 5a20745069
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts
+11 -13
View File
@@ -11,7 +11,7 @@ import { Codicon } from 'vs/base/common/codicons';
import { ThemeIcon } from 'vs/base/common/themables';
import { Disposable } from 'vs/base/common/lifecycle';
import { clamp } from 'vs/base/common/numbers';
import { autorun, autorunWithStore, derived, IObservable, ISettableObservable, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
import { autorun, derived, IObservable, ISettableObservable, ITransaction, observableValue, transaction } from 'vs/base/common/observable';
import { noBreakWhitespace } from 'vs/base/common/strings';
import { isDefined } from 'vs/base/common/types';
import { EditorExtensionsRegistry, IEditorContributionDescription } from 'vs/editor/browser/editorExtensions';
@@ -45,18 +45,16 @@ export class InputCodeEditorView extends CodeEditorView {
this.htmlElements.root.classList.add(`input`);
this._register(
autorunWithStore((reader, store) => {
if (this.checkboxesVisible.read(reader)) {
store.add(
new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
getIntersectingGutterItems: (range, reader) => {
return this.modifiedBaseRangeGutterItemInfos.read(reader);
},
createView: (item, target) => new MergeConflictGutterItemView(item, target, contextMenuService),
})
);
}
}, 'update checkboxes')
new EditorGutter(this.editor, this.htmlElements.gutterDiv, {
getIntersectingGutterItems: (range, reader) => {
if (this.checkboxesVisible.read(reader)) {
return this.modifiedBaseRangeGutterItemInfos.read(reader);
} else {
return [];
}
},
createView: (item, target) => new MergeConflictGutterItemView(item, target, contextMenuService),
})
);
this._register(