Fix whitespace issues from github merge UI

mjbvz · mjbvz · commit 36d09208f191 · 2020-12-18T14:03:25.000-08:00
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts b/src/vs/workbench/contrib/extensions/browser/extensionEditor.ts
@@ -884,8 +884,8 @@ export class ExtensionEditor extends EditorPane {
 		return { focus: () => extensionPackContent.focus() };
 	}
 
-	private openChangelog(template: IExtensionEditorTemplate,  token: CancellationToken): Promise<IActiveElement> {
-	  return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, WebviewIndex.Changelog, token);
+	private openChangelog(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement> {
+		return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, WebviewIndex.Changelog, token);
 	}
 
 	private openContributions(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement | null> {

Original file line number	Diff line number	Diff line change
`@@ -884,8 +884,8 @@ export class ExtensionEditor extends EditorPane {`
`884`	`884`	`return { focus: () => extensionPackContent.focus() };`
`885`	`885`	`}`
`886`	`886`
`887`		`- private openChangelog(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement> {`
`888`		`- return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, WebviewIndex.Changelog, token);`
	`887`	`+ private openChangelog(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement> {`
	`888`	`+ return this.openMarkdown(this.extensionChangelog!.get(), localize('noChangelog', "No Changelog available."), template, WebviewIndex.Changelog, token);`
`889`	`889`	`}`
`890`	`890`
`891`	`891`	`private openContributions(template: IExtensionEditorTemplate, token: CancellationToken): Promise<IActiveElement \| null> {`