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

Fix merge problems from master

Browse Source
This commit is contained in:
Ryan Cavanaugh
2015-11-09 12:49:36 -08:00
parent 7dd1bf487d
commit e630ce247b
9 changed files with 29 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/editorServices.ts
View File

@@ -371,7 +371,7 @@ namespace ts.server {
openRefCount = 0;
constructor(public projectService: ProjectService, public projectOptions?: ProjectOptions) {
if(projectOptions && projectOptions.files){
if (projectOptions && projectOptions.files) {
// If files are listed explicitly, allow all extensions
projectOptions.compilerOptions.allowNonTsExtensions = true;
}
@@ -1321,7 +1321,7 @@ namespace ts.server {
this.setCompilerOptions(opt);
}
else {
var defaultOpts = ts.getDefaultCompilerOptions();
const defaultOpts = ts.getDefaultCompilerOptions();
defaultOpts.allowNonTsExtensions = true;
this.setCompilerOptions(defaultOpts);
}