Merge branch 'master' into map5

This commit is contained in:
Andy Hanson
2017-01-11 12:24:47 -08:00
15 changed files with 206 additions and 49 deletions

View File

@@ -355,5 +355,9 @@ namespace ts.server {
positionToLineOffset(position: number): ILineInfo {
return this.textStorage.positionToLineOffset(position);
}
public isJavaScript() {
return this.scriptKind === ScriptKind.JS || this.scriptKind === ScriptKind.JSX;
}
}
}