From 04320e415e68841f3a517bb0a3616c78908750f2 Mon Sep 17 00:00:00 2001
From: steveluc <steveluc@microsoft.com>
Date: Mon, 9 Mar 2015 01:23:03 -0700
Subject: [PATCH] Renames and comments as requested by feedback.

---
 src/harness/harnessLanguageService.ts | 2 +-
 src/server/editorServices.ts          | 2 +-
 src/server/server.ts                  | 8 ++++----
 src/server/session.ts                 | 8 +++++++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/harness/harnessLanguageService.ts b/src/harness/harnessLanguageService.ts
index 55b3464a384..68ac8d916fb 100644
--- a/src/harness/harnessLanguageService.ts
+++ b/src/harness/harnessLanguageService.ts
@@ -528,7 +528,7 @@ module Harness.LanguageService {
             return this.host.log(message);
         }
         
-        enabled() {
+        loggingEnabled() {
             return true;
         }
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 970286f29fa..dd5f74cfff2 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -6,7 +6,7 @@ module ts.server {
     export interface Logger {
         close(): void;
         isVerbose(): boolean;
-        enabled(): boolean;
+        loggingEnabled(): boolean;
         perftrc(s: string): void;
         info(s: string): void;
         startGroup(): void;
diff --git a/src/server/server.ts b/src/server/server.ts
index 1735a2dddec..4c13be80c4c 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -51,12 +51,12 @@ module ts.server {
             this.firstInGroup = true;
         }
 
-        enabled() {
+        loggingEnabled() {
             return !!this.logFilename;
         }
 
         isVerbose() {
-            return this.enabled() && (this.level == "verbose");
+            return this.loggingEnabled() && (this.level == "verbose");
         }
         
 
@@ -196,7 +196,7 @@ module ts.server {
         detailLevel?: string;
     }
 
-    function parseLogEnv(logEnvStr: string): LogOptions {
+    function parseLoggingEnvironmentString(logEnvStr: string): LogOptions {
         var logEnv: LogOptions = {};
         var args = logEnvStr.split(' ');
         for (var i = 0, len = args.length; i < (len - 1); i += 2) {
@@ -222,7 +222,7 @@ module ts.server {
         var detailLevel = "normal";
         var logEnvStr = process.env["TSS_LOG"];
         if (logEnvStr) {
-            var logEnv = parseLogEnv(logEnvStr);
+            var logEnv = parseLoggingEnvironmentString(logEnvStr);
             if (logEnv.file) {
                 fileName = logEnv.file;
             }
diff --git a/src/server/session.ts b/src/server/session.ts
index ee828642830..cc705d64d5e 100644
--- a/src/server/session.ts
+++ b/src/server/session.ts
@@ -464,7 +464,13 @@ module ts.server {
             var compilerService = project.compilerService;
             var position = compilerService.host.lineColToPosition(file, line, col);
             var edits = compilerService.languageService.getFormattingEditsAfterKeystroke(file, position, key,
-                compilerService.formatCodeOptions); 
+                compilerService.formatCodeOptions);
+            // Check whether we should auto-indent. This will be when
+            // the position is on a line containing only whitespace.
+            // This should leave the edits returned from
+            // getFormattingEditsAfterKeytroke either empty or pertaining
+            // only to the previous line.  If all this is true, then
+            // add edits necessary to properly indent the current line.
             if ((key == "\n") && ((!edits) || (edits.length == 0) || allEditsBeforePos(edits, position))) {
                 var scriptInfo = compilerService.host.getScriptInfo(file);
                 if (scriptInfo) {