From 287b316937b3976067c22a9ec2b93fce2710a35a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 17 Dec 2015 22:00:04 -0800
Subject: [PATCH 1/2] Addressed CR feedback.

---
 src/server/editorServices.ts     | 2 --
 tests/cases/unittests/session.ts | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index d023a9827ee..80fbc573ff2 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -555,7 +555,6 @@ namespace ts.server {
         }
 
         handleProjectFilelistChanges(project: Project) {
-            // TODO: Ignoring potentially returned 'error' and 'succeeded' condition
             const { projectOptions } = this.configFileToProjectOptions(project.projectFilename);
 
             const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
@@ -585,7 +584,6 @@ namespace ts.server {
 
             this.log("Detected newly added tsconfig file: " + fileName);
 
-            // TODO: Ignoring potentially returned 'error' and 'succeeded' condition
             const { projectOptions } = this.configFileToProjectOptions(fileName);
 
             const rootFilesInTsconfig = projectOptions.files.map(f => this.getCanonicalFileName(f));
diff --git a/tests/cases/unittests/session.ts b/tests/cases/unittests/session.ts
index 1251fb7215f..41f4bc599f6 100644
--- a/tests/cases/unittests/session.ts
+++ b/tests/cases/unittests/session.ts
@@ -1,6 +1,6 @@
 /// <reference path="..\..\..\src\harness\harness.ts" />
 
-var expect: typeof _chai.expect = _chai.expect;
+const expect: typeof _chai.expect = _chai.expect;
 
 namespace ts.server {
     let lastWrittenToHost: string;

From 9badf0c0261e803638d50a3b31bd5024fe4711db Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Fri, 18 Dec 2015 14:48:35 -0800
Subject: [PATCH 2/2] filelist -> fileList

---
 src/server/editorServices.ts | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 80fbc573ff2..5a1c85fc13c 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -486,7 +486,7 @@ namespace ts.server {
         // number becomes 0 for a watcher, then we should close it.
         directoryWatchersRefCount: ts.Map<number> = {};
         hostConfiguration: HostConfiguration;
-        timerForDetectingProjectFilelistChanges: Map<NodeJS.Timer> = {};
+        timerForDetectingProjectFileListChanges: Map<NodeJS.Timer> = {};
 
         constructor(public host: ServerHost, public psLogger: Logger, public eventHandler?: ProjectServiceEventHandler) {
             // ts.disableIncrementalParsing = true;
@@ -541,20 +541,20 @@ namespace ts.server {
             }
 
             this.log("Detected source file changes: " + fileName);
-            this.startTimerForDetectingProjectFilelistChanges(project);
+            this.startTimerForDetectingProjectFileListChanges(project);
         }
 
-        startTimerForDetectingProjectFilelistChanges(project: Project) {
-            if (this.timerForDetectingProjectFilelistChanges[project.projectFilename]) {
-                clearTimeout(this.timerForDetectingProjectFilelistChanges[project.projectFilename]);
+        startTimerForDetectingProjectFileListChanges(project: Project) {
+            if (this.timerForDetectingProjectFileListChanges[project.projectFilename]) {
+                clearTimeout(this.timerForDetectingProjectFileListChanges[project.projectFilename]);
             }
-            this.timerForDetectingProjectFilelistChanges[project.projectFilename] = setTimeout(
-                () => this.handleProjectFilelistChanges(project),
+            this.timerForDetectingProjectFileListChanges[project.projectFilename] = setTimeout(
+                () => this.handleProjectFileListChanges(project),
                 250
             );
         }
 
-        handleProjectFilelistChanges(project: Project) {
+        handleProjectFileListChanges(project: Project) {
             const { projectOptions } = this.configFileToProjectOptions(project.projectFilename);
 
             const newRootFiles = projectOptions.files.map((f => this.getCanonicalFileName(f)));
@@ -1083,7 +1083,6 @@ namespace ts.server {
          * Close file whose contents is managed by the client
          * @param filename is absolute pathname
          */
-
         closeClientFile(filename: string) {
             const info = ts.lookUp(this.filenameToScriptInfo, filename);
             if (info) {
@@ -1739,9 +1738,9 @@ namespace ts.server {
         }
 
         getLineMapper() {
-            return ((line: number) => {
+            return (line: number) => {
                 return this.index.lineNumberToInfo(line).offset;
-            });
+            };
         }
 
         getTextChangeRangeSinceVersion(scriptVersion: number) {