From 1d830ffe7a6fa15674359d8d09a65848cc8ce6a7 Mon Sep 17 00:00:00 2001
From: Sheetal Nandi <shkamat@microsoft.com>
Date: Fri, 24 May 2019 16:29:27 -0700
Subject: [PATCH] Start fixing fourslash tests

---
 src/harness/fourslash.ts                     | 12 ++++++++----
 tests/cases/fourslash/untypedModuleImport.ts |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 8a0a2bffbd..c48da8bee5 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -955,14 +955,18 @@ namespace FourSlash {
             const fullExpected = ts.map<FourSlashInterface.ReferenceGroup, ReferenceGroupJson>(parts, ({ definition, ranges }) => ({
                 definition: typeof definition === "string" ? definition : { ...definition, range: ts.createTextSpanFromRange(definition.range) },
                 references: ranges.map<ts.ReferenceEntry>(r => {
-                    const { isWriteAccess = false, isDefinition = false, isInString } = (r.marker && r.marker.data || {}) as { isWriteAccess?: boolean, isDefinition?: boolean, isInString?: true };
-                    return {
+                    const { isWriteAccess = false, isDefinition = false, isInString, declarationRange } = (r.marker && r.marker.data || {}) as { isWriteAccess?: boolean, isDefinition?: boolean, isInString?: true, declarationRange?: number };
+                    const result: ts.ReferenceEntry = {
                         fileName: r.fileName,
                         textSpan: ts.createTextSpanFromRange(r),
                         isWriteAccess,
                         isDefinition,
                         ...(isInString ? { isInString: true } : undefined),
                     };
+                    if (declarationRange !== undefined) {
+                        result.declarationSpan = ts.createTextSpanFromRange(this.getRanges()[declarationRange]);
+                    }
+                    return result;
                 }),
             }));
 
@@ -1011,7 +1015,7 @@ Actual: ${stringify(fullActual)}`);
                 };
 
                 if ((actual === undefined) !== (expected === undefined)) {
-                    fail(`Expected ${expected}, got ${actual}`);
+                    fail(`Expected ${stringify(expected)}, got ${stringify(actual)}`);
                 }
 
                 for (const key in actual) {
@@ -1021,7 +1025,7 @@ Actual: ${stringify(fullActual)}`);
                             recur(ak, ek, path ? path + "." + key : key);
                         }
                         else if (ak !== ek) {
-                            fail(`Expected '${key}' to be '${ek}', got '${ak}'`);
+                            fail(`Expected '${key}' to be '${stringify(ek)}', got '${stringify(ak)}'`);
                         }
                     }
                 }
diff --git a/tests/cases/fourslash/untypedModuleImport.ts b/tests/cases/fourslash/untypedModuleImport.ts
index 5501cec479..e64d37d0e6 100644
--- a/tests/cases/fourslash/untypedModuleImport.ts
+++ b/tests/cases/fourslash/untypedModuleImport.ts
@@ -4,7 +4,7 @@
 ////{}
 
 // @Filename: a.ts
-////import /*foo*/[|{| "isWriteAccess": true, "isDefinition": true |}foo|] from /*fooModule*/"[|{| "isInString": true |}foo|]";
+////[|import /*foo*/[|{| "isWriteAccess": true, "isDefinition": true, "declarationRange": 0 |}foo|] from /*fooModule*/"[|{| "isInString": true |}foo|]";|]
 ////[|foo|]();
 
 goTo.file("a.ts");
@@ -13,7 +13,7 @@ verify.numberOfErrorsInCurrentFile(0);
 goTo.marker("fooModule");
 verify.goToDefinitionIs([]);
 verify.quickInfoIs("");
-const [r0, r1, r2] = test.ranges();
+const [r00, r0, r1, r2] = test.ranges();
 verify.singleReferenceGroup('"foo"', [r1]);
 
 goTo.marker("foo");