From e233da0fd6ae9abe2147e0d6d367f6396be2654d Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Tue, 3 Feb 2015 18:03:40 -0800
Subject: [PATCH] Parameter destructuring + tests

---
 src/services/services.ts                               | 10 ++++++----
 ...istAtIdentifierDefinitionLocations_destructuring.ts |  8 ++++++++
 .../completionListBuilderLocations_parameters.ts       |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/services/services.ts b/src/services/services.ts
index b4a622297c7..126cf578c1c 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2515,8 +2515,9 @@ module ts {
                                 isFunction(containingNodeKind) ||
                                 containingNodeKind === SyntaxKind.ClassDeclaration ||          // class A<T, |
                                 containingNodeKind === SyntaxKind.FunctionDeclaration ||       // function A<T, |
-                                containingNodeKind === SyntaxKind.InterfaceDeclaration ||        // interface A<T, |
-                                containingNodeKind === SyntaxKind.ArrayBindingPattern;         //  var [x, y|
+                                containingNodeKind === SyntaxKind.InterfaceDeclaration ||      // interface A<T, |
+                                containingNodeKind === SyntaxKind.ArrayBindingPattern ||       //  var [x, y|
+                                containingNodeKind === SyntaxKind.ObjectBindingPattern;        // function func({ x, y|
 
                         case SyntaxKind.DotToken:
                             return containingNodeKind === SyntaxKind.ArrayBindingPattern;       // var [.|
@@ -2530,8 +2531,9 @@ module ts {
 
                         case SyntaxKind.OpenBraceToken:
                             return containingNodeKind === SyntaxKind.EnumDeclaration ||        // enum a { |
-                                containingNodeKind === SyntaxKind.InterfaceDeclaration ||        // interface a { |
-                                containingNodeKind === SyntaxKind.TypeLiteral;                  // var x : { |
+                                containingNodeKind === SyntaxKind.InterfaceDeclaration ||      // interface a { |
+                                containingNodeKind === SyntaxKind.TypeLiteral ||               // var x : { |
+                                containingNodeKind === SyntaxKind.ObjectBindingPattern;        // function func({ x|
 
                         case SyntaxKind.SemicolonToken:
                             return containingNodeKind === SyntaxKind.PropertySignature &&
diff --git a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
index 2863b1c0732..143c884e177 100644
--- a/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
+++ b/tests/cases/fourslash/completionListAtIdentifierDefinitionLocations_destructuring.ts
@@ -8,6 +8,14 @@
 
 //// var [x, ...z/*variable4*/
 
+//// var {x/*variable5*/
+
+//// var {x, y/*variable6*/
+
+//// function func1({ a/*parameter1*/
+
+//// function func2({ a, b/*parameter2*/
+
 test.markers().forEach((m) => {
     goTo.position(m.position, m.fileName);
     verify.completionListIsEmpty();
diff --git a/tests/cases/fourslash/completionListBuilderLocations_parameters.ts b/tests/cases/fourslash/completionListBuilderLocations_parameters.ts
index 4bc60180efc..12dba953d3d 100644
--- a/tests/cases/fourslash/completionListBuilderLocations_parameters.ts
+++ b/tests/cases/fourslash/completionListBuilderLocations_parameters.ts
@@ -19,4 +19,4 @@ test.markers().forEach((m) => {
     goTo.position(m.position, m.fileName);
     verify.not.completionListIsEmpty();
     verify.completionListAllowsNewIdentifier();
-});
+});
\ No newline at end of file