Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-20 15:19:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71762 from skprabhanjan/fix-71570

Browse Source 
fix-71570 Error when restoring a markdown preview for a file that has been deleted
This commit is contained in:
Matt Bierner
2019-04-12 11:07:48 -07:00
committed by GitHub
parent 37ab243fd9 bda2870db9
commit 0b4d49b59e
2 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/markdown-language-features/src/features/preview.ts
+33 -15
View File
@@ -381,22 +381,27 @@ export class MarkdownPreview extends Disposable {
clearTimeout(this.throttleTimer);
this.throttleTimer = undefined;
const document = await vscode.workspace.openTextDocument(resource);
if (!this.forceUpdate && this.currentVersion && this.currentVersion.resource.fsPath === resource.fsPath && this.currentVersion.version === document.version) {
if (this.line) {
this.updateForView(resource, this.line);
try {
const document = await vscode.workspace.openTextDocument(resource);
if (!this.forceUpdate && this.currentVersion && this.currentVersion.resource.fsPath === resource.fsPath && this.currentVersion.version === document.version) {
if (this.line) {
this.updateForView(resource, this.line);
}
return;
}
return;
}
this.forceUpdate = false;
this.forceUpdate = false;
this.currentVersion = { resource, version: document.version };
const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line, this.state);
if (this._resource === resource) {
this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
this.editor.iconPath = this.iconPath;
this.editor.webview.options = MarkdownPreview.getWebviewOptions(resource, this._contributionProvider.contributions);
this.editor.webview.html = content;
this.currentVersion = { resource, version: document.version };
const content = await this._contentProvider.provideTextDocumentContent(document, this._previewConfigurations, this.line, this.state);
if (this._resource === resource) {
this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
this.editor.iconPath = this.iconPath;
this.editor.webview.options = MarkdownPreview.getWebviewOptions(resource, this._contributionProvider.contributions);
this.editor.webview.html = content;
}
}
catch (e) {
await this.showFileNotFoundError();
}
}
@@ -456,7 +461,20 @@ export class MarkdownPreview extends Disposable {
}
}
vscode.workspace.openTextDocument(this._resource).then(vscode.window.showTextDocument);
try {
vscode.workspace.openTextDocument(this._resource).then(vscode.window.showTextDocument);
}
catch (e) {
await this.showFileNotFoundError();
}
}
private async showFileNotFoundError() {
const content = await this._contentProvider.provideFileNotFoundContent(this._resource);
this.editor.title = MarkdownPreview.getPreviewTitle(this._resource, this._locked);
this.editor.iconPath = this.iconPath;
this.editor.webview.options = MarkdownPreview.getWebviewOptions(this._resource, this._contributionProvider.contributions);
this.editor.webview.html = content;
}
private async onDidClickPreviewLink(path: string, fragment: string | undefined) {
extensions/markdown-language-features/src/features/previewContentProvider.ts
+13
View File
@@ -90,6 +90,19 @@ export class MarkdownContentProvider {
</html>`;
}
public async provideFileNotFoundContent(
resource: vscode.Uri,
): Promise<string> {
const resourcePath = path.basename(resource.fsPath);
const body = localize('preview.notFound', '{0} cannot be found', resourcePath);
return `<!DOCTYPE html>
<html>
<body class="vscode-body">
${body}
</body>
</html>`;
}
private extensionResourcePath(mediaFile: string): string {
return vscode.Uri.file(this.context.asAbsolutePath(path.join('media', mediaFile)))
.with({ scheme: 'vscode-resource' })