Fix can't change markdown security level for directly opened file

mjbvz · mjbvz · commit fd182746cb47 · 2018-04-02T16:29:49.000-07:00
Fixes microsoft#46424
diff --git a/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts b/extensions/markdown-language-features/src/commands/showPreviewSecuritySelector.ts
@@ -18,13 +18,13 @@ export class ShowPreviewSecuritySelectorCommand implements Command {
 	) { }
 
 	public execute(resource: string | undefined) {
-		if (resource) {
-			const source = vscode.Uri.parse(resource).query;
-			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.Uri.parse(source));
+		if (this.previewManager.activePreviewResource) {
+			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
+		} else if (resource) {
+			const source = vscode.Uri.parse(resource);
+			this.previewSecuritySelector.showSecutitySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);
 		} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {
 			this.previewSecuritySelector.showSecutitySelectorForResource(vscode.window.activeTextEditor.document.uri);
-		} else if (this.previewManager.activePreviewResource) {
-			this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -18,13 +18,13 @@ export class ShowPreviewSecuritySelectorCommand implements Command {`
`18`	`18`	`) { }`
`19`	`19`
`20`	`20`	`public execute(resource: string \| undefined) {`
`21`		`- if (resource) {`
`22`		`- const source = vscode.Uri.parse(resource).query;`
`23`		`- this.previewSecuritySelector.showSecutitySelectorForResource(vscode.Uri.parse(source));`
	`21`	`+ if (this.previewManager.activePreviewResource) {`
	`22`	`+ this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);`
	`23`	`+ } else if (resource) {`
	`24`	`+ const source = vscode.Uri.parse(resource);`
	`25`	`+ this.previewSecuritySelector.showSecutitySelectorForResource(source.query ? vscode.Uri.parse(source.query) : source);`
`24`	`26`	`} else if (vscode.window.activeTextEditor && isMarkdownFile(vscode.window.activeTextEditor.document)) {`
`25`	`27`	`this.previewSecuritySelector.showSecutitySelectorForResource(vscode.window.activeTextEditor.document.uri);`
`26`		`- } else if (this.previewManager.activePreviewResource) {`
`27`		`- this.previewSecuritySelector.showSecutitySelectorForResource(this.previewManager.activePreviewResource);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`