Merge branch 'master' into completionsRecommended

microsoft · Dec 1, 2017 · Nov 14, 2017 · Nov 17, 2017 · Nov 17, 2017 · Nov 17, 2017
commit d1abfbe3506d774bafa07af5cd178d4b36450334
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -3096,19 +3096,11 @@ Actual: ${stringify(fullActual)}`);
                     assert.equal(ts.displayPartsToString(details.displayParts), text, this.assertionMessageAtLastKnownMarker("completion item detail text for " + entryId));
                 }
 
-                    if (kind !== undefined) {
-                        assert.equal(item.kind, kind, this.assertionMessageAtLastKnownMarker("completion item kind for " + entryId));
-                    }
-
-                    if (spanIndex !== undefined) {
-                        const span = this.getTextSpanForRangeAtIndex(spanIndex);
-                        assert.isTrue(TestState.textSpansEqual(span, item.replacementSpan), this.assertionMessageAtLastKnownMarker(stringify(span) + " does not equal " + stringify(item.replacementSpan) + " replacement span for " + entryId));
-                    }
-
-                    assert.equal(item.hasAction, hasAction, "hasAction");
-                    assert.equal(item.isRecommended, options && options.isRecommended, "isRecommended");
-
-                    return;
+                if (entryId.source === undefined) {
+                    assert.equal(options && options.sourceDisplay, undefined);
+                }
+                else {
+                    assert.deepEqual(details.source, [ts.textPart(options!.sourceDisplay)]);
                 }
             }
 
@@ -3122,6 +3114,7 @@ Actual: ${stringify(fullActual)}`);
             }
 
             assert.equal(item.hasAction, hasAction);
+            assert.equal(item.isRecommended, options && options.isRecommended, "isRecommended");
         }
 
         private findFile(indexOrName: string | number) {
@@ -4567,6 +4560,7 @@ namespace FourSlashInterface {
     export interface VerifyCompletionListContainsOptions extends ts.GetCompletionsAtPositionOptions {
         sourceDisplay: string;
         isRecommended?: true;
+        allowDuplicate?: true; // TODO: GH#20042
     }
 
     export interface NewContentOptions {

diff --git a/tests/cases/fourslash/fourslash.ts b/tests/cases/fourslash/fourslash.ts
@@ -148,7 +148,7 @@ declare namespace FourSlashInterface {
             kind?: string,
             spanIndex?: number,
             hasAction?: boolean,
-            options?: { includeExternalModuleExports?: boolean, sourceDisplay?: string, isRecommended?: true },
+            options?: { includeExternalModuleExports?: boolean, sourceDisplay?: string, isRecommended?: true, allowDuplicate?: true },
         ): void;
         completionListItemsCountIsGreaterThan(count: number): void;
         completionListIsEmpty(): void;