microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 21:06:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Kagami Sascha Rosylight
2016-12-17 13:21:34 +09:00
parent 273a0dbdfe
commit ebf46a77e9
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/harness/fourslash.ts
View File

@@ -3524,11 +3524,11 @@ namespace FourSlashInterface {
this.state.formatOnType(this.state.getMarkerByName(posMarker).position, key);
}
public setOption(name: string, value: number): void;
public setOption(name: string, value: string): void;
public setOption(name: string, value: boolean): void;
public setOption(name: string, value: any): void {
(<any>this.state.formatCodeSettings)[name] = value;
public setOption(name: keyof ts.FormatCodeSettings, value: number): void;
public setOption(name: keyof ts.FormatCodeSettings, value: string): void;
public setOption(name: keyof ts.FormatCodeSettings, value: boolean): void;
public setOption(name: keyof ts.FormatCodeSettings, value: any): void {
this.state.formatCodeSettings[name] = value;
}
public getOption(name: keyof ts.FormatCodeSettings) {