diff --git a/tests/baselines/reference/cancellationWhenfindingAllRefsOnDefinition.3.baseline.jsonc b/tests/baselines/reference/cancellationWhenfindingAllRefsOnDefinition.3.baseline.jsonc
new file mode 100644
index 00000000000..fac647eb0ac
--- /dev/null
+++ b/tests/baselines/reference/cancellationWhenfindingAllRefsOnDefinition.3.baseline.jsonc
@@ -0,0 +1,116 @@
+// === /tests/cases/fourslash/findAllRefsOnDefinition-import.ts ===
+// export class Test{
+// 
+//     constructor(){
+// 
+//     }
+// 
+//     public /*FIND ALL REFS*/[|start|](){
+//         return this;
+//     }
+// 
+//     public stop(){
+//         return this;
+//     }
+// }
+
+// === /tests/cases/fourslash/findAllRefsOnDefinition.ts ===
+// import Second = require("./findAllRefsOnDefinition-import");
+// 
+// var second = new Second.Test()
+// second.[|start|]();
+// second.stop();
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/findAllRefsOnDefinition-import.ts",
+      "kind": "method",
+      "name": "(method) Test.start(): this",
+      "textSpan": {
+        "start": 58,
+        "length": 5
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "method",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "Test",
+          "kind": "className"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "start",
+          "kind": "methodName"
+        },
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": ":",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "this",
+          "kind": "keyword"
+        }
+      ],
+      "contextSpan": {
+        "start": 51,
+        "length": 42
+      }
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 58,
+          "length": 5
+        },
+        "fileName": "/tests/cases/fourslash/findAllRefsOnDefinition-import.ts",
+        "contextSpan": {
+          "start": 51,
+          "length": 42
+        },
+        "isWriteAccess": true,
+        "isDefinition": true
+      },
+      {
+        "textSpan": {
+          "start": 100,
+          "length": 5
+        },
+        "fileName": "/tests/cases/fourslash/findAllRefsOnDefinition.ts",
+        "isWriteAccess": false,
+        "isDefinition": false
+      }
+    ]
+  }
+]
\ No newline at end of file
diff --git a/tests/baselines/reference/findReferencesAfterEdit.2.baseline.jsonc b/tests/baselines/reference/findReferencesAfterEdit.2.baseline.jsonc
new file mode 100644
index 00000000000..c4ffdfb45bd
--- /dev/null
+++ b/tests/baselines/reference/findReferencesAfterEdit.2.baseline.jsonc
@@ -0,0 +1,195 @@
+// === /tests/cases/fourslash/a.ts ===
+// interface A {
+//     /*FIND ALL REFS*/[|foo|]: string;
+// }
+
+// === /tests/cases/fourslash/b.ts ===
+// ///<reference path='a.ts'/>
+// 
+// 
+// function foo(x: A) {
+//     x.[|foo|]
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/a.ts",
+      "kind": "property",
+      "name": "(property) A.foo: string",
+      "textSpan": {
+        "start": 18,
+        "length": 3
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "property",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "A",
+          "kind": "interfaceName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "foo",
+          "kind": "propertyName"
+        },
+        {
+          "text": ":",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        }
+      ],
+      "contextSpan": {
+        "start": 18,
+        "length": 12
+      }
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 18,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/a.ts",
+        "contextSpan": {
+          "start": 18,
+          "length": 12
+        },
+        "isWriteAccess": false,
+        "isDefinition": true
+      },
+      {
+        "textSpan": {
+          "start": 57,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/b.ts",
+        "isWriteAccess": false,
+        "isDefinition": false
+      }
+    ]
+  }
+]
+
+// === /tests/cases/fourslash/a.ts ===
+// interface A {
+//     [|foo|]: string;
+// }
+
+// === /tests/cases/fourslash/b.ts ===
+// ///<reference path='a.ts'/>
+// 
+// 
+// function foo(x: A) {
+//     x./*FIND ALL REFS*/[|foo|]
+// }
+
+[
+  {
+    "definition": {
+      "containerKind": "",
+      "containerName": "",
+      "fileName": "/tests/cases/fourslash/a.ts",
+      "kind": "property",
+      "name": "(property) A.foo: string",
+      "textSpan": {
+        "start": 18,
+        "length": 3
+      },
+      "displayParts": [
+        {
+          "text": "(",
+          "kind": "punctuation"
+        },
+        {
+          "text": "property",
+          "kind": "text"
+        },
+        {
+          "text": ")",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "A",
+          "kind": "interfaceName"
+        },
+        {
+          "text": ".",
+          "kind": "punctuation"
+        },
+        {
+          "text": "foo",
+          "kind": "propertyName"
+        },
+        {
+          "text": ":",
+          "kind": "punctuation"
+        },
+        {
+          "text": " ",
+          "kind": "space"
+        },
+        {
+          "text": "string",
+          "kind": "keyword"
+        }
+      ],
+      "contextSpan": {
+        "start": 18,
+        "length": 12
+      }
+    },
+    "references": [
+      {
+        "textSpan": {
+          "start": 18,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/a.ts",
+        "contextSpan": {
+          "start": 18,
+          "length": 12
+        },
+        "isWriteAccess": false
+      },
+      {
+        "textSpan": {
+          "start": 57,
+          "length": 3
+        },
+        "fileName": "/tests/cases/fourslash/b.ts",
+        "isWriteAccess": false
+      }
+    ]
+  }
+]
\ No newline at end of file