From 141654dfccaa4839a240ba4a0936a6ff1b91f901 Mon Sep 17 00:00:00 2001
From: Lukas Taegert-Atkinson <lukas.taegert-atkinson@tngtech.com>
Date: Wed, 13 Feb 2019 06:28:57 +0100
Subject: [PATCH] Make sure it resolves #2683

---
 test/function/samples/deconflict-deconflicted/_config.js | 3 +++
 test/function/samples/deconflict-deconflicted/dep.js     | 5 +++++
 test/function/samples/deconflict-deconflicted/main.js    | 3 +++
 3 files changed, 11 insertions(+)
 create mode 100644 test/function/samples/deconflict-deconflicted/_config.js
 create mode 100644 test/function/samples/deconflict-deconflicted/dep.js
 create mode 100644 test/function/samples/deconflict-deconflicted/main.js

diff --git a/test/function/samples/deconflict-deconflicted/_config.js b/test/function/samples/deconflict-deconflicted/_config.js
new file mode 100644
index 00000000000..a3fcda5c37c
--- /dev/null
+++ b/test/function/samples/deconflict-deconflicted/_config.js
@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'also deconflict variables which already appear to be deconflicted (#2683)'
+};
diff --git a/test/function/samples/deconflict-deconflicted/dep.js b/test/function/samples/deconflict-deconflicted/dep.js
new file mode 100644
index 00000000000..e9c523549f3
--- /dev/null
+++ b/test/function/samples/deconflict-deconflicted/dep.js
@@ -0,0 +1,5 @@
+var value = '1';
+
+export function x(value$1) {
+	return value$1 + value;
+}
diff --git a/test/function/samples/deconflict-deconflicted/main.js b/test/function/samples/deconflict-deconflicted/main.js
new file mode 100644
index 00000000000..8db44ecb0bd
--- /dev/null
+++ b/test/function/samples/deconflict-deconflicted/main.js
@@ -0,0 +1,3 @@
+import { x } from './dep.js';
+
+assert.equal(x('name'), 'name1');