Skip to content

Commit 3b56ebe

Browse files
author
Andy Hanson
committed
Convert other namespace + type alias in protocol.ts to const enums
1 parent f94818d commit 3b56ebe

File tree

2 files changed

+34
-46
lines changed

2 files changed

+34
-46
lines changed

src/harness/unittests/session.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ namespace ts.server {
134134
type: "request",
135135
arguments: {
136136
formatOptions: {
137-
indentStyle: "Block"
137+
indentStyle: protocol.IndentStyle.Block,
138138
}
139139
}
140140
};
@@ -149,11 +149,11 @@ namespace ts.server {
149149
type: "request",
150150
arguments: {
151151
options: {
152-
module: "System",
153-
target: "ES5",
154-
jsx: "React",
155-
newLine: "Lf",
156-
moduleResolution: "Node"
152+
module: protocol.ModuleKind.System,
153+
target: protocol.ScriptTarget.ES5,
154+
jsx: protocol.JsxEmit.React,
155+
newLine: protocol.NewLineKind.Lf,
156+
moduleResolution: protocol.ModuleResolutionKind.Node,
157157
}
158158
}
159159
};

src/server/protocol.ts

Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2291,14 +2291,12 @@ namespace ts.server.protocol {
22912291
body?: NavigationTree;
22922292
}
22932293

2294-
export namespace IndentStyle {
2295-
export type None = "None";
2296-
export type Block = "Block";
2297-
export type Smart = "Smart";
2294+
export const enum IndentStyle {
2295+
None = "None",
2296+
Block = "Block",
2297+
Smart = "Smart",
22982298
}
22992299

2300-
export type IndentStyle = IndentStyle.None | IndentStyle.Block | IndentStyle.Smart;
2301-
23022300
export interface EditorSettings {
23032301
baseIndentSize?: number;
23042302
indentSize?: number;
@@ -2395,47 +2393,37 @@ namespace ts.server.protocol {
23952393
[option: string]: CompilerOptionsValue | undefined;
23962394
}
23972395

2398-
export namespace JsxEmit {
2399-
export type None = "None";
2400-
export type Preserve = "Preserve";
2401-
export type ReactNative = "ReactNative";
2402-
export type React = "React";
2396+
export const enum JsxEmit {
2397+
None = "None",
2398+
Preserve = "Preserve",
2399+
ReactNative = "ReactNative",
2400+
React = "React",
24032401
}
24042402

2405-
export type JsxEmit = JsxEmit.None | JsxEmit.Preserve | JsxEmit.React | JsxEmit.ReactNative;
2406-
2407-
export namespace ModuleKind {
2408-
export type None = "None";
2409-
export type CommonJS = "CommonJS";
2410-
export type AMD = "AMD";
2411-
export type UMD = "UMD";
2412-
export type System = "System";
2413-
export type ES6 = "ES6";
2414-
export type ES2015 = "ES2015";
2403+
export const enum ModuleKind {
2404+
None = "None",
2405+
CommonJS = "CommonJS",
2406+
AMD = "AMD",
2407+
UMD = "UMD",
2408+
System = "System",
2409+
ES6 = "ES6",
2410+
ES2015 = "ES2015",
24152411
}
24162412

2417-
export type ModuleKind = ModuleKind.None | ModuleKind.CommonJS | ModuleKind.AMD | ModuleKind.UMD | ModuleKind.System | ModuleKind.ES6 | ModuleKind.ES2015;
2418-
2419-
export namespace ModuleResolutionKind {
2420-
export type Classic = "Classic";
2421-
export type Node = "Node";
2413+
export const enum ModuleResolutionKind {
2414+
Classic = "Classic",
2415+
Node = "Node",
24222416
}
24232417

2424-
export type ModuleResolutionKind = ModuleResolutionKind.Classic | ModuleResolutionKind.Node;
2425-
2426-
export namespace NewLineKind {
2427-
export type Crlf = "Crlf";
2428-
export type Lf = "Lf";
2418+
export const enum NewLineKind {
2419+
Crlf,
2420+
Lf,
24292421
}
24302422

2431-
export type NewLineKind = NewLineKind.Crlf | NewLineKind.Lf;
2432-
2433-
export namespace ScriptTarget {
2434-
export type ES3 = "ES3";
2435-
export type ES5 = "ES5";
2436-
export type ES6 = "ES6";
2437-
export type ES2015 = "ES2015";
2423+
export const enum ScriptTarget {
2424+
ES3 = "ES3",
2425+
ES5 = "ES5",
2426+
ES6 = "ES6",
2427+
ES2015 = "ES2015",
24382428
}
2439-
2440-
export type ScriptTarget = ScriptTarget.ES3 | ScriptTarget.ES5 | ScriptTarget.ES6 | ScriptTarget.ES2015;
24412429
}

0 commit comments

Comments
 (0)