Merge branch 'master' into LSAPICleanup

Conflicts:
	src/services/services.ts

src/services/formatting/formatting.ts

@@ -68,7 +68,9 @@ module ts.formatting {
 
     export function formatOnEnter(position: number, sourceFile: SourceFile, rulesProvider: RulesProvider, options: FormatCodeOptions): TextChange[] {
         var line = sourceFile.getLineAndCharacterFromPosition(position).line;
-        Debug.assert(line >= 2);
+        if (line === 1) {
+            return [];
+        }
         // get the span for the previous\current line
         var span = {
             // get start position for the previous line
@@ -597,7 +599,11 @@ module ts.formatting {
                 if (listEndToken !== SyntaxKind.Unknown) {
                     if (formattingScanner.isOnToken()) {
                         var tokenInfo = formattingScanner.readTokenInfo(parent);
-                        if (tokenInfo.token.kind === listEndToken) {
+                        // consume the list end token only if it is still belong to the parent
+                        // there might be the case when current token matches end token but does not considered as one
+                        // function (x: function) <-- 
+                        // without this check close paren will be interpreted as list end token for function expression which is wrong
+                        if (tokenInfo.token.kind === listEndToken && rangeContainsRange(parent, tokenInfo.token)) {
                             // consume list end token
                             consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);
                         }

src/services/services.ts

@@ -846,6 +846,7 @@ module ts {
     //
     export interface LanguageServiceHost {
         getCompilationSettings(): CompilerOptions;
+        getNewLine?(): string;
         getScriptFileNames(): string[];
         getScriptVersion(fileName: string): string;
         getScriptSnapshot(fileName: string): IScriptSnapshot;
@@ -2048,7 +2049,7 @@ module ts {
                 getCancellationToken: () => cancellationToken,
                 getCanonicalFileName: filename => useCaseSensitivefilenames ? filename : filename.toLowerCase(),
                 useCaseSensitiveFileNames: () => useCaseSensitivefilenames,
-                getNewLine: () => "\r\n",
+                getNewLine: () => host.getNewLine ? host.getNewLine() : "\r\n",
                 getDefaultLibFilename: getDefaultLibraryFilename,
                 writeFile: (filename, data, writeByteOrderMark) => { },
                 getCurrentDirectory: () => host.getCurrentDirectory()