Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-26 13:19:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCM - 💄 fix property init order in quickDiffDecorator.ts (#243058)

Browse Source
This commit is contained in:
Ladislau Szomoru
2025-03-10 11:46:39 +00:00
committed by GitHub
parent 8d69af582f
commit 06e9d7ece1
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/lib/propertyInitOrderChecker.js
View File

@@ -209,7 +209,6 @@ const ignored = new Set([
'vs/workbench/contrib/testing/common/testServiceImpl.ts',
'vs/platform/quickinput/browser/commandsQuickAccess.ts',
'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
'vs/workbench/contrib/scm/browser/scmViewService.ts',
'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
'vs/workbench/contrib/scm/browser/workingSet.ts',

1
build/lib/propertyInitOrderChecker.ts
View File

@@ -178,7 +178,6 @@ const ignored = new Set([
'vs/workbench/contrib/testing/common/testServiceImpl.ts',
'vs/platform/quickinput/browser/commandsQuickAccess.ts',
'vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.ts',
'vs/workbench/contrib/scm/browser/quickDiffDecorator.ts',
'vs/workbench/contrib/scm/browser/scmViewService.ts',
'vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.ts',
'vs/workbench/contrib/scm/browser/workingSet.ts',

9
src/vs/workbench/contrib/scm/browser/quickDiffDecorator.ts
View File

@@ -22,7 +22,8 @@ import { IWorkbenchContribution } from '../../../common/contributions.js';
import { ResourceMap } from '../../../../base/common/map.js';
import { IUriIdentityService } from '../../../../platform/uriIdentity/common/uriIdentity.js';
import { IContextKey, IContextKeyService, RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
import { autorun, autorunWithStore, observableFromEvent } from '../../../../base/common/observable.js';
import { autorun, autorunWithStore, IObservable, observableFromEvent } from '../../../../base/common/observable.js';
import { EditorInput } from '../../../common/editor/editorInput.js';
export const quickDiffDecorationCount = new RawContextKey<number>('quickDiffDecorationCount', 0);
@@ -188,8 +189,7 @@ export class QuickDiffWorkbenchController extends Disposable implements IWorkben
private enabled = false;
private readonly quickDiffDecorationCount: IContextKey<number>;
private readonly activeEditor = observableFromEvent(this,
this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
private readonly activeEditor: IObservable<EditorInput | undefined>;
// Resource URI -> Code Editor Id -> Decoration (Disposable)
private readonly decorators = new ResourceMap<DisposableMap<string>>();
@@ -209,6 +209,9 @@ export class QuickDiffWorkbenchController extends Disposable implements IWorkben
this.quickDiffDecorationCount = quickDiffDecorationCount.bindTo(contextKeyService);
this.activeEditor = observableFromEvent(this,
this.editorService.onDidActiveEditorChange, () => this.editorService.activeEditor);
const onDidChangeConfiguration = Event.filter(configurationService.onDidChangeConfiguration, e => e.affectsConfiguration('scm.diffDecorations'));
this._register(onDidChangeConfiguration(this.onDidChangeConfiguration, this));
this.onDidChangeConfiguration();