Merge branch 'deshadow-bug' into rewrite-master

src/Module.js

@@ -537,6 +537,8 @@ export default class Module {
 					// namespace optimisation – name of `foo.bar` could be `bar`
 					if ( reference.name === name && name.length === reference.end - reference.start ) return;
 
+					reference.rewritten = true;
+
 					// prevent local variables from shadowing renamed references
 					const identifier = name.match( /[^\.]+/ )[0];
 					if ( reference.scope.contains( identifier ) ) {
@@ -553,7 +555,7 @@ export default class Module {
 
 			if ( keys( toDeshadow ).length ) {
 				statement.references.forEach( reference => {
-					if ( reference.name in toDeshadow ) {
+					if ( !reference.rewritten && reference.name in toDeshadow ) {
 						magicString.overwrite( reference.start, reference.end, toDeshadow[ reference.name ], true );
 					}
 				});

src/Statement.js

@@ -53,6 +53,7 @@ class Reference {
 
 		this.start = node.start;
 		this.end = node.start + this.name.length; // can be overridden in the case of namespace members
+		this.rewritten = false;
 	}
 }
 

test/function/deshadow-top-level-declaration/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: 'deshadows top-level declarations'
+};

test/function/deshadow-top-level-declaration/a.js

@@ -0,0 +1 @@
+import './x';

test/function/deshadow-top-level-declaration/b.js

@@ -0,0 +1,5 @@
+import { foo as _foo } from './foo';
+
+export default function foo () {
+	_foo();
+}

test/function/deshadow-top-level-declaration/foo.js

@@ -0,0 +1,3 @@
+function foo () {}
+
+export { foo };

test/function/deshadow-top-level-declaration/main.js

@@ -0,0 +1,5 @@
+import './foo';
+import './a';
+import b from './b';
+
+assert.equal( typeof b, 'function' );

test/function/deshadow-top-level-declaration/x.js

@@ -0,0 +1,5 @@
+import { foo } from './foo';
+
+function x () {
+	foo();
+}