Chromium Code Reviews| Index: pkg/front_end/lib/src/fasta/source/outline_builder.dart |
| diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart |
| index 19938160b2349fa6d28a204a813355fba9e137d5..9780586561adbaba105ddb751b2a3ffb51b5ce1c 100644 |
| --- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart |
| +++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart |
| @@ -246,9 +246,19 @@ class OutlineBuilder extends UnhandledListener { |
| library.metadata = metadata; |
| } |
| + @override |
| + void beginClassOrNamedMixinApplication(Token token) { |
| + library.beginNestedDeclaration(null); |
| + } |
| + |
| @override |
| void beginClassDeclaration(Token begin, Token name) { |
| - library.beginNestedDeclaration(name.lexeme); |
| + library.currentDeclaration.name = name.lexeme; |
| + } |
| + |
| + @override |
| + void beginNamedMixinApplication(Token beginToken, Token name) { |
| + library.currentDeclaration.name = name.lexeme; |
| } |
| @override |
| @@ -408,11 +418,6 @@ class OutlineBuilder extends UnhandledListener { |
| library.addMixinApplication(supertype, mixins, withKeyword.charOffset)); |
| } |
| - @override |
| - void beginNamedMixinApplication(Token begin, Token name) { |
| - library.beginNestedDeclaration(name.lexeme, hasMembers: false); |
|
ahe
2017/06/23 14:33:22
hasMember is mostly an optimization, so it's safe
|
| - } |
| - |
| @override |
| void endNamedMixinApplication(Token beginToken, Token classKeyword, |
| Token equals, Token implementsKeyword, Token endToken) { |