Merge pull request #1551 from rollup/gh-1550

deshadow aliased imports

src/ast/scopes/ModuleScope.js

@@ -50,6 +50,10 @@ export default class ModuleScope extends Scope {
 				if ( name !== specifier.name ) {
 					names.add( declaration.getName( true ) );
 				}
+
+				if ( specifier.name !== 'default' && specifier.specifier.imported.name !== specifier.specifier.local.name ) {
+					names.add( specifier.specifier.imported.name );
+				}
 			}
 		});
 

test/function/samples/deshadowed-namespaced-import-renamed/_config.js

@@ -0,0 +1,3 @@
+module.exports = {
+	description: '#1550'
+};

test/function/samples/deshadowed-namespaced-import-renamed/foo.js

@@ -0,0 +1 @@
+export * from './ns.js';

test/function/samples/deshadowed-namespaced-import-renamed/main.js

@@ -0,0 +1,10 @@
+import { foo as doFoo } from './foo.js';
+
+assert.equal((() => {
+	function foo() {
+		return doFoo();
+	}
+
+	return foo();
+})(), 42);
+

test/function/samples/deshadowed-namespaced-import-renamed/ns.js

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