Merge branch 'main' into fix-136313

2 files changed, 9 insertions, 13 deletions

diff --git a/src/vs/workbench/contrib/extensions/common/extensions.ts b/src/vs/workbench/contrib/extensions/common/extensions.ts
index 8f7974fdba9..1864d52a09e 100644
--- a/src/vs/workbench/contrib/extensions/common/extensions.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensions.ts
@@ -68,11 +68,11 @@ export interface IExtension {
 	readonly extensionPack: string[];
 	readonly telemetryData: any;
 	readonly preview: boolean;
-	getManifest(preRelease: boolean, token: CancellationToken): Promise<IExtensionManifest | null>;
+	getManifest(token: CancellationToken): Promise<IExtensionManifest | null>;
 	hasReadme(): boolean;
-	getReadme(preRelease: boolean, token: CancellationToken): Promise<string>;
+	getReadme(token: CancellationToken): Promise<string>;
 	hasChangelog(): boolean;
-	getChangelog(preRelease: boolean, token: CancellationToken): Promise<string>;
+	getChangelog(token: CancellationToken): Promise<string>;
 	readonly server?: IExtensionManagementServer;
 	readonly local?: ILocalExtension;
 	gallery?: IGalleryExtension;
@@ -182,3 +182,7 @@ export const LIST_WORKSPACE_UNSUPPORTED_EXTENSIONS_COMMAND_ID = 'workbench.exten
 export const DefaultViewsContext = new RawContextKey<boolean>('defaultExtensionViews', true);
 export const ExtensionsSortByContext = new RawContextKey<string>('extensionsSortByValue', '');
 export const HasOutdatedExtensionsContext = new RawContextKey<boolean>('hasOutdatedExtensions', false);
+
+// Context Menu Groups
+export const THEME_ACTIONS_GROUP = '_theme_';
+export const INSTALL_ACTIONS_GROUP = '0_install';
diff --git a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
index 9e222c71023..b5c0ed689b5 100644
--- a/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
+++ b/src/vs/workbench/contrib/extensions/common/extensionsInput.ts
@@ -8,7 +8,7 @@ import { URI } from 'vs/base/common/uri';
 import { localize } from 'vs/nls';
 import { EditorInputCapabilities, IUntypedEditorInput } from 'vs/workbench/common/editor';
 import { EditorInput } from 'vs/workbench/common/editor/editorInput';
-import { ExtensionEditorTab, IExtension, IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions';
+import { ExtensionEditorTab, IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
 import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
 import { join } from 'vs/base/common/path';
 import { IEditorOptions } from 'vs/platform/editor/common/editor';
@@ -38,16 +38,8 @@ export class ExtensionsInput extends EditorInput {
 		});
 	}
 
-	constructor(
-		private _extension: IExtension,
-		@IExtensionsWorkbenchService extensionsWorkbenchService: IExtensionsWorkbenchService
-	) {
+	constructor(private _extension: IExtension) {
 		super();
-		this._register(extensionsWorkbenchService.onChange(extension => {
-			if (extension && areSameExtensions(this._extension.identifier, extension.identifier)) {
-				this._extension = extension;
-			}
-		}));
 	}
 
 	get extension(): IExtension { return this._extension; }