editors - more 💄

Benjamin Pasero · Benjamin Pasero · commit a12c7ec2d79c · 2020-06-12T12:30:54.000+02:00
diff --git a/src/vs/workbench/common/editor.ts b/src/vs/workbench/common/editor.ts
@@ -562,8 +562,6 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 		return { typeId: this.getTypeId() };
 	}
 
-	abstract resolve(): Promise<IEditorModel | null>;
-
 	isReadonly(): boolean {
 		return true;
 	}
@@ -580,6 +578,10 @@ export abstract class EditorInput extends Disposable implements IEditorInput {
 		return false;
 	}
 
+	async resolve(): Promise<IEditorModel | null> {
+		return null;
+	}
+
 	async save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
 		return this;
 	}
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
@@ -8,6 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { EditorInput } from 'vs/workbench/common/editor';
 import { IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
+import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 
 export class ExtensionsInput extends EditorInput {
 
@@ -34,26 +35,15 @@ export class ExtensionsInput extends EditorInput {
 		return localize('extensionsInputName', "Extension: {0}", this.extension.displayName);
 	}
 
-	async resolve(): Promise<null> {
-		return null;
-	}
-
 	supportsSplitEditor(): boolean {
 		return false;
 	}
 
 	matches(other: unknown): boolean {
-		if (super.matches(other) === true) {
+		if (super.matches(other)) {
 			return true;
 		}
 
-		if (!(other instanceof ExtensionsInput)) {
-			return false;
-		}
-
-		const otherExtensionInput = other as ExtensionsInput;
-
-		// TODO@joao is this correct?
-		return this.extension === otherExtensionInput.extension;
+		return other instanceof ExtensionsInput && areSameExtensions(this.extension.identifier, other.extension.identifier);
 	}
 }
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsInput.ts b/src/vs/workbench/contrib/extensions/electron-browser/runtimeExtensionsInput.ts
@@ -33,14 +33,6 @@ export class RuntimeExtensionsInput extends EditorInput {
 		return nls.localize('extensionsInputName', "Running Extensions");
 	}
 
-	matches(other: unknown): boolean {
-		return other instanceof RuntimeExtensionsInput;
-	}
-
-	async resolve(): Promise<null> {
-		return null;
-	}
-
 	supportsSplitEditor(): boolean {
 		return false;
 	}
@@ -50,4 +42,8 @@ export class RuntimeExtensionsInput extends EditorInput {
 			this.dispose(); // Only dispose if not opened anymore because all runtime extensions inputs are shared
 		}
 	}
+
+	matches(other: unknown): boolean {
+		return other instanceof RuntimeExtensionsInput;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -562,8 +562,6 @@ export abstract class EditorInput extends Disposable implements IEditorInput {`
`562`	`562`	`return { typeId: this.getTypeId() };`
`563`	`563`	`}`
`564`	`564`
`565`		`- abstract resolve(): Promise<IEditorModel \| null>;`
`566`		`-`
`567`	`565`	`isReadonly(): boolean {`
`568`	`566`	`return true;`
`569`	`567`	`}`
`@@ -580,6 +578,10 @@ export abstract class EditorInput extends Disposable implements IEditorInput {`
`580`	`578`	`return false;`
`581`	`579`	`}`
`582`	`580`
	`581`	`+ async resolve(): Promise<IEditorModel \| null> {`
	`582`	`+ return null;`
	`583`	`+ }`
	`584`	`+`
`583`	`585`	`async save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput \| undefined> {`
`584`	`586`	`return this;`
`585`	`587`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,6 @@ export class RuntimeExtensionsInput extends EditorInput {`
`33`	`33`	`return nls.localize('extensionsInputName', "Running Extensions");`
`34`	`34`	`}`
`35`	`35`
`36`		`- matches(other: unknown): boolean {`
`37`		`- return other instanceof RuntimeExtensionsInput;`
`38`		`- }`
`39`		`-`
`40`		`- async resolve(): Promise<null> {`
`41`		`- return null;`
`42`		`- }`
`43`		`-`
`44`	`36`	`supportsSplitEditor(): boolean {`
`45`	`37`	`return false;`
`46`	`38`	`}`
`@@ -50,4 +42,8 @@ export class RuntimeExtensionsInput extends EditorInput {`
`50`	`42`	`this.dispose(); // Only dispose if not opened anymore because all runtime extensions inputs are shared`
`51`	`43`	`}`
`52`	`44`	`}`
	`45`	`+`
	`46`	`+ matches(other: unknown): boolean {`
	`47`	`+ return other instanceof RuntimeExtensionsInput;`
	`48`	`+ }`
`53`	`49`	`}`