From 63af3d1366845e9d9e504792d25c41c57f5dac0d Mon Sep 17 00:00:00 2001
From: Chris Cowan <agentme49@gmail.com>
Date: Tue, 1 Mar 2016 17:13:20 -0800
Subject: [PATCH] Fix issue where we didn't record seeing a property sometimes.

---
 .../src/index.js                                         | 9 +++------
 .../duplicate-keys/getters-and-setters/actual.js         | 8 +++++++-
 .../duplicate-keys/getters-and-setters/expected.js       | 8 +++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js b/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js
index df7b32cee0..551e27a4ec 100644
--- a/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js
+++ b/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js
@@ -33,23 +33,20 @@ export default function() {
           case "get":
             if (alreadySeenData[name] || alreadySeenGetters[name]) {
               isDuplicate = true;
-            } else {
-              alreadySeenGetters[name] = true;
             }
+            alreadySeenGetters[name] = true;
             break;
           case "set":
             if (alreadySeenData[name] || alreadySeenSetters[name]) {
               isDuplicate = true;
-            } else {
-              alreadySeenSetters[name] = true;
             }
+            alreadySeenSetters[name] = true;
             break;
           default:
             if (alreadySeenData[name] || alreadySeenGetters[name] || alreadySeenSetters[name]) {
               isDuplicate = true;
-            } else {
-              alreadySeenData[name] = true;
             }
+            alreadySeenData[name] = true;
           }
 
           if (isDuplicate) {
diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/actual.js b/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/actual.js
index b67c507f76..fe9df3aa0e 100644
--- a/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/actual.js
+++ b/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/actual.js
@@ -6,5 +6,11 @@ var x = {
   a: 3,
   b: 4,
   get b() {},
-  set b(x) {}
+  set b(x) {},
+  get c() {},
+  c: 5,
+  set c(x) {},
+  set d(x) {},
+  d: 6,
+  get d() {}
 };
diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/expected.js b/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/expected.js
index 02f77e94e2..9c5ae8b475 100644
--- a/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/expected.js
+++ b/packages/babel-plugin-transform-es2015-duplicate-keys/test/fixtures/duplicate-keys/getters-and-setters/expected.js
@@ -6,5 +6,11 @@ var x = {
   ["a"]: 3,
   b: 4,
   get ["b"]() {},
-  set ["b"](x) {}
+  set ["b"](x) {},
+  get c() {},
+  ["c"]: 5,
+  set ["c"](x) {},
+  set d(x) {},
+  ["d"]: 6,
+  get ["d"]() {}
 };