Skip to content

Commit d2fa62d

Browse files
joaomorenojoaomoreno
committed
cleanup extensions menu
fixes microsoft#14384
1 parent 63806e7 commit d2fa62d

3 files changed

Lines changed: 9 additions & 18 deletions

File tree

‎gulpfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var ALL_EDITOR_TASKS = [
5858
'tslint',
5959
'hygiene',
6060
];
61-
var runningEditorTasks = process.argv.length > 2 && process.argv.slice(2).every(function(arg) { return (ALL_EDITOR_TASKS.indexOf(arg) !== -1); });
61+
var runningEditorTasks = process.argv.length > 2 && process.argv.slice(2).every(function (arg) { return (ALL_EDITOR_TASKS.indexOf(arg) !== -1); });
6262

6363
if (runningEditorTasks) {
6464
require(`./build/gulpfile.editor`);
@@ -67,5 +67,5 @@ if (runningEditorTasks) {
6767
// Load all the gulpfiles only if running tasks other than the editor tasks
6868
const build = path.join(__dirname, 'build');
6969
require('glob').sync('gulpfile.*.js', { cwd: build })
70-
.forEach(f => require(`./build/${ f }`));
70+
.forEach(f => require(`./build/${f}`));
7171
}

‎src/vs/workbench/parts/extensions/electron-browser/extensionsActions.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ export class BuiltinStatusLabelAction extends Action {
11471147
export class DisableAllAction extends Action {
11481148

11491149
static ID = 'workbench.extensions.action.disableAll';
1150-
static LABEL = localize('disableAll', "Disable All");
1150+
static LABEL = localize('disableAll', "Disable All Installed Extensions");
11511151

11521152
private disposables: IDisposable[] = [];
11531153

@@ -1178,7 +1178,7 @@ export class DisableAllAction extends Action {
11781178
export class DisableAllWorkpsaceAction extends Action {
11791179

11801180
static ID = 'workbench.extensions.action.disableAllWorkspace';
1181-
static LABEL = localize('disableAllWorkspace', "Disable All (Workspace)");
1181+
static LABEL = localize('disableAllWorkspace', "Disable All Installed Extensions for this Workspace");
11821182

11831183
private disposables: IDisposable[] = [];
11841184

@@ -1210,7 +1210,7 @@ export class DisableAllWorkpsaceAction extends Action {
12101210
export class EnableAllAction extends Action {
12111211

12121212
static ID = 'workbench.extensions.action.enableAll';
1213-
static LABEL = localize('enableAll', "Enable All");
1213+
static LABEL = localize('enableAll', "Enable All Installed Extensions");
12141214

12151215
private disposables: IDisposable[] = [];
12161216

@@ -1241,7 +1241,7 @@ export class EnableAllAction extends Action {
12411241
export class EnableAllWorkpsaceAction extends Action {
12421242

12431243
static ID = 'workbench.extensions.action.enableAllWorkspace';
1244-
static LABEL = localize('enableAllWorkspace', "Enable All (Workspace)");
1244+
static LABEL = localize('enableAllWorkspace', "Enable All Installed Extensions for this Workspace");
12451245

12461246
private disposables: IDisposable[] = [];
12471247

‎src/vs/workbench/parts/extensions/electron-browser/extensionsViewlet.ts‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ import { Delegate, Renderer } from './extensionsList';
3232
import { IExtensionsWorkbenchService, IExtension, IExtensionsViewlet, VIEWLET_ID, ExtensionState } from '../common/extensions';
3333
import {
3434
ShowRecommendedExtensionsAction, ShowWorkspaceRecommendedExtensionsAction, ShowPopularExtensionsAction, ShowInstalledExtensionsAction, ShowDisabledExtensionsAction,
35-
ShowOutdatedExtensionsAction, ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, InstallVSIXAction, ConfigureWorkspaceRecommendedExtensionsAction,
36-
EnableAllAction, EnableAllWorkpsaceAction, DisableAllAction, DisableAllWorkpsaceAction
35+
ShowOutdatedExtensionsAction, ClearExtensionsInputAction, ChangeSortAction, UpdateAllAction, InstallVSIXAction
3736
} from './extensionsActions';
3837
import { IExtensionManagementService, IExtensionGalleryService, IExtensionTipsService, SortBy, SortOrder, IQueryOptions, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
3938
import { ExtensionsInput } from './extensionsInput';
@@ -163,8 +162,6 @@ export class ExtensionsViewlet extends Viewlet implements IExtensionsViewlet {
163162
getSecondaryActions(): IAction[] {
164163
if (!this.secondaryActions) {
165164
this.secondaryActions = [
166-
this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL),
167-
new Separator(),
168165
this.instantiationService.createInstance(ShowInstalledExtensionsAction, ShowInstalledExtensionsAction.ID, ShowInstalledExtensionsAction.LABEL),
169166
this.instantiationService.createInstance(ShowOutdatedExtensionsAction, ShowOutdatedExtensionsAction.ID, ShowOutdatedExtensionsAction.LABEL),
170167
this.instantiationService.createInstance(ShowDisabledExtensionsAction, ShowDisabledExtensionsAction.ID, ShowDisabledExtensionsAction.LABEL),
@@ -178,14 +175,8 @@ export class ExtensionsViewlet extends Viewlet implements IExtensionsViewlet {
178175
this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort..asc', localize('ascending', "Sort Order: ↑"), this.onSearchChange, undefined, 'asc'),
179176
this.instantiationService.createInstance(ChangeSortAction, 'extensions.sort..desc', localize('descending', "Sort Order: ↓"), this.onSearchChange, undefined, 'desc'),
180177
new Separator(),
181-
this.instantiationService.createInstance(DisableAllAction, DisableAllAction.ID, DisableAllAction.LABEL),
182-
this.instantiationService.createInstance(DisableAllWorkpsaceAction, DisableAllWorkpsaceAction.ID, DisableAllWorkpsaceAction.LABEL),
183-
new Separator(),
184-
this.instantiationService.createInstance(EnableAllAction, EnableAllAction.ID, EnableAllAction.LABEL),
185-
this.instantiationService.createInstance(EnableAllWorkpsaceAction, EnableAllWorkpsaceAction.ID, EnableAllWorkpsaceAction.LABEL),
186-
new Separator(),
187-
this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL),
188-
this.instantiationService.createInstance(ConfigureWorkspaceRecommendedExtensionsAction, ConfigureWorkspaceRecommendedExtensionsAction.ID, ConfigureWorkspaceRecommendedExtensionsAction.LABEL)
178+
this.instantiationService.createInstance(UpdateAllAction, UpdateAllAction.ID, UpdateAllAction.LABEL),
179+
this.instantiationService.createInstance(InstallVSIXAction, InstallVSIXAction.ID, InstallVSIXAction.LABEL)
189180
];
190181
}
191182

0 commit comments

Comments
 (0)