Skip to content

Commit e47951d

Browse files
authored
Timeline - expose timeline item to all extensions that have the proposal enabled (microsoft#238125)
1 parent 97ff3e5 commit e47951d

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/vs/workbench/api/common/extHostCommands.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { VSBuffer } from '../../../base/common/buffer.js';
2828
import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
2929
import { toErrorMessage } from '../../../base/common/errorMessage.js';
3030
import { StopWatch } from '../../../base/common/stopwatch.js';
31-
import { ExtensionIdentifier, IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
31+
import { IExtensionDescription } from '../../../platform/extensions/common/extensions.js';
3232
import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
3333
import { IExtHostTelemetry } from './extHostTelemetry.js';
3434
import { generateUuid } from '../../../base/common/uuid.js';
@@ -41,7 +41,7 @@ interface CommandHandler {
4141
}
4242

4343
export interface ArgumentProcessor {
44-
processArgument(arg: any, extensionId: ExtensionIdentifier | undefined): any;
44+
processArgument(arg: any, extension: IExtensionDescription | undefined): any;
4545
}
4646

4747
export class ExtHostCommands implements ExtHostCommandsShape {
@@ -310,7 +310,7 @@ export class ExtHostCommands implements ExtHostCommandsShape {
310310
if (!cmdHandler) {
311311
return Promise.reject(new Error(`Contributed command '${id}' does not exist.`));
312312
} else {
313-
args = args.map(arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension?.identifier), arg));
313+
args = args.map(arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension), arg));
314314
return this._executeContributedCommand(id, args, true);
315315
}
316316
}

src/vs/workbench/api/common/extHostTimeline.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { MarkdownString } from './extHostTypeConverters.js';
1616
import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
1717
import { MarshalledId } from '../../../base/common/marshallingIds.js';
1818
import { isString } from '../../../base/common/types.js';
19+
import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
1920

2021
export interface IExtHostTimeline extends ExtHostTimelineShape {
2122
readonly _serviceBrand: undefined;
@@ -42,7 +43,7 @@ export class ExtHostTimeline implements IExtHostTimeline {
4243
commands.registerArgumentProcessor({
4344
processArgument: (arg, extension) => {
4445
if (arg && arg.$mid === MarshalledId.TimelineActionContext) {
45-
if (this._providers.get(arg.source) && ExtensionIdentifier.equals(extension, this._providers.get(arg.source)?.extension)) {
46+
if (this._providers.get(arg.source) && extension && isProposedApiEnabled(extension, 'timeline')) {
4647
const uri = arg.uri === undefined ? undefined : URI.revive(arg.uri);
4748
return this._itemsBySourceAndUriMap.get(arg.source)?.get(getUriKey(uri))?.get(arg.handle);
4849
} else {

0 commit comments

Comments
 (0)