Remove some inline constants

mjbvz · mjbvz · commit e3573bd2bb16 · 2019-01-03T17:39:12.000-08:00
diff --git a/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts b/src/vs/editor/contrib/parameterHints/parameterHintsModel.ts
@@ -22,7 +22,8 @@ const DefaultState = new class { readonly state = 'default'; };
 const PendingState = new class { readonly state = 'pending'; };
 
 class ActiveState {
-	readonly state = 'active';
+	static readonly state = 'active';
+	readonly state = ActiveState.state;
 	constructor(
 		readonly hints: modes.SignatureHelp
 	) { }
@@ -96,12 +97,12 @@ export class ParameterHintsModel extends Disposable {
 			() => this.doTrigger({
 				triggerKind: context.triggerKind,
 				triggerCharacter: context.triggerCharacter,
-				isRetrigger: this.state.state === 'active' || this.state.state === 'pending',
+				isRetrigger: this.state.state === ActiveState.state || this.state.state === PendingState.state,
 			}, triggerId), delay).then(undefined, onUnexpectedError);
 	}
 
 	public next(): void {
-		if (this.state.state !== 'active') {
+		if (this.state.state !== ActiveState.state) {
 			return;
 		}
 
@@ -120,7 +121,7 @@ export class ParameterHintsModel extends Disposable {
 	}
 
 	public previous(): void {
-		if (this.state.state !== 'active') {
+		if (this.state.state !== ActiveState.state) {
 			return;
 		}
 
@@ -139,14 +140,11 @@ export class ParameterHintsModel extends Disposable {
 	}
 
 	private updateActiveSignature(activeSignature: number) {
-		if (this.state.state !== 'active') {
+		if (this.state.state !== ActiveState.state) {
 			return;
 		}
 
-		this.state = {
-			state: 'active',
-			hints: { ...this.state.hints, activeSignature }
-		};
+		this.state = new ActiveState({ ...this.state.hints, activeSignature });
 		this._onChangedHints.fire(this.state.hints);
 	}
 
@@ -187,7 +185,7 @@ export class ParameterHintsModel extends Disposable {
 	}
 
 	private get isTriggered(): boolean {
-		return this.state.state === 'active' || this.state.state === 'pending' || this.throttledDelayer.isTriggered();
+		return this.state.state === ActiveState.state || this.state.state === PendingState.state || this.throttledDelayer.isTriggered();
 	}
 
 	private onModelChanged(): void {

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ const DefaultState = new class { readonly state = 'default'; };`
`22`	`22`	`const PendingState = new class { readonly state = 'pending'; };`
`23`	`23`
`24`	`24`	`class ActiveState {`
`25`		`- readonly state = 'active';`
	`25`	`+ static readonly state = 'active';`
	`26`	`+ readonly state = ActiveState.state;`
`26`	`27`	`constructor(`
`27`	`28`	`readonly hints: modes.SignatureHelp`
`28`	`29`	`) { }`
`@@ -96,12 +97,12 @@ export class ParameterHintsModel extends Disposable {`
`96`	`97`	`() => this.doTrigger({`
`97`	`98`	`triggerKind: context.triggerKind,`
`98`	`99`	`triggerCharacter: context.triggerCharacter,`
`99`		`- isRetrigger: this.state.state === 'active' \|\| this.state.state === 'pending',`
	`100`	`+ isRetrigger: this.state.state === ActiveState.state \|\| this.state.state === PendingState.state,`
`100`	`101`	`}, triggerId), delay).then(undefined, onUnexpectedError);`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`public next(): void {`
`104`		`- if (this.state.state !== 'active') {`
	`105`	`+ if (this.state.state !== ActiveState.state) {`
`105`	`106`	`return;`
`106`	`107`	`}`
`107`	`108`
`@@ -120,7 +121,7 @@ export class ParameterHintsModel extends Disposable {`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`public previous(): void {`
`123`		`- if (this.state.state !== 'active') {`
	`124`	`+ if (this.state.state !== ActiveState.state) {`
`124`	`125`	`return;`
`125`	`126`	`}`
`126`	`127`
`@@ -139,14 +140,11 @@ export class ParameterHintsModel extends Disposable {`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`private updateActiveSignature(activeSignature: number) {`
`142`		`- if (this.state.state !== 'active') {`
	`143`	`+ if (this.state.state !== ActiveState.state) {`
`143`	`144`	`return;`
`144`	`145`	`}`
`145`	`146`
`146`		`- this.state = {`
`147`		`- state: 'active',`
`148`		`- hints: { ...this.state.hints, activeSignature }`
`149`		`- };`
	`147`	`+ this.state = new ActiveState({ ...this.state.hints, activeSignature });`
`150`	`148`	`this._onChangedHints.fire(this.state.hints);`
`151`	`149`	`}`
`152`	`150`
`@@ -187,7 +185,7 @@ export class ParameterHintsModel extends Disposable {`
`187`	`185`	`}`
`188`	`186`
`189`	`187`	`private get isTriggered(): boolean {`
`190`		`- return this.state.state === 'active' \|\| this.state.state === 'pending' \|\| this.throttledDelayer.isTriggered();`
	`188`	`+ return this.state.state === ActiveState.state \|\| this.state.state === PendingState.state \|\| this.throttledDelayer.isTriggered();`
`191`	`189`	`}`
`192`	`190`
`193`	`191`	`private onModelChanged(): void {`