From f848087db0082493458c9a1406d718cf802de7c5 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 11:59:45 -0400
Subject: [PATCH 01/17] Added failing tests.

---
 ...lRefsObjectBindingElementPropertyName01.ts | 19 +++++++++++++++++++
 ...itionObjectBindingElementPropertyName01.ts | 14 ++++++++++++++
 ...foForObjectBindingElementPropertyName01.ts | 12 ++++++++++++
 ...enameObjectBindingElementPropertyName01.ts | 15 +++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
 create mode 100644 tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
 create mode 100644 tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
new file mode 100644
index 00000000000..0d03561515d
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName01.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { [|property1|]: prop1 } = foo;
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
new file mode 100644
index 00000000000..9348ba05678
--- /dev/null
+++ b/tests/cases/fourslash/goToDefinitionObjectBindingElementPropertyName01.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    /*def*/property1: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { /*use*/property1: prop1 } = foo;
+
+goTo.marker("use");
+verify.definitionLocationExists();
+goTo.definition();
+verify.caretAtMarker("def");
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
new file mode 100644
index 00000000000..72e742ba7af
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { /*use*/property1: prop1 } = foo;
+
+goTo.marker();
+verify.quickInfoIs("(property) I.property1: number");
\ No newline at end of file
diff --git a/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
new file mode 100644
index 00000000000..34dcc1353d0
--- /dev/null
+++ b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    /*1*/[|property1|]: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { /*2*/[|property1|]: prop1 } = foo;
+
+for (let m of test.markers()) {
+    goTo.position(m.position);
+    verify.renameInfoSucceeded("property1", "I.property1", "property");
+    verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
+}
\ No newline at end of file

From cb48c041874bebbfbf78a46ed5d2aa5e0979cdf9 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 12:18:06 -0400
Subject: [PATCH 02/17] Added failing tests for when RHS is a destructuring.

---
 ...lRefsObjectBindingElementPropertyName02.ts | 19 +++++++++++++++++++
 ...foForObjectBindingElementPropertyName02.ts | 12 ++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName02.ts

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
new file mode 100644
index 00000000000..86514051557
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName02.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { [|property1|]: {} } = foo;
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName02.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName02.ts
new file mode 100644
index 00000000000..5a166037f1c
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName02.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { /**/property1: {} } = foo;
+
+goTo.marker();
+verify.quickInfoIs("(property) I.property1: number");
\ No newline at end of file

From 70758e2920f6142d8dbcc02250129fa0f19a1d80 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 14:24:13 -0400
Subject: [PATCH 03/17] Add two new tests to test for regression.

---
 .../quickInfoForObjectBindingElementName01.ts        | 12 ++++++++++++
 .../quickInfoForObjectBindingElementName02.ts        | 12 ++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementName01.ts
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementName02.ts

diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementName01.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementName01.ts
new file mode 100644
index 00000000000..5cba9554b80
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementName01.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { /**/property1 } = foo;
+
+goTo.marker();
+verify.quickInfoIs("var property1: number");
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementName02.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementName02.ts
new file mode 100644
index 00000000000..e861d3db8fb
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementName02.ts
@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var { property1: /**/prop1 } = foo;
+
+goTo.marker();
+verify.quickInfoIs("var prop1: number");
\ No newline at end of file

From 341ba747d0d62bb9ca21830e1491d4e2790822c3 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 14:25:51 -0400
Subject: [PATCH 04/17] Fix marker name.

---
 .../fourslash/quickInfoForObjectBindingElementPropertyName01.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
index 72e742ba7af..52a9af258b3 100644
--- a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName01.ts
@@ -6,7 +6,7 @@
 ////}
 ////
 ////var foo: I;
-////var { /*use*/property1: prop1 } = foo;
+////var { /**/property1: prop1 } = foo;
 
 goTo.marker();
 verify.quickInfoIs("(property) I.property1: number");
\ No newline at end of file

From 8ec4af546aad35e023a83e978ec5c833e74f2aa1 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 15:50:25 -0400
Subject: [PATCH 05/17] Just use ranges, don't bother iwth renameInfoSucceeded.

---
 .../renameObjectBindingElementPropertyName01.ts          | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
index 34dcc1353d0..535dbd3d5a3 100644
--- a/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
+++ b/tests/cases/fourslash/renameObjectBindingElementPropertyName01.ts
@@ -1,15 +1,14 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    /*1*/[|property1|]: number;
+////    [|property1|]: number;
 ////    property2: string;
 ////}
 ////
 ////var foo: I;
-////var { /*2*/[|property1|]: prop1 } = foo;
+////var { [|property1|]: prop1 } = foo;
 
-for (let m of test.markers()) {
-    goTo.position(m.position);
-    verify.renameInfoSucceeded("property1", "I.property1", "property");
+for (let range of test.ranges()) {
+    goTo.position(range.start);
     verify.renameLocations(/*findInStrings*/ false, /*findInComments*/ false);
 }
\ No newline at end of file

From d7a4ac25f495d5ba78ff27b90fd4f23caf09abac Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 15:52:10 -0400
Subject: [PATCH 06/17] Allow semantic operations to be performed on property
 names.

Provide the property symbol of the type being destructured when referring to the property name.
---
 src/compiler/checker.ts | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index efee668a24b..763e4173287 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -12352,10 +12352,21 @@ namespace ts {
                 return getSymbolOfNode(node.parent);
             }
 
-            if (node.kind === SyntaxKind.Identifier && isInRightSideOfImportOrExportAssignment(<Identifier>node)) {
-                return node.parent.kind === SyntaxKind.ExportAssignment
-                    ? getSymbolOfEntityNameOrPropertyAccessExpression(<Identifier>node)
-                    : getSymbolOfPartOfRightHandSideOfImportEquals(<Identifier>node);
+            if (node.kind === SyntaxKind.Identifier) {
+                if (isInRightSideOfImportOrExportAssignment(<Identifier>node)) {
+                    return node.parent.kind === SyntaxKind.ExportAssignment
+                        ? getSymbolOfEntityNameOrPropertyAccessExpression(<Identifier>node)
+                        : getSymbolOfPartOfRightHandSideOfImportEquals(<Identifier>node);
+                }
+                else if (node.parent.kind === SyntaxKind.BindingElement &&
+                        node.parent.parent.kind === SyntaxKind.ObjectBindingPattern &&
+                        node === (<BindingElement>node.parent).propertyName) {
+                    let typeOfPattern = getTypeAtLocation(node.parent.parent);
+                    let propertyDeclaration = getPropertyOfType(typeOfPattern, (<Identifier>node).text);
+                    if (propertyDeclaration) {
+                        return propertyDeclaration;
+                    }
+                }
             }
 
             switch (node.kind) {

From a769e6747a0ead53cc8ca77c446de6cea5bc7c92 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 15:57:30 -0400
Subject: [PATCH 07/17] Added one more test.

---
 ...lRefsObjectBindingElementPropertyName03.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
new file mode 100644
index 00000000000..304fa9e42e9
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName03.ts
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////var foo: I;
+////var [{ [|property1|]: prop1 }, { property1, property2 } ] = [foo, foo];
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file

From 5ee5ae11f99a8830af6fb4a94aca7f8ef2f68b94 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 16:09:59 -0400
Subject: [PATCH 08/17] Check for definedness on the pattern's type.

---
 src/compiler/checker.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 763e4173287..64155fe7737 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -12362,7 +12362,8 @@ namespace ts {
                         node.parent.parent.kind === SyntaxKind.ObjectBindingPattern &&
                         node === (<BindingElement>node.parent).propertyName) {
                     let typeOfPattern = getTypeAtLocation(node.parent.parent);
-                    let propertyDeclaration = getPropertyOfType(typeOfPattern, (<Identifier>node).text);
+                    let propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, (<Identifier>node).text);
+
                     if (propertyDeclaration) {
                         return propertyDeclaration;
                     }

From 475819e27cb84e007fae02e82a4dbaa7d6fa6e05 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Thu, 25 Jun 2015 16:18:51 -0400
Subject: [PATCH 09/17] Accepted new baselines.

---
 .../reference/declarationEmitDestructuring1.symbols      | 1 +
 .../declarationEmitDestructuringArrayPattern2.symbols    | 1 +
 ...larationEmitDestructuringObjectLiteralPattern.symbols | 9 +++++++++
 ...arationEmitDestructuringObjectLiteralPattern1.symbols | 4 ++++
 ...arationEmitDestructuringObjectLiteralPattern2.symbols | 5 +++++
 ...ucturingObjectBindingPatternAndAssignment1ES5.symbols | 2 ++
 ...ucturingObjectBindingPatternAndAssignment1ES6.symbols | 2 ++
 .../destructuringVariableDeclaration1ES5.symbols         | 6 ++++++
 .../destructuringVariableDeclaration1ES6.symbols         | 6 ++++++
 tests/baselines/reference/downlevelLetConst12.symbols    | 2 ++
 tests/baselines/reference/downlevelLetConst13.symbols    | 4 ++++
 tests/baselines/reference/downlevelLetConst14.symbols    | 4 ++++
 tests/baselines/reference/downlevelLetConst15.symbols    | 6 ++++++
 .../emitArrowFunctionWhenUsingArguments18_ES6.symbols    | 1 +
 tests/baselines/reference/for-of41.symbols               | 2 ++
 tests/baselines/reference/for-of42.symbols               | 2 ++
 .../reference/initializePropertiesWithRenamedLet.symbols | 1 +
 tests/baselines/reference/letInNonStrictMode.symbols     | 1 +
 .../objectBindingPatternKeywordIdentifiers06.symbols     | 1 +
 tests/baselines/reference/systemModule13.symbols         | 3 +++
 tests/baselines/reference/systemModule8.symbols          | 3 +++
 21 files changed, 66 insertions(+)

diff --git a/tests/baselines/reference/declarationEmitDestructuring1.symbols b/tests/baselines/reference/declarationEmitDestructuring1.symbols
index 10920128eee..32755fdef35 100644
--- a/tests/baselines/reference/declarationEmitDestructuring1.symbols
+++ b/tests/baselines/reference/declarationEmitDestructuring1.symbols
@@ -23,6 +23,7 @@ function bar({a1, b1, c1}: { a1: number, b1: boolean, c1: string }): void { }
 function baz({a2, b2: {b1, c1}}: { a2: number, b2: { b1: boolean, c1: string } }): void { } 
 >baz : Symbol(baz, Decl(declarationEmitDestructuring1.ts, 2, 77))
 >a2 : Symbol(a2, Decl(declarationEmitDestructuring1.ts, 3, 14))
+>b2 : Symbol(b2, Decl(declarationEmitDestructuring1.ts, 3, 46))
 >b1 : Symbol(b1, Decl(declarationEmitDestructuring1.ts, 3, 23))
 >c1 : Symbol(c1, Decl(declarationEmitDestructuring1.ts, 3, 26))
 >a2 : Symbol(a2, Decl(declarationEmitDestructuring1.ts, 3, 34))
diff --git a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.symbols b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.symbols
index 9e0e48f89e8..0a3c6f4044d 100644
--- a/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.symbols
+++ b/tests/baselines/reference/declarationEmitDestructuringArrayPattern2.symbols
@@ -17,6 +17,7 @@ var [a2, [b2, { x12, y12: c2 }]=["abc", { x12: 10, y12: false }]] = [1, ["hello"
 >a2 : Symbol(a2, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 5))
 >b2 : Symbol(b2, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 10))
 >x12 : Symbol(x12, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 15))
+>y12 : Symbol(y12, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 91))
 >c2 : Symbol(c2, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 20))
 >x12 : Symbol(x12, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 41))
 >y12 : Symbol(y12, Decl(declarationEmitDestructuringArrayPattern2.ts, 5, 50))
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols
index 3cb4ef28c2b..0a57a93f3d0 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern.symbols
@@ -21,24 +21,33 @@ var { x6, y6 } = { x6: 5, y6: "hello" };
 >y6 : Symbol(y6, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 4, 25))
 
 var { x7: a1 } = { x7: 5, y7: "hello" };
+>x7 : Symbol(x7, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 5, 18))
 >a1 : Symbol(a1, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 5, 5))
 >x7 : Symbol(x7, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 5, 18))
 >y7 : Symbol(y7, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 5, 25))
 
 var { y8: b1 } = { x8: 5, y8: "hello" };
+>y8 : Symbol(y8, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 6, 25))
 >b1 : Symbol(b1, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 6, 5))
 >x8 : Symbol(x8, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 6, 18))
 >y8 : Symbol(y8, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 6, 25))
 
 var { x9: a2, y9: b2 } = { x9: 5, y9: "hello" };
+>x9 : Symbol(x9, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 26))
 >a2 : Symbol(a2, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 5))
+>y9 : Symbol(y9, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 33))
 >b2 : Symbol(b2, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 13))
 >x9 : Symbol(x9, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 26))
 >y9 : Symbol(y9, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 7, 33))
 
 var { a: x11, b: { a: y11, b: { a: z11 }}} = { a: 1, b: { a: "hello", b: { a: true } } };
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 46))
 >x11 : Symbol(x11, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 5))
+>b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 52))
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 57))
 >y11 : Symbol(y11, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 18))
+>b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 69))
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 74))
 >z11 : Symbol(z11, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 31))
 >a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 46))
 >b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern.ts, 9, 52))
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.symbols b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.symbols
index a4c43a07bc8..cac2431411e 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.symbols
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern1.symbols
@@ -21,17 +21,21 @@ var { x6, y6 } = { x6: 5, y6: "hello" };
 >y6 : Symbol(y6, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 4, 25))
 
 var { x7: a1 } = { x7: 5, y7: "hello" };
+>x7 : Symbol(x7, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 5, 18))
 >a1 : Symbol(a1, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 5, 5))
 >x7 : Symbol(x7, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 5, 18))
 >y7 : Symbol(y7, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 5, 25))
 
 var { y8: b1 } = { x8: 5, y8: "hello" };
+>y8 : Symbol(y8, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 6, 25))
 >b1 : Symbol(b1, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 6, 5))
 >x8 : Symbol(x8, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 6, 18))
 >y8 : Symbol(y8, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 6, 25))
 
 var { x9: a2, y9: b2 } = { x9: 5, y9: "hello" };
+>x9 : Symbol(x9, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 26))
 >a2 : Symbol(a2, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 5))
+>y9 : Symbol(y9, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 33))
 >b2 : Symbol(b2, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 13))
 >x9 : Symbol(x9, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 26))
 >y9 : Symbol(y9, Decl(declarationEmitDestructuringObjectLiteralPattern1.ts, 7, 33))
diff --git a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols
index 76440b60038..77e26e2c9b7 100644
--- a/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols
+++ b/tests/baselines/reference/declarationEmitDestructuringObjectLiteralPattern2.symbols
@@ -1,8 +1,13 @@
 === tests/cases/compiler/declarationEmitDestructuringObjectLiteralPattern2.ts ===
 
 var { a: x11, b: { a: y11, b: { a: z11 }}} = { a: 1, b: { a: "hello", b: { a: true } } };
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 46))
 >x11 : Symbol(x11, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 5))
+>b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 52))
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 57))
 >y11 : Symbol(y11, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 18))
+>b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 69))
+>a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 74))
 >z11 : Symbol(z11, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 31))
 >a : Symbol(a, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 46))
 >b : Symbol(b, Decl(declarationEmitDestructuringObjectLiteralPattern2.ts, 1, 52))
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
index 017a7f71e61..718af66047d 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES5.symbols
@@ -19,6 +19,7 @@ var { b1, } = { b1:1, };
 >b1 : Symbol(b1, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 11, 15))
 
 var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
+>b2 : Symbol(b2, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 12, 44))
 >b21 : Symbol(b21, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 12, 11))
 >b21 : Symbol(b21, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 12, 21))
 >b2 : Symbol(b2, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 12, 44))
@@ -32,6 +33,7 @@ var {b4 = 1}: any = { b4: 100000 };
 >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 14, 21))
 
 var {b5: { b52 }  } = { b5: { b52 } };
+>b5 : Symbol(b5, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 15, 23))
 >b52 : Symbol(b52, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 15, 10))
 >b5 : Symbol(b5, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 15, 23))
 >b52 : Symbol(b52, Decl(destructuringObjectBindingPatternAndAssignment1ES5.ts, 15, 29))
diff --git a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
index 11289210ee4..57d739cbbfc 100644
--- a/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
+++ b/tests/baselines/reference/destructuringObjectBindingPatternAndAssignment1ES6.symbols
@@ -19,6 +19,7 @@ var { b1, } = { b1:1, };
 >b1 : Symbol(b1, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 11, 15))
 
 var { b2: { b21 } = { b21: "string" }  } = { b2: { b21: "world" } };
+>b2 : Symbol(b2, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 12, 44))
 >b21 : Symbol(b21, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 12, 11))
 >b21 : Symbol(b21, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 12, 21))
 >b2 : Symbol(b2, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 12, 44))
@@ -32,6 +33,7 @@ var {b4 = 1}: any = { b4: 100000 };
 >b4 : Symbol(b4, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 14, 21))
 
 var {b5: { b52 }  } = { b5: { b52 } };
+>b5 : Symbol(b5, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 15, 23))
 >b52 : Symbol(b52, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 15, 10))
 >b5 : Symbol(b5, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 15, 23))
 >b52 : Symbol(b52, Decl(destructuringObjectBindingPatternAndAssignment1ES6.ts, 15, 29))
diff --git a/tests/baselines/reference/destructuringVariableDeclaration1ES5.symbols b/tests/baselines/reference/destructuringVariableDeclaration1ES5.symbols
index 2a2f2a358ca..924527bf1b4 100644
--- a/tests/baselines/reference/destructuringVariableDeclaration1ES5.symbols
+++ b/tests/baselines/reference/destructuringVariableDeclaration1ES5.symbols
@@ -17,6 +17,7 @@ var [a3, [[a4]], a5]: [number, [[string]], boolean] = [1, [["hello"]], true];
 // The type T associated with a destructuring variable declaration is determined as follows:
 //      Otherwise, if the declaration includes an initializer expression, T is the type of that initializer expression.
 var { b1: { b11 } = { b11: "string" }  } = { b1: { b11: "world" } };
+>b1 : Symbol(b1, Decl(destructuringVariableDeclaration1ES5.ts, 7, 44))
 >b11 : Symbol(b11, Decl(destructuringVariableDeclaration1ES5.ts, 7, 11))
 >b11 : Symbol(b11, Decl(destructuringVariableDeclaration1ES5.ts, 7, 21))
 >b1 : Symbol(b1, Decl(destructuringVariableDeclaration1ES5.ts, 7, 44))
@@ -74,6 +75,7 @@ var [d3, d4] = [1, "string", ...temp1];
 
 //  Combining both forms of destructuring,
 var {e: [e1, e2, e3 = { b1: 1000, b4: 200 }]} = { e: [1, 2, { b1: 4, b4: 0 }] }; 
+>e : Symbol(e, Decl(destructuringVariableDeclaration1ES5.ts, 31, 49))
 >e1 : Symbol(e1, Decl(destructuringVariableDeclaration1ES5.ts, 31, 9))
 >e2 : Symbol(e2, Decl(destructuringVariableDeclaration1ES5.ts, 31, 12))
 >e3 : Symbol(e3, Decl(destructuringVariableDeclaration1ES5.ts, 31, 16))
@@ -84,8 +86,10 @@ var {e: [e1, e2, e3 = { b1: 1000, b4: 200 }]} = { e: [1, 2, { b1: 4, b4: 0 }] };
 >b4 : Symbol(b4, Decl(destructuringVariableDeclaration1ES5.ts, 31, 68))
 
 var {f: [f1, f2, { f3: f4, f5 }, , ]} = { f: [1, 2, { f3: 4, f5: 0 }] };
+>f : Symbol(f, Decl(destructuringVariableDeclaration1ES5.ts, 32, 41))
 >f1 : Symbol(f1, Decl(destructuringVariableDeclaration1ES5.ts, 32, 9))
 >f2 : Symbol(f2, Decl(destructuringVariableDeclaration1ES5.ts, 32, 12))
+>f3 : Symbol(f3, Decl(destructuringVariableDeclaration1ES5.ts, 32, 53))
 >f4 : Symbol(f4, Decl(destructuringVariableDeclaration1ES5.ts, 32, 18))
 >f5 : Symbol(f5, Decl(destructuringVariableDeclaration1ES5.ts, 32, 26))
 >f : Symbol(f, Decl(destructuringVariableDeclaration1ES5.ts, 32, 41))
@@ -96,6 +100,7 @@ var {f: [f1, f2, { f3: f4, f5 }, , ]} = { f: [1, 2, { f3: 4, f5: 0 }] };
 // an initializer expression, the type of the initializer expression is required to be assignable
 // to the widened form of the type associated with the destructuring variable declaration, binding property, or binding element.
 var {g: {g1 = [undefined, null]}}: { g: { g1: any[] } } = { g: { g1: [1, 2] } };
+>g : Symbol(g, Decl(destructuringVariableDeclaration1ES5.ts, 37, 36))
 >g1 : Symbol(g1, Decl(destructuringVariableDeclaration1ES5.ts, 37, 9))
 >undefined : Symbol(undefined)
 >g : Symbol(g, Decl(destructuringVariableDeclaration1ES5.ts, 37, 36))
@@ -104,6 +109,7 @@ var {g: {g1 = [undefined, null]}}: { g: { g1: any[] } } = { g: { g1: [1, 2] } };
 >g1 : Symbol(g1, Decl(destructuringVariableDeclaration1ES5.ts, 37, 64))
 
 var {h: {h1 = [undefined, null]}}: { h: { h1: number[] } } = { h: { h1: [1, 2] } };
+>h : Symbol(h, Decl(destructuringVariableDeclaration1ES5.ts, 38, 36))
 >h1 : Symbol(h1, Decl(destructuringVariableDeclaration1ES5.ts, 38, 9))
 >undefined : Symbol(undefined)
 >h : Symbol(h, Decl(destructuringVariableDeclaration1ES5.ts, 38, 36))
diff --git a/tests/baselines/reference/destructuringVariableDeclaration1ES6.symbols b/tests/baselines/reference/destructuringVariableDeclaration1ES6.symbols
index 0350ff35251..ee4f391eb7a 100644
--- a/tests/baselines/reference/destructuringVariableDeclaration1ES6.symbols
+++ b/tests/baselines/reference/destructuringVariableDeclaration1ES6.symbols
@@ -17,6 +17,7 @@ var [a3, [[a4]], a5]: [number, [[string]], boolean] = [1, [["hello"]], true];
 // The type T associated with a destructuring variable declaration is determined as follows:
 //      Otherwise, if the declaration includes an initializer expression, T is the type of that initializer expression.
 var { b1: { b11 } = { b11: "string" }  } = { b1: { b11: "world" } };
+>b1 : Symbol(b1, Decl(destructuringVariableDeclaration1ES6.ts, 7, 44))
 >b11 : Symbol(b11, Decl(destructuringVariableDeclaration1ES6.ts, 7, 11))
 >b11 : Symbol(b11, Decl(destructuringVariableDeclaration1ES6.ts, 7, 21))
 >b1 : Symbol(b1, Decl(destructuringVariableDeclaration1ES6.ts, 7, 44))
@@ -74,6 +75,7 @@ var [d3, d4] = [1, "string", ...temp1];
 
 //  Combining both forms of destructuring,
 var {e: [e1, e2, e3 = { b1: 1000, b4: 200 }]} = { e: [1, 2, { b1: 4, b4: 0 }] }; 
+>e : Symbol(e, Decl(destructuringVariableDeclaration1ES6.ts, 31, 49))
 >e1 : Symbol(e1, Decl(destructuringVariableDeclaration1ES6.ts, 31, 9))
 >e2 : Symbol(e2, Decl(destructuringVariableDeclaration1ES6.ts, 31, 12))
 >e3 : Symbol(e3, Decl(destructuringVariableDeclaration1ES6.ts, 31, 16))
@@ -84,8 +86,10 @@ var {e: [e1, e2, e3 = { b1: 1000, b4: 200 }]} = { e: [1, 2, { b1: 4, b4: 0 }] };
 >b4 : Symbol(b4, Decl(destructuringVariableDeclaration1ES6.ts, 31, 68))
 
 var {f: [f1, f2, { f3: f4, f5 }, , ]} = { f: [1, 2, { f3: 4, f5: 0 }] };
+>f : Symbol(f, Decl(destructuringVariableDeclaration1ES6.ts, 32, 41))
 >f1 : Symbol(f1, Decl(destructuringVariableDeclaration1ES6.ts, 32, 9))
 >f2 : Symbol(f2, Decl(destructuringVariableDeclaration1ES6.ts, 32, 12))
+>f3 : Symbol(f3, Decl(destructuringVariableDeclaration1ES6.ts, 32, 53))
 >f4 : Symbol(f4, Decl(destructuringVariableDeclaration1ES6.ts, 32, 18))
 >f5 : Symbol(f5, Decl(destructuringVariableDeclaration1ES6.ts, 32, 26))
 >f : Symbol(f, Decl(destructuringVariableDeclaration1ES6.ts, 32, 41))
@@ -96,6 +100,7 @@ var {f: [f1, f2, { f3: f4, f5 }, , ]} = { f: [1, 2, { f3: 4, f5: 0 }] };
 // an initializer expression, the type of the initializer expression is required to be assignable
 // to the widened form of the type associated with the destructuring variable declaration, binding property, or binding element.
 var {g: {g1 = [undefined, null]}}: { g: { g1: any[] } } = { g: { g1: [1, 2] } };
+>g : Symbol(g, Decl(destructuringVariableDeclaration1ES6.ts, 37, 36))
 >g1 : Symbol(g1, Decl(destructuringVariableDeclaration1ES6.ts, 37, 9))
 >undefined : Symbol(undefined)
 >g : Symbol(g, Decl(destructuringVariableDeclaration1ES6.ts, 37, 36))
@@ -104,6 +109,7 @@ var {g: {g1 = [undefined, null]}}: { g: { g1: any[] } } = { g: { g1: [1, 2] } };
 >g1 : Symbol(g1, Decl(destructuringVariableDeclaration1ES6.ts, 37, 64))
 
 var {h: {h1 = [undefined, null]}}: { h: { h1: number[] } } = { h: { h1: [1, 2] } };
+>h : Symbol(h, Decl(destructuringVariableDeclaration1ES6.ts, 38, 36))
 >h1 : Symbol(h1, Decl(destructuringVariableDeclaration1ES6.ts, 38, 9))
 >undefined : Symbol(undefined)
 >h : Symbol(h, Decl(destructuringVariableDeclaration1ES6.ts, 38, 36))
diff --git a/tests/baselines/reference/downlevelLetConst12.symbols b/tests/baselines/reference/downlevelLetConst12.symbols
index d1c7fe3ea5b..97d6d5eebf8 100644
--- a/tests/baselines/reference/downlevelLetConst12.symbols
+++ b/tests/baselines/reference/downlevelLetConst12.symbols
@@ -12,6 +12,7 @@ let [baz] = [];
 >baz : Symbol(baz, Decl(downlevelLetConst12.ts, 6, 5))
 
 let {a: baz2} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst12.ts, 7, 17))
 >baz2 : Symbol(baz2, Decl(downlevelLetConst12.ts, 7, 5))
 >a : Symbol(a, Decl(downlevelLetConst12.ts, 7, 17))
 
@@ -19,6 +20,7 @@ const [baz3] = []
 >baz3 : Symbol(baz3, Decl(downlevelLetConst12.ts, 9, 7))
 
 const {a: baz4} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst12.ts, 10, 19))
 >baz4 : Symbol(baz4, Decl(downlevelLetConst12.ts, 10, 7))
 >a : Symbol(a, Decl(downlevelLetConst12.ts, 10, 19))
 
diff --git a/tests/baselines/reference/downlevelLetConst13.symbols b/tests/baselines/reference/downlevelLetConst13.symbols
index 1b06184f2b3..f8cd2e548a9 100644
--- a/tests/baselines/reference/downlevelLetConst13.symbols
+++ b/tests/baselines/reference/downlevelLetConst13.symbols
@@ -16,10 +16,12 @@ export const [bar2] = [2];
 >bar2 : Symbol(bar2, Decl(downlevelLetConst13.ts, 7, 14))
 
 export let {a: bar3} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst13.ts, 8, 24))
 >bar3 : Symbol(bar3, Decl(downlevelLetConst13.ts, 8, 12))
 >a : Symbol(a, Decl(downlevelLetConst13.ts, 8, 24))
 
 export const {a: bar4} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst13.ts, 9, 26))
 >bar4 : Symbol(bar4, Decl(downlevelLetConst13.ts, 9, 14))
 >a : Symbol(a, Decl(downlevelLetConst13.ts, 9, 26))
 
@@ -39,10 +41,12 @@ export module M {
 >bar6 : Symbol(bar6, Decl(downlevelLetConst13.ts, 15, 18))
 
     export let {a: bar7} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst13.ts, 16, 28))
 >bar7 : Symbol(bar7, Decl(downlevelLetConst13.ts, 16, 16))
 >a : Symbol(a, Decl(downlevelLetConst13.ts, 16, 28))
 
     export const {a: bar8} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst13.ts, 17, 30))
 >bar8 : Symbol(bar8, Decl(downlevelLetConst13.ts, 17, 18))
 >a : Symbol(a, Decl(downlevelLetConst13.ts, 17, 30))
 }
diff --git a/tests/baselines/reference/downlevelLetConst14.symbols b/tests/baselines/reference/downlevelLetConst14.symbols
index bf3450af71c..135f3c1417d 100644
--- a/tests/baselines/reference/downlevelLetConst14.symbols
+++ b/tests/baselines/reference/downlevelLetConst14.symbols
@@ -35,6 +35,7 @@ var z0, z1, z2, z3;
 >z1 : Symbol(z1, Decl(downlevelLetConst14.ts, 11, 9))
 
     let {a: z2} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst14.ts, 13, 19))
 >z2 : Symbol(z2, Decl(downlevelLetConst14.ts, 13, 9))
 >a : Symbol(a, Decl(downlevelLetConst14.ts, 13, 19))
 
@@ -43,6 +44,7 @@ var z0, z1, z2, z3;
 >z2 : Symbol(z2, Decl(downlevelLetConst14.ts, 13, 9))
 
     let {a: z3} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst14.ts, 15, 19))
 >z3 : Symbol(z3, Decl(downlevelLetConst14.ts, 15, 9))
 >a : Symbol(a, Decl(downlevelLetConst14.ts, 15, 19))
 
@@ -86,6 +88,7 @@ var y = true;
 >y : Symbol(y, Decl(downlevelLetConst14.ts, 29, 11))
 
         let {a: z6} = {a: 1}
+>a : Symbol(a, Decl(downlevelLetConst14.ts, 30, 23))
 >z6 : Symbol(z6, Decl(downlevelLetConst14.ts, 30, 13))
 >a : Symbol(a, Decl(downlevelLetConst14.ts, 30, 23))
 
@@ -129,6 +132,7 @@ var z5 = 1;
 >_z : Symbol(_z, Decl(downlevelLetConst14.ts, 46, 11))
 
         let {a: _z5} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst14.ts, 47, 24))
 >_z5 : Symbol(_z5, Decl(downlevelLetConst14.ts, 47, 13))
 >a : Symbol(a, Decl(downlevelLetConst14.ts, 47, 24))
 
diff --git a/tests/baselines/reference/downlevelLetConst15.symbols b/tests/baselines/reference/downlevelLetConst15.symbols
index 159e5a6d676..00c7e122eb2 100644
--- a/tests/baselines/reference/downlevelLetConst15.symbols
+++ b/tests/baselines/reference/downlevelLetConst15.symbols
@@ -28,6 +28,7 @@ var z0, z1, z2, z3;
 >z0 : Symbol(z0, Decl(downlevelLetConst15.ts, 9, 11))
 
     const [{a: z1}] = [{a: 1}]
+>a : Symbol(a, Decl(downlevelLetConst15.ts, 11, 24))
 >z1 : Symbol(z1, Decl(downlevelLetConst15.ts, 11, 12))
 >a : Symbol(a, Decl(downlevelLetConst15.ts, 11, 24))
 
@@ -36,6 +37,7 @@ var z0, z1, z2, z3;
 >z1 : Symbol(z1, Decl(downlevelLetConst15.ts, 11, 12))
 
     const {a: z2} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst15.ts, 13, 21))
 >z2 : Symbol(z2, Decl(downlevelLetConst15.ts, 13, 11))
 >a : Symbol(a, Decl(downlevelLetConst15.ts, 13, 21))
 
@@ -44,6 +46,8 @@ var z0, z1, z2, z3;
 >z2 : Symbol(z2, Decl(downlevelLetConst15.ts, 13, 11))
 
     const {a: {b: z3}} = { a: {b: 1} };
+>a : Symbol(a, Decl(downlevelLetConst15.ts, 15, 26))
+>b : Symbol(b, Decl(downlevelLetConst15.ts, 15, 31))
 >z3 : Symbol(z3, Decl(downlevelLetConst15.ts, 15, 15))
 >a : Symbol(a, Decl(downlevelLetConst15.ts, 15, 26))
 >b : Symbol(b, Decl(downlevelLetConst15.ts, 15, 31))
@@ -88,6 +92,7 @@ var y = true;
 >y : Symbol(y, Decl(downlevelLetConst15.ts, 29, 13))
 
         const {a: z6} = { a: 1 }
+>a : Symbol(a, Decl(downlevelLetConst15.ts, 30, 25))
 >z6 : Symbol(z6, Decl(downlevelLetConst15.ts, 30, 15))
 >a : Symbol(a, Decl(downlevelLetConst15.ts, 30, 25))
 
@@ -131,6 +136,7 @@ var z5 = 1;
 >_z : Symbol(_z, Decl(downlevelLetConst15.ts, 46, 13))
 
         const {a: _z5} = { a: 1 };
+>a : Symbol(a, Decl(downlevelLetConst15.ts, 47, 26))
 >_z5 : Symbol(_z5, Decl(downlevelLetConst15.ts, 47, 15))
 >a : Symbol(a, Decl(downlevelLetConst15.ts, 47, 26))
 
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
index 4d0887c1ff8..eb24f638884 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18_ES6.symbols
@@ -4,6 +4,7 @@ function f() {
 >f : Symbol(f, Decl(emitArrowFunctionWhenUsingArguments18_ES6.ts, 0, 0))
 
     var { arguments: args } = { arguments };
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments18_ES6.ts, 2, 31))
 >args : Symbol(args, Decl(emitArrowFunctionWhenUsingArguments18_ES6.ts, 2, 9))
 >arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments18_ES6.ts, 2, 31))
 
diff --git a/tests/baselines/reference/for-of41.symbols b/tests/baselines/reference/for-of41.symbols
index cf8db913919..046361653bb 100644
--- a/tests/baselines/reference/for-of41.symbols
+++ b/tests/baselines/reference/for-of41.symbols
@@ -6,7 +6,9 @@ var array = [{x: [0], y: {p: ""}}]
 >p : Symbol(p, Decl(for-of41.ts, 0, 26))
 
 for (var {x: [a], y: {p}} of array) {
+>x : Symbol(x, Decl(for-of41.ts, 0, 14))
 >a : Symbol(a, Decl(for-of41.ts, 1, 14))
+>y : Symbol(y, Decl(for-of41.ts, 0, 21))
 >p : Symbol(p, Decl(for-of41.ts, 1, 22))
 >array : Symbol(array, Decl(for-of41.ts, 0, 3))
 
diff --git a/tests/baselines/reference/for-of42.symbols b/tests/baselines/reference/for-of42.symbols
index b310fb1044f..5310f4970b9 100644
--- a/tests/baselines/reference/for-of42.symbols
+++ b/tests/baselines/reference/for-of42.symbols
@@ -5,7 +5,9 @@ var array = [{ x: "", y: 0 }]
 >y : Symbol(y, Decl(for-of42.ts, 0, 21))
 
 for (var {x: a, y: b} of array) {
+>x : Symbol(x, Decl(for-of42.ts, 0, 14))
 >a : Symbol(a, Decl(for-of42.ts, 1, 10))
+>y : Symbol(y, Decl(for-of42.ts, 0, 21))
 >b : Symbol(b, Decl(for-of42.ts, 1, 15))
 >array : Symbol(array, Decl(for-of42.ts, 0, 3))
 
diff --git a/tests/baselines/reference/initializePropertiesWithRenamedLet.symbols b/tests/baselines/reference/initializePropertiesWithRenamedLet.symbols
index 203508ddf98..f16d8cfc9e0 100644
--- a/tests/baselines/reference/initializePropertiesWithRenamedLet.symbols
+++ b/tests/baselines/reference/initializePropertiesWithRenamedLet.symbols
@@ -24,6 +24,7 @@ var x, y, z;
 
 if (true) {
     let { x: x } = { x: 0 };
+>x : Symbol(x, Decl(initializePropertiesWithRenamedLet.ts, 10, 20))
 >x : Symbol(x, Decl(initializePropertiesWithRenamedLet.ts, 10, 9))
 >x : Symbol(x, Decl(initializePropertiesWithRenamedLet.ts, 10, 20))
 
diff --git a/tests/baselines/reference/letInNonStrictMode.symbols b/tests/baselines/reference/letInNonStrictMode.symbols
index 2b854a8c03f..47ba4465d1b 100644
--- a/tests/baselines/reference/letInNonStrictMode.symbols
+++ b/tests/baselines/reference/letInNonStrictMode.symbols
@@ -3,6 +3,7 @@ let [x] = [1];
 >x : Symbol(x, Decl(letInNonStrictMode.ts, 0, 5))
 
 let {a: y} = {a: 1};
+>a : Symbol(a, Decl(letInNonStrictMode.ts, 1, 14))
 >y : Symbol(y, Decl(letInNonStrictMode.ts, 1, 5))
 >a : Symbol(a, Decl(letInNonStrictMode.ts, 1, 14))
 
diff --git a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols
index 7cee5f3009b..f0546012498 100644
--- a/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols
+++ b/tests/baselines/reference/objectBindingPatternKeywordIdentifiers06.symbols
@@ -1,6 +1,7 @@
 === tests/cases/conformance/es6/destructuring/objectBindingPatternKeywordIdentifiers06.ts ===
 
 var { as: as } = { as: 1 }
+>as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers06.ts, 1, 18))
 >as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers06.ts, 1, 5))
 >as : Symbol(as, Decl(objectBindingPatternKeywordIdentifiers06.ts, 1, 18))
 
diff --git a/tests/baselines/reference/systemModule13.symbols b/tests/baselines/reference/systemModule13.symbols
index d9e64335c2b..8245029e006 100644
--- a/tests/baselines/reference/systemModule13.symbols
+++ b/tests/baselines/reference/systemModule13.symbols
@@ -6,7 +6,10 @@ export let [x,y,z] = [1, 2, 3];
 >z : Symbol(z, Decl(systemModule13.ts, 1, 16))
 
 export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
+>a : Symbol(a, Decl(systemModule13.ts, 2, 36))
 >z0 : Symbol(z0, Decl(systemModule13.ts, 2, 14))
+>b : Symbol(b, Decl(systemModule13.ts, 2, 44))
+>c : Symbol(c, Decl(systemModule13.ts, 2, 49))
 >z1 : Symbol(z1, Decl(systemModule13.ts, 2, 25))
 >a : Symbol(a, Decl(systemModule13.ts, 2, 36))
 >b : Symbol(b, Decl(systemModule13.ts, 2, 44))
diff --git a/tests/baselines/reference/systemModule8.symbols b/tests/baselines/reference/systemModule8.symbols
index 3365ce7e37d..719d48e4592 100644
--- a/tests/baselines/reference/systemModule8.symbols
+++ b/tests/baselines/reference/systemModule8.symbols
@@ -78,7 +78,10 @@ export let [y] = [1];
 >y : Symbol(y, Decl(systemModule8.ts, 27, 12))
 
 export const {a: z0, b: {c: z1}} = {a: true, b: {c: "123"}};
+>a : Symbol(a, Decl(systemModule8.ts, 28, 36))
 >z0 : Symbol(z0, Decl(systemModule8.ts, 28, 14))
+>b : Symbol(b, Decl(systemModule8.ts, 28, 44))
+>c : Symbol(c, Decl(systemModule8.ts, 28, 49))
 >z1 : Symbol(z1, Decl(systemModule8.ts, 28, 25))
 >a : Symbol(a, Decl(systemModule8.ts, 28, 36))
 >b : Symbol(b, Decl(systemModule8.ts, 28, 44))

From c0faaeecbe045dd070f17d41fe314f6561f67ccc Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 1 Jul 2015 14:26:05 -0700
Subject: [PATCH 10/17] Added more test cases for object binding patterns.

---
 ...lRefsObjectBindingElementPropertyName04.ts | 21 +++++++++++++++++
 ...lRefsObjectBindingElementPropertyName05.ts | 21 +++++++++++++++++
 ...lRefsObjectBindingElementPropertyName06.ts | 23 +++++++++++++++++++
 ...lRefsObjectBindingElementPropertyName07.ts | 15 ++++++++++++
 4 files changed, 80 insertions(+)
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
new file mode 100644
index 00000000000..ad72bd99bb8
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////function f({ [|property1|]: p1 }: I,
+////           { [|property1|] }: I,
+////           { property1: p2 }) {
+////}
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
new file mode 100644
index 00000000000..aa6432fa62e
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    property1: number;
+////    property2: string;
+////}
+////
+////function f({ [|property1|]: p }, { property1 }) {
+////    let x = property1;
+////}
+
+// Notice only one range.
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
new file mode 100644
index 00000000000..4ce33f2b6ad
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -0,0 +1,23 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////for (let { [|property1|]: p } of <I[]>[]) {
+////}
+////for (let { [|property1|] } of <I[]>[]) {
+////}
+////for (var { [|property1|]: p } of <I[]>[]) {
+////}
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts
new file mode 100644
index 00000000000..6448d2396b3
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName07.ts
@@ -0,0 +1,15 @@
+/// <reference path='fourslash.ts'/>
+
+////let p, b;
+////
+////p, [{ [|a|]: p, b }] = [{ [|a|]: 10, b: true }];
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file

From 873835b9e50354dc26f67e0f0ddbc336349fbf93 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 15:07:04 -0700
Subject: [PATCH 11/17] Add tests.

---
 ...tifierDefinitionLocations_destructuring.ts |  2 +-
 ...lRefsObjectBindingElementPropertyName04.ts | 16 +++++++-------
 ...lRefsObjectBindingElementPropertyName05.ts | 14 +++----------
 ...lRefsObjectBindingElementPropertyName06.ts | 13 +++++++++---
 ...lRefsObjectBindingElementPropertyName09.ts | 21 +++++++++++++++++++
 ...lRefsObjectBindingElementPropertyName10.ts | 21 +++++++++++++++++++
 ...foForObjectBindingElementPropertyName03.ts | 14 +++++++++++++
 ...foForObjectBindingElementPropertyName04.ts | 14 +++++++++++++
 8 files changed, 92 insertions(+), 23 deletions(-)
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
 create mode 100644 tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
 create mode 100644 tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts

diff --git a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
index 0812cb138d2..7f8ef32e1ad 100644
--- a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
+++ b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
@@ -16,7 +16,7 @@
 
 //// function func2({ a, b/*parameter2*/
 
-test.markers().forEach((m) => {
+test.markers().forEach(m => {
     goTo.position(m.position, m.fileName);
     verify.completionListIsEmpty();
 });
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
index ad72bd99bb8..a72023a1028 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -5,17 +5,17 @@
 ////    property2: string;
 ////}
 ////
-////function f({ [|property1|]: p1 }: I,
+////function f({ /**/[|property1|]: p1 }: I,
 ////           { [|property1|] }: I,
 ////           { property1: p2 }) {
+////
+////    return property1 + 1;
 ////}
 
-let ranges = test.ranges();
-for (let range of ranges) {
-    goTo.position(range.start);
+goTo.marker();
 
-    verify.referencesCountIs(ranges.length);
-    for (let expectedRange of ranges) {
-        verify.referencesAtPositionContains(expectedRange);
-    }
+let ranges = test.ranges();
+verify.referencesCountIs(ranges.length);
+for (let expectedRange of ranges) {
+    verify.referencesAtPositionContains(expectedRange);
 }
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
index aa6432fa62e..f7e3b80fe45 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName05.ts
@@ -5,17 +5,9 @@
 ////    property2: string;
 ////}
 ////
-////function f({ [|property1|]: p }, { property1 }) {
+////function f({ /**/property1: p }, { property1 }) {
 ////    let x = property1;
 ////}
 
-// Notice only one range.
-let ranges = test.ranges();
-for (let range of ranges) {
-    goTo.position(range.start);
-
-    verify.referencesCountIs(ranges.length);
-    for (let expectedRange of ranges) {
-        verify.referencesAtPositionContains(expectedRange);
-    }
-}
\ No newline at end of file
+goTo.marker();
+verify.referencesCountIs(0);
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
index 4ce33f2b6ad..67c7029861e 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName06.ts
@@ -5,12 +5,19 @@
 ////    property2: string;
 ////}
 ////
-////for (let { [|property1|]: p } of <I[]>[]) {
+////var elems: I[];
+////for (let { [|property1|]: p } of elems) {
 ////}
-////for (let { [|property1|] } of <I[]>[]) {
+////for (let { property1 } of elems) {
 ////}
-////for (var { [|property1|]: p } of <I[]>[]) {
+////for (var { [|property1|]: p1 } of elems) {
 ////}
+////var p2;
+////for ({ property1 : p2 } of elems) {
+////}
+
+// Note: if this test ever changes, consider updating
+//       'quickInfoForObjectBindingElementPropertyName05.ts'
 
 let ranges = test.ranges();
 for (let range of ranges) {
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
new file mode 100644
index 00000000000..0b82c73e31d
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface I {
+////    [|property1|]: number;
+////    property2: string;
+////}
+////
+////function f({ [|property1|]: p1 }: I,
+////           { /**/[|property1|] }: I,
+////           { property1: p2 }) {
+////
+////    return [|property1|] + 1;
+////}
+
+goTo.marker();
+
+let ranges = test.ranges();
+verify.referencesCountIs(ranges.length);
+for (let expectedRange of ranges) {
+    verify.referencesAtPositionContains(expectedRange);
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
new file mode 100644
index 00000000000..ea38f35d103
--- /dev/null
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
@@ -0,0 +1,21 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    [|next|]?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ [|next|]: { [|next|]: x} }: Recursive) {
+////}
+
+goTo.marker();
+
+let ranges = test.ranges();
+for (let range of ranges) {
+    goTo.position(range.start);
+
+    verify.referencesCountIs(ranges.length);
+    for (let expectedRange of ranges) {
+        verify.referencesAtPositionContains(expectedRange);
+    }
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
new file mode 100644
index 00000000000..cfdeef111dc
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName03.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    next?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ /*1*/next: { /*2*/next: x} }: Recursive) {
+////}
+
+for (let { position } of test.markers()) {
+    goTo.position(position)
+    verify.quickInfoIs("(property) Recursive.next: Recursive");
+}
\ No newline at end of file
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
new file mode 100644
index 00000000000..6a0a6cb792a
--- /dev/null
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
@@ -0,0 +1,14 @@
+/// <reference path='fourslash.ts'/>
+
+////interface Recursive {
+////    next?: Recursive;
+////    value: any;
+////}
+////
+////function f ({ /*1*/next: { /*2*/next: x} }) {
+////}
+
+for (let { position } of test.markers()) {
+    goTo.position(position)
+    verify.quickInfoIs("(property) next: any");
+}
\ No newline at end of file

From 1f6e2ddeacbcd18763ee2c1ea9527dd240740cca Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 15:53:11 -0700
Subject: [PATCH 12/17] Fixed reporting of problems with tests.

---
 src/harness/fourslash.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
index 208237b8b64..c90494ce8ed 100644
--- a/src/harness/fourslash.ts
+++ b/src/harness/fourslash.ts
@@ -670,20 +670,20 @@ module FourSlash {
 
             var completions = this.getCompletionListAtCaret();
             if ((!completions || completions.entries.length === 0) && negative) {
-                this.raiseError("Completion list is empty at Caret");
-            } else if ((completions && completions.entries.length !== 0) && !negative) {
-
-                var errorMsg = "\n" + "Completion List contains: [" + completions.entries[0].name;
+                this.raiseError("Completion list is empty at caret at position " + this.activeFile.fileName + " " + this.currentCaretPosition);
+            }
+            else if (completions && completions.entries.length !== 0 && !negative) {
+                let errorMsg = "\n" + "Completion List contains: [" + completions.entries[0].name;
                 for (var i = 1; i < completions.entries.length; i++) {
                     errorMsg += ", " + completions.entries[i].name;
                 }
                 errorMsg += "]\n";
 
-                Harness.IO.log(errorMsg);
-                this.raiseError("Completion list is not empty at Caret");
+                this.raiseError("Completion list is not empty at caret at position " + this.activeFile.fileName + " " + this.currentCaretPosition + errorMsg);
             }
         }
 
+
         public verifyCompletionListAllowsNewIdentifier(negative: boolean) {
             var completions = this.getCompletionListAtCaret();
 

From 5c6a3d73b9e9eb3ac44590b30573e05394fa1cbc Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 15:53:42 -0700
Subject: [PATCH 13/17] Use type predicate for 'isVariableLike'.

---
 src/compiler/utilities.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index e66e1925519..37a7552a3e7 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -566,7 +566,7 @@ namespace ts {
         }
     }
 
-    export function isVariableLike(node: Node): boolean {
+    export function isVariableLike(node: Node): node is VariableLikeDeclaration {
         if (node) {
             switch (node.kind) {
                 case SyntaxKind.BindingElement:

From fdd1f30a955ea2aa99dea761754bb12ee52cc32b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 15:56:13 -0700
Subject: [PATCH 14/17] Enable retrieving the type of a binding property name
 when an initializer/type annotation is present.

---
 src/compiler/checker.ts  | 19 ++++++++++++++-----
 src/services/services.ts | 15 +++++++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 8122ab3c983..38554f63b2a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -2293,6 +2293,7 @@ namespace ts {
             if (declaration.parent.parent.kind === SyntaxKind.ForInStatement) {
                 return anyType;
             }
+
             if (declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
                 // checkRightHandSideOfForOf will return undefined if the for-of expression type was
                 // missing properties/signatures required to get its iteratedType (like
@@ -2300,13 +2301,16 @@ namespace ts {
                 // or it may have led to an error inside getElementTypeOfIterable.
                 return checkRightHandSideOfForOf((<ForOfStatement>declaration.parent.parent).expression) || anyType;
             }
+
             if (isBindingPattern(declaration.parent)) {
                 return getTypeForBindingElement(<BindingElement>declaration);
             }
+            
             // Use type from type annotation if one is present
             if (declaration.type) {
                 return getTypeFromTypeNode(declaration.type);
             }
+
             if (declaration.kind === SyntaxKind.Parameter) {
                 let func = <FunctionLikeDeclaration>declaration.parent;
                 // For a parameter of a set accessor, use the type of the get accessor if one is present
@@ -2322,14 +2326,22 @@ namespace ts {
                     return type;
                 }
             }
+            
             // Use the type of the initializer expression if one is present
             if (declaration.initializer) {
                 return checkExpressionCached(declaration.initializer);
             }
+            
             // If it is a short-hand property assignment, use the type of the identifier
             if (declaration.kind === SyntaxKind.ShorthandPropertyAssignment) {
                 return checkIdentifier(<Identifier>declaration.name);
             }
+
+            // If the declaration specifies a binding pattern, use the type implied by the binding pattern
+            if (isBindingPattern(declaration.name)) {
+                return getTypeFromBindingPattern(<BindingPattern>declaration.name);
+            }
+
             // No type specified and nothing can be inferred
             return undefined;
         }
@@ -2415,13 +2427,10 @@ namespace ts {
                 // tools see the actual type.
                 return declaration.kind !== SyntaxKind.PropertyAssignment ? getWidenedType(type) : type;
             }
-            // If no type was specified and nothing could be inferred, and if the declaration specifies a binding pattern, use
-            // the type implied by the binding pattern
-            if (isBindingPattern(declaration.name)) {
-                return getTypeFromBindingPattern(<BindingPattern>declaration.name);
-            }
+            
             // Rest parameters default to type any[], other parameters default to type any
             type = declaration.dotDotDotToken ? anyArrayType : anyType;
+            
             // Report implicit any errors unless this is a private property within an ambient declaration
             if (reportErrors && compilerOptions.noImplicitAny) {
                 let root = getRootDeclaration(declaration);
diff --git a/src/services/services.ts b/src/services/services.ts
index d79436bb478..0a34ed0e1c0 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -3232,8 +3232,19 @@ namespace ts {
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
 
-                    typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
-                    existingMembers = (<BindingPattern>objectLikeContainer).elements;
+                    let rootDeclaration = getRootDeclaration(objectLikeContainer.parent);
+                    if (isVariableLike(rootDeclaration)) {
+                        // We don't want to complete using the type acquired by the shape 
+                        // of the binding pattern; we are only interested in types acquired
+                        // through type declaration or inference.
+                        if (rootDeclaration.initializer || rootDeclaration.type) {
+                            typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
+                            existingMembers = (<BindingPattern>objectLikeContainer).elements;
+                        }
+                    }
+                    else {
+                        Debug.fail("Root declaration is not variable-like.")
+                    }
                 }
                 else {
                     Debug.fail("Expected object literal or binding pattern, got " + objectLikeContainer.kind);

From 5cd77167ec212f94ea2cc8783678440b8ffafd0b Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 15:57:01 -0700
Subject: [PATCH 15/17] Updated baselines.

---
 tests/baselines/reference/arrowFunctionExpressions.symbols | 2 ++
 tests/baselines/reference/emitArrowFunctionES6.symbols     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/baselines/reference/arrowFunctionExpressions.symbols b/tests/baselines/reference/arrowFunctionExpressions.symbols
index 28945e1179f..61c575933da 100644
--- a/tests/baselines/reference/arrowFunctionExpressions.symbols
+++ b/tests/baselines/reference/arrowFunctionExpressions.symbols
@@ -70,6 +70,7 @@ var p6 = ({ a }) => { };
 
 var p7 = ({ a: { b } }) => { };
 >p7 : Symbol(p7, Decl(arrowFunctionExpressions.ts, 21, 3))
+>a : Symbol(a)
 >b : Symbol(b, Decl(arrowFunctionExpressions.ts, 21, 16))
 
 var p8 = ({ a = 1 }) => { };
@@ -78,6 +79,7 @@ var p8 = ({ a = 1 }) => { };
 
 var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >p9 : Symbol(p9, Decl(arrowFunctionExpressions.ts, 23, 3))
+>a : Symbol(a)
 >b : Symbol(b, Decl(arrowFunctionExpressions.ts, 23, 16))
 >b : Symbol(b, Decl(arrowFunctionExpressions.ts, 23, 28))
 
diff --git a/tests/baselines/reference/emitArrowFunctionES6.symbols b/tests/baselines/reference/emitArrowFunctionES6.symbols
index 06f83f7f6f0..8d1603cfd82 100644
--- a/tests/baselines/reference/emitArrowFunctionES6.symbols
+++ b/tests/baselines/reference/emitArrowFunctionES6.symbols
@@ -56,6 +56,7 @@ var p6 = ({ a }) => { };
 
 var p7 = ({ a: { b } }) => { };
 >p7 : Symbol(p7, Decl(emitArrowFunctionES6.ts, 15, 3))
+>a : Symbol(a)
 >b : Symbol(b, Decl(emitArrowFunctionES6.ts, 15, 16))
 
 var p8 = ({ a = 1 }) => { };
@@ -64,6 +65,7 @@ var p8 = ({ a = 1 }) => { };
 
 var p9 = ({ a: { b = 1 } = { b: 1 } }) => { };
 >p9 : Symbol(p9, Decl(emitArrowFunctionES6.ts, 17, 3))
+>a : Symbol(a)
 >b : Symbol(b, Decl(emitArrowFunctionES6.ts, 17, 16))
 >b : Symbol(b, Decl(emitArrowFunctionES6.ts, 17, 28))
 

From 9233073d235b745b599a4b71dfebbb70749e1c0a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 16:05:49 -0700
Subject: [PATCH 16/17] Fixed tests.

---
 .../findAllRefsObjectBindingElementPropertyName10.ts  |  2 --
 .../quickInfoForObjectBindingElementPropertyName04.ts | 11 +++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
index ea38f35d103..7b8be1aa91c 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName10.ts
@@ -8,8 +8,6 @@
 ////function f ({ [|next|]: { [|next|]: x} }: Recursive) {
 ////}
 
-goTo.marker();
-
 let ranges = test.ranges();
 for (let range of ranges) {
     goTo.position(range.start);
diff --git a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
index 6a0a6cb792a..8b152740861 100644
--- a/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/quickInfoForObjectBindingElementPropertyName04.ts
@@ -8,7 +8,10 @@
 ////function f ({ /*1*/next: { /*2*/next: x} }) {
 ////}
 
-for (let { position } of test.markers()) {
-    goTo.position(position)
-    verify.quickInfoIs("(property) next: any");
-}
\ No newline at end of file
+goTo.marker("1");
+verify.quickInfoIs(`(property) next: {
+    next: any;
+}`);
+
+goTo.marker("2");
+verify.quickInfoIs("(property) next: any");
\ No newline at end of file

From 4c483e5517bc4ef57e46cbf9e204b1623c14d106 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 15 Jul 2015 16:32:02 -0700
Subject: [PATCH 17/17] Make tests intentionally expect wrong results until we
 do "smarter" things for object binding elements.

---
 .../findAllRefsObjectBindingElementPropertyName04.ts        | 4 +++-
 .../findAllRefsObjectBindingElementPropertyName09.ts        | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
index a72023a1028..bdb37525f71 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName04.ts
@@ -6,12 +6,14 @@
 ////}
 ////
 ////function f({ /**/[|property1|]: p1 }: I,
-////           { [|property1|] }: I,
+////           { /*SHOULD_BE_A_REFERENCE*/property1 }: I,
 ////           { property1: p2 }) {
 ////
 ////    return property1 + 1;
 ////}
 
+// NOTE: In the future, the identifier at
+//       SHOULD_BE_A_REFERENCE should be in the set of ranges.
 goTo.marker();
 
 let ranges = test.ranges();
diff --git a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
index 0b82c73e31d..e45359bcf1c 100644
--- a/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
+++ b/tests/cases/fourslash/findAllRefsObjectBindingElementPropertyName09.ts
@@ -1,17 +1,19 @@
 /// <reference path='fourslash.ts'/>
 
 ////interface I {
-////    [|property1|]: number;
+////    /*SHOULD_BE_A_REFERENCE1*/property1: number;
 ////    property2: string;
 ////}
 ////
-////function f({ [|property1|]: p1 }: I,
+////function f({ /*SHOULD_BE_A_REFERENCE2*/property1: p1 }: I,
 ////           { /**/[|property1|] }: I,
 ////           { property1: p2 }) {
 ////
 ////    return [|property1|] + 1;
 ////}
 
+// NOTE: In the future, the identifiers at
+//       SHOULD_BE_A_REFERENCE[1/2] should be in the set of ranges.
 goTo.marker();
 
 let ranges = test.ranges();