Merge pull request #12730 from Microsoft/memberList_to_completionList

Use "completionList" methods instead of "memberList" ones, since they're identical
2025-11-18 17:21:48 +00:00 · 2016-12-07 15:34:32 -08:00
parent 420d6a2c24 9f20077914
commit b0bbbcbe07
174 changed files with 1235 additions and 1293 deletions
@@ -607,23 +607,13 @@ namespace FourSlash {
            });
        }

-        public verifyMemberListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
-            const members = this.getMemberListAtCaret();
-            if (members) {
-                this.assertItemInCompletionList(members.entries, symbol, text, documentation, kind);
-            }
-            else {
-                this.raiseError("Expected a member list, but none was provided");
-            }
-        }
-
-        public verifyMemberListCount(expectedCount: number, negative: boolean) {
+        public verifyCompletionListCount(expectedCount: number, negative: boolean) {
            if (expectedCount === 0 && negative) {
-                this.verifyMemberListIsEmpty(/*negative*/ false);
+                this.verifyCompletionListIsEmpty(/*negative*/ false);
                return;
            }

-            const members = this.getMemberListAtCaret();
+            const members = this.getCompletionListAtCaret();

            if (members) {
                const match = members.entries.length === expectedCount;
@@ -637,13 +627,6 @@ namespace FourSlash {
            }
        }

-        public verifyMemberListDoesNotContain(symbol: string) {
-            const members = this.getMemberListAtCaret();
-            if (members && members.entries.filter(e => e.name === symbol).length !== 0) {
-                this.raiseError(`Member list did contain ${symbol}`);
-            }
-        }
-
        public verifyCompletionListItemsCountIsGreaterThan(count: number, negative: boolean) {
            const completions = this.getCompletionListAtCaret();
            const itemsCount = completions.entries.length;
@@ -685,16 +668,6 @@ namespace FourSlash {
            }
        }

-        public verifyMemberListIsEmpty(negative: boolean) {
-            const members = this.getMemberListAtCaret();
-            if ((!members || members.entries.length === 0) && negative) {
-                this.raiseError("Member list is empty at Caret");
-            }
-            else if ((members && members.entries.length !== 0) && !negative) {
-                this.raiseError(`Member list is not empty at Caret:\nMember List contains: ${stringify(members.entries.map(e => e.name))}`);
-            }
-        }
-
        public verifyCompletionListIsEmpty(negative: boolean) {
            const completions = this.getCompletionListAtCaret();
            if ((!completions || completions.entries.length === 0) && negative) {
@@ -892,10 +865,6 @@ namespace FourSlash {
            this.raiseError(`verifyReferencesAtPositionListContains failed - could not find the item: ${stringify(missingItem)} in the returned list: (${stringify(references)})`);
        }

-        private getMemberListAtCaret() {
-            return this.languageService.getCompletionsAtPosition(this.activeFile.fileName, this.currentCaretPosition);
-        }
-
        private getCompletionListAtCaret() {
            return this.languageService.getCompletionsAtPosition(this.activeFile.fileName, this.currentCaretPosition);
        }
@@ -1353,11 +1322,6 @@ namespace FourSlash {
            Harness.IO.log(stringify(sigHelp));
        }

-        public printMemberListMembers() {
-            const members = this.getMemberListAtCaret();
-            this.printMembersOrCompletions(members);
-        }
-
        public printCompletionListMembers() {
            const completions = this.getCompletionListAtCaret();
            this.printMembersOrCompletions(completions);
@@ -3061,19 +3025,8 @@ namespace FourSlashInterface {
            }
        }

-        // Verifies the member list contains the specified symbol. The
-        // member list is brought up if necessary
-        public memberListContains(symbol: string, text?: string, documentation?: string, kind?: string) {
-            if (this.negative) {
-                this.state.verifyMemberListDoesNotContain(symbol);
-            }
-            else {
-                this.state.verifyMemberListContains(symbol, text, documentation, kind);
-            }
-        }
-
-        public memberListCount(expectedCount: number) {
-            this.state.verifyMemberListCount(expectedCount, this.negative);
+        public completionListCount(expectedCount: number) {
+            this.state.verifyCompletionListCount(expectedCount, this.negative);
        }

        // Verifies the completion list contains the specified symbol. The
@@ -3109,10 +3062,6 @@ namespace FourSlashInterface {
            this.state.verifyCompletionListAllowsNewIdentifier(this.negative);
        }

-        public memberListIsEmpty() {
-            this.state.verifyMemberListIsEmpty(this.negative);
-        }
-
        public signatureHelpPresent() {
            this.state.verifySignatureHelpPresent(!this.negative);
        }
@@ -3514,10 +3463,6 @@ namespace FourSlashInterface {
            this.state.printCurrentSignatureHelp();
        }

-        public printMemberListMembers() {
-            this.state.printMemberListMembers();
-        }
-
        public printCompletionListMembers() {
            this.state.printCompletionListMembers();
        }
@@ -7,6 +7,6 @@

 goTo.eof();
 edit.insert('t.');
-verify.memberListContains('x');
-verify.memberListContains('y');
-verify.not.memberListContains('z');
+verify.completionListContains('x');
+verify.completionListContains('y');
+verify.not.completionListContains('z');
@@ -139,18 +139,18 @@ verify.quickInfos({
 });

 goTo.marker('4');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('5');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -158,18 +158,18 @@ verify.completionListContains("b", "(parameter) b: number", "number to add");
 verify.quickInfoAt("6", "(property) c1.p3: number", "getter property 1\nsetter property 1");

 goTo.marker('7');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -177,48 +177,48 @@ verify.currentParameterHelpArgumentDocCommentIs("number to add");
 verify.quickInfoAt("8q", "(method) c1.p2(b: number): number", "sum with property");

 goTo.marker('9');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 verify.quickInfoAt("10", "(property) c1.p3: number", "getter property 1\nsetter property 1");

 goTo.marker('11');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('12');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -232,18 +232,18 @@ verify.quickInfos({
 });

 goTo.marker('16');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('17');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -251,18 +251,18 @@ verify.completionListContains("b", "(parameter) b: number", "number to add");
 verify.quickInfoAt("18", "(property) c1.pp3: number", "getter property 2\nsetter property 2");

 goTo.marker('19');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('20');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -270,48 +270,48 @@ verify.currentParameterHelpArgumentDocCommentIs("number to add");
 verify.quickInfoAt("20q", "(method) c1.pp2(b: number): number", "sum with property");

 goTo.marker('21');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 verify.quickInfoAt("22", "(property) c1.pp3: number", "getter property 2\nsetter property 2");

 goTo.marker('23');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('24');
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
-verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
-verify.memberListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
-verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
-verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
+verify.completionListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
+verify.completionListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("nc_pp1", "(property) c1.nc_pp1: number", "");
+verify.completionListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "");
+verify.completionListContains("nc_pp3", "(property) c1.nc_pp3: number", "");

 goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("sum with property");
@@ -329,12 +329,12 @@ goTo.marker('29');
 verify.completionListContains("c1", "class c1", "This is comment for c1");

 goTo.marker('30');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 goTo.marker('31');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
@@ -345,12 +345,12 @@ goTo.marker('33');
 verify.completionListContains("c1", "class c1", "This is comment for c1");

 goTo.marker('34');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 goTo.marker('35');
 verify.currentSignatureHelpDocCommentIs("static sum with property");
@@ -359,12 +359,12 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 verify.quickInfoAt("35q", "(method) c1.s2(b: number): number", "static sum with property");

 goTo.marker('36');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 verify.quickInfoAt("37", "(property) c1.s3: number", "static getter property\nsetter property 3");

@@ -372,23 +372,23 @@ goTo.marker('38');
 verify.completionListContains("c1", "class c1", "This is comment for c1");

 goTo.marker('39');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 goTo.marker('40');
 verify.completionListContains("c1", "class c1", "This is comment for c1");

 goTo.marker('41');
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("static sum with property");
@@ -477,12 +477,12 @@ verify.quickInfos({

 goTo.marker("67");
 verify.quickInfoIs("(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
-verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
-verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
+verify.completionListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
+verify.completionListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
+verify.completionListContains("nc_p3", "(property) c1.nc_p3: number", "");

 verify.quickInfos({
    68: "var i1_f: (b: number) => number",
@@ -526,12 +526,12 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");

 goTo.marker('88');
 verify.quickInfoIs("(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
-verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
-verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
-verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
-verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
+verify.completionListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
+verify.completionListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
+verify.completionListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
+verify.completionListContains("nc_s1", "(property) c1.nc_s1: number", "");
+verify.completionListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
+verify.completionListContains("nc_s3", "(property) c1.nc_s3: number", "");

 verify.quickInfos({
    89: "var i1_s_f: (b: number) => number",
@@ -593,10 +593,10 @@ verify.completionListContains("i1_c", "var i1_c: typeof c1", "");

 goTo.marker('110');
 verify.quickInfoIs("(property) cProperties.p2: number", "setter only property");
-verify.memberListContains("p1", "(property) cProperties.p1: number", "getter only property");
-verify.memberListContains("p2", "(property) cProperties.p2: number", "setter only property");
-verify.memberListContains("nc_p1", "(property) cProperties.nc_p1: number", "");
-verify.memberListContains("nc_p2", "(property) cProperties.nc_p2: number", "");
+verify.completionListContains("p1", "(property) cProperties.p1: number", "getter only property");
+verify.completionListContains("p2", "(property) cProperties.p2: number", "setter only property");
+verify.completionListContains("nc_p1", "(property) cProperties.nc_p1: number", "");
+verify.completionListContains("nc_p2", "(property) cProperties.nc_p2: number", "");

 verify.quickInfos({
    111: ["(property) cProperties.p1: number", "getter only property"],
@@ -605,7 +605,7 @@ verify.quickInfos({
 });

 goTo.marker('114');
-verify.memberListContains("a", "(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
+verify.completionListContains("a", "(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
 verify.quickInfoIs("(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");

 goTo.marker('115');
@@ -22,11 +22,11 @@ verify.completionListContains("Colors", "enum Colors", "Enum of colors");
 verify.quickInfoIs("enum Colors", "Enum of colors");

 goTo.marker('6');
-verify.memberListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.memberListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
+verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
 verify.quickInfoIs("(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");

 goTo.marker('7');
-verify.memberListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
-verify.memberListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
+verify.completionListContains("Cornflower", "(enum member) Colors.Cornflower = 0", "Fancy name for 'blue'");
+verify.completionListContains("FancyPink", "(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
 verify.quickInfoIs("(enum member) Colors.FancyPink = 1", "Fancy name for 'pink'");
@@ -46,9 +46,9 @@ goTo.marker('4');
 verify.completionListContains("m1", "namespace m1", "Namespace comment");

 goTo.marker('5');
-verify.memberListContains("b", "var m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace m1.m2");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace m1.m2");

 goTo.marker('6');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -57,8 +57,8 @@ verify.quickInfoAt("6q", "function m1.fooExport(): number", "exported function")
 verify.quickInfoAt("7", "var myvar: m1.m2.c");

 goTo.marker('8');
-verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
+verify.completionListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.completionListContains("i", "var m1.m2.i: m1.m2.c", "i");

 goTo.file("commentsExternalModules_file1.ts");
 verify.quickInfoAt("9", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");
@@ -67,12 +67,12 @@ goTo.marker('10');
 verify.completionListContains("extMod", 'import extMod = require("./commentsExternalModules_file0")', "This is on import declaration");

 goTo.marker('11');
-verify.memberListContains("m1", "namespace extMod.m1");
+verify.completionListContains("m1", "namespace extMod.m1");

 goTo.marker('12');
-verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace extMod.m1.m2");
+verify.completionListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace extMod.m1.m2");

 goTo.marker('13');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -81,5 +81,5 @@ verify.quickInfoAt("13q", "function extMod.m1.fooExport(): number", "exported fu
 verify.quickInfoAt("14", "var newVar: extMod.m1.m2.c");

 goTo.marker('15');
-verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.completionListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.completionListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
@@ -30,12 +30,12 @@ verify.quickInfos({
 });

 goTo.marker('6');
-verify.memberListContains("m1", "namespace extMod.m1");
+verify.completionListContains("m1", "namespace extMod.m1");

 goTo.marker('7');
-verify.memberListContains("b", "var extMod.m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace extMod.m1.m2");
+verify.completionListContains("b", "var extMod.m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function extMod.m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace extMod.m1.m2");

 goTo.marker('8');
 verify.currentSignatureHelpDocCommentIs("exported function");
@@ -45,5 +45,5 @@ verify.quickInfos({
 });

 goTo.marker('10');
-verify.memberListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
-verify.memberListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
+verify.completionListContains("c", "constructor extMod.m1.m2.c(): extMod.m1.m2.c", "");
+verify.completionListContains("i", "var extMod.m1.m2.i: extMod.m1.m2.c", "i");
@@ -221,18 +221,18 @@
 ////}

 goTo.marker('1');
-verify.memberListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
-verify.memberListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
-verify.memberListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i1.p1: number", "");
-verify.memberListContains("f1", "(method) i1.f1(): void", "");
-verify.memberListContains("l1", "(property) i1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i1.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i1.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
+verify.completionListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
+verify.completionListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i1.p1: number", "");
+verify.completionListContains("f1", "(method) i1.f1(): void", "");
+verify.completionListContains("l1", "(property) i1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i1.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i1.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
 goTo.marker('2');
 verify.currentSignatureHelpDocCommentIs("i1_f1");
 goTo.marker('3');
@@ -263,18 +263,18 @@ verify.quickInfos({
 });

 goTo.marker('6');
-verify.memberListContains("i1_p1", "(property) c1.i1_p1: number", "");
-verify.memberListContains("i1_f1", "(method) c1.i1_f1(): void", "");
-verify.memberListContains("i1_l1", "(property) c1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) c1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) c1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) c1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) c1.p1: number", "c1_p1");
-verify.memberListContains("f1", "(method) c1.f1(): void", "c1_f1");
-verify.memberListContains("l1", "(property) c1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "c1_nc_p1");
-verify.memberListContains("nc_f1", "(method) c1.nc_f1(): void", "c1_nc_f1");
-verify.memberListContains("nc_l1", "(property) c1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) c1.i1_p1: number", "");
+verify.completionListContains("i1_f1", "(method) c1.i1_f1(): void", "");
+verify.completionListContains("i1_l1", "(property) c1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) c1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) c1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) c1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) c1.p1: number", "c1_p1");
+verify.completionListContains("f1", "(method) c1.f1(): void", "c1_f1");
+verify.completionListContains("l1", "(property) c1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) c1.nc_p1: number", "c1_nc_p1");
+verify.completionListContains("nc_f1", "(method) c1.nc_f1(): void", "c1_nc_f1");
+verify.completionListContains("nc_l1", "(property) c1.nc_l1: () => void", "");
 goTo.marker('7');
 verify.currentSignatureHelpDocCommentIs("");
 goTo.marker('8');
@@ -305,18 +305,18 @@ verify.quickInfos({
 });

 goTo.marker('11');
-verify.memberListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
-verify.memberListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
-verify.memberListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
-verify.memberListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
-verify.memberListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
-verify.memberListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i1.p1: number", "");
-verify.memberListContains("f1", "(method) i1.f1(): void", "");
-verify.memberListContains("l1", "(property) i1.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i1.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i1.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
+verify.completionListContains("i1_p1", "(property) i1.i1_p1: number", "i1_p1");
+verify.completionListContains("i1_f1", "(method) i1.i1_f1(): void", "i1_f1");
+verify.completionListContains("i1_l1", "(property) i1.i1_l1: () => void", "");
+verify.completionListContains("i1_nc_p1", "(property) i1.i1_nc_p1: number", "");
+verify.completionListContains("i1_nc_f1", "(method) i1.i1_nc_f1(): void", "");
+verify.completionListContains("i1_nc_l1", "(property) i1.i1_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i1.p1: number", "");
+verify.completionListContains("f1", "(method) i1.f1(): void", "");
+verify.completionListContains("l1", "(property) i1.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i1.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i1.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i1.nc_l1: () => void", "");
 goTo.marker('12');
 verify.currentSignatureHelpDocCommentIs("i1_f1");
 goTo.marker('13');
@@ -376,18 +376,18 @@ verify.quickInfos({
 });

 goTo.marker('19');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
-verify.memberListContains("p1", "(property) c2.p1: number", "c2 p1");
-verify.memberListContains("f1", "(method) c2.f1(): void", "c2 f1");
-verify.memberListContains("prop", "(property) c2.prop: number", "c2 prop");
-verify.memberListContains("nc_p1", "(property) c2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c2.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c2.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
+verify.completionListContains("p1", "(property) c2.p1: number", "c2 p1");
+verify.completionListContains("f1", "(method) c2.f1(): void", "c2 f1");
+verify.completionListContains("prop", "(property) c2.prop: number", "c2 prop");
+verify.completionListContains("nc_p1", "(property) c2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c2.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c2.nc_prop: number", "");
 goTo.marker('20');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('21');
@@ -405,18 +405,18 @@ verify.quickInfos({
 });

 goTo.marker('24');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
-verify.memberListContains("p1", "(property) c3.p1: number", "c3 p1");
-verify.memberListContains("f1", "(method) c3.f1(): void", "c3 f1");
-verify.memberListContains("prop", "(property) c3.prop: number", "c3 prop");
-verify.memberListContains("nc_p1", "(property) c3.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c3.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c3.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number", "");
+verify.completionListContains("p1", "(property) c3.p1: number", "c3 p1");
+verify.completionListContains("f1", "(method) c3.f1(): void", "c3 f1");
+verify.completionListContains("prop", "(property) c3.prop: number", "c3 prop");
+verify.completionListContains("nc_p1", "(property) c3.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c3.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c3.nc_prop: number", "");
 goTo.marker('25');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('26');
@@ -434,18 +434,18 @@ verify.quickInfos({
 });

 goTo.marker('29');
-verify.memberListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
-verify.memberListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
-verify.memberListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
-verify.memberListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
-verify.memberListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
-verify.memberListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number");
-verify.memberListContains("p1", "(property) c2.p1: number", "c2 p1");
-verify.memberListContains("f1", "(method) c2.f1(): void", "c2 f1");
-verify.memberListContains("prop", "(property) c2.prop: number", "c2 prop");
-verify.memberListContains("nc_p1", "(property) c2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) c2.nc_f1(): void", "");
-verify.memberListContains("nc_prop", "(property) c2.nc_prop: number", "");
+verify.completionListContains("c2_p1", "(property) c2.c2_p1: number", "c2 c2_p1");
+verify.completionListContains("c2_f1", "(method) c2.c2_f1(): void", "c2 c2_f1");
+verify.completionListContains("c2_prop", "(property) c2.c2_prop: number", "c2 c2_prop");
+verify.completionListContains("c2_nc_p1", "(property) c2.c2_nc_p1: number", "");
+verify.completionListContains("c2_nc_f1", "(method) c2.c2_nc_f1(): void", "");
+verify.completionListContains("c2_nc_prop", "(property) c2.c2_nc_prop: number");
+verify.completionListContains("p1", "(property) c2.p1: number", "c2 p1");
+verify.completionListContains("f1", "(method) c2.f1(): void", "c2 f1");
+verify.completionListContains("prop", "(property) c2.prop: number", "c2 prop");
+verify.completionListContains("nc_p1", "(property) c2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) c2.nc_f1(): void", "");
+verify.completionListContains("nc_prop", "(property) c2.nc_prop: number", "");
 goTo.marker('30');
 verify.currentSignatureHelpDocCommentIs("c2 c2_f1");
 goTo.marker('31');
@@ -478,18 +478,18 @@ verify.completionListContains("c4", "class c4", "");
 verify.completionListContains("c4_i", "var c4_i: c4", "");

 goTo.marker('36');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i2.p1: number", "i2 p1");
-verify.memberListContains("f1", "(method) i2.f1(): void", "i2 f1");
-verify.memberListContains("l1", "(property) i2.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i2.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i2.p1: number", "i2 p1");
+verify.completionListContains("f1", "(method) i2.f1(): void", "i2 f1");
+verify.completionListContains("l1", "(property) i2.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i2.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
 goTo.marker('37');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('38');
@@ -521,18 +521,18 @@ verify.quickInfos({
 });

 goTo.marker('41');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i3.p1: number", "i3 p1");
-verify.memberListContains("f1", "(method) i3.f1(): void", "i3 f1");
-verify.memberListContains("l1", "(property) i3.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i3.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i3.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i3.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i3.p1: number", "i3 p1");
+verify.completionListContains("f1", "(method) i3.f1(): void", "i3 f1");
+verify.completionListContains("l1", "(property) i3.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i3.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i3.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i3.nc_l1: () => void", "");
 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('43');
@@ -562,18 +562,18 @@ verify.quickInfos({
 });

 goTo.marker('46');
-verify.memberListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
-verify.memberListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
-verify.memberListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
-verify.memberListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
-verify.memberListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
-verify.memberListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
-verify.memberListContains("p1", "(property) i2.p1: number", "i2 p1");
-verify.memberListContains("f1", "(method) i2.f1(): void", "i2 f1");
-verify.memberListContains("l1", "(property) i2.l1: () => void", "");
-verify.memberListContains("nc_p1", "(property) i2.nc_p1: number", "");
-verify.memberListContains("nc_f1", "(method) i2.nc_f1(): void", "");
-verify.memberListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
+verify.completionListContains("i2_p1", "(property) i2.i2_p1: number", "i2_p1");
+verify.completionListContains("i2_f1", "(method) i2.i2_f1(): void", "i2_f1");
+verify.completionListContains("i2_l1", "(property) i2.i2_l1: () => void", "");
+verify.completionListContains("i2_nc_p1", "(property) i2.i2_nc_p1: number", "");
+verify.completionListContains("i2_nc_f1", "(method) i2.i2_nc_f1(): void", "");
+verify.completionListContains("i2_nc_l1", "(property) i2.i2_nc_l1: () => void", "");
+verify.completionListContains("p1", "(property) i2.p1: number", "i2 p1");
+verify.completionListContains("f1", "(method) i2.f1(): void", "i2 f1");
+verify.completionListContains("l1", "(property) i2.l1: () => void", "");
+verify.completionListContains("nc_p1", "(property) i2.nc_p1: number", "");
+verify.completionListContains("nc_f1", "(method) i2.nc_f1(): void", "");
+verify.completionListContains("nc_l1", "(property) i2.nc_l1: () => void", "");
 goTo.marker('47');
 verify.currentSignatureHelpDocCommentIs("i2_f1");
 goTo.marker('48');
@@ -80,12 +80,12 @@ verify.quickInfos({

 goTo.marker('8');
 verify.quickInfoIs("(property) i2.x: number", "this is x");
-verify.memberListContains("x", "(property) i2.x: number", "this is x");
-verify.memberListContains("foo", "(property) i2.foo: (b: number) => string", "this is foo");
-verify.memberListContains("nc_x", "(property) i2.nc_x: number", "");
-verify.memberListContains("nc_foo", "(property) i2.nc_foo: (b: number) => string", "");
-verify.memberListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this is fnfoo");
-verify.memberListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");
+verify.completionListContains("x", "(property) i2.x: number", "this is x");
+verify.completionListContains("foo", "(property) i2.foo: (b: number) => string", "this is foo");
+verify.completionListContains("nc_x", "(property) i2.nc_x: number", "");
+verify.completionListContains("nc_foo", "(property) i2.nc_foo: (b: number) => string", "");
+verify.completionListContains("fnfoo", "(method) i2.fnfoo(b: number): string", "this is fnfoo");
+verify.completionListContains("nc_fnfoo", "(method) i2.nc_fnfoo(b: number): string", "");

 verify.quickInfos({
    9: "var i2_i_foo: (b: number) => string",
@@ -199,12 +199,12 @@ verify.completionListContains("i3_i", "var i3_i: i3", "");

 goTo.marker('41');
 verify.quickInfoIs("(method) i3.f(a: number): string", "Function i3 f");
-verify.memberListContains("f", "(method) i3.f(a: number): string", "Function i3 f");
-verify.memberListContains("l", "(property) i3.l: (b: number) => string", "");
-verify.memberListContains("x", "(property) i3.x: number", "Comment i3 x");
-verify.memberListContains("nc_f", "(method) i3.nc_f(a: number): string", "");
-verify.memberListContains("nc_l", "(property) i3.nc_l: (b: number) => string", "");
-verify.memberListContains("nc_x", "(property) i3.nc_x: number", "");
+verify.completionListContains("f", "(method) i3.f(a: number): string", "Function i3 f");
+verify.completionListContains("l", "(property) i3.l: (b: number) => string", "");
+verify.completionListContains("x", "(property) i3.x: number", "Comment i3 x");
+verify.completionListContains("nc_f", "(method) i3.nc_f(a: number): string", "");
+verify.completionListContains("nc_l", "(property) i3.nc_l: (b: number) => string", "");
+verify.completionListContains("nc_x", "(property) i3.nc_x: number", "");

 goTo.marker('42');
 verify.currentSignatureHelpDocCommentIs("Function i3 f");
@@ -110,9 +110,9 @@ goTo.marker('4');
 verify.completionListContains("m1", "namespace m1", "Namespace comment");

 goTo.marker('5');
-verify.memberListContains("b", "var m1.b: number", "b's comment");
-verify.memberListContains("fooExport", "function m1.fooExport(): number", "exported function");
-verify.memberListContains("m2", "namespace m1.m2");
+verify.completionListContains("b", "var m1.b: number", "b's comment");
+verify.completionListContains("fooExport", "function m1.fooExport(): number", "exported function");
+verify.completionListContains("m2", "namespace m1.m2");
 verify.quickInfoIs("function m1.fooExport(): number", "exported function");

 goTo.marker('6');
@@ -122,55 +122,55 @@ verify.quickInfoAt("7", "var myvar: m1.m2.c");

 goTo.marker('8');
 verify.quickInfoIs("constructor m1.m2.c(): m1.m2.c");
-verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
-verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
+verify.completionListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
+verify.completionListContains("i", "var m1.m2.i: m1.m2.c", "i");

 goTo.marker('9');
 verify.completionListContains("m2", "namespace m2", "namespace comment of m2.m3");
 verify.quickInfoIs("namespace m2", "namespace comment of m2.m3");

 goTo.marker('10');
-verify.memberListContains("m3", "namespace m2.m3");
+verify.completionListContains("m3", "namespace m2.m3");
 verify.quickInfoIs("namespace m2.m3", "namespace comment of m2.m3");

 goTo.marker('11');
 verify.quickInfoIs("constructor m2.m3.c(): m2.m3.c");
-verify.memberListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
+verify.completionListContains("c", "constructor m2.m3.c(): m2.m3.c", "");

 goTo.marker('12');
 verify.completionListContains("m3", "namespace m3", "namespace comment of m3.m4.m5");
 verify.quickInfoIs("namespace m3", "namespace comment of m3.m4.m5");

 goTo.marker('13');
-verify.memberListContains("m4", "namespace m3.m4", "namespace comment of m3.m4.m5");
+verify.completionListContains("m4", "namespace m3.m4", "namespace comment of m3.m4.m5");
 verify.quickInfoIs("namespace m3.m4", "namespace comment of m3.m4.m5");

 goTo.marker('14');
-verify.memberListContains("m5", "namespace m3.m4.m5");
+verify.completionListContains("m5", "namespace m3.m4.m5");
 verify.quickInfoIs("namespace m3.m4.m5", "namespace comment of m3.m4.m5");

 goTo.marker('15');
 verify.quickInfoIs("constructor m3.m4.m5.c(): m3.m4.m5.c");
-verify.memberListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
+verify.completionListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");

 goTo.marker('16');
 verify.completionListContains("m4", "namespace m4", "namespace comment of m4.m5.m6");
 verify.quickInfoIs("namespace m4", "namespace comment of m4.m5.m6");

 goTo.marker('17');
-verify.memberListContains("m5", "namespace m4.m5", "namespace comment of m4.m5.m6");
+verify.completionListContains("m5", "namespace m4.m5", "namespace comment of m4.m5.m6");
 verify.quickInfoIs("namespace m4.m5", "namespace comment of m4.m5.m6");

 goTo.marker('18');
-verify.memberListContains("m6", "namespace m4.m5.m6");
+verify.completionListContains("m6", "namespace m4.m5.m6");
 verify.quickInfoIs("namespace m4.m5.m6", "namespace comment of m4.m5.m6");

 goTo.marker('19');
-verify.memberListContains("m7", "namespace m4.m5.m6.m7");
+verify.completionListContains("m7", "namespace m4.m5.m6.m7");
 verify.quickInfoIs("namespace m4.m5.m6.m7");

 goTo.marker('20');
-verify.memberListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
+verify.completionListContains("c", "constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
 verify.quickInfoIs("constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c");

 goTo.marker('21');
@@ -178,19 +178,19 @@ verify.completionListContains("m5", "namespace m5");
 verify.quickInfoIs("namespace m5", "namespace comment of m5.m6.m7");

 goTo.marker('22');
-verify.memberListContains("m6", "namespace m5.m6");
+verify.completionListContains("m6", "namespace m5.m6");
 verify.quickInfoIs("namespace m5.m6", "namespace comment of m5.m6.m7");

 goTo.marker('23');
-verify.memberListContains("m7", "namespace m5.m6.m7");
+verify.completionListContains("m7", "namespace m5.m6.m7");
 verify.quickInfoIs("namespace m5.m6.m7", "namespace comment of m5.m6.m7");

 goTo.marker('24');
-verify.memberListContains("m8", "namespace m5.m6.m7.m8");
+verify.completionListContains("m8", "namespace m5.m6.m7.m8");
 verify.quickInfoIs("namespace m5.m6.m7.m8", "namespace m8 comment");

 goTo.marker('25');
-verify.memberListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
+verify.completionListContains("c", "constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c", "");
 verify.quickInfoIs("constructor m5.m6.m7.m8.c(): m5.m6.m7.m8.c");

 goTo.marker('26');
@@ -198,15 +198,15 @@ verify.completionListContains("m6", "namespace m6");
 verify.quickInfoIs("namespace m6");

 goTo.marker('27');
-verify.memberListContains("m7", "namespace m6.m7");
+verify.completionListContains("m7", "namespace m6.m7");
 verify.quickInfoIs("namespace m6.m7");

 goTo.marker('28');
-verify.memberListContains("m8", "namespace m6.m7.m8");
+verify.completionListContains("m8", "namespace m6.m7.m8");
 verify.quickInfoIs("namespace m6.m7.m8");

 goTo.marker('29');
-verify.memberListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
+verify.completionListContains("c", "constructor m6.m7.m8.c(): m6.m7.m8.c", "");
 verify.quickInfoIs("constructor m6.m7.m8.c(): m6.m7.m8.c");

 goTo.marker('30');
@@ -214,15 +214,15 @@ verify.completionListContains("m7", "namespace m7");
 verify.quickInfoIs("namespace m7");

 goTo.marker('31');
-verify.memberListContains("m8", "namespace m7.m8");
+verify.completionListContains("m8", "namespace m7.m8");
 verify.quickInfoIs("namespace m7.m8");

 goTo.marker('32');
-verify.memberListContains("m9", "namespace m7.m8.m9");
+verify.completionListContains("m9", "namespace m7.m8.m9");
 verify.quickInfoIs("namespace m7.m8.m9", "namespace m9 comment");

 goTo.marker('33');
-verify.memberListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
+verify.completionListContains("c", "constructor m7.m8.m9.c(): m7.m8.m9.c", "");
 verify.quickInfoIs("constructor m7.m8.m9.c(): m7.m8.m9.c");

 goTo.marker('34');
@@ -326,10 +326,10 @@ goTo.marker('22q');
 verify.quickInfoAt("22q", "var i1_i: i1(b: string) => number (+1 overload)", "this is signature 2");

 goTo.marker('23');
-verify.memberListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
-verify.memberListContains('foo2', '(method) i1.foo2(a: number): number (+1 overload)', '');
-verify.memberListContains('foo3', '(method) i1.foo3(a: number): number (+1 overload)', '');
-verify.memberListContains('foo4', '(method) i1.foo4(a: number): number (+1 overload)', 'foo4 1');
+verify.completionListContains('foo', '(method) i1.foo(a: number): number (+1 overload)', 'foo 1');
+verify.completionListContains('foo2', '(method) i1.foo2(a: number): number (+1 overload)', '');
+verify.completionListContains('foo3', '(method) i1.foo3(a: number): number (+1 overload)', '');
+verify.completionListContains('foo4', '(method) i1.foo4(a: number): number (+1 overload)', 'foo4 1');

 goTo.marker('24');
 verify.currentSignatureHelpDocCommentIs("foo 1");
@@ -432,11 +432,11 @@ verify.currentParameterHelpArgumentDocCommentIs("");
 verify.quickInfoAt("43q", "var i4_i: i4(b: string) => number (+1 overload)");

 goTo.marker('44');
-verify.memberListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
-verify.memberListContains('prop2', '(method) c.prop2(a: number): number (+1 overload)', 'prop2 1');
-verify.memberListContains('prop3', '(method) c.prop3(a: number): number (+1 overload)', '');
-verify.memberListContains('prop4', '(method) c.prop4(a: number): number (+1 overload)', 'prop4 1');
-verify.memberListContains('prop5', '(method) c.prop5(a: number): number (+1 overload)', 'prop5 1');
+verify.completionListContains('prop1', '(method) c.prop1(a: number): number (+1 overload)', '');
+verify.completionListContains('prop2', '(method) c.prop2(a: number): number (+1 overload)', 'prop2 1');
+verify.completionListContains('prop3', '(method) c.prop3(a: number): number (+1 overload)', '');
+verify.completionListContains('prop4', '(method) c.prop4(a: number): number (+1 overload)', 'prop4 1');
+verify.completionListContains('prop5', '(method) c.prop5(a: number): number (+1 overload)', 'prop5 1');

 goTo.marker('45');
 verify.currentSignatureHelpDocCommentIs("");
@@ -15,6 +15,6 @@
 ////x./**/

 goTo.marker();
-verify.memberListContains("commonProperty", "(property) commonProperty: string | number");
-verify.memberListContains("commonFunction", "(method) commonFunction(): number");
-verify.memberListCount(2);
+verify.completionListContains("commonProperty", "(property) commonProperty: string | number");
+verify.completionListContains("commonFunction", "(method) commonFunction(): number");
+verify.completionListCount(2);
@@ -15,6 +15,6 @@
 ////x.commonProperty./**/

 goTo.marker();
-verify.memberListContains("toString", "(method) toString(): string");
-verify.memberListContains("valueOf", "(method) valueOf(): string | number");
-verify.memberListCount(2);
+verify.completionListContains("toString", "(method) toString(): string");
+verify.completionListContains("valueOf", "(method) valueOf(): string | number");
+verify.completionListCount(2);
@@ -16,9 +16,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);

 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
@@ -22,9 +22,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);

 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
@@ -18,9 +18,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);

 goTo.marker('1');
 verify.completionListContains("jspm:browser");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(2);
+verify.completionListCount(2);
@@ -16,9 +16,9 @@
 goTo.marker('0');
 verify.completionListContains("jspm");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(1);
+verify.completionListCount(1);

 goTo.marker('1');
 verify.completionListContains("jspm:dev");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(4);
+verify.completionListCount(4);
@@ -8,8 +8,8 @@

 goTo.marker('1');
 verify.completionListContains("Option 1");
-verify.memberListCount(3);
+verify.completionListCount(3);

 goTo.marker('2');
 verify.completionListContains("Option 2");
-verify.memberListCount(3);
+verify.completionListCount(3);
@@ -12,9 +12,9 @@
 goTo.marker('1');
 verify.completionListContains("foo");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);

 goTo.marker('2');
 verify.completionListContains("some other name");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
@@ -12,9 +12,9 @@
 goTo.marker('1');
 verify.completionListContains("A");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);

 goTo.marker('2');
 verify.completionListContains("A");
 verify.completionListAllowsNewIdentifier();
-verify.memberListCount(3);
+verify.completionListCount(3);
@@ -20,4 +20,4 @@ verify.quickInfoIs('function f(p1: "literal", p2: "literal", p3: "other1" | "oth
 goTo.marker('2');
 verify.completionListContains("other1");
 verify.completionListContains("other2");
-verify.memberListCount(2);
+verify.completionListCount(2);
@@ -9,5 +9,5 @@
 //// }

 goTo.marker();
-verify.memberListContains("charAt");
-verify.memberListCount(1);
+verify.completionListContains("charAt");
+verify.completionListCount(1);
@@ -8,4 +8,4 @@
 ////testModule./**/

 goTo.marker();
-verify.memberListContains("foo");
+verify.completionListContains("foo");
@@ -3,5 +3,5 @@
 ////var v = { x: 4, y: 3 }./**/

 goTo.marker();
-verify.not.memberListContains('a');
-verify.memberListContains('x');
+verify.not.completionListContains('a');
+verify.completionListContains('x');
@@ -4,5 +4,5 @@
 /////a/./**/

 goTo.marker();
-verify.not.memberListContains('v');
-verify.memberListContains('compile');
+verify.not.completionListContains('v');
+verify.completionListContains('compile');
@@ -3,5 +3,5 @@
 /////a/./**/

 goTo.marker();
-verify.not.memberListContains('alert');
-verify.memberListContains('compile');
+verify.not.completionListContains('alert');
+verify.completionListContains('compile');
@@ -3,5 +3,5 @@
 ////"a"./**/

 goTo.marker();
-verify.not.memberListContains('alert');
-verify.memberListContains('charAt');
+verify.not.completionListContains('alert');
+verify.completionListContains('charAt');
@@ -15,4 +15,4 @@

 goTo.marker();
 verify.completionListIsEmpty();
-verify.memberListIsEmpty();
+verify.completionListIsEmpty();
@@ -15,4 +15,4 @@

 goTo.marker();
 verify.completionListIsEmpty();
-verify.memberListIsEmpty();
+verify.completionListIsEmpty();
@@ -3,4 +3,4 @@
 //// if(0 === ''.

 goTo.eof();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");
@@ -8,4 +8,4 @@
 ////var p = <Shapes.

 goTo.eof();
-verify.memberListContains("Point");
+verify.completionListContains("Point");
@@ -19,4 +19,4 @@


 goTo.marker();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");
@@ -18,9 +18,9 @@


 goTo.marker("TypeReference");
-verify.memberListContains("C1");
-verify.memberListContains("C2");
+verify.completionListContains("C1");
+verify.completionListContains("C2");

 goTo.marker("ValueReference");
-verify.memberListContains("C1");
-verify.memberListContains("C2");
+verify.completionListContains("C1");
+verify.completionListContains("C2");
@@ -14,17 +14,17 @@

 goTo.marker("c1");
 edit.insert(".");
-verify.memberListContains("x");
-verify.memberListContains("prototype");
-verify.memberListContains("staticMethod");
+verify.completionListContains("x");
+verify.completionListContains("prototype");
+verify.completionListContains("staticMethod");

 goTo.marker("c2");
 edit.insert(".");
-verify.memberListContains("x");
-verify.memberListContains("staticMethod");
-verify.memberListContains("prototype");
+verify.completionListContains("x");
+verify.completionListContains("staticMethod");
+verify.completionListContains("prototype");

 goTo.marker("c3");
 edit.insert(".");
-verify.memberListContains("doStuff");
-verify.memberListCount(1);
+verify.completionListContains("doStuff");
+verify.completionListCount(1);
@@ -25,46 +25,46 @@


 goTo.marker("staticsInsideClassScope");
-verify.memberListContains("privateStaticProperty");
-verify.memberListContains("privateStaticMethod");
-verify.memberListContains("publicStaticProperty");
-verify.memberListContains("publicStaticMethod");
+verify.completionListContains("privateStaticProperty");
+verify.completionListContains("privateStaticMethod");
+verify.completionListContains("publicStaticProperty");
+verify.completionListContains("publicStaticMethod");
 // No instance properties
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateInstanceMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateInstanceMethod");
 // constructors should have a 'prototype' member
-verify.memberListContains("prototype");
+verify.completionListContains("prototype");

 goTo.marker("instanceMembersInsideClassScope");
-verify.memberListContains("privateProperty");
-verify.memberListContains("privateInstanceMethod");
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicInstanceMethod");
+verify.completionListContains("privateProperty");
+verify.completionListContains("privateInstanceMethod");
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicInstanceMethod");
 // No statics
-verify.not.memberListContains("privateStaticProperty");
-verify.not.memberListContains("privateStaticMethod");
+verify.not.completionListContains("privateStaticProperty");
+verify.not.completionListContains("privateStaticMethod");


 goTo.marker("staticsOutsideClassScope");
 // No privates
-verify.not.memberListContains("privateStaticProperty");
-verify.not.memberListContains("privateStaticMethod");
+verify.not.completionListContains("privateStaticProperty");
+verify.not.completionListContains("privateStaticMethod");
 // Only publics
-verify.memberListContains("publicStaticProperty");
-verify.memberListContains("publicStaticMethod");
+verify.completionListContains("publicStaticProperty");
+verify.completionListContains("publicStaticMethod");
 // No instance properties
-verify.not.memberListContains("publicProperty");
-verify.not.memberListContains("publicInstanceMethod");
+verify.not.completionListContains("publicProperty");
+verify.not.completionListContains("publicInstanceMethod");
 // constructors should have a 'prototype' member
-verify.memberListContains("prototype");
+verify.completionListContains("prototype");

 goTo.marker("instanceMembersOutsideClassScope");
 // No privates
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateInstanceMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateInstanceMethod");
 // Only publics
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicInstanceMethod");
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicInstanceMethod");
 // No statics
-verify.not.memberListContains("publicStaticProperty");
-verify.not.memberListContains("publicStaticMethod");
+verify.not.completionListContains("publicStaticProperty");
+verify.not.completionListContains("publicStaticMethod");
@@ -10,15 +10,15 @@
 ////Foo.bar./*enumValueReference*/;

 goTo.marker('valueReference');
-verify.memberListContains("bar");
-verify.memberListContains("baz");
-verify.memberListCount(2);
+verify.completionListContains("bar");
+verify.completionListContains("baz");
+verify.completionListCount(2);


 goTo.marker('typeReference');
-verify.memberListCount(2);
+verify.completionListCount(2);

 goTo.marker('enumValueReference');
-verify.memberListContains("toString");
-verify.memberListContains("toFixed");
-verify.memberListCount(6);
+verify.completionListContains("toString");
+verify.completionListContains("toFixed");
+verify.completionListCount(6);
@@ -15,18 +15,18 @@

 goTo.marker("enumVariable");
 // Should only have the enum's own members, and nothing else
-verify.memberListContains("Red");
-verify.memberListContains("Green");
-verify.memberListCount(2);
+verify.completionListContains("Red");
+verify.completionListContains("Green");
+verify.completionListCount(2);


 goTo.marker("variableOfEnumType");
 // Should have number members, and not enum members
-verify.memberListContains("toString");
-verify.not.memberListContains("Red");
+verify.completionListContains("toString");
+verify.not.completionListContains("Red");


 goTo.marker("callOfEnumReturnType");
 // Should have number members, and not enum members
-verify.memberListContains("toString");
-verify.not.memberListContains("Red");
+verify.completionListContains("toString");
+verify.not.completionListContains("Red");
@@ -6,5 +6,5 @@
 /////*1*/var bar;

 goTo.marker();
-verify.memberListContains("fun");
+verify.completionListContains("fun");
 verify.not.errorExistsAfterMarker("1");
@@ -10,4 +10,4 @@
 //// test./**/

 goTo.marker();
-verify.not.memberListContains("x");
+verify.not.completionListContains("x");
@@ -19,17 +19,17 @@
 ////spreadNull./*3*/a;
 ////spreadUndefined./*4*/a;
 goTo.marker('1');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListContains('b', '(property) b: string');
-verify.memberListCount(2);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListContains('b', '(property) b: string');
+verify.completionListCount(2);
 goTo.marker('2');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListContains('b', '(property) b: boolean');
-verify.memberListContains('c', '(property) c: number');
-verify.memberListCount(3);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListContains('b', '(property) b: boolean');
+verify.completionListContains('c', '(property) c: number');
+verify.completionListCount(3);
 goTo.marker('3');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListCount(1);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListCount(1);
 goTo.marker('4');
-verify.memberListContains('a', '(property) a: number');
-verify.memberListCount(1);
+verify.completionListContains('a', '(property) a: number');
+verify.completionListCount(1);
@@ -8,6 +8,6 @@
 ////var { x, ...rest } = t;
 ////rest./*1*/x;
 goTo.marker('1');
-verify.memberListContains('parent', '(property) Gen.parent: Gen');
-verify.memberListContains('millenial', '(property) Gen.millenial: string');
-verify.memberListCount(2);
+verify.completionListContains('parent', '(property) Gen.parent: Gen');
+verify.completionListContains('millenial', '(property) Gen.millenial: string');
+verify.completionListCount(2);
@@ -3,5 +3,5 @@
 //// var person: {name:string; id: number} = { n/**/

 goTo.marker();
-verify.memberListContains('name');
-verify.memberListContains('id');
+verify.completionListContains('name');
+verify.completionListContains('id');
@@ -3,5 +3,5 @@
 //// var person: {name:string; id: number} = { n/**/

 goTo.marker();
-verify.memberListContains('name');
-verify.memberListContains('id');
+verify.completionListContains('name');
+verify.completionListContains('id');
@@ -8,4 +8,4 @@
 ////fnc1./**/

 goTo.marker();
-verify.memberListContains('arguments', '(property) Function.arguments: any');
+verify.completionListContains('arguments', '(property) Function.arguments: any');
@@ -52,26 +52,26 @@
 ////}

 goTo.marker("objectMembers");
-verify.memberListContains("hasOwnProperty");
-verify.memberListContains("isPrototypeOf");
-verify.memberListContains("toString");
+verify.completionListContains("hasOwnProperty");
+verify.completionListContains("isPrototypeOf");
+verify.completionListContains("toString");

 goTo.marker("interfaceMembers");
-verify.memberListContains("bar11");
-verify.memberListContains("bar12");
-verify.memberListContains("bar21");
-verify.memberListContains("bar22");
+verify.completionListContains("bar11");
+verify.completionListContains("bar12");
+verify.completionListContains("bar21");
+verify.completionListContains("bar22");

 goTo.marker("callableMembers");
-verify.memberListContains("name");
-verify.memberListContains("apply");
-verify.memberListContains("call");
-verify.memberListContains("bind");
+verify.completionListContains("name");
+verify.completionListContains("apply");
+verify.completionListContains("call");
+verify.completionListContains("bind");

 goTo.marker("publicOnlyMemebers");
-verify.memberListContains("publicProperty");
-verify.memberListContains("publicMethod");
-verify.not.memberListContains("privateProperty");
-verify.not.memberListContains("privateMethod");
-verify.not.memberListContains("publicStaticMethod");
-verify.not.memberListContains("privateStaticMethod");
+verify.completionListContains("publicProperty");
+verify.completionListContains("publicMethod");
+verify.not.completionListContains("privateProperty");
+verify.not.completionListContains("privateMethod");
+verify.not.completionListContains("publicStaticMethod");
+verify.not.completionListContains("privateStaticMethod");
@@ -6,7 +6,7 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
@@ -7,12 +7,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -8,12 +8,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -8,12 +8,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
@@ -8,14 +8,14 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v"); // questionable
+verify.completionListContains("v"); // questionable
@@ -11,4 +11,4 @@

 goTo.marker("1");

-verify.memberListContains("MyType");
+verify.completionListContains("MyType");
@@ -11,15 +11,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");  // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");  // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");  // REVIEW: Is this intended behavior?

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,8 +9,8 @@

 goTo.marker("1");

-verify.not.memberListContains("I");
-verify.not.memberListContains("TString");
-verify.not.memberListContains("TNumber");
-verify.not.memberListContains("foo");
-verify.not.memberListContains("obj");
+verify.not.completionListContains("I");
+verify.not.completionListContains("TString");
+verify.not.completionListContains("TNumber");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
@@ -4,4 +4,4 @@
 /////**/

 goTo.marker();
-verify.memberListContains("a");
+verify.completionListContains("a");
@@ -6,5 +6,5 @@
 ////class Bar extends mod./**/

 goTo.marker();
-verify.memberListContains("Foo");
-verify.memberListCount(1);
+verify.completionListContains("Foo");
+verify.completionListCount(1);
@@ -7,10 +7,10 @@
 ////}/*editDeclaration*/

 goTo.marker("requestCompletion");
-verify.memberListContains("foo");
+verify.completionListContains("foo");

 goTo.marker("memberCompletion");
-verify.memberListContains("toExponential");
+verify.completionListContains("toExponential");

 // Now change the decl by adding a semicolon
 goTo.marker("editDeclaration");
@@ -18,7 +18,7 @@ edit.insert(";");

 // foo should still be there
 goTo.marker("requestCompletion");
-verify.memberListContains("foo");
+verify.completionListContains("foo");

 goTo.marker("memberCompletion");
-verify.memberListContains("toExponential");
+verify.completionListContains("toExponential");
@@ -15,13 +15,13 @@
 ////fo/*referenceInGlobalScope*/o;

 goTo.marker("globalScope");
-verify.memberListContains("foo");
+verify.completionListContains("foo");

 goTo.marker("insideFunctionDeclaration");
-verify.memberListContains("foo");
+verify.completionListContains("foo");

 goTo.marker("insideFunctionExpression");
-verify.memberListContains("foo");
+verify.completionListContains("foo");

 verify.quickInfos({
    referenceInsideFunctionExpression: "(local function) foo(): number",
@@ -12,5 +12,5 @@
 ////t.pos = { x: 4, y: 3 + t./**/ };

 goTo.marker();
-verify.not.memberListContains('x');
-verify.memberListContains('name');
+verify.not.completionListContains('x');
+verify.completionListContains('name');
@@ -6,6 +6,6 @@
 ////    /**/

 goTo.marker()
-verify.memberListContains('xa');
-verify.memberListContains('xb');
-verify.memberListCount(2);
+verify.completionListContains('xa');
+verify.completionListContains('xb');
+verify.completionListCount(2);
@@ -61,44 +61,44 @@


 goTo.marker("valueReference");
-verify.memberListContains("localVariable");
-verify.memberListContains("exportedVaribale");
+verify.completionListContains("localVariable");
+verify.completionListContains("exportedVaribale");

-verify.memberListContains("localFunction");
-verify.memberListContains("exportedFunction");
+verify.completionListContains("localFunction");
+verify.completionListContains("exportedFunction");

-verify.memberListContains("localClass");
-verify.memberListContains("exportedClass");
+verify.completionListContains("localClass");
+verify.completionListContains("exportedClass");

-verify.memberListContains("localModule");
-verify.memberListContains("exportedModule");
+verify.completionListContains("localModule");
+verify.completionListContains("exportedModule");

-verify.memberListContains("exportedVaribale2");
-verify.memberListContains("exportedFunction2");
-verify.memberListContains("exportedClass2");
-verify.memberListContains("exportedModule2");
+verify.completionListContains("exportedVaribale2");
+verify.completionListContains("exportedFunction2");
+verify.completionListContains("exportedClass2");
+verify.completionListContains("exportedModule2");

 goTo.marker("typeReference");
-verify.memberListContains("localInterface");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("localInterface");
+verify.completionListContains("exportedInterface");

-verify.memberListContains("localClass");
-verify.memberListContains("exportedClass");
+verify.completionListContains("localClass");
+verify.completionListContains("exportedClass");

-verify.memberListContains("localModule");
-verify.memberListContains("exportedModule");
+verify.completionListContains("localModule");
+verify.completionListContains("exportedModule");

-verify.memberListContains("exportedClass2");
-verify.memberListContains("exportedModule2");
+verify.completionListContains("exportedClass2");
+verify.completionListContains("exportedModule2");

 goTo.marker("insideMethod");
-verify.not.memberListContains("property");
-verify.not.memberListContains("testMethod");
-verify.not.memberListContains("staticMethod");
+verify.not.completionListContains("property");
+verify.not.completionListContains("testMethod");
+verify.not.completionListContains("staticMethod");

-verify.memberListContains("globalVar");
-verify.memberListContains("globalFunction");
+verify.completionListContains("globalVar");
+verify.completionListContains("globalFunction");

-verify.memberListContains("param");
-verify.memberListContains("localVar");
-verify.memberListContains("localFunction");
+verify.completionListContains("param");
+verify.completionListContains("localVar");
+verify.completionListContains("localFunction");
@@ -3,11 +3,11 @@
 //// type constructorType<T1, T2> = new <T/*1*/, /*2*/

 goTo.marker("1");
-verify.memberListContains("T");
-verify.memberListContains("T1");
-verify.memberListContains("T2");
+verify.completionListContains("T");
+verify.completionListContains("T1");
+verify.completionListContains("T2");

 goTo.marker("2");
-verify.memberListContains("T");
-verify.memberListContains("T1");
-verify.memberListContains("T2");
+verify.completionListContains("T");
+verify.completionListContains("T1");
+verify.completionListContains("T2");
@@ -7,6 +7,6 @@
 ////aaa = { /*9*/

 goTo.marker("9");
-verify.memberListContains("x");
-verify.memberListCount(1);
+verify.completionListContains("x");
+verify.completionListCount(1);

@@ -7,7 +7,7 @@
 ////aaa.x = { /*10*/

 goTo.marker("10");
-verify.memberListContains("a");
-verify.memberListCount(1);
+verify.completionListContains("a");
+verify.completionListCount(1);


@@ -10,7 +10,7 @@
 ////};

 goTo.marker("15");
-verify.not.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(1);
+verify.not.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(1);

@@ -9,24 +9,24 @@
 ////};

 goTo.marker();
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);

 //      x|
 edit.insert("x");
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);

 //      x1|
 edit.insert("1");
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);

 //      x1: null,|
 edit.insert(": null,");
-verify.not.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(1);
+verify.not.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(1);
@@ -9,6 +9,6 @@
 ////};

 goTo.marker();
-verify.memberListContains("x1");
-verify.memberListContains("y1");
-verify.memberListCount(2);
+verify.completionListContains("x1");
+verify.completionListContains("y1");
+verify.completionListCount(2);
@@ -6,7 +6,7 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");
@@ -5,12 +5,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -6,12 +6,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -5,12 +5,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -6,12 +6,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // questionable
@@ -6,12 +6,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
@@ -6,12 +6,12 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c"); // definitely questionable
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c"); // definitely questionable
@@ -6,14 +6,14 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v"); // questionable
+verify.completionListContains("v"); // questionable
@@ -7,14 +7,14 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v"); // questionable
+verify.completionListContains("v"); // questionable
@@ -9,4 +9,4 @@

 goTo.marker("1");

-verify.memberListContains("MyType");
+verify.completionListContains("MyType");
@@ -9,4 +9,4 @@

 goTo.marker("1");

-verify.memberListContains("MyType");
+verify.completionListContains("MyType");
@@ -10,4 +10,4 @@

 goTo.marker("1");

-verify.memberListContains("MyType");
+verify.completionListContains("MyType");
@@ -11,4 +11,4 @@

 goTo.marker("1");

-verify.memberListContains("MyType");
+verify.completionListContains("MyType");
@@ -11,15 +11,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -10,15 +10,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -9,15 +9,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -9,15 +9,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -10,15 +10,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -9,15 +9,15 @@

 goTo.marker("1");

-verify.memberListContains("foo");
-verify.memberListContains("x");
-verify.memberListContains("y");
-verify.memberListContains("z");
+verify.completionListContains("foo");
+verify.completionListContains("x");
+verify.completionListContains("y");
+verify.completionListContains("z");

-verify.memberListContains("bar");
-verify.memberListContains("a");
-verify.memberListContains("b");
-verify.memberListContains("c");
+verify.completionListContains("bar");
+verify.completionListContains("a");
+verify.completionListContains("b");
+verify.completionListContains("c");

-verify.memberListContains("v");
-verify.memberListContains("p");
+verify.completionListContains("v");
+verify.completionListContains("p");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber");
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber");

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber"); // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,10 +9,10 @@

 goTo.marker("1");

-verify.memberListContains("I");
-verify.memberListContains("TString");
-verify.memberListContains("TNumber"); // REVIEW: Is this intended behavior?
+verify.completionListContains("I");
+verify.completionListContains("TString");
+verify.completionListContains("TNumber"); // REVIEW: Is this intended behavior?

 // Ideally the following shouldn't show up since they're not types.
-verify.memberListContains("foo");
-verify.memberListContains("obj");
+verify.completionListContains("foo");
+verify.completionListContains("obj");
@@ -9,8 +9,8 @@

 goTo.marker("1");

-verify.not.memberListContains("I");
-verify.not.memberListContains("TString");
-verify.not.memberListContains("TNumber");
-verify.not.memberListContains("foo");
-verify.not.memberListContains("obj");
+verify.not.completionListContains("I");
+verify.not.completionListContains("TString");
+verify.not.completionListContains("TNumber");
+verify.not.completionListContains("foo");
+verify.not.completionListContains("obj");
@@ -32,32 +32,32 @@

 // Same class, everything is visible
 goTo.marker("1");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');

 goTo.marker("2");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');

 // Can not access protected properties overridden in subclass
 goTo.marker("3");
-verify.memberListContains('privateMethod');
-verify.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.completionListContains('privateMethod');
+verify.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
@@ -33,44 +33,44 @@

 // Same class, everything is visible
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');

 // Can not access properties on super
 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.not.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.not.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');

 // Can not access protected properties through base class
 goTo.marker("3");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');

 // Same class, everything is visible
 goTo.marker("4");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.memberListContains('protectedMethod');
-verify.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.completionListContains('protectedMethod');
+verify.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
@@ -26,21 +26,21 @@

 // Only public properties are visible outside the class
 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');

 goTo.marker("2");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.not.memberListContains('protectedOverriddenMethod');
-verify.not.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.not.completionListContains('protectedOverriddenMethod');
+verify.not.completionListContains('protectedOverriddenProperty');
@@ -24,11 +24,11 @@


 goTo.marker("1");
-verify.not.memberListContains('privateMethod');
-verify.not.memberListContains('privateProperty');
-verify.not.memberListContains('protectedMethod');
-verify.not.memberListContains('protectedProperty');
-verify.memberListContains('publicMethod');
-verify.memberListContains('publicProperty');
-verify.memberListContains('protectedOverriddenMethod');
-verify.memberListContains('protectedOverriddenProperty');
+verify.not.completionListContains('privateMethod');
+verify.not.completionListContains('privateProperty');
+verify.not.completionListContains('protectedMethod');
+verify.not.completionListContains('protectedProperty');
+verify.completionListContains('publicMethod');
+verify.completionListContains('publicProperty');
+verify.completionListContains('protectedOverriddenMethod');
+verify.completionListContains('protectedOverriddenProperty');
@@ -21,4 +21,4 @@ verify.completionListContains("any");
 verify.completionListContains("$");

 // Nothing else should show up
-verify.memberListCount(4);
+verify.completionListCount(4);
@@ -6,6 +6,6 @@
 ////var x = Foo./**/

 goTo.marker();
-verify.memberListContains("X");
-verify.memberListContains("Y");
-verify.memberListCount(2);
+verify.completionListContains("X");
+verify.completionListContains("Y");
+verify.completionListCount(2);
@@ -3,46 +3,46 @@
 /////**/

 goTo.marker();
-verify.memberListContains("break");
-verify.memberListContains("case");
-verify.memberListContains("catch");
-verify.memberListContains("class");
-verify.memberListContains("constructor");
-verify.memberListContains("continue");
-verify.memberListContains("debugger");
-verify.memberListContains("declare");
-verify.memberListContains("default");
-verify.memberListContains("delete");
-verify.memberListContains("do");
-verify.memberListContains("else");
-verify.memberListContains("enum");
-verify.memberListContains("export");
-verify.memberListContains("extends");
-verify.memberListContains("false");
-verify.memberListContains("finally");
-verify.memberListContains("for");
-verify.memberListContains("function");
-verify.memberListContains("get");
-verify.memberListContains("if");
-verify.memberListContains("implements");
-verify.memberListContains("import");
-verify.memberListContains("in");
-verify.memberListContains("instanceof");
-verify.memberListContains("interface");
-verify.memberListContains("module");
-verify.memberListContains("new");
-verify.memberListContains("private");
-verify.memberListContains("public");
-verify.memberListContains("return");
-verify.memberListContains("set");
-verify.memberListContains("static");
-verify.memberListContains("super");
-verify.memberListContains("switch");
-verify.memberListContains("this");
-verify.memberListContains("throw");
-verify.memberListContains("true");
-verify.memberListContains("try");
-verify.memberListContains("typeof");
-verify.memberListContains("var");
-verify.memberListContains("while");
-verify.memberListContains("with");
+verify.completionListContains("break");
+verify.completionListContains("case");
+verify.completionListContains("catch");
+verify.completionListContains("class");
+verify.completionListContains("constructor");
+verify.completionListContains("continue");
+verify.completionListContains("debugger");
+verify.completionListContains("declare");
+verify.completionListContains("default");
+verify.completionListContains("delete");
+verify.completionListContains("do");
+verify.completionListContains("else");
+verify.completionListContains("enum");
+verify.completionListContains("export");
+verify.completionListContains("extends");
+verify.completionListContains("false");
+verify.completionListContains("finally");
+verify.completionListContains("for");
+verify.completionListContains("function");
+verify.completionListContains("get");
+verify.completionListContains("if");
+verify.completionListContains("implements");
+verify.completionListContains("import");
+verify.completionListContains("in");
+verify.completionListContains("instanceof");
+verify.completionListContains("interface");
+verify.completionListContains("module");
+verify.completionListContains("new");
+verify.completionListContains("private");
+verify.completionListContains("public");
+verify.completionListContains("return");
+verify.completionListContains("set");
+verify.completionListContains("static");
+verify.completionListContains("super");
+verify.completionListContains("switch");
+verify.completionListContains("this");
+verify.completionListContains("throw");
+verify.completionListContains("true");
+verify.completionListContains("try");
+verify.completionListContains("typeof");
+verify.completionListContains("var");
+verify.completionListContains("while");
+verify.completionListContains("with");
@@ -22,35 +22,35 @@
 ////interface TestInterface implements Module./*TypeReferenceInImplementsList*/ { }

 goTo.marker("ValueReference");
-verify.memberListContains("exportedVariable");
-verify.memberListContains("exportedFunction");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
+verify.completionListContains("exportedVariable");
+verify.completionListContains("exportedFunction");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
 // No inner declarations
-verify.not.memberListContains("innerVariable");
-verify.not.memberListContains("innerClass");
+verify.not.completionListContains("innerVariable");
+verify.not.completionListContains("innerClass");
 // Include type declarations
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedInterface");

 goTo.marker("TypeReference");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");

 goTo.marker("TypeReferenceInExtendsList");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");


 goTo.marker("TypeReferenceInImplementsList");
-verify.memberListContains("exportedClass");
-verify.memberListContains("exportedModule");
-verify.memberListContains("exportedInterface");
+verify.completionListContains("exportedClass");
+verify.completionListContains("exportedModule");
+verify.completionListContains("exportedInterface");
 // Include value completions
-verify.memberListContains("exportedVariable");
+verify.completionListContains("exportedVariable");

@@ -10,5 +10,5 @@
 ////object./**/

 goTo.marker();
-verify.memberListContains("bar", '(property) bar: any');
-verify.memberListContains("foo", '(method) foo(bar: any): any');
+verify.completionListContains("bar", '(property) bar: any');
+verify.completionListContains("foo", '(method) foo(bar: any): any');
--- a/Show More
+++ b/Show More