Merge branch 'main' into fix/improve-marker-placements

Author: cpendery

src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.ts

@@ -0,0 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { RunOnceScheduler } from 'vs/base/common/async';
+import { Disposable, IDisposable } from 'vs/base/common/lifecycle';
+import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
+
+/**
+ * Schedules a signal to play while progress is happening.
+ */
+export class AccessibilityProgressSignalScheduler extends Disposable {
+	private _scheduler: RunOnceScheduler;
+	private _signalLoop: IDisposable | undefined;
+	constructor(msLoopTime: number, msDelayTime: number, @IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService) {
+		super();
+		this._scheduler = new RunOnceScheduler(() => {
+			this._signalLoop = this._accessibilitySignalService.playSignalLoop(AccessibilitySignal.chatResponsePending, msLoopTime);
+		}, msDelayTime);
+		this._scheduler.schedule();
+	}
+	override dispose(): void {
+		super.dispose();
+		this._signalLoop?.dispose();
+		this._scheduler.dispose();
+	}
+}
+

src/vs/workbench/contrib/chat/browser/chatAccessibilityService.ts

@@ -4,18 +4,20 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { status } from 'vs/base/browser/ui/aria/aria';
-import { RunOnceScheduler } from 'vs/base/common/async';
-import { Disposable, DisposableMap, IDisposable } from 'vs/base/common/lifecycle';
+import { Disposable, DisposableMap } from 'vs/base/common/lifecycle';
 import { AccessibilitySignal, IAccessibilitySignalService } from 'vs/platform/accessibilitySignal/browser/accessibilitySignalService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { AccessibilityProgressSignalScheduler } from 'vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler';
 import { IChatAccessibilityService } from 'vs/workbench/contrib/chat/browser/chat';
 import { IChatResponseViewModel } from 'vs/workbench/contrib/chat/common/chatViewModel';
 
+const CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS = 5000;
+const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
 export class ChatAccessibilityService extends Disposable implements IChatAccessibilityService {
 
 	declare readonly _serviceBrand: undefined;
 
-	private _pendingSignalMap: DisposableMap<number, AccessibilitySignalScheduler> = this._register(new DisposableMap());
+	private _pendingSignalMap: DisposableMap<number, AccessibilityProgressSignalScheduler> = this._register(new DisposableMap());
 
 	private _requestId: number = 0;
 
@@ -25,7 +27,7 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 	acceptRequest(): number {
 		this._requestId++;
 		this._accessibilitySignalService.playSignal(AccessibilitySignal.chatRequestSent, { allowManyInParallel: true });
-		this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilitySignalScheduler));
+		this._pendingSignalMap.set(this._requestId, this._instantiationService.createInstance(AccessibilityProgressSignalScheduler, CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS, CHAT_RESPONSE_PENDING_ALLOWANCE_MS));
 		return this._requestId;
 	}
 	acceptResponse(response: IChatResponseViewModel | string | undefined, requestId: number): void {
@@ -41,25 +43,3 @@ export class ChatAccessibilityService extends Disposable implements IChatAccessi
 	}
 }
 
-const CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS = 5000;
-const CHAT_RESPONSE_PENDING_ALLOWANCE_MS = 4000;
-/**
- * Schedules an audio cue to play when a chat response is pending for too long.
- */
-class AccessibilitySignalScheduler extends Disposable {
-	private _scheduler: RunOnceScheduler;
-	private _signalLoop: IDisposable | undefined;
-	constructor(@IAccessibilitySignalService private readonly _accessibilitySignalService: IAccessibilitySignalService) {
-		super();
-		this._scheduler = new RunOnceScheduler(() => {
-			this._signalLoop = this._accessibilitySignalService.playSignalLoop(AccessibilitySignal.chatResponsePending, CHAT_RESPONSE_PENDING_AUDIO_CUE_LOOP_MS);
-		}, CHAT_RESPONSE_PENDING_ALLOWANCE_MS);
-		this._scheduler.schedule();
-	}
-	override dispose(): void {
-		super.dispose();
-		this._signalLoop?.dispose();
-		this._scheduler.cancel();
-		this._scheduler.dispose();
-	}
-}

src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.ts

@@ -42,6 +42,7 @@ export class NotebookCellOutlineProvider {
 	}
 
 	private readonly _outlineEntryFactory: NotebookOutlineEntryFactory;
+	private readonly delayRecomputeActive: () => void;
 	constructor(
 		private readonly _editor: INotebookEditor,
 		private readonly _target: OutlineTarget,
@@ -52,20 +53,27 @@ export class NotebookCellOutlineProvider {
 		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		this._outlineEntryFactory = new NotebookOutlineEntryFactory(notebookExecutionStateService);
+		const delayerRecomputeActive = this._disposables.add(new Delayer(10));
+		this.delayRecomputeActive = () => delayerRecomputeActive.trigger(() => {
+			const { changeEventTriggered } = this._recomputeActive();
+			if (!changeEventTriggered) {
+				this._onDidChange.fire({});
+			}
+		});
 
 		this._disposables.add(Event.debounce<void, void>(
 			_editor.onDidChangeSelection,
 			(last, _current) => last,
 			200
 		)(() => {
-			this._recomputeActive();
+			this.delayRecomputeActive();
 		}, this))
 		this._disposables.add(Event.debounce<INotebookViewCellsUpdateEvent, INotebookViewCellsUpdateEvent>(
 			_editor.onDidChangeViewCells,
 			(last, _current) => last ?? _current,
 			200
 		)(() => {
-			this._recomputeActive();
+			this.delayRecomputeActive();
 		}, this)
 		);
 
@@ -253,10 +261,7 @@ export class NotebookCellOutlineProvider {
 			}
 		}));
 
-		const { changeEventTriggered } = this._recomputeActive();
-		if (!changeEventTriggered) {
-			this._onDidChange.fire({});
-		}
+		this.delayRecomputeActive();
 	}
 
 	private _recomputeActive(): { changeEventTriggered: boolean } {