Language Service host API cleanup

src/compiler/core.ts

@@ -644,6 +644,10 @@ module ts {
         }
     }
 
+    export function getDefaultLibFilename(options: CompilerOptions): string {
+        return options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts";
+    }
+
     export interface ObjectAllocator {
         getNodeConstructor(kind: SyntaxKind): new () => Node;
         getSymbolConstructor(): new (flags: SymbolFlags, name: string) => Symbol;

src/compiler/program.ts

@@ -64,7 +64,7 @@ module ts {
 
         return {
             getSourceFile,
-            getDefaultLibFilename: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), options.target === ScriptTarget.ES6 ? "lib.es6.d.ts" : "lib.d.ts"),
+            getDefaultLibFilename: options => combinePaths(getDirectoryPath(normalizePath(sys.getExecutingFilePath())), getDefaultLibFilename(options)),
             writeFile,
             getCurrentDirectory: () => currentDirectory || (currentDirectory = sys.getCurrentDirectory()),
             useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
@@ -174,7 +174,7 @@ module ts {
             }
             var diagnostic: DiagnosticMessage;
             if (hasExtension(filename)) {
-                if (!options.allowNonTsExtensions && !fileExtensionIs(filename, ".ts")) {
+                if (!options.allowNonTsExtensions && !fileExtensionIs(host.getCanonicalFileName(filename), ".ts")) {
                     diagnostic = Diagnostics.File_0_must_have_extension_ts_or_d_ts;
                 }
                 else if (!findSourceFile(filename, isDefaultLib, refFile, refPos, refEnd)) {

src/harness/fourslash.ts

@@ -237,9 +237,6 @@ module FourSlash {
             getLength: () => {
                 return sourceText.length;
             },
-            getLineStartPositions: () => {
-                return <number[]>[];
-            },
             getChangeRange: (oldSnapshot: ts.IScriptSnapshot) => {
                 return <ts.TextChangeRange>undefined;
             }
@@ -1403,7 +1400,7 @@ module FourSlash {
             var content = snapshot.getText(0, snapshot.getLength());
 
             var referenceSourceFile = ts.createLanguageServiceSourceFile(
-                this.activeFile.fileName, createScriptSnapShot(content), ts.ScriptTarget.Latest, /*version:*/ "0", /*isOpen:*/ false, /*setNodeParents:*/ false);
+                this.activeFile.fileName, createScriptSnapShot(content), ts.ScriptTarget.Latest, /*version:*/ "0", /*setNodeParents:*/ false);
             var referenceSyntaxDiagnostics = referenceSourceFile.getSyntacticDiagnostics();
 
             Utils.assertDiagnosticsEquals(incrementalSyntaxDiagnostics, referenceSyntaxDiagnostics);

src/harness/harness.ts

@@ -930,6 +930,8 @@ module Harness {
                     settingsCallback(null);
                 }
 
+                var newLine = '\r\n';
+
                 var useCaseSensitiveFileNames = ts.sys.useCaseSensitiveFileNames;
                 this.settings.forEach(setting => {
                     switch (setting.flag.toLowerCase()) {
@@ -1008,7 +1010,7 @@ module Harness {
 
                         case 'newline':
                         case 'newlines':
-                            ts.sys.newLine = setting.value;
+                            newLine = setting.value;
                             break;
 
                         case 'comments':
@@ -1050,7 +1052,7 @@ module Harness {
                             break;
 
                         case 'includebuiltfile':
-                            inputFiles.push({ unitName: setting.value, content: IO.readFile(libFolder + setting.value) });
+                            inputFiles.push({ unitName: setting.value, content: normalizeLineEndings(IO.readFile(libFolder + setting.value), newLine) });
                             break;
 
                         default:
@@ -1096,7 +1098,7 @@ module Harness {
                 onComplete(result, program);
 
                 // reset what newline means in case the last test changed it
-                ts.sys.newLine = '\r\n';
+                ts.sys.newLine = newLine;
                 return options;
             }
 
@@ -1168,6 +1170,14 @@ module Harness {
             }
         }
 
+        function normalizeLineEndings(text: string, lineEnding: string): string {
+            var normalized = text.replace(/\r\n?/g, '\n');
+            if (lineEnding !== '\n') {
+                normalized = normalized.replace(/\n/g, lineEnding);
+            }
+            return normalized;
+        }
+
         export function getMinimalDiagnostic(err: ts.Diagnostic): HarnessDiagnostic {
             var errorLineInfo = err.file ? err.file.getLineAndCharacterFromPosition(err.start) : { line: 0, character: 0 };
             return {

src/harness/harnessLanguageService.ts

@@ -7,7 +7,7 @@ module Harness.LanguageService {
         public editRanges: { length: number; textChangeRange: ts.TextChangeRange; }[] = [];
         public lineMap: number[] = null;
 
-        constructor(public fileName: string, public content: string, public isOpen = true) {
+        constructor(public fileName: string, public content: string) {
             this.setContent(content);
         }
 
@@ -72,14 +72,6 @@ module Harness.LanguageService {
             return this.textSnapshot.length;
         }
 
-        public getLineStartPositions(): string {
-            if (this.lineMap === null) {
-                this.lineMap = ts.computeLineStarts(this.textSnapshot);
-            }
-
-            return JSON.stringify(this.lineMap);
-        }
-
         public getChangeRange(oldScript: ts.ScriptSnapshotShim): string {
             var oldShim = <ScriptSnapshotShim>oldScript;
             var range = this.scriptInfo.getTextChangeRangeBetweenVersions(oldShim.version, this.version);
@@ -109,11 +101,9 @@ module Harness.LanguageService {
             fileName: string,
             compilationSettings: ts.CompilerOptions,
             scriptSnapshot: ts.IScriptSnapshot,
-            version: string,
-            isOpen: boolean): ts.SourceFile {
+            version: string): ts.SourceFile {
             var sourceFile = ts.createSourceFile(fileName, scriptSnapshot.getText(0, scriptSnapshot.getLength()), compilationSettings.target);
             sourceFile.version = version;
-            sourceFile.isOpen = isOpen;
             return sourceFile;
         }
 
@@ -123,10 +113,9 @@ module Harness.LanguageService {
             compilationSettings: ts.CompilerOptions,
             scriptSnapshot: ts.IScriptSnapshot,
             version: string,
-            isOpen: boolean,
             textChangeRange: ts.TextChangeRange
             ): ts.SourceFile {
-            return ts.updateLanguageServiceSourceFile(document, scriptSnapshot, version, isOpen, textChangeRange);
+            return ts.updateLanguageServiceSourceFile(document, scriptSnapshot, version, textChangeRange);
         }
 
         public releaseDocument(fileName: string, compilationSettings: ts.CompilerOptions): void {
@@ -159,13 +148,17 @@ module Harness.LanguageService {
         }
 
         private getScriptInfo(fileName: string): ScriptInfo {
-            return this.fileNameToScript[fileName];
+            return ts.lookUp(this.fileNameToScript, fileName);
         }
 
         public addScript(fileName: string, content: string) {
             this.fileNameToScript[fileName] = new ScriptInfo(fileName, content);
         }
 
+        private contains(fileName: string): boolean {
+            return ts.hasProperty(this.fileNameToScript, fileName);
+        }
+
         public updateScript(fileName: string, content: string) {
             var script = this.getScriptInfo(fileName);
             if (script !== null) {
@@ -223,20 +216,22 @@ module Harness.LanguageService {
 
         public getScriptFileNames(): string {
             var fileNames: string[] = [];
-            ts.forEachKey(this.fileNameToScript, (fileName) => { fileNames.push(fileName); });
+            ts.forEachKey(this.fileNameToScript,(fileName) => { fileNames.push(fileName); });
             return JSON.stringify(fileNames);
         }
 
         public getScriptSnapshot(fileName: string): ts.ScriptSnapshotShim {
-            return new ScriptSnapshotShim(this.getScriptInfo(fileName));
+            if (this.contains(fileName)) {
+                return new ScriptSnapshotShim(this.getScriptInfo(fileName));
+            }
+            return undefined;
         }
 
         public getScriptVersion(fileName: string): string {
-            return this.getScriptInfo(fileName).version.toString();
-        }
-
-        public getScriptIsOpen(fileName: string): boolean {
-            return this.getScriptInfo(fileName).isOpen;
+            if (this.contains(fileName)) {
+                return this.getScriptInfo(fileName).version.toString();
+            }
+            return undefined;
         }
 
         public getLocalizedDiagnosticMessages(): string {
@@ -272,7 +267,6 @@ module Harness.LanguageService {
         public parseSourceText(fileName: string, sourceText: ts.IScriptSnapshot): ts.SourceFile {
             var result = ts.createSourceFile(fileName, sourceText.getText(0, sourceText.getLength()), ts.ScriptTarget.Latest);
             result.version = "1";
-            result.isOpen = true;
             return result;
         }
 

src/services/formatting/rulesProvider.ts

@@ -22,7 +22,7 @@ module ts.formatting {
         private activeRules: Rule[];
         private rulesMap: RulesMap;
 
-        constructor(private logger: Logger) {
+        constructor() {
             this.globalRules = new Rules();
         }