From 2035db1d51b0eaae1d840ceba1a70541a77153c3 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Fri, 23 Sep 2016 17:37:11 -0700
Subject: [PATCH 01/27] Convert to Doc Comment

---
 src/services/types.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/services/types.ts b/src/services/types.ts
index e8c411cc1c8..35d52532687 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -473,7 +473,11 @@ namespace ts {
 
     export interface CompletionInfo {
         isMemberCompletion: boolean;
-        isNewIdentifierLocation: boolean;  // true when the current location also allows for a new identifier
+
+        /**
+         * true when the current location also allows for a new identifier
+         */
+        isNewIdentifierLocation: boolean;
         entries: CompletionEntry[];
     }
 

From b38d7ac9fd41c46b70c0e5fcfe815a25c98270a4 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Mon, 26 Sep 2016 11:19:06 -0700
Subject: [PATCH 02/27] Annotate directorySeparator

---
 src/compiler/core.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 72d05e1cfd7..aca9701eee7 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1044,9 +1044,14 @@ namespace ts {
         return 0;
     }
 
+    /**
+     * Internally, we represent paths as strings with '/' as the directory separator.
+     * When we make system calls (eg: LanguageServiceHost.getDirectory()),
+     * we expect the host to correctly handle paths in our specified format.
+     */
     export const directorySeparator = "/";
     const directorySeparatorCharCode = CharacterCodes.slash;
-    function getNormalizedParts(normalizedSlashedPath: string, rootLength: number) {
+    function getNormalizedParts(normalizedSlashedPath: string, rootLength: number): string[] {
         const parts = normalizedSlashedPath.substr(rootLength).split(directorySeparator);
         const normalized: string[] = [];
         for (const part of parts) {

From d423aadc72c5247db5f674f7277429bcf39fc6af Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Mon, 26 Sep 2016 13:34:07 -0700
Subject: [PATCH 03/27] comments

---
 src/services/completions.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index d6a4da89ed1..00a5f80379b 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -323,12 +323,12 @@ namespace ts.Completions {
         }
 
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            fragment = getDirectoryPath(fragment);
+            fragment = getDirectoryPath(fragment); // TODO: modify fragment so it respects our internal path representation?
             if (!fragment) {
-                fragment = "./";
+                fragment = "." + directorySeparator;
             }
             else {
-                fragment = ensureTrailingDirectorySeparator(fragment);
+                fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?
             }
 
             const absolutePath = normalizeAndPreserveTrailingSlash(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment));
@@ -544,7 +544,7 @@ namespace ts.Completions {
                 const kind = match[2];
                 const toComplete = match[3];
 
-                const scriptPath = getDirectoryPath(sourceFile.path);
+                const scriptPath = getDirectoryPath(sourceFile.path); // TODO: normalize for win10?
                 let entries: CompletionEntry[];
                 if (kind === "path") {
                     // Give completions for a relative path

From 1f7b6e6a31afaaa00a57cf875b7a3a41af267250 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 27 Sep 2016 10:54:03 -0700
Subject: [PATCH 04/27] More comments

---
 src/compiler/core.ts        | 11 +++++++++--
 src/services/completions.ts | 14 +++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index aca9701eee7..0b6dd3c9d7c 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1015,7 +1015,9 @@ namespace ts {
         return path.replace(/\\/g, "/");
     }
 
-    // Returns length of path root (i.e. length of "/", "x:/", "//server/share/, file:///user/files")
+    /**
+     * Returns length of path root (i.e. length of "/", "x:/", "//server/share/, file:///user/files")
+    */
     export function getRootLength(path: string): number {
         if (path.charCodeAt(0) === CharacterCodes.slash) {
             if (path.charCodeAt(1) !== CharacterCodes.slash) return 1;
@@ -1074,7 +1076,7 @@ namespace ts {
 
     export function normalizePath(path: string): string {
         path = normalizeSlashes(path);
-        const rootLength = getRootLength(path);
+        const rootLength = getRootLength(path); // TODO: this expects un-slash-normalized strings. eg: 'x:\\...'
         const root = path.substr(0, rootLength);
         const normalized = getNormalizedParts(path, rootLength);
         if (normalized.length) {
@@ -1091,6 +1093,11 @@ namespace ts {
         return path.charCodeAt(path.length - 1) === directorySeparatorCharCode;
     }
 
+    /**
+     * Returns the path except for its basename. Eg:
+     * 
+     * /path/to/file.ext -> /path/to
+     */
     export function getDirectoryPath(path: Path): Path;
     export function getDirectoryPath(path: string): string;
     export function getDirectoryPath(path: string): any {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 00a5f80379b..04b68544376 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -322,10 +322,22 @@ namespace ts.Completions {
             return result;
         }
 
+        /**
+         * Given a path ending at a directory, gets the completions for the path.
+         */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
+            /*Debug.assert(fragment !== undefined);
+
+            if (fragment === "") {
+                fragment = ".";
+            } else {
+                fragment = getDirectoryPath(fragment);
+            }
+            */
+
             fragment = getDirectoryPath(fragment); // TODO: modify fragment so it respects our internal path representation?
             if (!fragment) {
-                fragment = "." + directorySeparator;
+                fragment = ".";
             }
             else {
                 fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?

From 769d248519c28bc538ee9eedf657d9fbacf3f354 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 27 Sep 2016 13:43:42 -0700
Subject: [PATCH 05/27] new test

---
 .../tripleSlashRefPathRelativePaths.ts        | 137 ++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts

diff --git a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
new file mode 100644
index 00000000000..96d0a11214f
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
@@ -0,0 +1,137 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises relative path completions going up and down 2 directories
+// and the use of forward- and back-slashes and combinations thereof.
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.ts
+//// /*f2*/
+// @Filename: dir1/g1.ts
+//// /*g1*/
+// @Filename: dir1/g2.ts
+//// /*g2*/
+// @Filename: dir1/dir2/h1.ts
+//// /*h1*/
+// @Filename: dir1/dir2/h2.ts
+//// /*h2*/
+// @Filename: dir1/dir2/.hidden.ts
+//// /*hidden*/
+// @Filename: dir1/dir2/dir3/i1.ts
+//// /*i1*/
+// @Filename: dir1/dir2/dir3/i2.ts
+//// /*i2*/
+// @Filename: dir1/dir2/dir3/dir4/j1.ts
+//// /*j1*/
+// @Filename: dir1/dir2/dir3/dir4/j2.ts
+//// /*j2*/
+
+
+// @Filename: dir1/dir2/test.ts
+//// /// <reference path="/*0*/
+//// /// <reference path="./*1*/
+//// /// <reference path="../*2*/
+
+//// /// <reference path="..//*3*/
+//// /// <reference path="..\/*4*/
+//// /// <reference path="../..//*5*/
+//// /// <reference path="../..\/*6*/
+//// /// <reference path="..\..//*7*/
+//// /// <reference path="..\..\/*8*/
+
+//// /// <reference path=".//*9*/
+//// /// <reference path=".\/*10*/
+//// /// <reference path="./h/*11*/
+//// /// <reference path=".\h/*12*/
+//// /// <reference path="./h1/*13*/
+//// /// <reference path=".\h1/*14*/
+//// /// <reference path="./h1./*15*/
+//// /// <reference path=".\h1./*16*/
+//// /// <reference path="./h1.t/*17*/
+//// /// <reference path=".\h1.t/*18*/
+
+//// /// <reference path="dir3/*19*/
+//// /// <reference path="dir3//*20*/
+//// /// <reference path="dir3\/*21*/
+//// /// <reference path="./dir3//*22*/
+//// /// <reference path=".\dir3\/*23*/
+//// /// <reference path="dir3/dir4//*24*/
+//// /// <reference path="dir3\dir4\/*25*/
+//// /// <reference path="./dir3/dir4//*26*/
+//// /// <reference path=".\dir3\dir4\/*27*/
+
+function workingDirCompletions() {
+    for (let m of ["0", "9", "10"]) {
+        goTo.marker(m);
+        verify.completionListContains("h1.ts");
+        verify.completionListContains("h2.ts");
+        verify.completionListContains(".hidden.ts");
+        verify.completionListContains("dir3");
+        verify.not.completionListItemsCountIsGreaterThan(4);
+    }
+
+    goTo.marker("1");
+    verify.completionListContains(".hidden.ts");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+    goTo.marker("2");
+    verify.not.completionListItemsCountIsGreaterThan(0);
+
+    for (let m of ["11", "12"]) {
+        goTo.marker(m);
+        verify.completionListContains("h1.ts");
+        verify.completionListContains("h2.ts");
+        verify.not.completionListItemsCountIsGreaterThan(2);
+    }
+
+    for (let m of ["13", "14", "15", "16", "17", "18"]) {
+        goTo.marker(m);
+        verify.completionListContains("h1.ts");
+        verify.not.completionListItemsCountIsGreaterThan(1);
+    }
+
+    goTo.marker("19");
+    verify.completionListContains("dir3");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+}
+
+function parentDirCompletions() {
+
+    for (let m of ["3", "4"]) {
+        goTo.marker(m);
+        verify.completionListContains("g1.ts");
+        verify.completionListContains("g2.ts");
+        verify.completionListContains("dir2");
+        verify.not.completionListItemsCountIsGreaterThan(3);
+    }
+
+    for (let m of ["5", "6", "7", "8"]) {
+        goTo.marker(m);
+        verify.completionListContains("f1.ts");
+        verify.completionListContains("f2.ts");
+        verify.completionListContains("dir1");
+        verify.not.completionListItemsCountIsGreaterThan(3);
+    }
+}
+
+function childDirCompletions() {
+    for (let m of ["20", "21", "22", "23"]) {
+        goTo.marker(m);
+        verify.completionListContains("i1.ts");
+        verify.completionListContains("i2.ts");
+        verify.completionListContains("dir4");
+        verify.not.completionListItemsCountIsGreaterThan(3);
+    }
+
+     for (let m of ["24", "25", "26", "27"]) {
+        goTo.marker(m);
+        verify.completionListContains("j1.ts");
+        verify.completionListContains("j2.ts");
+        verify.not.completionListItemsCountIsGreaterThan(2);
+    }
+}
+
+workingDirCompletions();
+parentDirCompletions();
+childDirCompletions();
\ No newline at end of file

From 6dd548285f33d6194cd9294af114b642c318db40 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 27 Sep 2016 14:04:57 -0700
Subject: [PATCH 06/27] remove Comment

---
 src/services/completions.ts | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 04b68544376..35a7bce5561 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -326,18 +326,9 @@ namespace ts.Completions {
          * Given a path ending at a directory, gets the completions for the path.
          */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            /*Debug.assert(fragment !== undefined);
-
-            if (fragment === "") {
-                fragment = ".";
-            } else {
-                fragment = getDirectoryPath(fragment);
-            }
-            */
-
             fragment = getDirectoryPath(fragment); // TODO: modify fragment so it respects our internal path representation?
             if (!fragment) {
-                fragment = ".";
+                fragment = "./";
             }
             else {
                 fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?

From 629e126718d7a6950e0394082fdd7964bdc4857f Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Wed, 28 Sep 2016 16:04:39 -0700
Subject: [PATCH 07/27] Factored out hidden path test

---
 .../fourslash/tripleSlashRefPathHiddenFile.ts | 28 +++++++++++++++++++
 .../tripleSlashRefPathRelativePaths.ts        |  8 ++----
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts

diff --git a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
new file mode 100644
index 00000000000..6c1280637e9
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
@@ -0,0 +1,28 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises completions for hidden files (ie: those beginning with '.')
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.ts
+//// /*f2*/
+// @Filename: .hidden.ts
+//// /*hidden*/
+
+// @Filename: test.ts
+//// /// <reference path="/*0*/
+//// /// <reference path="./*1*/
+//// /// <reference path=".//*2*/
+//// /// <reference path=".\/*3*/
+
+for(let m of ["0", "2", "3"]) {
+    goTo.marker(m);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f2.ts");
+    verify.completionListContains(".hidden.ts");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
+
+goTo.marker("1");
+verify.completionListContains(".hidden.ts");
+verify.not.completionListItemsCountIsGreaterThan(1);
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
index 96d0a11214f..d22000b0322 100644
--- a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
@@ -15,8 +15,6 @@
 //// /*h1*/
 // @Filename: dir1/dir2/h2.ts
 //// /*h2*/
-// @Filename: dir1/dir2/.hidden.ts
-//// /*hidden*/
 // @Filename: dir1/dir2/dir3/i1.ts
 //// /*i1*/
 // @Filename: dir1/dir2/dir3/i2.ts
@@ -65,14 +63,12 @@ function workingDirCompletions() {
         goTo.marker(m);
         verify.completionListContains("h1.ts");
         verify.completionListContains("h2.ts");
-        verify.completionListContains(".hidden.ts");
         verify.completionListContains("dir3");
-        verify.not.completionListItemsCountIsGreaterThan(4);
+        verify.not.completionListItemsCountIsGreaterThan(3);
     }
 
     goTo.marker("1");
-    verify.completionListContains(".hidden.ts");
-    verify.not.completionListItemsCountIsGreaterThan(1);
+    verify.not.completionListItemsCountIsGreaterThan(0);
 
     goTo.marker("2");
     verify.not.completionListItemsCountIsGreaterThan(0);

From f6ff6bd206283f2e4479f59f841be42fd218593e Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Wed, 28 Sep 2016 16:45:52 -0700
Subject: [PATCH 08/27] factor and simplify rel path test

---
 .../tripleSlashRefPathBackandForwardSlash.ts  |  73 +++++++++
 .../tripleSlashRefPathCompletionsNarrow.ts    |  21 +++
 .../fourslash/tripleSlashRefPathHiddenFile.ts |   9 +-
 .../tripleSlashRefPathRelativePaths.ts        | 143 ++++++------------
 4 files changed, 145 insertions(+), 101 deletions(-)
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts

diff --git a/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts b/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
new file mode 100644
index 00000000000..c7cae3c4a45
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
@@ -0,0 +1,73 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises completions for hidden files (ie: those beginning with '.')
+
+// @Filename: f.ts
+//// /*f1*/
+// @Filename: d1/g.ts
+//// /*g1*/
+// @Filename: d1/d2/h.ts
+//// /*h1*/
+// @Filename: d1/d2/d3/i.ts
+//// /// <reference path=".\..\..\/*28*/
+
+// @Filename: test.ts
+//// /// <reference path="/*0*/
+//// /// <reference path=".//*1*/
+//// /// <reference path=".\/*2*/
+//// /// <reference path="./*3*/
+
+//// /// <reference path="d1//*4*/
+//// /// <reference path="d1/.//*5*/
+//// /// <reference path="d1/.\/*6*/
+//// /// <reference path="d1/./*7*/
+
+//// /// <reference path="d1\/*8*/
+//// /// <reference path="d1\.//*9*/
+//// /// <reference path="d1\.\/*10*/
+//// /// <reference path="d1\./*11*/
+
+//// /// <reference path="d1/d2//*12*/
+//// /// <reference path="d1/d2/.//*13*/
+//// /// <reference path="d1/d2/.\/*14*/
+//// /// <reference path="d1/d2/./*15*/
+
+//// /// <reference path="d1/d2\/*16*/
+//// /// <reference path="d1/d2\.//*17*/
+//// /// <reference path="d1/d2\.\/*18*/
+//// /// <reference path="d1/d2\./*19*/
+
+//// /// <reference path="d1\d2//*20*/
+//// /// <reference path="d1\d2/.//*21*/
+//// /// <reference path="d1\d2/.\/*22*/
+//// /// <reference path="d1\d2/./*23*/
+
+//// /// <reference path="d1\d2\/*24*/
+//// /// <reference path="d1\d2\.//*25*/
+//// /// <reference path="d1\d2\.\/*26*/
+//// /// <reference path="d1\d2\./*27*/
+
+testBlock(0,  'f.ts', "d1");
+testBlock(4,  'g.ts', "d2");
+testBlock(8,  'g.ts', "d2");
+testBlock(12, 'h.ts', "d3");
+testBlock(16, 'h.ts', "d3");
+testBlock(20, 'h.ts', "d3");
+testBlock(24, 'h.ts', "d3");
+
+goTo.marker("28");
+verify.completionListContains("g.ts");
+verify.completionListContains("d2");
+verify.not.completionListItemsCountIsGreaterThan(2);
+
+function testBlock(offset: number, fileName: string, dir: string) {
+    for (let m = offset; m < offset + 3; ++m) {
+        goTo.marker("" + m);
+        verify.completionListContains(fileName);
+        verify.completionListContains(dir);
+        verify.not.completionListItemsCountIsGreaterThan(2);
+    }
+
+    goTo.marker("" + (offset + 3));
+    verify.not.completionListItemsCountIsGreaterThan(0);
+}
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
new file mode 100644
index 00000000000..67fd8ee25e2
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises relative path completions going up and down 2 directories
+// and the use of forward- and back-slashes and combinations thereof.
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.ts
+//// /*f2*/
+
+// @Filename: test.ts
+//// /// <reference path="f/*0*/
+//// /// <reference path="f1/*1*/
+//// /// <reference path="f1./*2*/
+//// /// <reference path="f1.t/*3*/
+
+//// /// <reference path="./f/*4*/
+//// /// <reference path="./f1/*5*/
+//// /// <reference path="./f1./*6*/
+//// /// <reference path="./f1.t/*7*/
+
diff --git a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
index 6c1280637e9..aa9a87b5e07 100644
--- a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
@@ -2,10 +2,8 @@
 
 // Exercises completions for hidden files (ie: those beginning with '.')
 
-// @Filename: f1.ts
-//// /*f1*/
-// @Filename: f2.ts
-//// /*f2*/
+// @Filename: f.ts
+//// /*f*/
 // @Filename: .hidden.ts
 //// /*hidden*/
 
@@ -17,8 +15,7 @@
 
 for(let m of ["0", "2", "3"]) {
     goTo.marker(m);
-    verify.completionListContains("f1.ts");
-    verify.completionListContains("f2.ts");
+    verify.completionListContains("f.ts");
     verify.completionListContains(".hidden.ts");
     verify.not.completionListItemsCountIsGreaterThan(3);
 }
diff --git a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
index d22000b0322..82908f246a5 100644
--- a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
@@ -3,131 +3,84 @@
 // Exercises relative path completions going up and down 2 directories
 // and the use of forward- and back-slashes and combinations thereof.
 
-// @Filename: f1.ts
+// @Filename: f.ts
 //// /*f1*/
-// @Filename: f2.ts
-//// /*f2*/
-// @Filename: dir1/g1.ts
+// @Filename: d1/g.ts
 //// /*g1*/
-// @Filename: dir1/g2.ts
-//// /*g2*/
-// @Filename: dir1/dir2/h1.ts
+// @Filename: d1/d2/h.ts
 //// /*h1*/
-// @Filename: dir1/dir2/h2.ts
-//// /*h2*/
-// @Filename: dir1/dir2/dir3/i1.ts
+// @Filename: d1/d2/d3/i.ts
 //// /*i1*/
-// @Filename: dir1/dir2/dir3/i2.ts
-//// /*i2*/
-// @Filename: dir1/dir2/dir3/dir4/j1.ts
+// @Filename: d1/d2/d3/d4/j.ts
 //// /*j1*/
-// @Filename: dir1/dir2/dir3/dir4/j2.ts
-//// /*j2*/
 
-
-// @Filename: dir1/dir2/test.ts
+// @Filename: d1/d2/test.ts
 //// /// <reference path="/*0*/
-//// /// <reference path="./*1*/
-//// /// <reference path="../*2*/
+//// /// <reference path=".//*1*/
 
-//// /// <reference path="..//*3*/
-//// /// <reference path="..\/*4*/
-//// /// <reference path="../..//*5*/
-//// /// <reference path="../..\/*6*/
-//// /// <reference path="..\..//*7*/
-//// /// <reference path="..\..\/*8*/
+//// /// <reference path="./*2*/
+//// /// <reference path="../*3*/
 
-//// /// <reference path=".//*9*/
-//// /// <reference path=".\/*10*/
-//// /// <reference path="./h/*11*/
-//// /// <reference path=".\h/*12*/
-//// /// <reference path="./h1/*13*/
-//// /// <reference path=".\h1/*14*/
-//// /// <reference path="./h1./*15*/
-//// /// <reference path=".\h1./*16*/
-//// /// <reference path="./h1.t/*17*/
-//// /// <reference path=".\h1.t/*18*/
+//// /// <reference path="..//4*/
+//// /// <reference path="..\/*5*/
 
-//// /// <reference path="dir3/*19*/
-//// /// <reference path="dir3//*20*/
-//// /// <reference path="dir3\/*21*/
-//// /// <reference path="./dir3//*22*/
-//// /// <reference path=".\dir3\/*23*/
-//// /// <reference path="dir3/dir4//*24*/
-//// /// <reference path="dir3\dir4\/*25*/
-//// /// <reference path="./dir3/dir4//*26*/
-//// /// <reference path=".\dir3\dir4\/*27*/
+//// /// <reference path="../..//*6*/
+
+//// /// <reference path="d3/*7*/
+
+//// /// <reference path="d3//*8*/
+//// /// <reference path="./d3//*9*/
+
+//// /// <reference path="d3/d4//*10*/
+//// /// <reference path="./d3/d4//*11*/
+
+workingDirCompletions();
+parentDirCompletions();
+childDirCompletions();
 
 function workingDirCompletions() {
-    for (let m of ["0", "9", "10"]) {
+    for (let m of ["0", "1",]) {
         goTo.marker(m);
-        verify.completionListContains("h1.ts");
-        verify.completionListContains("h2.ts");
-        verify.completionListContains("dir3");
-        verify.not.completionListItemsCountIsGreaterThan(3);
-    }
-
-    goTo.marker("1");
-    verify.not.completionListItemsCountIsGreaterThan(0);
-
-    goTo.marker("2");
-    verify.not.completionListItemsCountIsGreaterThan(0);
-
-    for (let m of ["11", "12"]) {
-        goTo.marker(m);
-        verify.completionListContains("h1.ts");
-        verify.completionListContains("h2.ts");
+        verify.completionListContains("h.ts");
+        verify.completionListContains("d3");
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
 
-    for (let m of ["13", "14", "15", "16", "17", "18"]) {
+    for(let m of ["2", "3"]) {
         goTo.marker(m);
-        verify.completionListContains("h1.ts");
-        verify.not.completionListItemsCountIsGreaterThan(1);
+        verify.not.completionListItemsCountIsGreaterThan(0);
     }
-
-    goTo.marker("19");
-    verify.completionListContains("dir3");
-    verify.not.completionListItemsCountIsGreaterThan(1);
-
 }
 
 function parentDirCompletions() {
 
-    for (let m of ["3", "4"]) {
+    for (let m of ["4", "5"]) {
         goTo.marker(m);
-        verify.completionListContains("g1.ts");
-        verify.completionListContains("g2.ts");
-        verify.completionListContains("dir2");
-        verify.not.completionListItemsCountIsGreaterThan(3);
+        verify.completionListContains("g.ts");
+        verify.completionListContains("d2");
+        verify.not.completionListItemsCountIsGreaterThan(2);
     }
 
-    for (let m of ["5", "6", "7", "8"]) {
-        goTo.marker(m);
-        verify.completionListContains("f1.ts");
-        verify.completionListContains("f2.ts");
-        verify.completionListContains("dir1");
-        verify.not.completionListItemsCountIsGreaterThan(3);
-    }
+    goTo.marker("6");
+    verify.completionListContains("f.ts");
+    verify.completionListContains("d1");
+    verify.not.completionListItemsCountIsGreaterThan(2);
 }
 
 function childDirCompletions() {
-    for (let m of ["20", "21", "22", "23"]) {
-        goTo.marker(m);
-        verify.completionListContains("i1.ts");
-        verify.completionListContains("i2.ts");
-        verify.completionListContains("dir4");
-        verify.not.completionListItemsCountIsGreaterThan(3);
-    }
+    goTo.marker("7");
+    verify.not.completionListItemsCountIsGreaterThan(0);
 
-     for (let m of ["24", "25", "26", "27"]) {
+    for (let m of ["8", "9"]) {
         goTo.marker(m);
-        verify.completionListContains("j1.ts");
-        verify.completionListContains("j2.ts");
+        verify.completionListContains("i.ts");
+        verify.completionListContains("d4");
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
-}
 
-workingDirCompletions();
-parentDirCompletions();
-childDirCompletions();
\ No newline at end of file
+    for (let m of ["10", "11"]) {
+        goTo.marker(m);
+        verify.completionListContains("j.ts");
+        verify.not.completionListItemsCountIsGreaterThan(1);
+    }
+}
\ No newline at end of file

From 49e0de991d2d82941726e4c3c376fa94a7075446 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 16:16:54 -0700
Subject: [PATCH 09/27] Fix tests

---
 .../tripleSlashRefPathBackandForwardSlash.ts     |  3 ++-
 .../fourslash/tripleSlashRefPathHiddenFile.ts    |  2 +-
 .../fourslash/tripleSlashRefPathRelativePaths.ts | 16 ++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts b/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
index c7cae3c4a45..838dce4479c 100644
--- a/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
@@ -69,5 +69,6 @@ function testBlock(offset: number, fileName: string, dir: string) {
     }
 
     goTo.marker("" + (offset + 3));
-    verify.not.completionListItemsCountIsGreaterThan(0);
+        verify.completionListContains(fileName);
+    verify.not.completionListItemsCountIsGreaterThan(1);
 }
diff --git a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
index aa9a87b5e07..125a97cecf7 100644
--- a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
@@ -17,7 +17,7 @@ for(let m of ["0", "2", "3"]) {
     goTo.marker(m);
     verify.completionListContains("f.ts");
     verify.completionListContains(".hidden.ts");
-    verify.not.completionListItemsCountIsGreaterThan(3);
+    verify.not.completionListItemsCountIsGreaterThan(2);
 }
 
 goTo.marker("1");
diff --git a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
index 82908f246a5..05863b4f651 100644
--- a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
@@ -19,9 +19,10 @@
 //// /// <reference path=".//*1*/
 
 //// /// <reference path="./*2*/
+
 //// /// <reference path="../*3*/
 
-//// /// <reference path="..//4*/
+//// /// <reference path="..//*4*/
 //// /// <reference path="..\/*5*/
 
 //// /// <reference path="../..//*6*/
@@ -46,10 +47,12 @@ function workingDirCompletions() {
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
 
-    for(let m of ["2", "3"]) {
-        goTo.marker(m);
-        verify.not.completionListItemsCountIsGreaterThan(0);
-    }
+    goTo.marker("2");
+    verify.completionListContains("h.ts");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+
+    goTo.marker("3");
+    verify.not.completionListItemsCountIsGreaterThan(0);
 }
 
 function parentDirCompletions() {
@@ -69,7 +72,8 @@ function parentDirCompletions() {
 
 function childDirCompletions() {
     goTo.marker("7");
-    verify.not.completionListItemsCountIsGreaterThan(0);
+    verify.completionListContains("d3");
+    verify.not.completionListItemsCountIsGreaterThan(1);
 
     for (let m of ["8", "9"]) {
         goTo.marker(m);

From 2195f176665e0e531c41e21f3faeb0ac2a386f41 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 16:17:20 -0700
Subject: [PATCH 10/27] Rename Tests

---
 .../completionForTripleSlashReference1.ts     | 51 -------------------
 ....ts => tripleSlashRefPathAbsolutePaths.ts} |  0
 .../tripleSlashRefPathCompletionContext.ts    |  0
 .../tripleSlashRefPathCompletionNarrowing.ts  | 37 ++++++++++++++
 .../tripleSlashRefPathCompletionsNarrow.ts    | 21 --------
 ...ripleSlashRefPathExtensionsAllowJSFalse.ts | 31 +++++++++++
 ...ripleSlashRefPathExtensionsAllowJSTrue.ts} | 24 +++++----
 ...ence4.ts => tripleSlashRefPathRootdirs.ts} |  0
 8 files changed, 81 insertions(+), 83 deletions(-)
 delete mode 100644 tests/cases/fourslash/completionForTripleSlashReference1.ts
 rename tests/cases/fourslash/{completionForTripleSlashReference3.ts => tripleSlashRefPathAbsolutePaths.ts} (100%)
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
 delete mode 100644 tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
 create mode 100644 tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
 rename tests/cases/fourslash/{completionForTripleSlashReference2.ts => tripleSlashRefPathExtensionsAllowJSTrue.ts} (53%)
 rename tests/cases/fourslash/{completionForTripleSlashReference4.ts => tripleSlashRefPathRootdirs.ts} (100%)

diff --git a/tests/cases/fourslash/completionForTripleSlashReference1.ts b/tests/cases/fourslash/completionForTripleSlashReference1.ts
deleted file mode 100644
index 2ce4de2e72e..00000000000
--- a/tests/cases/fourslash/completionForTripleSlashReference1.ts
+++ /dev/null
@@ -1,51 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// Should give completions for relative references to ts files when allowJs is false
-
-// @Filename: test0.ts
-//// /// <reference path="/*0*/
-//// /// <reference path="./*1*/
-//// /// <reference path="../*2*/
-//// /// <reference path=".//*3*/
-//// /// <reference path="./f/*4*/" />
-//// /// <reference path="./parentTest//*5*/
-
-// @Filename: parentTest/sub/test1.ts
-//// /// <reference path="../g/*6*/
-
-// @Filename: f1.ts
-//// /*f1*/
-// @Filename: f1.js
-//// /*f1j*/
-// @Filename: f1.d.ts
-//// /*f1d*/
-// @Filename: f2.tsx
-//// /f2*/
-// @Filename: f3.js
-//// /*f3*/
-// @Filename: f4.jsx
-//// /*f4*/
-// @Filename: e1.ts
-//// /*e1*/
-// @Filename: parentTest/g1.ts
-//// /*parentg1*/
-
-for (let i = 0; i < 5; i++) {
-    goTo.marker("" + i);
-    verify.completionListContains("f1.ts");
-    verify.completionListContains("f1.d.ts");
-    verify.completionListContains("f2.tsx");
-    verify.completionListContains("e1.ts");
-    verify.completionListContains("parentTest");
-    verify.not.completionListItemsCountIsGreaterThan(5);
-}
-
-goTo.marker("5");
-verify.completionListContains("g1.ts");
-verify.completionListContains("sub");
-verify.not.completionListItemsCountIsGreaterThan(2);
-
-goTo.marker("6");
-verify.completionListContains("g1.ts");
-verify.completionListContains("sub");
-verify.not.completionListItemsCountIsGreaterThan(2);
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference3.ts b/tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
similarity index 100%
rename from tests/cases/fourslash/completionForTripleSlashReference3.ts
rename to tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
new file mode 100644
index 00000000000..91b84bc699d
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
@@ -0,0 +1,37 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises relative path completions going up and down 2 directories
+// and the use of forward- and back-slashes and combinations thereof.
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f2.ts
+//// /*f2*/
+// @Filename: d/g.ts
+//// /*g*/
+
+// @Filename: test.ts
+//// /// <reference path="f/*0*/
+//// /// <reference path="./f/*1*/
+
+//// /// <reference path="f1/*2*/
+//// /// <reference path="f1./*3*/
+//// /// <reference path="f1.t/*4*/
+//// /// <reference path="f1.ts/*5*/
+//// /// <reference path="./f1/*6*/
+//// /// <reference path="./f1./*7*/
+//// /// <reference path="./f1.t/*8*/
+//// /// <reference path="./f1.ts/*9*/
+
+for (let m of ["0", "1"]) {
+    goTo.marker(m);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f2.ts");
+    verify.not.completionListItemsCountIsGreaterThan(2);
+}
+
+for (let m = 2; m < 10; ++m) {
+    goTo.marker("" + m);
+    verify.completionListContains("f1.ts");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
deleted file mode 100644
index 67fd8ee25e2..00000000000
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionsNarrow.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/// <reference path='fourslash.ts' />
-
-// Exercises relative path completions going up and down 2 directories
-// and the use of forward- and back-slashes and combinations thereof.
-
-// @Filename: f1.ts
-//// /*f1*/
-// @Filename: f2.ts
-//// /*f2*/
-
-// @Filename: test.ts
-//// /// <reference path="f/*0*/
-//// /// <reference path="f1/*1*/
-//// /// <reference path="f1./*2*/
-//// /// <reference path="f1.t/*3*/
-
-//// /// <reference path="./f/*4*/
-//// /// <reference path="./f1/*5*/
-//// /// <reference path="./f1./*6*/
-//// /// <reference path="./f1.t/*7*/
-
diff --git a/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
new file mode 100644
index 00000000000..2ca68befe25
--- /dev/null
+++ b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
@@ -0,0 +1,31 @@
+/// <reference path='fourslash.ts' />
+
+// Should give completions for relative references to ts files when allowJs is false
+
+// @Filename: test0.ts
+//// /// <reference path="/*0*/
+//// /// <reference path=".//*1*/
+//// /// <reference path="./f/*2*/
+
+// @Filename: f1.ts
+//// /*f1*/
+// @Filename: f1.js
+//// /*f1j*/
+// @Filename: f1.d.ts
+//// /*f1d*/
+// @Filename: f1.tsx
+//// /f2*/
+// @Filename: f1.js
+//// /*f3*/
+// @Filename: f1.jsx
+//// /*f4*/
+// @Filename: f1.cs
+//// /*f5*/
+
+for (let i = 0; i < 3; i++) {
+    goTo.marker("" + i);
+    verify.completionListContains("f1.ts");
+    verify.completionListContains("f1.d.ts");
+    verify.completionListContains("f1.tsx");
+    verify.not.completionListItemsCountIsGreaterThan(3);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference2.ts b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
similarity index 53%
rename from tests/cases/fourslash/completionForTripleSlashReference2.ts
rename to tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
index e6553ce8e73..2f574b9eaf4 100644
--- a/tests/cases/fourslash/completionForTripleSlashReference2.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
@@ -1,15 +1,13 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for relative references to js and ts files when allowJs is true
+// Should give completions for relative references to ts files when allowJs is false
 
 // @allowJs: true
 
 // @Filename: test0.ts
 //// /// <reference path="/*0*/
-//// /// <reference path="./*1*/
-//// /// <reference path="../*2*/
-//// /// <reference path=".//*3*/
-//// /// <reference path="./f/*4*/" />
+//// /// <reference path=".//*1*/
+//// /// <reference path="./f/*2*/
 
 // @Filename: f1.ts
 //// /*f1*/
@@ -17,17 +15,21 @@
 //// /*f1j*/
 // @Filename: f1.d.ts
 //// /*f1d*/
-// @Filename: f2.tsx
+// @Filename: f1.tsx
 //// /f2*/
-// @Filename: f4.jsx
+// @Filename: f1.js
+//// /*f3*/
+// @Filename: f1.jsx
 //// /*f4*/
+// @Filename: f1.cs
+//// /*f5*/
 
-for (let i = 0; i < 5; i++) {
+for (let i = 0; i < 3; i++) {
     goTo.marker("" + i);
     verify.completionListContains("f1.ts");
-    verify.completionListContains("f1.js");
     verify.completionListContains("f1.d.ts");
-    verify.completionListContains("f2.tsx");
-    verify.completionListContains("f4.jsx");
+    verify.completionListContains("f1.tsx");
+    verify.completionListContains("f1.js");
+    verify.completionListContains("f1.jsx");
     verify.not.completionListItemsCountIsGreaterThan(5);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForTripleSlashReference4.ts b/tests/cases/fourslash/tripleSlashRefPathRootdirs.ts
similarity index 100%
rename from tests/cases/fourslash/completionForTripleSlashReference4.ts
rename to tests/cases/fourslash/tripleSlashRefPathRootdirs.ts

From 4b07377efb0ea4924f8303022a1a1975414df25d Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 16:17:44 -0700
Subject: [PATCH 11/27] Fix fragment handling

---
 src/services/completions.ts | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 35a7bce5561..9cb8abcd912 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -323,17 +323,25 @@ namespace ts.Completions {
         }
 
         /**
-         * Given a path ending at a directory, gets the completions for the path.
+         * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
          */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            fragment = getDirectoryPath(fragment); // TODO: modify fragment so it respects our internal path representation?
-            if (!fragment) {
-                fragment = "./";
-            }
-            else {
-                fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?
+            if(fragment === undefined) { fragment = "./"; } // TODO: (arozga) remove the second check along with adding --strictNullChecks
+            
+            fragment = normalizeSlashes(fragment);
+
+            const baseName = getBaseFileName(fragment); // TODO: brittle?
+
+            // Remove the basename from our directory path
+            // TODO: (arozga) when is that used for filtering options later?
+            fragment = getDirectoryPath(fragment);
+            
+            if (fragment === "") { 
+                fragment = '.' + directorySeparator; // TODO: (arozga) can we remove this?
             }
 
+            fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?
+
             const absolutePath = normalizeAndPreserveTrailingSlash(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment));
             const baseDirectory = getDirectoryPath(absolutePath);
             const ignoreCase = !(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames());
@@ -374,6 +382,8 @@ namespace ts.Completions {
                 }
             }
 
+            result = result.filter(entry => entry.name.indexOf(baseName) >= 0);
+
             return result;
         }
 
@@ -583,7 +593,7 @@ namespace ts.Completions {
                     // Wrap in try catch because getEffectiveTypeRoots touches the filesystem
                     typeRoots = getEffectiveTypeRoots(options, host);
                 }
-                catch (e) {}
+                catch (e) { }
 
                 if (typeRoots) {
                     for (const root of typeRoots) {
@@ -1700,7 +1710,7 @@ namespace ts.Completions {
         try {
             return directoryProbablyExists(path, host);
         }
-        catch (e) {}
+        catch (e) { }
         return undefined;
     }
 
@@ -1708,7 +1718,7 @@ namespace ts.Completions {
         try {
             return toApply && toApply.apply(host, args);
         }
-        catch (e) {}
+        catch (e) { }
         return undefined;
     }
 }

From 85736319f9469a50fd4255592041c703f85cbb9f Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 17:08:04 -0700
Subject: [PATCH 12/27] Rename Tests

---
 ...pleSlashRefPathCompletionAbsolutePaths.ts} |  2 +-
 ...shRefPathCompletionBackandForwardSlash.ts} |  0
 ...efPathCompletionExtensionsAllowJSFalse.ts} |  0
 ...RefPathCompletionExtensionsAllowJSTrue.ts} |  0
 ...tripleSlashRefPathCompletionHiddenFile.ts} | 11 +++-----
 .../tripleSlashRefPathCompletionNarrowing.ts  | 26 ++++++++++++-------
 ...pleSlashRefPathCompletionRelativePaths.ts} |  0
 ...> tripleSlashRefPathCompletionRootdirs.ts} |  0
 8 files changed, 21 insertions(+), 18 deletions(-)
 rename tests/cases/fourslash/{tripleSlashRefPathAbsolutePaths.ts => tripleSlashRefPathCompletionAbsolutePaths.ts} (90%)
 rename tests/cases/fourslash/{tripleSlashRefPathBackandForwardSlash.ts => tripleSlashRefPathCompletionBackandForwardSlash.ts} (100%)
 rename tests/cases/fourslash/{tripleSlashRefPathExtensionsAllowJSFalse.ts => tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts} (100%)
 rename tests/cases/fourslash/{tripleSlashRefPathExtensionsAllowJSTrue.ts => tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts} (100%)
 rename tests/cases/fourslash/{tripleSlashRefPathHiddenFile.ts => tripleSlashRefPathCompletionHiddenFile.ts} (61%)
 rename tests/cases/fourslash/{tripleSlashRefPathRelativePaths.ts => tripleSlashRefPathCompletionRelativePaths.ts} (100%)
 rename tests/cases/fourslash/{tripleSlashRefPathRootdirs.ts => tripleSlashRefPathCompletionRootdirs.ts} (100%)

diff --git a/tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
similarity index 90%
rename from tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
index 798e556be58..79e6f7c8b1a 100644
--- a/tests/cases/fourslash/tripleSlashRefPathAbsolutePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for absolute paths
+// Offers completions for absolute paths.
 
 // @Filename: tests/test0.ts
 //// /// <reference path="/tests/cases/f/*0*/
diff --git a/tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts
similarity index 100%
rename from tests/cases/fourslash/tripleSlashRefPathBackandForwardSlash.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts
similarity index 100%
rename from tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSFalse.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
similarity index 100%
rename from tests/cases/fourslash/tripleSlashRefPathExtensionsAllowJSTrue.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionHiddenFile.ts
similarity index 61%
rename from tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionHiddenFile.ts
index 125a97cecf7..fffd310bfeb 100644
--- a/tests/cases/fourslash/tripleSlashRefPathHiddenFile.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionHiddenFile.ts
@@ -13,13 +13,8 @@
 //// /// <reference path=".//*2*/
 //// /// <reference path=".\/*3*/
 
-for(let m of ["0", "2", "3"]) {
+for(let m of ["0", "1", "2", "3"]) {
     goTo.marker(m);
     verify.completionListContains("f.ts");
-    verify.completionListContains(".hidden.ts");
-    verify.not.completionListItemsCountIsGreaterThan(2);
-}
-
-goTo.marker("1");
-verify.completionListContains(".hidden.ts");
-verify.not.completionListItemsCountIsGreaterThan(1);
\ No newline at end of file
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
index 91b84bc699d..5f43b3033fc 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
@@ -14,14 +14,16 @@
 //// /// <reference path="f/*0*/
 //// /// <reference path="./f/*1*/
 
-//// /// <reference path="f1/*2*/
-//// /// <reference path="f1./*3*/
-//// /// <reference path="f1.t/*4*/
-//// /// <reference path="f1.ts/*5*/
-//// /// <reference path="./f1/*6*/
-//// /// <reference path="./f1./*7*/
-//// /// <reference path="./f1.t/*8*/
-//// /// <reference path="./f1.ts/*9*/
+//// /// <reference path="./d/*2*/
+
+//// /// <reference path="f1/*3*/
+//// /// <reference path="f1./*4*/
+//// /// <reference path="f1.t/*5*/
+//// /// <reference path="f1.ts/*6*/
+//// /// <reference path="./f1/*7*/
+//// /// <reference path="./f1./*8*/
+//// /// <reference path="./f1.t/*9*/
+//// /// <reference path="./f1.ts/*10*/
 
 for (let m of ["0", "1"]) {
     goTo.marker(m);
@@ -30,7 +32,13 @@ for (let m of ["0", "1"]) {
     verify.not.completionListItemsCountIsGreaterThan(2);
 }
 
-for (let m = 2; m < 10; ++m) {
+goTo.marker("2");
+verify.completionListContains("d");
+verify.not.completionListItemsCountIsGreaterThan(1);
+
+
+
+for (let m = 3; m < 11; ++m) {
     goTo.marker("" + m);
     verify.completionListContains("f1.ts");
     verify.not.completionListItemsCountIsGreaterThan(1);
diff --git a/tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts
similarity index 100%
rename from tests/cases/fourslash/tripleSlashRefPathRelativePaths.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts
diff --git a/tests/cases/fourslash/tripleSlashRefPathRootdirs.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionRootdirs.ts
similarity index 100%
rename from tests/cases/fourslash/tripleSlashRefPathRootdirs.ts
rename to tests/cases/fourslash/tripleSlashRefPathCompletionRootdirs.ts

From cb13ae03d269c637370e3c6e0f45c11b17ec2716 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 17:08:14 -0700
Subject: [PATCH 13/27] Pass linting

---
 src/services/completions.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 9cb8abcd912..308ec64f82b 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -326,8 +326,8 @@ namespace ts.Completions {
          * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
          */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            if(fragment === undefined) { fragment = "./"; } // TODO: (arozga) remove the second check along with adding --strictNullChecks
-            
+            if (fragment === undefined) { fragment = "./"; } // TODO: (arozga) remove the second check along with adding --strictNullChecks
+
             fragment = normalizeSlashes(fragment);
 
             const baseName = getBaseFileName(fragment); // TODO: brittle?
@@ -335,9 +335,9 @@ namespace ts.Completions {
             // Remove the basename from our directory path
             // TODO: (arozga) when is that used for filtering options later?
             fragment = getDirectoryPath(fragment);
-            
-            if (fragment === "") { 
-                fragment = '.' + directorySeparator; // TODO: (arozga) can we remove this?
+
+            if (fragment === "") {
+                fragment = "." + directorySeparator; // TODO: (arozga) can we remove this?
             }
 
             fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?
@@ -577,7 +577,11 @@ namespace ts.Completions {
                 };
             }
 
-            return undefined;
+            return {
+                isMemberCompletion: false,
+                isNewIdentifierLocation: false,
+                entries: []
+            };
         }
 
         function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {

From 6553413c61a1819229c85334a2b2937b3d0ed83d Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 17:08:27 -0700
Subject: [PATCH 14/27] New Test

---
 .../tripleSlashRefPathCompletionContext.ts    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
index e69de29bb2d..1ee6a666f7c 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts' />
+
+// Exercises for whether completions are performed depending on where the caret is positioned in the ref comment.
+
+// @Filename: f.ts
+//// /*f*/
+
+// @Filename: test.ts
+//// /// <reference path/*0*/=/*1*/"/*8*/
+//// /// <reference path/*2*/=/*3*/"/*9*/"/*4*/ /*5*///*6*/>/*7*/
+
+for(let m = 0; m < 8; ++m) {
+    goTo.marker("" + m);
+    verify.not.completionListItemsCountIsGreaterThan(0);
+}
+
+for(let m of ["8", "9"]) {
+    goTo.marker(m);
+    verify.completionListContains("f.ts");
+    verify.not.completionListItemsCountIsGreaterThan(1);
+}
\ No newline at end of file

From a2cbc6303458f3232236b7e403e158f7ad2a883a Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Thu, 29 Sep 2016 17:08:48 -0700
Subject: [PATCH 15/27] Question added

---
 src/services/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/services/types.ts b/src/services/types.ts
index 35d52532687..dfbcd79cdb2 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -472,6 +472,7 @@ namespace ts {
     }
 
     export interface CompletionInfo {
+        // TODO: (arozga) What does this do?
         isMemberCompletion: boolean;
 
         /**

From 3e15394b90332e380dfb77df28e8133631311117 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Fri, 30 Sep 2016 16:52:28 -0700
Subject: [PATCH 16/27] add readDirectory to LSHost

---
 src/server/lsHost.ts        | 8 ++++++--
 src/services/completions.ts | 7 +++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 5b33770ce28..68a16d2a22a 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -171,12 +171,16 @@ namespace ts.server {
             return this.host.fileExists(path);
         }
 
+        readFile(fileName: string): string {
+            return this.host.readFile(fileName);
+        }
+
         directoryExists(path: string): boolean {
             return this.host.directoryExists(path);
         }
 
-        readFile(fileName: string): string {
-            return this.host.readFile(fileName);
+        readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[] {
+            return this.host.readDirectory(path, exclude, exclude, include);
         }
 
         getDirectories(path: string): string[] {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index cf1e7a1e49a..38d8baa6b50 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -330,17 +330,16 @@ namespace ts.Completions {
 
             fragment = normalizeSlashes(fragment);
 
-            const baseName = getBaseFileName(fragment); // TODO: brittle?
+            const baseName = getBaseFileName(fragment);
 
             // Remove the basename from our directory path
-            // TODO: (arozga) when is that used for filtering options later?
             fragment = getDirectoryPath(fragment);
 
             if (fragment === "") {
-                fragment = "." + directorySeparator; // TODO: (arozga) can we remove this?
+                fragment = "." + directorySeparator;
             }
 
-            fragment = ensureTrailingDirectorySeparator(fragment); // TODO: why is this necessary?
+            fragment = ensureTrailingDirectorySeparator(fragment);
 
             const absolutePath = normalizeAndPreserveTrailingSlash(isRootedDiskPath(fragment) ? fragment : combinePaths(scriptPath, fragment));
             const baseDirectory = getDirectoryPath(absolutePath);

From 3ce97afa03be4e70a2dcd98bcb239bccf539e54c Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Mon, 3 Oct 2016 11:07:12 -0700
Subject: [PATCH 17/27] Rename labels in tests

---
 ...mpletionForStringLiteralRelativeImport1.ts | 74 ++++++++++---------
 ...mpletionForStringLiteralRelativeImport2.ts | 34 +++++----
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
index 3ba82fb0acf..f28d295a220 100644
--- a/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
@@ -5,44 +5,45 @@
 // @Filename: test0.ts
 //// import * as foo1 from "./*import_as0*/
 //// import * as foo2 from ".//*import_as1*/
-//// import * as foo4 from "./folder//*import_as2*/
+//// import * as foo4 from "./d1//*import_as2*/
 
 //// import foo6 = require("./*import_equals0*/
 //// import foo7 = require(".//*import_equals1*/
-//// import foo9 = require("./folder//*import_equals2*/
+//// import foo9 = require("./d1//*import_equals2*/
 
 //// var foo11 = require("./*require0*/
 //// var foo12 = require(".//*require1*/
-//// var foo14 = require("./folder//*require2*/
+//// var foo14 = require("./d1//*require2*/
 
-// @Filename: parentTest/sub/test5.ts
-//// import * as foo16 from "../g/*import_as3*/
-//// import foo17 = require("../g/*import_equals3*/
-//// var foo18 = require("../g/*require3*/
+// @Filename: d2/d3/test1.ts
+//// import * as foo16 from "..//*import_as3*/
+//// import foo17 = require("..//*import_equals3*/
+//// var foo18 = require("..//*require3*/
 
 
 // @Filename: f1.ts
 //// /*f1*/
-// @Filename: f1.js
-//// /*f1j*/
-// @Filename: f1.d.ts
-//// /*f1d*/
-// @Filename: f2.tsx
-//// /f2*/
-// @Filename: f3.js
+// @Filename: f2.js
+//// /*f2*/
+// @Filename: f3.d.ts
 //// /*f3*/
-// @Filename: f4.jsx
-//// /*f4*/
-// @Filename: e1.ts
-//// /*e1*/
-// @Filename: folder/f3.ts
-//// /*subf1*/
-// @Filename: folder/h1.ts
-//// /*subh1*/
-// @Filename: parentTest/f4.ts
-//// /*parentf1*/
-// @Filename: parentTest/g1.ts
-//// /*parentg1*/
+// @Filename: f4.tsx
+//// /f4*/
+// @Filename: f5.js
+//// /*f5*/
+// @Filename: f6.jsx
+//// /*f6*/
+// @Filename: f7.ts
+//// /*f7*/
+// @Filename: d1/f8.ts
+//// /*d1f1*/
+// @Filename: d1/f9.ts
+//// /*d1f9*/
+// @Filename: d2/f10.ts
+//// /*d2f1*/
+// @Filename: d2/f11.ts
+//// /*d2f11*/
+
 const kinds = ["import_as", "import_equals", "require"];
 
 for (const kind of kinds) {
@@ -51,20 +52,21 @@ for (const kind of kinds) {
 
     goTo.marker(kind + "1");
     verify.completionListContains("f1");
-    verify.completionListContains("f2");
-    verify.completionListContains("e1");
-    verify.completionListContains("folder");
-    verify.completionListContains("parentTest");
-    verify.not.completionListItemsCountIsGreaterThan(5);
+    verify.completionListContains("f3");
+    verify.completionListContains("f4");
+    verify.completionListContains("f7");
+    verify.completionListContains("d1");
+    verify.completionListContains("d2");
+    verify.not.completionListItemsCountIsGreaterThan(6);
 
     goTo.marker(kind + "2");
-    verify.completionListContains("f3");
-    verify.completionListContains("h1");
+    verify.completionListContains("f8");
+    verify.completionListContains("f9");
     verify.not.completionListItemsCountIsGreaterThan(2);
 
     goTo.marker(kind + "3");
-    verify.completionListContains("f4");
-    verify.completionListContains("g1");
-    verify.completionListContains("sub");
+    verify.completionListContains("f10");
+    verify.completionListContains("f11");
+    verify.completionListContains("d3");
     verify.not.completionListItemsCountIsGreaterThan(3);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
index 18a80ab3481..a6359537b6b 100644
--- a/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
@@ -16,20 +16,20 @@
 
 // @Filename: f1.ts
 //// /f1*/
-// @Filename: f1.js
-//// /*f1j*/
-// @Filename: f1.d.ts
-//// /*f1d*/
-// @Filename: f2.tsx
+// @Filename: f2.js
 //// /*f2*/
-// @Filename: f3.js
+// @Filename: f3.d.ts
 //// /*f3*/
-// @Filename: f4.jsx
+// @Filename: f4.tsx
 //// /*f4*/
-// @Filename: e1.ts
-//// /*e1*/
-// @Filename: e2.js
-//// /*e2*/
+// @Filename: f5.js
+//// /*f5*/
+// @Filename: f6.jsx
+//// /*f6*/
+// @Filename: g1.ts
+//// /*g1*/
+// @Filename: g2.js
+//// /*g2*/
 const kinds = ["import_as", "import_equals", "require"];
 
 for (const kind of kinds) {
@@ -38,16 +38,18 @@ for (const kind of kinds) {
     verify.completionListContains("f2");
     verify.completionListContains("f3");
     verify.completionListContains("f4");
-    verify.completionListContains("e1");
-    verify.completionListContains("e2");
-    verify.not.completionListItemsCountIsGreaterThan(6);
+    verify.completionListContains("f5");
+    verify.completionListContains("f6");
+    verify.completionListContains("g1");
+    verify.completionListContains("g2");
+    verify.not.completionListItemsCountIsGreaterThan(8);
 
     goTo.marker(kind + "1");
     verify.completionListContains("f1");
     verify.completionListContains("f2");
     verify.completionListContains("f3");
     verify.completionListContains("f4");
-    verify.completionListContains("e1");
-    verify.completionListContains("e2");
+    verify.completionListContains("f5");
+    verify.completionListContains("f6");
     verify.not.completionListItemsCountIsGreaterThan(6);
 }
\ No newline at end of file

From 179ceda746c335c8c627644d803ad747d768d70b Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Mon, 3 Oct 2016 11:25:23 -0700
Subject: [PATCH 18/27] Removed comments and fixed indentation

---
 src/compiler/core.ts        |  2 +-
 src/services/completions.ts | 10 +++++-----
 src/services/types.ts       |  1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index bcb808fa833..c137dfa644a 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1158,7 +1158,7 @@ namespace ts {
 
     export function normalizePath(path: string): string {
         path = normalizeSlashes(path);
-        const rootLength = getRootLength(path); // TODO: this expects un-slash-normalized strings. eg: 'x:\\...'
+        const rootLength = getRootLength(path); // TODO: (arozga) this expects un-slash-normalized strings. eg: 'x:\\...'
         const root = path.substr(0, rootLength);
         const normalized = getNormalizedParts(path, rootLength);
         if (normalized.length) {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 38d8baa6b50..72b648e0082 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -326,7 +326,7 @@ namespace ts.Completions {
          * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
          */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            if (fragment === undefined) { fragment = "./"; } // TODO: (arozga) remove the second check along with adding --strictNullChecks
+            if (fragment === undefined) { fragment = "./"; }
 
             fragment = normalizeSlashes(fragment);
 
@@ -556,7 +556,7 @@ namespace ts.Completions {
                 const kind = match[2];
                 const toComplete = match[3];
 
-                const scriptPath = getDirectoryPath(sourceFile.path); // TODO: normalize for win10?
+                const scriptPath = getDirectoryPath(sourceFile.path);
                 let entries: CompletionEntry[];
                 if (kind === "path") {
                     // Give completions for a relative path
@@ -596,7 +596,7 @@ namespace ts.Completions {
                     // Wrap in try catch because getEffectiveTypeRoots touches the filesystem
                     typeRoots = getEffectiveTypeRoots(options, host);
                 }
-                catch (e) { }
+                catch (e) {}
 
                 if (typeRoots) {
                     for (const root of typeRoots) {
@@ -1713,7 +1713,7 @@ namespace ts.Completions {
         try {
             return directoryProbablyExists(path, host);
         }
-        catch (e) { }
+        catch (e) {}
         return undefined;
     }
 
@@ -1721,7 +1721,7 @@ namespace ts.Completions {
         try {
             return toApply && toApply.apply(host, args);
         }
-        catch (e) { }
+        catch (e) {}
         return undefined;
     }
 }
diff --git a/src/services/types.ts b/src/services/types.ts
index 95052cdb480..fc9a3da5331 100644
--- a/src/services/types.ts
+++ b/src/services/types.ts
@@ -503,7 +503,6 @@ namespace ts {
     }
 
     export interface CompletionInfo {
-        // TODO: (arozga) What does this do?
         isMemberCompletion: boolean;
 
         /**

From 0871628ace675e06ce161c924b29cd8dbde5577d Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Mon, 3 Oct 2016 11:30:35 -0700
Subject: [PATCH 19/27] Remove trailing comment

---
 src/compiler/core.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index c137dfa644a..7d705acc5de 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -1158,7 +1158,7 @@ namespace ts {
 
     export function normalizePath(path: string): string {
         path = normalizeSlashes(path);
-        const rootLength = getRootLength(path); // TODO: (arozga) this expects un-slash-normalized strings. eg: 'x:\\...'
+        const rootLength = getRootLength(path);
         const root = path.substr(0, rootLength);
         const normalized = getNormalizedParts(path, rootLength);
         if (normalized.length) {

From d737dc1d3061d99a114aa4e502d952bd1e409f75 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 4 Oct 2016 13:07:24 -0700
Subject: [PATCH 20/27] Responding To billti's comments

---
 src/server/lsHost.ts                          |  2 +-
 src/services/completions.ts                   | 28 +++++++++----------
 ...tringLiteralRelativeImportAllowJSFalse.ts} |  0
 ...StringLiteralRelativeImportAllowJSTrue.ts} |  0
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename tests/cases/fourslash/{completionForStringLiteralRelativeImport1.ts => completionForStringLiteralRelativeImportAllowJSFalse.ts} (100%)
 rename tests/cases/fourslash/{completionForStringLiteralRelativeImport2.ts => completionForStringLiteralRelativeImportAllowJSTrue.ts} (100%)

diff --git a/src/server/lsHost.ts b/src/server/lsHost.ts
index 68a16d2a22a..dedbb14c929 100644
--- a/src/server/lsHost.ts
+++ b/src/server/lsHost.ts
@@ -180,7 +180,7 @@ namespace ts.server {
         }
 
         readDirectory(path: string, extensions?: string[], exclude?: string[], include?: string[]): string[] {
-            return this.host.readDirectory(path, exclude, exclude, include);
+            return this.host.readDirectory(path, extensions, exclude, include);
         }
 
         getDirectories(path: string): string[] {
diff --git a/src/services/completions.ts b/src/services/completions.ts
index 72b648e0082..a9395bd665b 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -548,39 +548,39 @@ namespace ts.Completions {
                 return undefined;
             }
 
+            const completionInfo: CompletionInfo = {
+                    isMemberCompletion: false,
+                    /**
+                     * The user may type in a path that doesn't yet exist, creating a "new identifier"
+                     * with respect to the collection of identifiers the server is aware of.
+                     */
+                    isNewIdentifierLocation: true,
+                    entries: []
+            };
+
             const text = sourceFile.text.substr(range.pos, position - range.pos);
 
             const match = tripleSlashDirectiveFragmentRegex.exec(text);
+
             if (match) {
                 const prefix = match[1];
                 const kind = match[2];
                 const toComplete = match[3];
 
                 const scriptPath = getDirectoryPath(sourceFile.path);
-                let entries: CompletionEntry[];
                 if (kind === "path") {
                     // Give completions for a relative path
                     const span: TextSpan = getDirectoryFragmentTextSpan(toComplete, range.pos + prefix.length);
-                    entries = getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getSupportedExtensions(compilerOptions), /*includeExtensions*/true, span, sourceFile.path);
+                    completionInfo.entries = getCompletionEntriesForDirectoryFragment(toComplete, scriptPath, getSupportedExtensions(compilerOptions), /*includeExtensions*/true, span, sourceFile.path);
                 }
                 else {
                     // Give completions based on the typings available
                     const span: TextSpan = { start: range.pos + prefix.length, length: match[0].length - prefix.length };
-                    entries = getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, span);
+                    completionInfo.entries = getCompletionEntriesFromTypings(host, compilerOptions, scriptPath, span);
                 }
-
-                return {
-                    isMemberCompletion: false,
-                    isNewIdentifierLocation: true,
-                    entries
-                };
             }
 
-            return {
-                isMemberCompletion: false,
-                isNewIdentifierLocation: false,
-                entries: []
-            };
+            return completionInfo;
         }
 
         function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts
similarity index 100%
rename from tests/cases/fourslash/completionForStringLiteralRelativeImport1.ts
rename to tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
similarity index 100%
rename from tests/cases/fourslash/completionForStringLiteralRelativeImport2.ts
rename to tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts

From 55d4e124fc783764381aa9c6ac392f7d788d1fe4 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 4 Oct 2016 13:28:43 -0700
Subject: [PATCH 21/27] Fixed a comment

---
 .../tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
index 2f574b9eaf4..524da0c2f0e 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for relative references to ts files when allowJs is false
+// Should give completions for relative references to ts files when allowJs is true.
 
 // @allowJs: true
 

From 2e589f112042bcaf7e64d5f8b404fd04312879a1 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 4 Oct 2016 13:32:37 -0700
Subject: [PATCH 22/27] Actually fixed comments

---
 .../completionForStringLiteralRelativeImportAllowJSFalse.ts     | 2 +-
 .../completionForStringLiteralRelativeImportAllowJSTrue.ts      | 2 +-
 .../tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts       | 2 +-
 .../tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts
index f28d295a220..f343ce8699b 100644
--- a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSFalse.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for ts files when allowJs is false
+// Should give completions for ts files only when allowJs is false.
 
 // @Filename: test0.ts
 //// import * as foo1 from "./*import_as0*/
diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
index a6359537b6b..72b6df52b32 100644
--- a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for ts and js files when allowJs is true
+// Should give completions for ts and js files when allowJs is true.
 
 // @allowJs: true
 
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts
index 2ca68befe25..95a4cd01b60 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSFalse.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for relative references to ts files when allowJs is false
+// Should give completions for relative references to ts files only when allowJs is false.
 
 // @Filename: test0.ts
 //// /// <reference path="/*0*/
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
index 524da0c2f0e..e8fe415824b 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionExtensionsAllowJSTrue.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Should give completions for relative references to ts files when allowJs is true.
+// Should give completions for relative references to ts and js files when allowJs is true.
 
 // @allowJs: true
 

From a12fe2e49181093dec7529fbd1b1a41077343138 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 4 Oct 2016 17:32:24 -0700
Subject: [PATCH 23/27] Eliminate allocation of filtered completions

---
 src/services/completions.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 071cac27bc6..d73e323aaa5 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -351,6 +351,12 @@ namespace ts.Completions {
                 const files = tryReadDirectory(host, baseDirectory, extensions, /*exclude*/undefined, /*include*/["./*"]);
 
                 if (files) {
+                    /**
+                     * Multiple file entries might map to the same truncated name once we remove extensions
+                     * (happens iff includeExtensions === false)so we use a set-like data structure. Eg:
+                     * 
+                     * both foo.ts and foo.tsx become foo
+                     */
                     const foundFiles = createMap<boolean>();
                     for (let filePath of files) {
                         filePath = normalizePath(filePath);
@@ -360,6 +366,11 @@ namespace ts.Completions {
 
                         const foundFileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
 
+                        // Only add entries that contain the basename as a substring.
+                        if (foundFileName.indexOf(baseName) === -1) {
+                            continue;
+                        }
+
                         if (!foundFiles[foundFileName]) {
                             foundFiles[foundFileName] = true;
                         }
@@ -377,13 +388,16 @@ namespace ts.Completions {
                     for (const directory of directories) {
                         const directoryName = getBaseFileName(normalizePath(directory));
 
+                        // Only add entries that contain the basename as a substring.
+                        if (directoryName.indexOf(baseName) === -1) {
+                            continue;
+                        }
+
                         result.push(createCompletionEntryForModule(directoryName, ScriptElementKind.directory, span));
                     }
                 }
             }
 
-            result = result.filter(entry => entry.name.indexOf(baseName) >= 0);
-
             return result;
         }
 

From 617daa9c27649aaea13f842b1a351a2936574f1a Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Tue, 4 Oct 2016 17:48:35 -0700
Subject: [PATCH 24/27] Change fragment initialization

---
 src/services/completions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index d73e323aaa5..f8532e1220d 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -327,7 +327,9 @@ namespace ts.Completions {
          * Given a path ending at a directory, gets the completions for the path, and filters for those entries containing the basename.
          */
         function getCompletionEntriesForDirectoryFragment(fragment: string, scriptPath: string, extensions: string[], includeExtensions: boolean, span: TextSpan, exclude?: string, result: CompletionEntry[] = []): CompletionEntry[] {
-            if (fragment === undefined) { fragment = "./"; }
+            if (fragment === undefined) {
+                fragment = "";
+            }
 
             fragment = normalizeSlashes(fragment);
 

From 24938a7b1c2424d44b923b4ded3327e39e6b0c06 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Wed, 5 Oct 2016 14:34:06 -0700
Subject: [PATCH 25/27] Remove filtering functionality

---
 src/services/completions.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index f8532e1220d..4a6c8608b63 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -333,9 +333,10 @@ namespace ts.Completions {
 
             fragment = normalizeSlashes(fragment);
 
-            const baseName = getBaseFileName(fragment);
-
-            // Remove the basename from our directory path
+            /**
+             * Remove the basename from the path. Note that we don't use the basename to filter completions;
+             * the client is responsible for refining completions.
+             */
             fragment = getDirectoryPath(fragment);
 
             if (fragment === "") {
@@ -368,11 +369,6 @@ namespace ts.Completions {
 
                         const foundFileName = includeExtensions ? getBaseFileName(filePath) : removeFileExtension(getBaseFileName(filePath));
 
-                        // Only add entries that contain the basename as a substring.
-                        if (foundFileName.indexOf(baseName) === -1) {
-                            continue;
-                        }
-
                         if (!foundFiles[foundFileName]) {
                             foundFiles[foundFileName] = true;
                         }
@@ -390,11 +386,6 @@ namespace ts.Completions {
                     for (const directory of directories) {
                         const directoryName = getBaseFileName(normalizePath(directory));
 
-                        // Only add entries that contain the basename as a substring.
-                        if (directoryName.indexOf(baseName) === -1) {
-                            continue;
-                        }
-
                         result.push(createCompletionEntryForModule(directoryName, ScriptElementKind.directory, span));
                     }
                 }

From 4a497fb99451d9231addf87027f57c3eb0d95958 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Wed, 5 Oct 2016 14:53:13 -0700
Subject: [PATCH 26/27] update tests to reflect no completion filtering

---
 ...rStringLiteralRelativeImportAllowJSTrue.ts | 13 ++-------
 ...ipleSlashRefPathCompletionAbsolutePaths.ts |  2 +-
 ...ashRefPathCompletionBackandForwardSlash.ts |  6 +---
 .../tripleSlashRefPathCompletionContext.ts    |  2 +-
 .../tripleSlashRefPathCompletionNarrowing.ts  | 23 ++++-----------
 ...ipleSlashRefPathCompletionRelativePaths.ts | 29 +++++--------------
 6 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
index 72b6df52b32..6eab9aaeca2 100644
--- a/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
+++ b/tests/cases/fourslash/completionForStringLiteralRelativeImportAllowJSTrue.ts
@@ -33,7 +33,8 @@
 const kinds = ["import_as", "import_equals", "require"];
 
 for (const kind of kinds) {
-    goTo.marker(kind + "0");
+    for(let i = 0; i < 2; ++i) {
+    goTo.marker(kind + i);
     verify.completionListContains("f1");
     verify.completionListContains("f2");
     verify.completionListContains("f3");
@@ -43,13 +44,5 @@ for (const kind of kinds) {
     verify.completionListContains("g1");
     verify.completionListContains("g2");
     verify.not.completionListItemsCountIsGreaterThan(8);
-
-    goTo.marker(kind + "1");
-    verify.completionListContains("f1");
-    verify.completionListContains("f2");
-    verify.completionListContains("f3");
-    verify.completionListContains("f4");
-    verify.completionListContains("f5");
-    verify.completionListContains("f6");
-    verify.not.completionListItemsCountIsGreaterThan(6);
+    }
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
index 79e6f7c8b1a..99fffd7a7d6 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionAbsolutePaths.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Offers completions for absolute paths.
+// Exercises completions for absolute paths.
 
 // @Filename: tests/test0.ts
 //// /// <reference path="/tests/cases/f/*0*/
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts
index 838dce4479c..2ec394e1dc8 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionBackandForwardSlash.ts
@@ -61,14 +61,10 @@ verify.completionListContains("d2");
 verify.not.completionListItemsCountIsGreaterThan(2);
 
 function testBlock(offset: number, fileName: string, dir: string) {
-    for (let m = offset; m < offset + 3; ++m) {
+    for (let m = offset; m < offset + 4; ++m) {
         goTo.marker("" + m);
         verify.completionListContains(fileName);
         verify.completionListContains(dir);
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
-
-    goTo.marker("" + (offset + 3));
-        verify.completionListContains(fileName);
-    verify.not.completionListItemsCountIsGreaterThan(1);
 }
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
index 1ee6a666f7c..ccab45a2b21 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionContext.ts
@@ -1,6 +1,6 @@
 /// <reference path='fourslash.ts' />
 
-// Exercises for whether completions are performed depending on where the caret is positioned in the ref comment.
+// Exercises whether completions are supplied, conditional on the caret position in the ref comment.
 
 // @Filename: f.ts
 //// /*f*/
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
index 5f43b3033fc..6bf3a1e72e3 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionNarrowing.ts
@@ -1,7 +1,7 @@
 /// <reference path='fourslash.ts' />
 
-// Exercises relative path completions going up and down 2 directories
-// and the use of forward- and back-slashes and combinations thereof.
+// Exercises how changes in the basename change the completions offered.
+// They should have no effect, as filtering completions is the responsibility of the editor.
 
 // @Filename: f1.ts
 //// /*f1*/
@@ -25,21 +25,10 @@
 //// /// <reference path="./f1.t/*9*/
 //// /// <reference path="./f1.ts/*10*/
 
-for (let m of ["0", "1"]) {
-    goTo.marker(m);
-    verify.completionListContains("f1.ts");
-    verify.completionListContains("f2.ts");
-    verify.not.completionListItemsCountIsGreaterThan(2);
-}
-
-goTo.marker("2");
-verify.completionListContains("d");
-verify.not.completionListItemsCountIsGreaterThan(1);
-
-
-
-for (let m = 3; m < 11; ++m) {
+for (let m = 0; m < 11; ++m) {
     goTo.marker("" + m);
     verify.completionListContains("f1.ts");
-    verify.not.completionListItemsCountIsGreaterThan(1);
+    verify.completionListContains("f2.ts");
+    verify.completionListContains("d");
+    verify.not.completionListItemsCountIsGreaterThan(3);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts b/tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts
index 05863b4f651..ba6af8735f8 100644
--- a/tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts
+++ b/tests/cases/fourslash/tripleSlashRefPathCompletionRelativePaths.ts
@@ -17,17 +17,14 @@
 // @Filename: d1/d2/test.ts
 //// /// <reference path="/*0*/
 //// /// <reference path=".//*1*/
-
 //// /// <reference path="./*2*/
-
 //// /// <reference path="../*3*/
+//// /// <reference path="d3/*4*/
 
-//// /// <reference path="..//*4*/
-//// /// <reference path="..\/*5*/
+//// /// <reference path="..//*5*/
+//// /// <reference path="..\/*6*/
 
-//// /// <reference path="../..//*6*/
-
-//// /// <reference path="d3/*7*/
+//// /// <reference path="../..//*7*/
 
 //// /// <reference path="d3//*8*/
 //// /// <reference path="./d3//*9*/
@@ -40,40 +37,30 @@ parentDirCompletions();
 childDirCompletions();
 
 function workingDirCompletions() {
-    for (let m of ["0", "1",]) {
-        goTo.marker(m);
+    for (let m = 0; m < 5; ++m) {
+        goTo.marker("" + m);
         verify.completionListContains("h.ts");
         verify.completionListContains("d3");
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
-
-    goTo.marker("2");
-    verify.completionListContains("h.ts");
-    verify.not.completionListItemsCountIsGreaterThan(1);
-
-    goTo.marker("3");
-    verify.not.completionListItemsCountIsGreaterThan(0);
 }
 
 function parentDirCompletions() {
 
-    for (let m of ["4", "5"]) {
+    for (let m of ["5", "6"]) {
         goTo.marker(m);
         verify.completionListContains("g.ts");
         verify.completionListContains("d2");
         verify.not.completionListItemsCountIsGreaterThan(2);
     }
 
-    goTo.marker("6");
+    goTo.marker("7");
     verify.completionListContains("f.ts");
     verify.completionListContains("d1");
     verify.not.completionListItemsCountIsGreaterThan(2);
 }
 
 function childDirCompletions() {
-    goTo.marker("7");
-    verify.completionListContains("d3");
-    verify.not.completionListItemsCountIsGreaterThan(1);
 
     for (let m of ["8", "9"]) {
         goTo.marker(m);

From af833aa761b32622cd7742e5d393d615baed27b0 Mon Sep 17 00:00:00 2001
From: Arthur Ozga <aozgaa-ms@outlook.com>
Date: Wed, 5 Oct 2016 15:22:08 -0700
Subject: [PATCH 27/27] provide completions only in the correct bounds

---
 src/services/completions.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/services/completions.ts b/src/services/completions.ts
index 4a6c8608b63..d14480e12b1 100644
--- a/src/services/completions.ts
+++ b/src/services/completions.ts
@@ -1698,9 +1698,15 @@ namespace ts.Completions {
      * Matches a triple slash reference directive with an incomplete string literal for its path. Used
      * to determine if the caret is currently within the string literal and capture the literal fragment
      * for completions.
-     * For example, this matches /// <reference path="fragment
+     * For example, this matches
+     * 
+     * /// <reference path="fragment
+     * 
+     * but not
+     *  
+     * /// <reference path="fragment"
      */
-    const tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3]*)$/;
+    const tripleSlashDirectiveFragmentRegex = /^(\/\/\/\s*<reference\s+(path|types)\s*=\s*(?:'|"))([^\3"]*)$/;
 
     interface VisibleModuleInfo {
         moduleName: string;