Skip to content

Commit c8584f4

Browse files
committed
[release] src/goTest: avoid a name conflicting with the proposed quickpick api
src/goTest used an extended quickpick type that adds a custom property 'kind' to specify the profile type. Unfortunately, that conflicts with the proposed API added during vscode 1.63 dev cycle and breaks the extension's profile feature. Rename ours to 'profilekind'. And reenabled the profile feature tests disabled due to 1858. (but these tests don't exercise the affected code path - quickpick UI interaction) Fixes #2048 Updates #1858 Change-Id: Iedd1c5f32cdbc8438e203f8989f28bfcaf1c04b4 Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/382334 Trust: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Ethan Reesor <[email protected]> Reviewed-by: Peter Weinberger <[email protected]> (cherry picked from commit 037e8a3) Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/383219 Reviewed-by: Robert Findley <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> TryBot-Result: kokoro <[email protected]>
1 parent c845547 commit c8584f4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/goTest/profile.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,16 @@ export class GoTestProfiler {
7676
}
7777

7878
async configure(): Promise<ProfilingOptions | undefined> {
79-
const { kind } = await vscode.window.showQuickPick(
80-
Kind.all.map((x) => ({ label: x.label, kind: x })),
79+
const { profilekind } = await vscode.window.showQuickPick(
80+
Kind.all.map((x) => ({ label: x.label, profilekind: x })),
8181
{
8282
title: 'Profile'
8383
}
8484
);
85-
if (!kind) return;
85+
if (!profilekind) return;
8686

8787
return {
88-
kind: kind.id
88+
kind: profilekind.id
8989
};
9090
}
9191

test/integration/goTest.run.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ suite('Go Test Runner', () => {
1313

1414
let testExplorer: GoTestExplorer;
1515

16-
suite.skip('Profile', () => {
16+
suite('Profile', () => {
1717
const sandbox = sinon.createSandbox();
1818
const ctx = MockExtensionContext.new();
1919

0 commit comments

Comments
 (0)