Skip to content

Commit 01e745d

Browse files
authored
Issue reporter uses name and publisher id (#24570)
Fixes #23126
1 parent 91a74e8 commit 01e745d

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

src/client/common/application/commands/reportIssueCommand.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,18 @@ export class ReportIssueCommandHandler implements IExtensionSingleActivationServ
105105
const installedExtensions = getExtensions()
106106
.filter((extension) => !extension.id.startsWith('vscode.'))
107107
.sort((a, b) => {
108-
if (a.packageJSON.displayName && b.packageJSON.displayName) {
109-
return a.packageJSON.displayName.localeCompare(b.packageJSON.displayName);
108+
if (a.packageJSON.name && b.packageJSON.name) {
109+
return a.packageJSON.name.localeCompare(b.packageJSON.name);
110110
}
111111
return a.id.localeCompare(b.id);
112112
})
113-
.map(
114-
(extension) =>
115-
`|${extension.packageJSON.displayName}|${extension.id}|${extension.packageJSON.version}|`,
116-
);
113+
.map((extension) => {
114+
let publisher: string = extension.packageJSON.publisher as string;
115+
if (publisher) {
116+
publisher = publisher.substring(0, 3);
117+
}
118+
return `|${extension.packageJSON.name}|${publisher}|${extension.packageJSON.version}|`;
119+
});
117120

118121
await this.commandManager.executeCommand('workbench.action.openIssueReporter', {
119122
extensionId: 'ms-python.python',

src/test/common/application/commands/issueUserDataTemplateVenv1.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ pipenvPath: "<placeholder>"
2626

2727
|Extension Name|Extension Id|Version|
2828
|---|---|---|
29-
|Python|ms-python.python|2020.2|
29+
|python|ms-|2020.2|
3030
</details>

src/test/common/application/commands/issueUserDataTemplateVenv2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ venvPath: "<placeholder>"
2323

2424
|Extension Name|Extension Id|Version|
2525
|---|---|---|
26-
|Python|ms-python.python|2020.2|
26+
|python|ms-|2020.2|
2727
</details>

src/test/common/application/commands/reportIssueCommand.unit.test.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ suite('Report Issue Command', () => {
101101
packageJSON: {
102102
displayName: 'Python',
103103
version: '2020.2',
104+
name: 'python',
105+
publisher: 'ms-python',
104106
},
105107
},
106108
]);

0 commit comments

Comments
 (0)