microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-13 06:20:23 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

resolve merge issues

Browse Source
This commit is contained in:
Vladimir Matsveyeu 2016-07-28 13:14:01 -07:00
parent 2cb3122e62
commit 2f7e738376
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scriptInfo.ts
View File

@ -23,7 +23,7 @@ namespace ts.server {
this.path = toPath(fileName, host.getCurrentDirectory(), createGetCanonicalFileName(host.useCaseSensitiveFileNames));
this.svc = ScriptVersionCache.fromString(host, content);
this.formatCodeSettings = getDefaultFormatCodeSettings(this.host);
this.scriptKind = scriptKind && scriptKind !== ScriptKind.Unknown
this.scriptKind = scriptKind
? scriptKind
: getScriptKindFromFileName(fileName);
}