Merge pull request #429 from dart-lang/module-builder-followup

John Messerly · John Messerly · commit de8e3a0cff11 · 2016-01-26T13:47:03.000-08:00
Import package:path with an alias in module_builder
diff --git a/pkg/dev_compiler/lib/src/codegen/module_builder.dart b/pkg/dev_compiler/lib/src/codegen/module_builder.dart
@@ -4,7 +4,7 @@
 
 library dev_compiler.src.codegen.module_builder;
 
-import 'package:path/path.dart' show relative;
+import 'package:path/path.dart' as path;
 
 import '../js/js_ast.dart' as JS;
 import '../js/js_ast.dart' show js;
@@ -110,7 +110,8 @@ class LegacyModuleBuilder extends ModuleBuilder {
 }
 
 String _relativeModuleName(String moduleName, {String from}) {
-  var relativeName = relative('/' + moduleName, from: '/' + from + '/..');
+  var relativeName =
+      path.relative('/' + moduleName, from: path.dirname('/$from'));
   return relativeName.startsWith('.') ? relativeName : './$relativeName';
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`library dev_compiler.src.codegen.module_builder;`
`6`	`6`
`7`		`-import 'package:path/path.dart' show relative;`
	`7`	`+import 'package:path/path.dart' as path;`
`8`	`8`
`9`	`9`	`import '../js/js_ast.dart' as JS;`
`10`	`10`	`import '../js/js_ast.dart' show js;`
`@@ -110,7 +110,8 @@ class LegacyModuleBuilder extends ModuleBuilder {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`String _relativeModuleName(String moduleName, {String from}) {`
`113`		`- var relativeName = relative('/' + moduleName, from: '/' + from + '/..');`
	`113`	`+ var relativeName =`
	`114`	`+ path.relative('/' + moduleName, from: path.dirname('/$from'));`
`114`	`115`	`return relativeName.startsWith('.') ? relativeName : './$relativeName';`
`115`	`116`	`}`
`116`	`117`