From 5a20745069ef3f3ff3923a7e481c2f7b9df2db5f Mon Sep 17 00:00:00 2001 From: Henning Dieterichs Date: Fri, 3 Mar 2023 15:56:06 +0100 Subject: [PATCH] Fixes #162047 (#175916) * Fixes #162047 * Fixes CI --- .../view/editors/inputCodeEditorView.ts | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts index 830ffd1a16c..f3da6538f82 100644 --- a/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts +++ b/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.ts @@ -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(