Skip to content

Commit ad592db

Browse files
committed
Use more const enums
1 parent 0b0335a commit ad592db

10 files changed

Lines changed: 57 additions & 18 deletions

File tree

‎src/vs/base/common/platform.ts‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,20 @@ if (typeof process === 'object' && typeof process.nextTick === 'function' && typ
7171
_language = _locale;
7272
}
7373

74-
export enum Platform {
74+
export const enum Platform {
7575
Web,
7676
Mac,
7777
Linux,
7878
Windows
7979
}
80+
export function PlatformToString(platform: Platform) {
81+
switch (platform) {
82+
case Platform.Web: return 'Web';
83+
case Platform.Mac: return 'Mac';
84+
case Platform.Linux: return 'Linux';
85+
case Platform.Windows: return 'Windows';
86+
}
87+
}
8088

8189
let _platform: Platform = Platform.Web;
8290
if (_isNative) {

‎src/vs/platform/configuration/common/configuration.ts‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,22 @@ export interface IConfigurationOverrides {
2828
resource?: URI;
2929
}
3030

31-
export enum ConfigurationTarget {
31+
export const enum ConfigurationTarget {
3232
USER = 1,
3333
WORKSPACE,
3434
WORKSPACE_FOLDER,
3535
DEFAULT,
3636
MEMORY
3737
}
38+
export function ConfigurationTargetToString(configurationTarget: ConfigurationTarget) {
39+
switch (configurationTarget) {
40+
case ConfigurationTarget.USER: return 'USER';
41+
case ConfigurationTarget.WORKSPACE: return 'WORKSPACE';
42+
case ConfigurationTarget.WORKSPACE_FOLDER: return 'WORKSPACE_FOLDER';
43+
case ConfigurationTarget.DEFAULT: return 'DEFAULT';
44+
case ConfigurationTarget.MEMORY: return 'MEMORY';
45+
}
46+
}
3847

3948
export interface IConfigurationChangeEvent {
4049

‎src/vs/platform/lifecycle/common/lifecycle.ts‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,33 @@ export const enum ShutdownReason {
4747
LOAD = 4
4848
}
4949

50-
export enum StartupKind {
50+
export const enum StartupKind {
5151
NewWindow = 1,
5252
ReloadedWindow = 3,
5353
ReopenedWindow = 4,
5454
}
55+
export function StartupKindToString(startupKind: StartupKind): string {
56+
switch (startupKind) {
57+
case StartupKind.NewWindow: return 'NewWindow';
58+
case StartupKind.ReloadedWindow: return 'ReloadedWindow';
59+
case StartupKind.ReopenedWindow: return 'ReopenedWindow';
60+
}
61+
}
5562

56-
export enum LifecyclePhase {
63+
export const enum LifecyclePhase {
5764
Starting = 1,
5865
Restoring = 2,
5966
Running = 3,
6067
Eventually = 4
6168
}
69+
export function LifecyclePhaseToString(phase: LifecyclePhase) {
70+
switch (phase) {
71+
case LifecyclePhase.Starting: return 'Starting';
72+
case LifecyclePhase.Restoring: return 'Restoring';
73+
case LifecyclePhase.Running: return 'Running';
74+
case LifecyclePhase.Eventually: return 'Eventually';
75+
}
76+
}
6277

6378
/**
6479
* A lifecycle service informs about lifecycle events of the

‎src/vs/platform/lifecycle/electron-browser/lifecycleService.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { TPromise } from 'vs/base/common/winjs.base';
88
import { toErrorMessage } from 'vs/base/common/errorMessage';
9-
import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, handleVetos } from 'vs/platform/lifecycle/common/lifecycle';
9+
import { ILifecycleService, ShutdownEvent, ShutdownReason, StartupKind, LifecyclePhase, handleVetos, LifecyclePhaseToString } from 'vs/platform/lifecycle/common/lifecycle';
1010
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
1111
import { ipcRenderer as ipc } from 'electron';
1212
import { Event, Emitter } from 'vs/base/common/event';
@@ -111,7 +111,7 @@ export class LifecycleService implements ILifecycleService {
111111
this._logService.trace(`lifecycle: phase changed (value: ${value})`);
112112

113113
this._phase = value;
114-
mark(`LifecyclePhase/${LifecyclePhase[value]}`);
114+
mark(`LifecyclePhase/${LifecyclePhaseToString(value)}`);
115115

116116
if (this._phaseWhen.has(this._phase)) {
117117
this._phaseWhen.get(this._phase).open();

‎src/vs/platform/telemetry/common/telemetryUtils.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { IDisposable } from 'vs/base/common/lifecycle';
99
import { guessMimeTypes } from 'vs/base/common/mime';
1010
import * as paths from 'vs/base/common/paths';
1111
import { URI } from 'vs/base/common/uri';
12-
import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
12+
import { IConfigurationService, ConfigurationTarget, ConfigurationTargetToString } from 'vs/platform/configuration/common/configuration';
1313
import { IKeybindingService, KeybindingSource } from 'vs/platform/keybinding/common/keybinding';
1414
import { ITelemetryService, ITelemetryInfo, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
1515
import { ILogService } from 'vs/platform/log/common/log';
@@ -200,7 +200,7 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
200200
}
201201
*/
202202
telemetryService.publicLog('updateConfiguration', {
203-
configurationSource: ConfigurationTarget[event.source],
203+
configurationSource: ConfigurationTargetToString(event.source),
204204
configurationKeys: flattenKeys(event.sourceConfig)
205205
});
206206
/* __GDPR__
@@ -210,7 +210,7 @@ export function configurationTelemetry(telemetryService: ITelemetryService, conf
210210
}
211211
*/
212212
telemetryService.publicLog('updateConfigurationValues', {
213-
configurationSource: ConfigurationTarget[event.source],
213+
configurationSource: ConfigurationTargetToString(event.source),
214214
configurationValues: flattenValues(event.sourceConfig, configurationValueWhitelist)
215215
});
216216
}

‎src/vs/platform/telemetry/node/commonProperties.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export function resolveCommonProperties(commit: string, version: string, machine
2222
// __GDPR__COMMON__ "common.platformVersion" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
2323
result['common.platformVersion'] = (os.release() || '').replace(/^(\d+)(\.\d+)?(\.\d+)?(.*)/, '$1$2$3');
2424
// __GDPR__COMMON__ "common.platform" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
25-
result['common.platform'] = Platform.Platform[Platform.platform];
25+
result['common.platform'] = Platform.PlatformToString(Platform.platform);
2626
// __GDPR__COMMON__ "common.nodePlatform" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
2727
result['common.nodePlatform'] = process.platform;
2828
// __GDPR__COMMON__ "common.nodeArch" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }

‎src/vs/workbench/common/contributions.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import { Registry } from 'vs/platform/registry/common/platform';
88
import { IInstantiationService, IConstructorSignature0 } from 'vs/platform/instantiation/common/instantiation';
9-
import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
9+
import { ILifecycleService, LifecyclePhase, LifecyclePhaseToString } from 'vs/platform/lifecycle/common/lifecycle';
1010
import { mark } from 'vs/base/common/performance';
1111

1212
// --- Workbench Contribution Registry
@@ -90,15 +90,15 @@ export class WorkbenchContributionsRegistry implements IWorkbenchContributionsRe
9090
}
9191

9292
private doInstantiateByPhase(instantiationService: IInstantiationService, phase: LifecyclePhase): void {
93-
mark(`LifecyclePhase/${LifecyclePhase[phase]}/createContrib:start`);
93+
mark(`LifecyclePhase/${LifecyclePhaseToString(phase)}/createContrib:start`);
9494
const toBeInstantiated = this.toBeInstantiated.get(phase);
9595
if (toBeInstantiated) {
9696
while (toBeInstantiated.length > 0) {
9797
const ctor = toBeInstantiated.shift();
9898
instantiationService.createInstance(ctor);
9999
}
100100
}
101-
mark(`LifecyclePhase/${LifecyclePhase[phase]}/createContrib:end`);
101+
mark(`LifecyclePhase/${LifecyclePhaseToString(phase)}/createContrib:end`);
102102
}
103103
}
104104

‎src/vs/workbench/electron-browser/workbench.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { QuickOpenController } from 'vs/workbench/browser/parts/quickopen/quickO
3737
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
3838
import { QuickInputService } from 'vs/workbench/browser/parts/quickinput/quickInput';
3939
import { getServices } from 'vs/platform/instantiation/common/extensions';
40-
import { Position, Parts, IPartService, ILayoutOptions, IDimension } from 'vs/workbench/services/part/common/partService';
40+
import { Position, Parts, IPartService, ILayoutOptions, IDimension, PositionToString } from 'vs/workbench/services/part/common/partService';
4141
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
4242
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
4343
import { ContextMenuService as NativeContextMenuService } from 'vs/workbench/services/contextview/electron-browser/contextmenuService';
@@ -1489,7 +1489,7 @@ export class Workbench extends Disposable implements IPartService {
14891489
const newPositionValue = (position === Position.BOTTOM) ? 'bottom' : 'right';
14901490
const oldPositionValue = (this.panelPosition === Position.BOTTOM) ? 'bottom' : 'right';
14911491
this.panelPosition = position;
1492-
this.storageService.store(Workbench.panelPositionStorageKey, Position[this.panelPosition].toLowerCase(), StorageScope.WORKSPACE);
1492+
this.storageService.store(Workbench.panelPositionStorageKey, PositionToString(this.panelPosition).toLowerCase(), StorageScope.WORKSPACE);
14931493

14941494
// Adjust CSS
14951495
DOM.removeClass(this.panelPart.getContainer(), oldPositionValue);

‎src/vs/workbench/parts/performance/electron-browser/actions.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import * as os from 'os';
1818
import { IExtensionService, ActivationTimes } from 'vs/workbench/services/extensions/common/extensions';
1919
import { getEntries } from 'vs/base/common/performance';
2020
import { timeout } from 'vs/base/common/async';
21-
import { StartupKind } from 'vs/platform/lifecycle/common/lifecycle';
21+
import { StartupKindToString } from 'vs/platform/lifecycle/common/lifecycle';
2222
import { Registry } from 'vs/platform/registry/common/platform';
2323
import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions';
2424
import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
@@ -34,7 +34,7 @@ class Info {
3434
table['nls:start => nls:end'] = new Info(metrics.timers.ellapsedNlsGeneration, '[main]', metrics.initialStartup);
3535
table['app.isReady => window.loadUrl()'] = new Info(metrics.timers.ellapsedWindowLoad, '[main]', metrics.initialStartup);
3636

37-
table['window.loadUrl() => begin to require(workbench.main.js)'] = new Info(metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKind[metrics.windowKind]);
37+
table['window.loadUrl() => begin to require(workbench.main.js)'] = new Info(metrics.timers.ellapsedWindowLoadToRequire, '[main->renderer]', StartupKindToString(metrics.windowKind));
3838
table['require(workbench.main.js)'] = new Info(metrics.timers.ellapsedRequire, '[renderer]', `cached data: ${(metrics.didUseCachedData ? 'YES' : 'NO')}${nodeModuleLoadTime ? `, node_modules took ${nodeModuleLoadTime}ms` : ''}`);
3939

4040
table['register extensions & spawn extension host'] = new Info(metrics.timers.ellapsedExtensions, '[renderer]');

‎src/vs/workbench/services/part/common/partService.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@ export const enum Parts {
1919
MENUBAR_PART
2020
}
2121

22-
export enum Position {
22+
export const enum Position {
2323
LEFT,
2424
RIGHT,
2525
BOTTOM
2626
}
27+
export function PositionToString(position: Position): string {
28+
switch (position) {
29+
case Position.LEFT: return 'LEFT';
30+
case Position.RIGHT: return 'RIGHT';
31+
case Position.BOTTOM: return 'BOTTOM';
32+
}
33+
}
2734

2835
export interface ILayoutOptions {
2936
toggleMaximizedPanel?: boolean;

0 commit comments

Comments
 (0)