Skip to content

Commit 8978118

Browse files
authored
correctly play error audio cue on line / char navigation (microsoft#175277)
fix microsoft#174857
1 parent 82f542a commit 8978118

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ interface LineFeatureState {
180180

181181
class MarkerLineFeature implements LineFeature {
182182
public readonly debounceWhileTyping = true;
183-
183+
private _previousLine: number = 0;
184184
constructor(
185185
public readonly audioCue: AudioCue,
186186
private readonly severity: MarkerSeverity,
@@ -195,16 +195,15 @@ class MarkerLineFeature implements LineFeature {
195195
),
196196
() => /** @description this.markerService.onMarkerChanged */({
197197
isPresent: (position) => {
198+
const lineChanged = position.lineNumber !== this._previousLine;
199+
this._previousLine = position.lineNumber;
198200
const hasMarker = this.markerService
199201
.read({ resource: model.uri })
200202
.some(
201-
(m) =>
202-
m.severity === this.severity &&
203-
m.startLineNumber <= position.lineNumber &&
204-
position.lineNumber <= m.endLineNumber &&
205-
m.startColumn <= position.column &&
206-
position.column <= m.endColumn
207-
);
203+
(m) => {
204+
const onLine = m.severity === this.severity && m.startLineNumber <= position.lineNumber && position.lineNumber <= m.endLineNumber;
205+
return lineChanged ? onLine : onLine && (position.lineNumber <= m.endLineNumber && m.startColumn <= position.column);
206+
});
208207
return hasMarker;
209208
},
210209
})

0 commit comments

Comments
 (0)