Skip to content
This repository has been archived by the owner on Dec 6, 2017. It is now read-only.

Fixes classes with the same name in different libraries. #220

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixes classes with the same name in different libraries. #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e7da4d
Adds missing import for TypeLiteral
winstonewert Feb 24, 2015
d823922
Merge remote-tracking branch 'upstream/master'
winstonewert Jun 11, 2015
dd10b23
Fixes classes with the same name in different libs.
winstonewert Jun 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion lib/transformer/injector_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ class _Processor {
(item) => item.element.returnType.element);
}

var keyName = '_KEY_${param.type.name}' + (annotations.isNotEmpty ? '_${annotations.first}' : '');
var prefix = prefixes[param.type.element.library];
var keyName = '_KEY${prefix.isNotEmpty ? '_$prefix' : ''}_${param.type.name}${annotations.isNotEmpty ? '_${annotations.first}' : ''}';
var typeArgs = param.type.typeArguments;
if (typeArgs != null && typeArgs.isNotEmpty && typeArgs.any((arg) => arg is! DynamicTypeImpl)) {
typeArgs.forEach((arg) => keyName = ('${keyName}_${arg.name}'));
Expand Down
109 changes: 87 additions & 22 deletions test/transformer_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ main() {
"import 'package:a/seat.dart' as import_2;",
],
keys: [
'Engine = new Key(import_1.Engine);',
'Seat = new Key(import_2.Seat);',
'import_1_Engine = new Key(import_1.Engine);',
'import_2_Seat = new Key(import_2.Seat);',
],
factories: [
'import_0.Car: (a1, a2) => new import_0.Car(a1, a2),',
'import_1.Engine: () => new import_1.Engine(),',
'import_2.Seat: () => new import_2.Seat(),',
],
paramKeys: [
'import_0.Car: [_KEY_Engine, _KEY_Seat],',
'import_0.Car: [_KEY_import_1_Engine, _KEY_import_2_Seat],',
'import_1.Engine: const[],',
'import_2.Seat: const[],'
]);
Expand Down Expand Up @@ -118,13 +118,13 @@ main() {
"import 'package:a/a.dart' as import_0;",
],
keys: [
'Foo_bool = new Key(new TypeLiteral<import_0.Foo<bool>>().type);',
'import_0_Foo_bool = new Key(new TypeLiteral<import_0.Foo<bool>>().type);',
],
factories: [
'import_0.Bar: (a1) => new import_0.Bar(a1),',
],
paramKeys: [
'import_0.Bar: [_KEY_Foo_bool],',
'import_0.Bar: [_KEY_import_0_Foo_bool],',
]);
});

Expand All @@ -145,13 +145,13 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
"Foo = new Key(import_0.Foo);"
"import_0_Foo = new Key(import_0.Foo);"
],
factories: [
'import_0.Bar: (a1) => new import_0.Bar(a1),',
],
paramKeys: [
'import_0.Bar: [_KEY_Foo],'
'import_0.Bar: [_KEY_import_0_Foo],'
]);
});

Expand All @@ -172,13 +172,13 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
'Foo_bool_dynamic_num = new Key(new TypeLiteral<import_0.Foo<bool, dynamic, num>>().type);',
'import_0_Foo_bool_dynamic_num = new Key(new TypeLiteral<import_0.Foo<bool, dynamic, num>>().type);',
],
factories: [
'import_0.Bar: (a1) => new import_0.Bar(a1),',
],
paramKeys: [
'import_0.Bar: [_KEY_Foo_bool_dynamic_num],'
'import_0.Bar: [_KEY_import_0_Foo_bool_dynamic_num],'
]);
});

Expand All @@ -203,15 +203,15 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
'Foo = new Key(import_0.Foo);',
'import_0_Foo = new Key(import_0.Foo);',
],
factories: [
'import_0.Bar: (a1) => new import_0.Bar(a1),',
'import_0.Baz: (a1) => new import_0.Baz(a1),',
],
paramKeys: [
'import_0.Bar: [_KEY_Foo],',
'import_0.Baz: [_KEY_Foo],',
'import_0.Bar: [_KEY_import_0_Foo],',
'import_0.Baz: [_KEY_import_0_Foo],',
]);
});

Expand Down Expand Up @@ -296,14 +296,14 @@ main() {
"import 'package:a/b.dart' as import_1;",
],
keys: [
"Engine = new Key(import_1.Engine);"
"import_1_Engine = new Key(import_1.Engine);"
],
factories: [
'import_0.Car: (a1) => new import_0.Car(a1),',
'import_1.Engine: () => new import_1.Engine(),',
],
paramKeys: [
'import_0.Car: [_KEY_Engine],',
'import_0.Car: [_KEY_import_1_Engine],',
'import_1.Engine: const[],',
]);
});
Expand Down Expand Up @@ -478,13 +478,13 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
"Fuel = new Key(import_0.Fuel);",
"import_0_Fuel = new Key(import_0.Fuel);",
],
factories: [
'import_0.Engine: (a1) => new import_0.Engine(a1),',
],
paramKeys: [
'import_0.Engine: [_KEY_Fuel],'
'import_0.Engine: [_KEY_import_0_Fuel],'
]);
});

Expand All @@ -509,13 +509,13 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
"JetFuel = new Key(import_0.JetFuel);",
"import_0_JetFuel = new Key(import_0.JetFuel);",
],
factories: [
'import_0.Engine: (a1) => new import_0.Engine(a1),',
],
paramKeys: [
'import_0.Engine: [_KEY_JetFuel],'
'import_0.Engine: [_KEY_import_0_JetFuel],'
]);
});

Expand Down Expand Up @@ -603,14 +603,14 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
"Engine = new Key(import_0.Engine);"
"import_0_Engine = new Key(import_0.Engine);"
],
factories: [
'import_0.Car: (a1) => new import_0.Car(a1),',
'import_0.Engine: () => new import_0.Engine(),',
],
paramKeys: [
'import_0.Car: [_KEY_Engine],',
'import_0.Car: [_KEY_import_0_Engine],',
'import_0.Engine: const[],',
]);
});
Expand Down Expand Up @@ -733,15 +733,15 @@ main() {
"import 'main.dart' as import_0;",
],
keys: [
"Engine_Turbo = new Key(import_0.Engine, import_0.Turbo);"
"import_0_Engine_Turbo = new Key(import_0.Engine, import_0.Turbo);"
],
factories: [
'import_0.Engine: () => new import_0.Engine(),',
'import_0.Car: (a1) => new import_0.Car(a1),',
],
paramKeys: [
'import_0.Engine: const[],',
'import_0.Car: [_KEY_Engine_Turbo],'
'import_0.Car: [_KEY_import_0_Engine_Turbo],'
]);
});

Expand Down Expand Up @@ -804,7 +804,72 @@ main() {
injectableAnnotations.clear();
});
});

it('supports multiple classes with the same name', () {
injectableAnnotations.add('di.annotations.Injectable');
return generates(phases,
inputs: {
'di|lib/annotations.dart': PACKAGE_DI,
'a|lib/first.dart': '''
library first;

import 'package:di/annotations.dart';

@Injectable()
class Foobar {
Foobar()
}
''',
'a|lib/second.dart': '''
library second;

import 'package:di/annotations.dart';

@Injectable()
class Foobar {
Foobar()
}
''',
'a|web/main.dart': '''

library main;

import 'package:di/annotations.dart';
import 'package:a/first.dart' as first;
import 'package:a/second.dart' as second;

@Injectable
class FooUser {
FooUser(first.Foobar first_foobar, second.Foobar second_foobar);
}

main() {}
'''
},
imports: [
"import 'main.dart' as import_0;",
"import 'package:a/first.dart' as import_1;",
"import 'package:a/second.dart' as import_2;",
],
keys: [
'import_1_Foobar = new Key(import_1.Foobar);',
'import_2_Foobar = new Key(import_2.Foobar);',
],
factories: [
'import_0.FooUser: (a1, a2) => new import_0.FooUser(a1, a2),',
'import_1.Foobar: () => new import_1.Foobar(),',
'import_2.Foobar: () => new import_2.Foobar(),',
],
paramKeys: [
'import_0.FooUser: [_KEY_import_1_Foobar, _KEY_import_2_Foobar],',
'import_1.Foobar: const[],',
'import_2.Foobar: const[],',
]).whenComplete(() {
injectableAnnotations.clear();
});
});
});

}

Future generates(List<List<Transformer>> phases,
Expand Down