Skip to content

fix(reportIssue): duplication of data #25676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eleanorjboyd merged 3 commits into from
Dec 17, 2025
+10 −10
Merged

fix(reportIssue): duplication of data #25676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2dbf315
fix(reportIssue): duplication of data
eleanorjboyd Dec 16, 2025
c983708
Merge branch 'main' into generous-deer
eleanorjboyd Dec 16, 2025
23bd58d
fix tests
eleanorjboyd Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/client/common/application/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export interface ICommandNameArgumentTypeMapping extends ICommandNameWithoutArgu
['jupyter.opennotebook']: [undefined | Uri, undefined | CommandSource];
['jupyter.runallcells']: [Uri];
['extension.open']: [string];
['workbench.action.openIssueReporter']: [{ extensionId: string; issueBody: string }];
['workbench.action.openIssueReporter']: [{ extensionId: string; issueBody: string; extensionData?: string }];
[Commands.GetSelectedInterpreterPath]: [{ workspaceFolder: string } | string[]];
[Commands.TriggerEnvironmentSelection]: [undefined | Uri];
[Commands.Start_Native_REPL]: [undefined | Uri];
Expand Down
2 changes: 1 addition & 1 deletion src/client/common/application/commands/reportIssueCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ export class ReportIssueCommandHandler implements IExtensionSingleActivationServ
await this.commandManager.executeCommand('workbench.action.openIssueReporter', {
extensionId: 'ms-python.python',
issueBody: template,
data: userTemplate.format(
extensionData: userTemplate.format(
pythonVersion,
virtualEnvKind,
languageServer,
Expand Down
16 changes: 8 additions & 8 deletions src/test/common/application/commands/reportIssueCommand.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@ suite('Report Issue Command', () => {
);
const expectedData = fs.readFileSync(userDataTemplatePath, 'utf8');

const args: [string, { extensionId: string; issueBody: string; data: string }] = capture<
const args: [string, { extensionId: string; issueBody: string; extensionData: string }] = capture<
AllCommands,
{ extensionId: string; issueBody: string; data: string }
{ extensionId: string; issueBody: string; extensionData: string }
>(cmdManager.executeCommand).last();

verify(cmdManager.registerCommand(Commands.ReportIssue, anything(), anything())).once();
verify(cmdManager.executeCommand('workbench.action.openIssueReporter', anything())).once();
expect(args[0]).to.be.equal('workbench.action.openIssueReporter');
const { issueBody, data } = args[1];
const { issueBody, extensionData } = args[1];
expect(issueBody).to.be.equal(expectedIssueBody);
expect(data).to.be.equal(expectedData);
expect(extensionData).to.be.equal(expectedData);
});

test('Test if issue body is filled when only including settings which are explicitly set', async () => {
Expand Down Expand Up @@ -167,16 +167,16 @@ suite('Report Issue Command', () => {
);
const expectedData = fs.readFileSync(userDataTemplatePath, 'utf8');

const args: [string, { extensionId: string; issueBody: string; data: string }] = capture<
const args: [string, { extensionId: string; issueBody: string; extensionData: string }] = capture<
AllCommands,
{ extensionId: string; issueBody: string; data: string }
{ extensionId: string; issueBody: string; extensionData: string }
>(cmdManager.executeCommand).last();

verify(cmdManager.executeCommand('workbench.action.openIssueReporter', anything())).once();
expect(args[0]).to.be.equal('workbench.action.openIssueReporter');
const { issueBody, data } = args[1];
const { issueBody, extensionData } = args[1];
expect(issueBody).to.be.equal(expectedIssueBody);
expect(data).to.be.equal(expectedData);
expect(extensionData).to.be.equal(expectedData);
});
test('Should send telemetry event when run Report Issue Command', async () => {
const sendTelemetryStub = sinon.stub(Telemetry, 'sendTelemetryEvent');
Expand Down