Skip to content

Commit f9b3974

Browse files
author
Benjamin Pasero
committed
notifications - handle markdown links in status bar
1 parent 2f8ddbe commit f9b3974

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/vs/workbench/services/progress/browser/progressService.ts

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
2424
import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
2525
import { EventHelper } from 'vs/base/browser/dom';
2626
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
27+
import { parseLinkedText } from 'vs/base/common/linkedText';
2728

2829
export class ProgressService extends Disposable implements IProgressService {
2930

@@ -200,17 +201,25 @@ export class ProgressService extends Disposable implements IProgressService {
200201

201202
this.withWindowProgress<R>({
202203
location: ProgressLocation.Window,
203-
title: options.title,
204+
title: options.title ? parseLinkedText(options.title).toString() : undefined, // convert markdown links => string
204205
command: 'notifications.showList'
205206
}, progress => {
206207

208+
function reportProgress(step: IProgressStep) {
209+
if (step.message) {
210+
progress.report({
211+
message: parseLinkedText(step.message).toString() // convert markdown links => string
212+
});
213+
}
214+
}
215+
207216
// Apply any progress that was made already
208217
if (progressStateModel.step) {
209-
progress.report(progressStateModel.step);
218+
reportProgress(progressStateModel.step);
210219
}
211220

212221
// Continue to report progress as it happens
213-
const onDidReportListener = progressStateModel.onDidReport(step => progress.report(step));
222+
const onDidReportListener = progressStateModel.onDidReport(step => reportProgress(step));
214223
promise.finally(() => onDidReportListener.dispose());
215224

216225
// When the progress model gets disposed, we are done as well

0 commit comments

Comments
 (0)