Merge branch 'master' into tsconfigMixedContentSupport

Jakefile.js

@@ -250,6 +250,7 @@ var harnessSources = harnessCoreSources.concat([
     "convertToBase64.ts",
     "transpile.ts",
     "reuseProgramStructure.ts",
+    "textStorage.ts",
     "cachingInServerLSHost.ts",
     "moduleResolution.ts",
     "tsconfigParsing.ts",

src/compiler/checker.ts

@@ -13475,13 +13475,14 @@ namespace ts {
                 const containingClass = getContainingClass(node);
                 if (containingClass) {
                     const containingType = getTypeOfNode(containingClass);
-                    const baseTypes = getBaseTypes(<InterfaceType>containingType);
-                    if (baseTypes.length) {
+                    let baseTypes = getBaseTypes(containingType as InterfaceType);
+                    while (baseTypes.length) {
                         const baseType = baseTypes[0];
                         if (modifiers & ModifierFlags.Protected &&
                             baseType.symbol === declaration.parent.symbol) {
                             return true;
                         }
+                        baseTypes = getBaseTypes(baseType as InterfaceType);
                     }
                 }
                 if (modifiers & ModifierFlags.Private) {
@@ -16207,7 +16208,7 @@ namespace ts {
                 return undefined;
             }
 
-            const onfulfilledParameterType = getTypeWithFacts(getUnionType(map(thenSignatures, getTypeOfFirstParameterOfSignature)), TypeFacts.NEUndefined);
+            const onfulfilledParameterType = getTypeWithFacts(getUnionType(map(thenSignatures, getTypeOfFirstParameterOfSignature)), TypeFacts.NEUndefinedOrNull);
             if (isTypeAny(onfulfilledParameterType)) {
                 return undefined;
             }
@@ -16701,6 +16702,14 @@ namespace ts {
             }
         }
 
+        function isRemovedPropertyFromObjectSpread(node: Node) {
+            if (isBindingElement(node) && isObjectBindingPattern(node.parent)) {
+                const lastElement = lastOrUndefined(node.parent.elements);
+                return lastElement !== node && !!lastElement.dotDotDotToken;
+            }
+            return false;
+        }
+
         function errorUnusedLocal(node: Node, name: string) {
             if (isIdentifierThatStartsWithUnderScore(node)) {
                 const declaration = getRootDeclaration(node.parent);
@@ -16710,7 +16719,10 @@ namespace ts {
                     return;
                 }
             }
-            error(node, Diagnostics._0_is_declared_but_never_used, name);
+
+            if (!isRemovedPropertyFromObjectSpread(node.kind === SyntaxKind.Identifier ? node.parent : node)) {
+                error(node, Diagnostics._0_is_declared_but_never_used, name);
+            }
         }
 
         function parameterNameStartsWithUnderscore(parameterName: DeclarationName) {

src/compiler/core.ts

@@ -863,24 +863,6 @@ namespace ts {
         return result;
     }
 
-    /**
-     * Reduce the properties defined on a map-like (but not from its prototype chain).
-     *
-     * NOTE: This is intended for use with MapLike<T> objects. For Map<T> objects, use
-     *       reduceProperties instead as it offers better performance.
-     *
-     * @param map The map-like to reduce
-     * @param callback An aggregation function that is called for each entry in the map
-     * @param initial The initial value for the reduction.
-     */
-    export function reduceOwnProperties<T, U>(map: MapLike<T>, callback: (aggregate: U, value: T, key: string) => U, initial: U): U {
-        let result = initial;
-        for (const key in map) if (hasOwnProperty.call(map, key)) {
-            result = callback(result, map[key], String(key));
-        }
-        return result;
-    }
-
     /**
      * Performs a shallow equality comparison of the contents of two map-likes.
      *

src/compiler/sourcemap.ts

@@ -427,7 +427,7 @@ namespace ts {
 
             encodeLastRecordedSourceMapSpan();
 
-            return stringify({
+            return JSON.stringify({
                 version: 3,
                 file: sourceMapData.sourceMapFile,
                 sourceRoot: sourceMapData.sourceMapSourceRoot,

src/compiler/transformers/ts.ts

@@ -1223,11 +1223,12 @@ namespace ts {
             }
 
             const { firstAccessor, secondAccessor, setAccessor } = getAllAccessorDeclarations(node.members, accessor);
-            if (accessor !== firstAccessor) {
+            const firstAccessorWithDecorators = firstAccessor.decorators ? firstAccessor : secondAccessor && secondAccessor.decorators ? secondAccessor : undefined;
+            if (!firstAccessorWithDecorators || accessor !== firstAccessorWithDecorators) {
                 return undefined;
             }
 
-            const decorators = firstAccessor.decorators || (secondAccessor && secondAccessor.decorators);
+            const decorators = firstAccessorWithDecorators.decorators;
             const parameters = getDecoratorsOfParameters(setAccessor);
             if (!decorators && !parameters) {
                 return undefined;

src/compiler/utilities.ts

@@ -3189,55 +3189,6 @@ namespace ts {
         return output;
     }
 
-    /**
-     * Serialize an object graph into a JSON string. This is intended only for use on an acyclic graph
-     * as the fallback implementation does not check for circular references by default.
-     */
-    export const stringify: (value: any) => string = typeof JSON !== "undefined" && JSON.stringify
-        ? JSON.stringify
-        : stringifyFallback;
-
-    /**
-     * Serialize an object graph into a JSON string.
-     */
-    function stringifyFallback(value: any): string {
-        // JSON.stringify returns `undefined` here, instead of the string "undefined".
-        return value === undefined ? undefined : stringifyValue(value);
-    }
-
-    function stringifyValue(value: any): string {
-        return typeof value === "string" ? `"${escapeString(value)}"`
-            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
-                : typeof value === "boolean" ? value ? "true" : "false"
-                    : typeof value === "object" && value ? isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
-                        : /*fallback*/ "null";
-    }
-
-    function cycleCheck(cb: (value: any) => string, value: any) {
-        Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
-        value.__cycle = true;
-        const result = cb(value);
-        delete value.__cycle;
-        return result;
-    }
-
-    function stringifyArray(value: any) {
-        return `[${reduceLeft(value, stringifyElement, "")}]`;
-    }
-
-    function stringifyElement(memo: string, value: any) {
-        return (memo ? memo + "," : memo) + stringifyValue(value);
-    }
-
-    function stringifyObject(value: any) {
-        return `{${reduceOwnProperties(value, stringifyProperty, "")}}`;
-    }
-
-    function stringifyProperty(memo: string, value: any, key: string) {
-        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
-            : (memo ? memo + "," : memo) + `"${escapeString(key)}":${stringifyValue(value)}`;
-    }
-
     const base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
     /**

src/harness/fourslash.ts

@@ -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();
         }

src/harness/unittests/textStorage.ts

@@ -0,0 +1,71 @@
+/// <reference path="../harness.ts" />
+/// <reference path="../../server/scriptVersionCache.ts"/>
+/// <reference path="./tsserverProjectSystem.ts" />
+
+namespace ts.textStorage {
+    describe("Text storage", () => {
+        const f = {
+            path: "/a/app.ts",
+            content: `
+                let x = 1;
+                let y = 2;
+                function bar(a: number) {
+                    return a + 1;
+                }`
+        };
+
+        it("text based storage should be have exactly the same as script version cache", () => {
+
+            debugger
+            const host = ts.projectSystem.createServerHost([f]);
+
+            const ts1 = new server.TextStorage(host, server.asNormalizedPath(f.path));
+            const ts2 = new server.TextStorage(host, server.asNormalizedPath(f.path));
+
+            ts1.useScriptVersionCache();
+            ts2.useText();
+
+            const lineMap = computeLineStarts(f.content);
+
+            for (let line = 0; line < lineMap.length; line++) {
+                const start = lineMap[line];
+                const end = line === lineMap.length - 1 ? f.path.length : lineMap[line + 1];
+
+                for (let offset = 0; offset < end - start; offset++) {
+                    const pos1 = ts1.lineOffsetToPosition(line + 1, offset + 1);
+                    const pos2 = ts2.lineOffsetToPosition(line + 1, offset + 1);
+                    assert.isTrue(pos1 === pos2, `lineOffsetToPosition ${line + 1}-${offset + 1}: expected ${pos1} to equal ${pos2}`);
+                }
+
+                const {start: start1, length: length1 } = ts1.lineToTextSpan(line);
+                const {start: start2, length: length2 } = ts2.lineToTextSpan(line);
+                assert.isTrue(start1 === start2, `lineToTextSpan ${line}::start:: expected ${start1} to equal ${start2}`);
+                assert.isTrue(length1 === length2, `lineToTextSpan ${line}::length:: expected ${length1} to equal ${length2}`);
+            }
+
+            for (let pos = 0; pos < f.content.length; pos++) {
+                const { line: line1, offset: offset1 } = ts1.positionToLineOffset(pos);
+                const { line: line2, offset: offset2 } = ts2.positionToLineOffset(pos);
+                assert.isTrue(line1 === line2, `positionToLineOffset ${pos}::line:: expected ${line1} to equal ${line2}`);
+                assert.isTrue(offset1 === offset2, `positionToLineOffset ${pos}::offset:: expected ${offset1} to equal ${offset2}`);
+            }
+        });
+
+        it("should switch to script version cache if necessary", () => {
+            const host = ts.projectSystem.createServerHost([f]);
+            const ts1 = new server.TextStorage(host, server.asNormalizedPath(f.path));
+
+            ts1.getSnapshot();
+            assert.isTrue(!ts1.hasScriptVersionCache(), "should not have script version cache - 1");
+
+            ts1.edit(0, 5, "   ");
+            assert.isTrue(ts1.hasScriptVersionCache(), "have script version cache - 1");
+
+            ts1.useText();
+            assert.isTrue(!ts1.hasScriptVersionCache(), "should not have script version cache - 2");
+
+            ts1.getLineInfo(0);
+            assert.isTrue(ts1.hasScriptVersionCache(), "have script version cache - 2");
+        })
+    });
+}

src/harness/unittests/tsserverProjectSystem.ts

@@ -1635,7 +1635,7 @@ namespace ts.projectSystem {
             const project = projectService.externalProjects[0];
 
             const scriptInfo = project.getScriptInfo(file1.path);
-            const snap = scriptInfo.snap();
+            const snap = scriptInfo.getSnapshot();
             const actualText = snap.getText(0, snap.getLength());
             assert.equal(actualText, "", `expected content to be empty string, got "${actualText}"`);
 
@@ -1648,7 +1648,7 @@ namespace ts.projectSystem {
             projectService.closeClientFile(file1.path);
 
             const scriptInfo2 = project.getScriptInfo(file1.path);
-            const snap2 = scriptInfo2.snap();
+            const snap2 = scriptInfo2.getSnapshot();
             const actualText2 = snap2.getText(0, snap.getLength());
             assert.equal(actualText2, "", `expected content to be empty string, got "${actualText2}"`);
         });
@@ -2346,13 +2346,13 @@ namespace ts.projectSystem {
             p.updateGraph();
 
             const scriptInfo = p.getScriptInfo(f.path);
-            checkSnapLength(scriptInfo.snap(), f.content.length);
+            checkSnapLength(scriptInfo.getSnapshot(), f.content.length);
 
             // open project and replace its content with empty string
             projectService.openClientFile(f.path, "");
-            checkSnapLength(scriptInfo.snap(), 0);
+            checkSnapLength(scriptInfo.getSnapshot(), 0);
         });
-        function checkSnapLength(snap: server.LineIndexSnapshot, expectedLength: number) {
+        function checkSnapLength(snap: IScriptSnapshot, expectedLength: number) {
             assert.equal(snap.getLength(), expectedLength, "Incorrect snapshot size");
         }
     });
@@ -2505,7 +2505,6 @@ namespace ts.projectSystem {
             const cwd = {
                 path: "/a/c"
             };
-            debugger;
             const host = createServerHost([f1, config, node, cwd], { currentDirectory: cwd.path });
             const projectService = createProjectService(host);
             projectService.openClientFile(f1.path);
@@ -2776,7 +2775,7 @@ namespace ts.projectSystem {
 
             // verify content
             const projectServiice = session.getProjectService();
-            const snap1 = projectServiice.getScriptInfo(f1.path).snap();
+            const snap1 = projectServiice.getScriptInfo(f1.path).getSnapshot();
             assert.equal(snap1.getText(0, snap1.getLength()), tmp.content, "content should be equal to the content of temp file");
 
             // reload from original file file
@@ -2788,7 +2787,7 @@ namespace ts.projectSystem {
             });
 
             // verify content
-            const snap2 = projectServiice.getScriptInfo(f1.path).snap();
+            const snap2 = projectServiice.getScriptInfo(f1.path).getSnapshot();
             assert.equal(snap2.getText(0, snap2.getLength()), f1.content, "content should be equal to the content of original file");
 
         });

src/server/editorServices.ts

@@ -429,7 +429,7 @@ namespace ts.server {
                 this.handleDeletedFile(info);
             }
             else {
-                if (info && (!info.isOpen)) {
+                if (info && (!info.isScriptOpen())) {
                     // file has been changed which might affect the set of referenced files in projects that include 
                     // this file and set of inferred projects
                     info.reloadFromFile();
@@ -445,7 +445,7 @@ namespace ts.server {
 
             // TODO: handle isOpen = true case
 
-            if (!info.isOpen) {
+            if (!info.isScriptOpen()) {
                 this.filenameToScriptInfo.remove(info.path);
                 this.lastDeletedFile = info;
 
@@ -639,10 +639,9 @@ namespace ts.server {
             // Closing file should trigger re-reading the file content from disk. This is
             // because the user may chose to discard the buffer content before saving
             // to the disk, and the server's version of the file can be out of sync.
-            info.reloadFromFile();
+            info.close();
 
             removeItemFromSet(this.openFiles, info);
-            info.isOpen = false;
 
             // collect all projects that should be removed
             let projectsToRemove: Project[];
@@ -999,7 +998,7 @@ namespace ts.server {
                 }
                 if (toAdd) {
                     for (const f of toAdd) {
-                        if (f.isOpen && isRootFileInInferredProject(f)) {
+                        if (f.isScriptOpen() && isRootFileInInferredProject(f)) {
                             // if file is already root in some inferred project 
                             // - remove the file from that project and delete the project if necessary
                             const inferredProject = f.containingProjects[0];
@@ -1099,36 +1098,35 @@ namespace ts.server {
         getOrCreateScriptInfoForNormalizedPath(fileName: NormalizedPath, openedByClient: boolean, fileContent?: string, scriptKind?: ScriptKind, hasMixedContent?: boolean) {
             let info = this.getScriptInfoForNormalizedPath(fileName);
             if (!info) {
-                let content: string;
-                if (this.host.fileExists(fileName)) {
-                    // by default pick whatever content was supplied as the argument
-                    // if argument was not given - then for mixed content files assume that its content is empty string
-                    content = fileContent || (hasMixedContent ? "" : this.host.readFile(fileName));
-                }
-                if (!content) {
-                    if (openedByClient) {
-                        content = "";
-                    }
-                }
-                if (content !== undefined) {
-                    info = new ScriptInfo(this.host, fileName, content, scriptKind, openedByClient, hasMixedContent);
-                    // do not watch files with mixed content - server doesn't know how to interpret it
+                if (openedByClient || this.host.fileExists(fileName)) {
+                    info = new ScriptInfo(this.host, fileName, scriptKind, hasMixedContent);
+
                     this.filenameToScriptInfo.set(info.path, info);
-                    if (!info.isOpen && !hasMixedContent) {
-                        info.setWatcher(this.host.watchFile(fileName, _ => this.onSourceFileChanged(fileName)));
+
+                    if (openedByClient) {
+                        if (fileContent === undefined) {
+                            // if file is opened by client and its content is not specified - use file text
+                            fileContent = this.host.readFile(fileName) || "";
+                        }
+                    }
+                    else {
+                        // do not watch files with mixed content - server doesn't know how to interpret it
+                        if (!hasMixedContent) {
+                            info.setWatcher(this.host.watchFile(fileName, _ => this.onSourceFileChanged(fileName)));
+                        }
                     }
                 }
             }
             if (info) {
-                if (fileContent !== undefined) {
-                    info.reload(fileContent);
-                }
-                if (openedByClient) {
-                    info.isOpen = true;
+                if (openedByClient && !info.isScriptOpen()) {
+                    info.open(fileContent);
                     if (hasMixedContent) {
                         info.registerFileUpdate();
                     }
                 }
+                else if (fileContent !== undefined) {
+                    info.reload(fileContent);
+                }
             }
             return info;
         }
@@ -1247,7 +1245,6 @@ namespace ts.server {
             const info = this.getScriptInfoForNormalizedPath(toNormalizedPath(uncheckedFileName));
             if (info) {
                 this.closeOpenFile(info);
-                info.isOpen = false;
             }
             this.printProjects();
         }
@@ -1272,7 +1269,7 @@ namespace ts.server {
             if (openFiles) {
                 for (const file of openFiles) {
                     const scriptInfo = this.getScriptInfo(file.fileName);
-                    Debug.assert(!scriptInfo || !scriptInfo.isOpen);
+                    Debug.assert(!scriptInfo || !scriptInfo.isScriptOpen());
                     const normalizedPath = scriptInfo ? scriptInfo.fileName : toNormalizedPath(file.fileName);
                     this.openClientFileWithNormalizedPath(normalizedPath, file.content, tryConvertScriptKindName(file.scriptKind), file.hasMixedContent);
                 }

src/server/lsHost.ts

@@ -169,7 +169,7 @@ namespace ts.server {
         getScriptSnapshot(filename: string): ts.IScriptSnapshot {
             const scriptInfo = this.project.getScriptInfoLSHost(filename);
             if (scriptInfo) {
-                return scriptInfo.snap();
+                return scriptInfo.getSnapshot();
             }
         }
 

src/server/project.ts

@@ -453,7 +453,7 @@ namespace ts.server {
 
         containsFile(filename: NormalizedPath, requireOpen?: boolean) {
             const info = this.projectService.getScriptInfoForNormalizedPath(filename);
-            if (info && (info.isOpen || !requireOpen)) {
+            if (info && (info.isScriptOpen() || !requireOpen)) {
                 return this.containsScriptInfo(info);
             }
         }

src/server/scriptInfo.ts

@@ -2,6 +2,161 @@
 
 namespace ts.server {
 
+    /* @internal */
+    export class TextStorage {
+        private svc: ScriptVersionCache | undefined;
+        private svcVersion = 0;
+
+        private text: string;
+        private lineMap: number[];
+        private textVersion = 0;
+
+        constructor(private readonly host: ServerHost, private readonly fileName: NormalizedPath) {
+        }
+
+        public getVersion() {
+            return this.svc
+                ? `SVC-${this.svcVersion}-${this.svc.getSnapshot().version}`
+                : `Text-${this.textVersion}`;
+        }
+
+        public hasScriptVersionCache() {
+            return this.svc !== undefined;
+        }
+
+        public useScriptVersionCache(newText?: string) {
+            this.switchToScriptVersionCache(newText);
+        }
+
+        public useText() {
+            this.svc = undefined;
+            this.reloadFromFile();
+        }
+
+        public edit(start: number, end: number, newText: string) {
+            this.switchToScriptVersionCache().edit(start, end - start, newText);
+        }
+
+        public reload(text: string) {
+            if (this.svc) {
+                this.svc.reload(text);
+            }
+            else {
+                this.setText(text);
+            }
+        }
+
+        public reloadFromFile(tempFileName?: string) {
+            if (this.svc || (tempFileName !== this.fileName)) {
+                this.reload(this.getFileText(tempFileName))
+            }
+            else {
+                this.setText(undefined);
+            }
+        }
+
+        public getSnapshot(): IScriptSnapshot {
+            return this.svc
+                ? this.svc.getSnapshot()
+                : ScriptSnapshot.fromString(this.getOrLoadText());
+        }
+
+        public getLineInfo(line: number) {
+            return this.switchToScriptVersionCache().getSnapshot().index.lineNumberToInfo(line);
+        }
+        /**
+         *  @param line 0 based index
+         */
+        lineToTextSpan(line: number) {
+            if (!this.svc) {
+                const lineMap = this.getLineMap();
+                const start = lineMap[line]; // -1 since line is 1-based
+                const end = line + 1 < lineMap.length ? lineMap[line + 1] : this.text.length;
+                return ts.createTextSpanFromBounds(start, end);
+            }
+            const index = this.svc.getSnapshot().index;
+            const lineInfo = index.lineNumberToInfo(line + 1);
+            let len: number;
+            if (lineInfo.leaf) {
+                len = lineInfo.leaf.text.length;
+            }
+            else {
+                const nextLineInfo = index.lineNumberToInfo(line + 2);
+                len = nextLineInfo.offset - lineInfo.offset;
+            }
+            return ts.createTextSpan(lineInfo.offset, len);
+        }
+
+        /**
+         * @param line 1 based index
+         * @param offset 1 based index
+         */
+        lineOffsetToPosition(line: number, offset: number): number {
+            if (!this.svc) {
+                return computePositionOfLineAndCharacter(this.getLineMap(), line - 1, offset - 1);
+            }
+            const index = this.svc.getSnapshot().index;
+
+            const lineInfo = index.lineNumberToInfo(line);
+            // TODO: assert this offset is actually on the line
+            return (lineInfo.offset + offset - 1);
+        }
+
+        /**
+         * @param line 1-based index
+         * @param offset 1-based index
+         */
+        positionToLineOffset(position: number): ILineInfo {
+            if (!this.svc) {
+                const { line, character } = computeLineAndCharacterOfPosition(this.getLineMap(), position);
+                return { line: line + 1, offset: character + 1 };
+            }
+            const index = this.svc.getSnapshot().index;
+            const lineOffset = index.charOffsetToLineNumberAndPos(position);
+            return { line: lineOffset.line, offset: lineOffset.offset + 1 };
+        }
+
+        private getFileText(tempFileName?: string) {
+            return this.host.readFile(tempFileName || this.fileName) || "";
+        }
+
+        private ensureNoScriptVersionCache() {
+            Debug.assert(!this.svc, "ScriptVersionCache should not be set");
+        }
+
+        private switchToScriptVersionCache(newText?: string): ScriptVersionCache {
+            if (!this.svc) {
+                this.svc = ScriptVersionCache.fromString(this.host, newText !== undefined ? newText : this.getOrLoadText());
+                this.svcVersion++;
+                this.text = undefined;
+            }
+            return this.svc;
+        }
+
+        private getOrLoadText() {
+            this.ensureNoScriptVersionCache();
+            if (this.text === undefined) {
+                this.setText(this.getFileText());
+            }
+            return this.text;
+        }
+
+        private getLineMap() {
+            this.ensureNoScriptVersionCache();
+            return this.lineMap || (this.lineMap = computeLineStarts(this.getOrLoadText()));
+        }
+
+        private setText(newText: string) {
+            this.ensureNoScriptVersionCache();
+            if (newText === undefined || this.text !== newText) {
+                this.text = newText;
+                this.lineMap = undefined;
+                this.textVersion++;
+            }
+        }
+    }
+
+
     export class ScriptInfo {
         /**
          * All projects that include this file
@@ -11,23 +166,45 @@ namespace ts.server {
         readonly path: Path;
 
         private fileWatcher: FileWatcher;
-        private svc: ScriptVersionCache;
+        private textStorage: TextStorage;
+
+        private isOpen: boolean;
 
         constructor(
             private readonly host: ServerHost,
             readonly fileName: NormalizedPath,
-            content: string,
             readonly scriptKind: ScriptKind,
-            public isOpen = false,
             public hasMixedContent = false) {
 
             this.path = toPath(fileName, host.getCurrentDirectory(), createGetCanonicalFileName(host.useCaseSensitiveFileNames));
-            this.svc = ScriptVersionCache.fromString(host, content);
+            this.textStorage = new TextStorage(host, fileName);
+            if (hasMixedContent) {
+                this.textStorage.reload("");
+            }
             this.scriptKind = scriptKind
                 ? scriptKind
                 : getScriptKindFromFileName(fileName);
         }
 
+        public isScriptOpen() {
+            return this.isOpen;
+        }
+
+        public open(newText: string) {
+            this.isOpen = true;
+            this.textStorage.useScriptVersionCache(newText);
+            this.markContainingProjectsAsDirty();
+        }
+
+        public close() {
+            this.isOpen = false;
+            this.textStorage.useText();
+        }
+
+        public getSnapshot() {
+            return this.textStorage.getSnapshot();
+        }
+
         getFormatCodeSettings() {
             return this.formatCodeSettings;
         }
@@ -117,16 +294,16 @@ namespace ts.server {
         }
 
         getLatestVersion() {
-            return this.svc.latestVersion().toString();
+            return this.textStorage.getVersion();
         }
 
         reload(script: string) {
-            this.svc.reload(script);
+            this.textStorage.reload(script);
             this.markContainingProjectsAsDirty();
         }
 
         saveTo(fileName: string) {
-            const snap = this.snap();
+            const snap = this.textStorage.getSnapshot();
             this.host.writeFile(fileName, snap.getText(0, snap.getLength()));
         }
 
@@ -135,22 +312,17 @@ namespace ts.server {
                 this.reload("");
             }
             else {
-                this.svc.reloadFromFile(tempFileName || this.fileName);
+                this.textStorage.reloadFromFile(tempFileName);
                 this.markContainingProjectsAsDirty();
             }
         }
 
-        snap() {
-            return this.svc.getSnapshot();
-        }
-
         getLineInfo(line: number) {
-            const snap = this.snap();
-            return snap.index.lineNumberToInfo(line);
+            return this.textStorage.getLineInfo(line);
         }
 
         editContent(start: number, end: number, newText: string): void {
-            this.svc.edit(start, end - start, newText);
+            this.textStorage.edit(start, end, newText);
             this.markContainingProjectsAsDirty();
         }
 
@@ -164,17 +336,7 @@ namespace ts.server {
          *  @param line 1 based index
          */
         lineToTextSpan(line: number) {
-            const index = this.snap().index;
-            const lineInfo = index.lineNumberToInfo(line + 1);
-            let len: number;
-            if (lineInfo.leaf) {
-                len = lineInfo.leaf.text.length;
-            }
-            else {
-                const nextLineInfo = index.lineNumberToInfo(line + 2);
-                len = nextLineInfo.offset - lineInfo.offset;
-            }
-            return ts.createTextSpan(lineInfo.offset, len);
+            return this.textStorage.lineToTextSpan(line);
         }
 
         /**
@@ -182,11 +344,7 @@ namespace ts.server {
          * @param offset 1 based index
          */
         lineOffsetToPosition(line: number, offset: number): number {
-            const index = this.snap().index;
-
-            const lineInfo = index.lineNumberToInfo(line);
-            // TODO: assert this offset is actually on the line
-            return (lineInfo.offset + offset - 1);
+            return this.textStorage.lineOffsetToPosition(line, offset);
         }
 
         /**
@@ -194,9 +352,7 @@ namespace ts.server {
          * @param offset 1-based index
          */
         positionToLineOffset(position: number): ILineInfo {
-            const index = this.snap().index;
-            const lineOffset = index.charOffsetToLineNumberAndPos(position);
-            return { line: lineOffset.line, offset: lineOffset.offset + 1 };
+            return this.textStorage.positionToLineOffset(position);
         }
     }
 }

src/server/scriptVersionCache.ts

@@ -438,8 +438,9 @@ namespace ts.server {
             }
         }
         getChangeRange(oldSnapshot: ts.IScriptSnapshot): ts.TextChangeRange {
-            const oldSnap = <LineIndexSnapshot>oldSnapshot;
-            return this.getTextChangeRangeSinceVersion(oldSnap.version);
+            if (oldSnapshot instanceof LineIndexSnapshot) {
+                return this.getTextChangeRangeSinceVersion(oldSnapshot.version);
+            }
         }
     }
 

src/server/session.ts

@@ -709,7 +709,7 @@ namespace ts.server {
                 const displayString = ts.displayPartsToString(nameInfo.displayParts);
                 const nameSpan = nameInfo.textSpan;
                 const nameColStart = scriptInfo.positionToLineOffset(nameSpan.start).offset;
-                const nameText = scriptInfo.snap().getText(nameSpan.start, ts.textSpanEnd(nameSpan));
+                const nameText = scriptInfo.getSnapshot().getText(nameSpan.start, ts.textSpanEnd(nameSpan));
                 const refs = combineProjectOutput<protocol.ReferencesResponseItem>(
                     projects,
                     (project: Project) => {
@@ -722,7 +722,7 @@ namespace ts.server {
                             const refScriptInfo = project.getScriptInfo(ref.fileName);
                             const start = refScriptInfo.positionToLineOffset(ref.textSpan.start);
                             const refLineSpan = refScriptInfo.lineToTextSpan(start.line - 1);
-                            const lineText = refScriptInfo.snap().getText(refLineSpan.start, ts.textSpanEnd(refLineSpan)).replace(/\r|\n/g, "");
+                            const lineText = refScriptInfo.getSnapshot().getText(refLineSpan.start, ts.textSpanEnd(refLineSpan)).replace(/\r|\n/g, "");
                             return {
                                 file: ref.fileName,
                                 start: start,
@@ -1326,7 +1326,7 @@ namespace ts.server {
                     highPriorityFiles.push(fileNameInProject);
                 else {
                     const info = this.projectService.getScriptInfo(fileNameInProject);
-                    if (!info.isOpen) {
+                    if (!info.isScriptOpen()) {
                         if (fileNameInProject.indexOf(".d.ts") > 0)
                             veryLowPriorityFiles.push(fileNameInProject);
                         else

src/services/jsDoc.ts

@@ -1,4 +1,4 @@
-/* @internal */
+/* @internal */
 namespace ts.JsDoc {
     const jsDocTagNames = [
         "augments",
@@ -166,6 +166,7 @@ namespace ts.JsDoc {
         const lineStart = sourceFile.getLineStarts()[posLineAndChar.line];
 
         const indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
+        const isJavaScriptFile = hasJavaScriptFileExtension(sourceFile.fileName);
 
         let docParams = "";
         for (let i = 0, numParams = parameters.length; i < numParams; i++) {
@@ -173,8 +174,12 @@ namespace ts.JsDoc {
             const paramName = currentName.kind === SyntaxKind.Identifier ?
                 (<Identifier>currentName).text :
                 "param" + i;
-
-            docParams += `${indentationStr} * @param ${paramName}${newLine}`;
+            if (isJavaScriptFile) {
+                docParams += `${indentationStr} * @param {any} ${paramName}${newLine}`;
+            }
+            else {
+                docParams += `${indentationStr} * @param ${paramName}${newLine}`;
+            }
         }
 
         // A doc comment consists of the following

src/services/services.ts

@@ -1725,7 +1725,7 @@ namespace ts {
             const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
 
             // Check if in a context where we don't want to perform any insertion
-            if (isInString(sourceFile, position) || isInComment(sourceFile, position)) {
+            if (isInString(sourceFile, position)) {
                 return false;
             }
 

src/services/types.ts

@@ -91,7 +91,9 @@ namespace ts {
             }
 
             public getText(start: number, end: number): string {
-                return this.text.substring(start, end);
+                return start === 0 && end === this.text.length
+                    ? this.text
+                    : this.text.substring(start, end);
             }
 
             public getLength(): number {

tests/baselines/reference/awaitInheritedPromise_es2017.js

@@ -0,0 +1,11 @@
+//// [awaitInheritedPromise_es2017.ts]
+interface A extends Promise<string> {}
+declare var a: A;
+async function f() {
+    await a;
+}
+
+//// [awaitInheritedPromise_es2017.js]
+async function f() {
+    await a;
+}

tests/baselines/reference/awaitInheritedPromise_es2017.symbols

@@ -0,0 +1,15 @@
+=== tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts ===
+interface A extends Promise<string> {}
+>A : Symbol(A, Decl(awaitInheritedPromise_es2017.ts, 0, 0))
+>Promise : Symbol(Promise, Decl(lib.es2015.symbol.wellknown.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.promise.d.ts, --, --), Decl(lib.es2015.iterable.d.ts, --, --))
+
+declare var a: A;
+>a : Symbol(a, Decl(awaitInheritedPromise_es2017.ts, 1, 11))
+>A : Symbol(A, Decl(awaitInheritedPromise_es2017.ts, 0, 0))
+
+async function f() {
+>f : Symbol(f, Decl(awaitInheritedPromise_es2017.ts, 1, 17))
+
+    await a;
+>a : Symbol(a, Decl(awaitInheritedPromise_es2017.ts, 1, 11))
+}

tests/baselines/reference/awaitInheritedPromise_es2017.types

@@ -0,0 +1,16 @@
+=== tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts ===
+interface A extends Promise<string> {}
+>A : A
+>Promise : Promise<T>
+
+declare var a: A;
+>a : A
+>A : A
+
+async function f() {
+>f : () => Promise<void>
+
+    await a;
+>await a : string
+>a : A
+}

tests/baselines/reference/decoratorOnClassAccessor7.errors.txt

@@ -0,0 +1,41 @@
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(26,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(31,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+
+
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts (2 errors) ====
+    declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+    
+    class A {
+        @dec1 get x() { return 0; }
+        set x(value: number) { }
+    }
+    
+    class B {
+        get x() { return 0; }
+        @dec2 set x(value: number) { }
+    }
+    
+    class C {
+        @dec1 set x(value: number) { }
+        get x() { return 0; }
+    }
+    
+    class D {
+        set x(value: number) { }
+        @dec2 get x() { return 0; }
+    }
+    
+    class E {
+        @dec1 get x() { return 0; }
+        @dec2 set x(value: number) { }
+        ~
+!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+    }
+    
+    class F {
+        @dec1 set x(value: number) { }
+        @dec2 get x() { return 0; }
+        ~
+!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+    }

tests/baselines/reference/decoratorOnClassAccessor7.js

@@ -0,0 +1,125 @@
+//// [decoratorOnClassAccessor7.ts]
+declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class A {
+    @dec1 get x() { return 0; }
+    set x(value: number) { }
+}
+
+class B {
+    get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class C {
+    @dec1 set x(value: number) { }
+    get x() { return 0; }
+}
+
+class D {
+    set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+class E {
+    @dec1 get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class F {
+    @dec1 set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+//// [decoratorOnClassAccessor7.js]
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var A = (function () {
+    function A() {
+    }
+    Object.defineProperty(A.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return A;
+}());
+__decorate([
+    dec1
+], A.prototype, "x", null);
+var B = (function () {
+    function B() {
+    }
+    Object.defineProperty(B.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return B;
+}());
+__decorate([
+    dec2
+], B.prototype, "x", null);
+var C = (function () {
+    function C() {
+    }
+    Object.defineProperty(C.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return C;
+}());
+__decorate([
+    dec1
+], C.prototype, "x", null);
+var D = (function () {
+    function D() {
+    }
+    Object.defineProperty(D.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return D;
+}());
+__decorate([
+    dec2
+], D.prototype, "x", null);
+var E = (function () {
+    function E() {
+    }
+    Object.defineProperty(E.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return E;
+}());
+__decorate([
+    dec1
+], E.prototype, "x", null);
+var F = (function () {
+    function F() {
+    }
+    Object.defineProperty(F.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: true,
+        configurable: true
+    });
+    return F;
+}());
+__decorate([
+    dec1
+], F.prototype, "x", null);

tests/baselines/reference/subSubClassCanAccessProtectedConstructor.js

@@ -0,0 +1,51 @@
+//// [subSubClassCanAccessProtectedConstructor.ts]
+class Base {
+    protected constructor() { }
+    public instance1 = new Base(); // allowed
+}
+
+class Subclass extends Base {
+    public instance1_1 = new Base(); // allowed
+    public instance1_2 = new Subclass(); // allowed
+}
+
+class SubclassOfSubclass extends Subclass {
+    public instance2_1 = new Base(); // allowed
+    public instance2_2 = new Subclass(); // allowed
+    public instance2_3 = new SubclassOfSubclass(); // allowed
+}
+
+
+//// [subSubClassCanAccessProtectedConstructor.js]
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var Base = (function () {
+    function Base() {
+        this.instance1 = new Base(); // allowed
+    }
+    return Base;
+}());
+var Subclass = (function (_super) {
+    __extends(Subclass, _super);
+    function Subclass() {
+        var _this = _super.apply(this, arguments) || this;
+        _this.instance1_1 = new Base(); // allowed
+        _this.instance1_2 = new Subclass(); // allowed
+        return _this;
+    }
+    return Subclass;
+}(Base));
+var SubclassOfSubclass = (function (_super) {
+    __extends(SubclassOfSubclass, _super);
+    function SubclassOfSubclass() {
+        var _this = _super.apply(this, arguments) || this;
+        _this.instance2_1 = new Base(); // allowed
+        _this.instance2_2 = new Subclass(); // allowed
+        _this.instance2_3 = new SubclassOfSubclass(); // allowed
+        return _this;
+    }
+    return SubclassOfSubclass;
+}(Subclass));

tests/baselines/reference/subSubClassCanAccessProtectedConstructor.symbols

@@ -0,0 +1,40 @@
+=== tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts ===
+class Base {
+>Base : Symbol(Base, Decl(subSubClassCanAccessProtectedConstructor.ts, 0, 0))
+
+    protected constructor() { }
+    public instance1 = new Base(); // allowed
+>instance1 : Symbol(Base.instance1, Decl(subSubClassCanAccessProtectedConstructor.ts, 1, 31))
+>Base : Symbol(Base, Decl(subSubClassCanAccessProtectedConstructor.ts, 0, 0))
+}
+
+class Subclass extends Base {
+>Subclass : Symbol(Subclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 3, 1))
+>Base : Symbol(Base, Decl(subSubClassCanAccessProtectedConstructor.ts, 0, 0))
+
+    public instance1_1 = new Base(); // allowed
+>instance1_1 : Symbol(Subclass.instance1_1, Decl(subSubClassCanAccessProtectedConstructor.ts, 5, 29))
+>Base : Symbol(Base, Decl(subSubClassCanAccessProtectedConstructor.ts, 0, 0))
+
+    public instance1_2 = new Subclass(); // allowed
+>instance1_2 : Symbol(Subclass.instance1_2, Decl(subSubClassCanAccessProtectedConstructor.ts, 6, 36))
+>Subclass : Symbol(Subclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 3, 1))
+}
+
+class SubclassOfSubclass extends Subclass {
+>SubclassOfSubclass : Symbol(SubclassOfSubclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 8, 1))
+>Subclass : Symbol(Subclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 3, 1))
+
+    public instance2_1 = new Base(); // allowed
+>instance2_1 : Symbol(SubclassOfSubclass.instance2_1, Decl(subSubClassCanAccessProtectedConstructor.ts, 10, 43))
+>Base : Symbol(Base, Decl(subSubClassCanAccessProtectedConstructor.ts, 0, 0))
+
+    public instance2_2 = new Subclass(); // allowed
+>instance2_2 : Symbol(SubclassOfSubclass.instance2_2, Decl(subSubClassCanAccessProtectedConstructor.ts, 11, 36))
+>Subclass : Symbol(Subclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 3, 1))
+
+    public instance2_3 = new SubclassOfSubclass(); // allowed
+>instance2_3 : Symbol(SubclassOfSubclass.instance2_3, Decl(subSubClassCanAccessProtectedConstructor.ts, 12, 40))
+>SubclassOfSubclass : Symbol(SubclassOfSubclass, Decl(subSubClassCanAccessProtectedConstructor.ts, 8, 1))
+}
+

tests/baselines/reference/subSubClassCanAccessProtectedConstructor.types

@@ -0,0 +1,46 @@
+=== tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts ===
+class Base {
+>Base : Base
+
+    protected constructor() { }
+    public instance1 = new Base(); // allowed
+>instance1 : Base
+>new Base() : Base
+>Base : typeof Base
+}
+
+class Subclass extends Base {
+>Subclass : Subclass
+>Base : Base
+
+    public instance1_1 = new Base(); // allowed
+>instance1_1 : Base
+>new Base() : Base
+>Base : typeof Base
+
+    public instance1_2 = new Subclass(); // allowed
+>instance1_2 : Subclass
+>new Subclass() : Subclass
+>Subclass : typeof Subclass
+}
+
+class SubclassOfSubclass extends Subclass {
+>SubclassOfSubclass : SubclassOfSubclass
+>Subclass : Subclass
+
+    public instance2_1 = new Base(); // allowed
+>instance2_1 : Base
+>new Base() : Base
+>Base : typeof Base
+
+    public instance2_2 = new Subclass(); // allowed
+>instance2_2 : Subclass
+>new Subclass() : Subclass
+>Subclass : typeof Subclass
+
+    public instance2_3 = new SubclassOfSubclass(); // allowed
+>instance2_3 : SubclassOfSubclass
+>new SubclassOfSubclass() : SubclassOfSubclass
+>SubclassOfSubclass : typeof SubclassOfSubclass
+}
+

tests/baselines/reference/unusedLocalsAndObjectSpread.errors.txt

@@ -0,0 +1,40 @@
+tests/cases/compiler/unusedLocalsAndObjectSpread.ts(21,18): error TS6133: 'bar' is declared but never used.
+tests/cases/compiler/unusedLocalsAndObjectSpread.ts(28,21): error TS6133: 'bar' is declared but never used.
+
+
+==== tests/cases/compiler/unusedLocalsAndObjectSpread.ts (2 errors) ====
+    
+    declare var console: { log(a: any): void };
+    
+    function one() {
+        const foo = { a: 1, b: 2 };
+        // 'a' is declared but never used
+        const {a, ...bar} = foo;
+        console.log(bar);
+    }
+    
+    function two() {
+        const foo = { a: 1, b: 2 };
+        // '_' is declared but never used
+        const {a: _, ...bar} = foo;
+        console.log(bar);
+    }
+    
+    function three() {
+        const foo = { a: 1, b: 2 };
+        // 'a' is declared but never used
+        const {a, ...bar} = foo; // bar should be unused
+                     ~~~
+!!! error TS6133: 'bar' is declared but never used.
+        //console.log(bar);
+    }
+    
+    function four() {
+        const foo = { a: 1, b: 2 };
+        // '_' is declared but never used
+        const {a: _, ...bar} = foo; // bar should be unused
+                        ~~~
+!!! error TS6133: 'bar' is declared but never used.
+        //console.log(bar);
+    }
+    

tests/baselines/reference/unusedLocalsAndObjectSpread.js

@@ -0,0 +1,67 @@
+//// [unusedLocalsAndObjectSpread.ts]
+
+declare var console: { log(a: any): void };
+
+function one() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo;
+    console.log(bar);
+}
+
+function two() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo;
+    console.log(bar);
+}
+
+function three() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+function four() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+
+//// [unusedLocalsAndObjectSpread.js]
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
+            t[p[i]] = s[p[i]];
+    return t;
+};
+function one() {
+    var foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    var a = foo.a, bar = __rest(foo, ["a"]);
+    console.log(bar);
+}
+function two() {
+    var foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    var _ = foo.a, bar = __rest(foo, ["a"]);
+    console.log(bar);
+}
+function three() {
+    var foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    var a = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
+    //console.log(bar);
+}
+function four() {
+    var foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    var _ = foo.a, bar = __rest(foo, ["a"]); // bar should be unused
+    //console.log(bar);
+}

tests/cases/compiler/subSubClassCanAccessProtectedConstructor.ts

@@ -0,0 +1,15 @@
+class Base {
+    protected constructor() { }
+    public instance1 = new Base(); // allowed
+}
+
+class Subclass extends Base {
+    public instance1_1 = new Base(); // allowed
+    public instance1_2 = new Subclass(); // allowed
+}
+
+class SubclassOfSubclass extends Subclass {
+    public instance2_1 = new Base(); // allowed
+    public instance2_2 = new Subclass(); // allowed
+    public instance2_3 = new SubclassOfSubclass(); // allowed
+}

tests/cases/compiler/unusedLocalsAndObjectSpread.ts

@@ -0,0 +1,31 @@
+//@noUnusedLocals:true
+
+declare var console: { log(a: any): void };
+
+function one() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo;
+    console.log(bar);
+}
+
+function two() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo;
+    console.log(bar);
+}
+
+function three() {
+    const foo = { a: 1, b: 2 };
+    // 'a' is declared but never used
+    const {a, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}
+
+function four() {
+    const foo = { a: 1, b: 2 };
+    // '_' is declared but never used
+    const {a: _, ...bar} = foo; // bar should be unused
+    //console.log(bar);
+}

tests/cases/conformance/async/es2017/awaitInheritedPromise_es2017.ts

@@ -0,0 +1,7 @@
+// @target: es2017
+// @strictNullChecks: true
+interface A extends Promise<string> {}
+declare var a: A;
+async function f() {
+    await a;
+}

tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts

@@ -0,0 +1,34 @@
+// @target:es5
+// @experimentaldecorators: true
+declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+
+class A {
+    @dec1 get x() { return 0; }
+    set x(value: number) { }
+}
+
+class B {
+    get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class C {
+    @dec1 set x(value: number) { }
+    get x() { return 0; }
+}
+
+class D {
+    set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+class E {
+    @dec1 get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+class F {
+    @dec1 set x(value: number) { }
+    @dec2 get x() { return 0; }
+}

tests/cases/fourslash/basicClassMembers.ts

@@ -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');

tests/cases/fourslash/commentBraceCompletionPosition.ts

@@ -14,10 +14,10 @@
 //// }
 
 goTo.marker('1');
-verify.not.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');
 
 goTo.marker('2');
-verify.not.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');
 
 goTo.marker('3');
-verify.not.isValidBraceCompletionAtPosition('(');
+verify.isValidBraceCompletionAtPosition('(');

tests/cases/fourslash/commentsClassMembers.ts

@@ -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');

tests/cases/fourslash/commentsEnums.ts

@@ -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'");

tests/cases/fourslash/commentsExternalModules.ts

@@ -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");

tests/cases/fourslash/commentsImportDeclaration.ts

@@ -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");

tests/cases/fourslash/commentsInheritance.ts

@@ -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');

tests/cases/fourslash/commentsInterface.ts

@@ -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");

tests/cases/fourslash/commentsModules.ts

@@ -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');

tests/cases/fourslash/commentsOverloads.ts

@@ -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("");

tests/cases/fourslash/completionEntryForUnionProperty.ts

@@ -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);

tests/cases/fourslash/completionEntryForUnionProperty2.ts

@@ -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);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment1.ts

@@ -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);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment2.ts

@@ -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);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment3.ts

@@ -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);

tests/cases/fourslash/completionForQuotedPropertyInPropertyAssignment4.ts

@@ -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);

tests/cases/fourslash/completionForStringLiteral.ts

@@ -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);

tests/cases/fourslash/completionForStringLiteral2.ts

@@ -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);

tests/cases/fourslash/completionForStringLiteral3.ts

@@ -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);

tests/cases/fourslash/completionForStringLiteral4.ts

@@ -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);

tests/cases/fourslash/completionListAfterAnyType.ts

@@ -9,5 +9,5 @@
 //// }
 
 goTo.marker();
-verify.memberListContains("charAt");
-verify.memberListCount(1);
+verify.completionListContains("charAt");
+verify.completionListCount(1);

tests/cases/fourslash/completionListAfterInvalidCharacter.ts

@@ -8,4 +8,4 @@
 ////testModule./**/
 
 goTo.marker();
-verify.memberListContains("foo");
+verify.completionListContains("foo");

tests/cases/fourslash/completionListAfterObjectLiteral1.ts

@@ -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');

tests/cases/fourslash/completionListAfterRegularExpressionLiteral01.ts

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

tests/cases/fourslash/completionListAfterRegularExpressionLiteral1.ts

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

tests/cases/fourslash/completionListAfterStringLiteral1.ts

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

tests/cases/fourslash/completionListAndMemberListOnCommentedDot.ts

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

tests/cases/fourslash/completionListAndMemberListOnCommentedWhiteSpace.ts

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

tests/cases/fourslash/completionListAtEOF1.ts

@@ -3,4 +3,4 @@
 //// if(0 === ''.
 
 goTo.eof();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");

tests/cases/fourslash/completionListAtEOF2.ts

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

tests/cases/fourslash/completionListAtNodeBoundry.ts

@@ -19,4 +19,4 @@
 
 
 goTo.marker();
-verify.memberListContains("charAt");
+verify.completionListContains("charAt");

tests/cases/fourslash/completionListBeforeKeyword.ts

@@ -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");

tests/cases/fourslash/completionListCladule.ts

@@ -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);

tests/cases/fourslash/completionListClassMembers.ts

@@ -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");

tests/cases/fourslash/completionListEnumMembers.ts

@@ -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);

tests/cases/fourslash/completionListEnumValues.ts

@@ -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");

tests/cases/fourslash/completionListErrorRecovery.ts

@@ -6,5 +6,5 @@
 /////*1*/var bar;
 
 goTo.marker();
-verify.memberListContains("fun");
+verify.completionListContains("fun");
 verify.not.errorExistsAfterMarker("1");

tests/cases/fourslash/completionListForNonExportedMemberInAmbientModuleWithExportAssignment1.ts

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

tests/cases/fourslash/completionListForObjectSpread.ts

@@ -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);

tests/cases/fourslash/completionListForRest.ts

@@ -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);

tests/cases/fourslash/completionListForShorthandPropertyAssignment.ts

@@ -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');

tests/cases/fourslash/completionListForShorthandPropertyAssignment2.ts

@@ -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');

tests/cases/fourslash/completionListFunctionMembers.ts

@@ -8,4 +8,4 @@
 ////fnc1./**/
 
 goTo.marker();
-verify.memberListContains('arguments', '(property) Function.arguments: any');
+verify.completionListContains('arguments', '(property) Function.arguments: any');

tests/cases/fourslash/completionListGenericConstraints.ts

@@ -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");

tests/cases/fourslash/completionListInClosedFunction01.ts

@@ -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");

tests/cases/fourslash/completionListInClosedFunction02.ts

@@ -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

tests/cases/fourslash/completionListInClosedFunction03.ts

@@ -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

tests/cases/fourslash/completionListInClosedFunction04.ts

@@ -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

tests/cases/fourslash/completionListInClosedFunction05.ts

@@ -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

tests/cases/fourslash/completionListInClosedFunction06.ts

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

tests/cases/fourslash/completionListInClosedFunction07.ts

@@ -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");

tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature01.ts

@@ -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");

tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature02.ts

@@ -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");

tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature03.ts

@@ -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");

tests/cases/fourslash/completionListInClosedObjectTypeLiteralInSignature04.ts

@@ -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");

tests/cases/fourslash/completionListInEmptyFile.ts

@@ -4,4 +4,4 @@
 /////**/
 
 goTo.marker();
-verify.memberListContains("a");
+verify.completionListContains("a");

tests/cases/fourslash/completionListInExtendsClauseAtEOF.ts

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

tests/cases/fourslash/completionListInFunctionExpression.ts

@@ -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");

tests/cases/fourslash/completionListInNamedFunctionExpression.ts

@@ -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",

tests/cases/fourslash/completionListInObjectLiteral.ts

@@ -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');

tests/cases/fourslash/completionListInObjectLiteralThatIsParameterOfFunctionCall.ts

@@ -6,6 +6,6 @@
 ////    /**/
 
 goTo.marker()
-verify.memberListContains('xa');
-verify.memberListContains('xb');
-verify.memberListCount(2);
+verify.completionListContains('xa');
+verify.completionListContains('xb');
+verify.completionListCount(2);

tests/cases/fourslash/completionListInScope.ts

@@ -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");

tests/cases/fourslash/completionListInTypeParameterOfTypeAlias3.ts

@@ -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");

tests/cases/fourslash/completionListInTypedObjectLiterals2.ts

@@ -7,6 +7,6 @@
 ////aaa = { /*9*/
 
 goTo.marker("9");
-verify.memberListContains("x");
-verify.memberListCount(1);
+verify.completionListContains("x");
+verify.completionListCount(1);
 

tests/cases/fourslash/completionListInTypedObjectLiterals3.ts

@@ -7,7 +7,7 @@
 ////aaa.x = { /*10*/
 
 goTo.marker("10");
-verify.memberListContains("a");
-verify.memberListCount(1);
+verify.completionListContains("a");
+verify.completionListCount(1);
 
 

tests/cases/fourslash/completionListInTypedObjectLiterals4.ts

@@ -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);
 

tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames.ts

@@ -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);

tests/cases/fourslash/completionListInTypedObjectLiteralsWithPartialPropertyNames2.ts

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