microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-09 07:55:10 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #3016 from zhengbli/fixFormatConfigurationIssue

Browse Source 
Fix host formatting configuration issues
This commit is contained in:
Zhengbo Li
2015-05-03 23:03:06 -07:00
parent 4cc1848a17 d580063083
commit 282c1d2139
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/editorServices.ts
View File

@@ -424,7 +424,7 @@ module ts.server {
getFormatCodeOptions(file?: string) {
if (file) {
var info = this.filenameToScriptInfo[file];
var info = this.filenameToScriptInfo[file];
if (info) {
return info.formatCodeOptions;
}
@@ -750,6 +750,7 @@ module ts.server {
if (content !== undefined) {
var indentSize: number;
info = new ScriptInfo(this.host, fileName, content, openedByClient);
info.setFormatOptions(this.getFormatCodeOptions());
this.filenameToScriptInfo[fileName] = info;
if (!info.isOpen) {
info.fileWatcher = this.host.watchFile(fileName, _ => { this.watchedFileChanged(fileName); });

2
src/server/session.ts
View File

@@ -519,7 +519,7 @@ module ts.server {
IndentSize: formatOptions.IndentSize,
TabSize: formatOptions.TabSize,
NewLineCharacter: "\n",
ConvertTabsToSpaces: true,
ConvertTabsToSpaces: formatOptions.ConvertTabsToSpaces,
};
var indentPosition =
compilerService.languageService.getIndentationAtPosition(file, position, editorOptions);