maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge 0ed43e7939 into 153a028f3b

Browse source
This commit is contained in:
btea 2021-11-26 14:22:14 +00:00 committed by GitHub
parent 153a028f3b 0ed43e7939
commit 8cd3a88144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/code/electron-sandbox/issue/issueReporterMain.ts
View file

@ -244,9 +244,9 @@ export class IssueReporter extends Disposable {
return ext.isTheme ? 'themes' : 'nonThemes';
});
const numberOfThemeExtesions = themes && themes.length;
this.issueReporterModel.update({ numberOfThemeExtesions, enabledNonThemeExtesions: nonThemes, allExtensions: installedExtensions });
this.updateExtensionTable(nonThemes, numberOfThemeExtesions);
const numberOfThemeExtensions = themes && themes.length;
this.issueReporterModel.update({ numberOfThemeExtensions, enabledNonThemeExtensions: nonThemes, allExtensions: installedExtensions });
this.updateExtensionTable(nonThemes, numberOfThemeExtensions);
if (this.configuration.disableExtensions || installedExtensions.length === 0) {
(<HTMLButtonElement>this.getElementById('disableExtensions')).disabled = true;

12
src/vs/code/electron-sandbox/issue/issueReporterModel.ts
View file

@ -21,9 +21,9 @@ export interface IssueReporterData {
includeExtensions: boolean;
includeExperiments: boolean;
numberOfThemeExtesions?: number;
numberOfThemeExtensions?: number;
allExtensions: IssueReporterExtensionData[];
enabledNonThemeExtesions?: IssueReporterExtensionData[];
enabledNonThemeExtensions?: IssueReporterExtensionData[];
extensionsDisabled?: boolean;
fileOnExtension?: boolean;
fileOnMarketplace?: boolean;
@ -232,19 +232,19 @@ ${this._data.experimentInfo}
return 'Extensions disabled';
}
const themeExclusionStr = this._data.numberOfThemeExtesions ? `\n(${this._data.numberOfThemeExtesions} theme extensions excluded)` : '';
const themeExclusionStr = this._data.numberOfThemeExtensions ? `\n(${this._data.numberOfThemeExtensions} theme extensions excluded)` : '';
if (!this._data.enabledNonThemeExtesions) {
if (!this._data.enabledNonThemeExtensions) {
return 'Extensions: none' + themeExclusionStr;
}
const tableHeader = `Extension|Author (truncated)|Version
---|---|---`;
const table = this._data.enabledNonThemeExtesions.map(e => {
const table = this._data.enabledNonThemeExtensions.map(e => {
return `${e.name}|${e.publisher?.substr(0, 3) ?? 'N/A'}|${e.version}`;
}).join('\n');
return `<details><summary>Extensions (${this._data.enabledNonThemeExtesions.length})</summary>
return `<details><summary>Extensions (${this._data.enabledNonThemeExtensions.length})</summary>
${tableHeader}
${table}