Merge pull request microsoft#203268 from microsoft/merogge/inline-cue

factor in alert enabled for line feature cues

Author: meganrogge

src/vs/editor/standalone/browser/standaloneServices.ts

@@ -1077,6 +1077,10 @@ class StandaloneAudioService implements IAudioCueService {
 		return Event.None;
 	}
 
+	onAlertEnabledChanged(cue: AudioCue): Event<void> {
+		return Event.None;
+	}
+
 	async playSound(cue: Sound, allowManyInParallel?: boolean | undefined): Promise<void> {
 	}
 	playAudioCueLoop(cue: AudioCue): IDisposable {

src/vs/platform/audioCues/browser/audioCueService.ts

@@ -22,6 +22,7 @@ export interface IAudioCueService {
 	isCueEnabled(cue: AudioCue): boolean;
 	isAlertEnabled(cue: AudioCue): boolean;
 	onEnabledChanged(cue: AudioCue): Event<void>;
+	onAlertEnabledChanged(cue: AudioCue): Event<void>;
 
 	playSound(cue: Sound, allowManyInParallel?: boolean): Promise<void>;
 	playAudioCueLoop(cue: AudioCue, milliseconds: number): IDisposable;
@@ -235,6 +236,10 @@ export class AudioCueService extends Disposable implements IAudioCueService {
 	public onEnabledChanged(cue: AudioCue): Event<void> {
 		return Event.fromObservableLight(this.isCueEnabledCache.get({ cue }));
 	}
+
+	public onAlertEnabledChanged(cue: AudioCue): Event<void> {
+		return Event.fromObservableLight(this.isAlertEnabledCache.get({ cue }));
+	}
 }
 
 

src/vs/workbench/contrib/audioCues/browser/audioCueLineFeatureContribution.ts

@@ -37,6 +37,11 @@ export class AudioCueLineFeatureContribution
 		() => this.audioCueService.isCueEnabled(cue)
 	));
 
+	private readonly isAlertEnabledCache = new CachedFunction<AudioCue, IObservable<boolean>>((cue) => observableFromEvent(
+		this.audioCueService.onAlertEnabledChanged(cue),
+		() => this.audioCueService.isAlertEnabled(cue)
+	));
+
 	constructor(
 		@IEditorService private readonly editorService: IEditorService,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
@@ -47,7 +52,7 @@ export class AudioCueLineFeatureContribution
 
 		const someAudioCueFeatureIsEnabled = derived(
 			(reader) => /** @description someAudioCueFeatureIsEnabled */ this.features.some((feature) =>
-				this.isEnabledCache.get(feature.audioCue).read(reader)
+				this.isEnabledCache.get(feature.audioCue).read(reader) || this.isAlertEnabledCache.get(feature.audioCue).read(reader)
 			)
 		);
 
@@ -116,7 +121,7 @@ export class AudioCueLineFeatureContribution
 			const isFeaturePresent = derivedOpts(
 				{ debugName: `isPresentInLine:${feature.audioCue.name}` },
 				(reader) => {
-					if (!this.isEnabledCache.get(feature.audioCue).read(reader)) {
+					if (!this.isEnabledCache.get(feature.audioCue).read(reader) && !this.isAlertEnabledCache.get(feature.audioCue).read(reader)) {
 						return false;
 					}
 					const position = debouncedPosition.read(reader);