| Index: pkg/analyzer_experimental/lib/src/generated/resolver.dart
|
| diff --git a/pkg/analyzer_experimental/lib/src/generated/resolver.dart b/pkg/analyzer_experimental/lib/src/generated/resolver.dart
|
| index c570762ccef5d850fa4389d1208d62739d83e5c4..06b2f30e6860e69b91a8c08e8d090fff989ef1d5 100644
|
| --- a/pkg/analyzer_experimental/lib/src/generated/resolver.dart
|
| +++ b/pkg/analyzer_experimental/lib/src/generated/resolver.dart
|
| @@ -12,11 +12,10 @@ import 'utilities_dart.dart';
|
| import 'ast.dart';
|
| import 'parser.dart' show Parser, ParserErrorCode;
|
| import 'sdk.dart' show DartSdk, SdkLibrary;
|
| -import 'element.dart' hide HideCombinator, ShowCombinator;
|
| +import 'element.dart';
|
| import 'html.dart' as ht;
|
| import 'engine.dart';
|
| import 'constant.dart';
|
| -import 'element.dart' as __imp_combi show HideCombinator, ShowCombinator;
|
| /**
|
| * Instances of the class {@code CompilationUnitBuilder} build an element model for a single
|
| * compilation unit.
|
| @@ -4488,11 +4487,11 @@ class LibraryResolver {
|
| List<NamespaceCombinator> combinators = new List<NamespaceCombinator>();
|
| for (Combinator combinator in directive.combinators) {
|
| if (combinator is HideCombinator) {
|
| - HideCombinatorImpl hide = new HideCombinatorImpl();
|
| + HideElementCombinatorImpl hide = new HideElementCombinatorImpl();
|
| hide.hiddenNames = getIdentifiers(((combinator as HideCombinator)).hiddenNames);
|
| combinators.add(hide);
|
| } else {
|
| - ShowCombinatorImpl show = new ShowCombinatorImpl();
|
| + ShowElementCombinatorImpl show = new ShowElementCombinatorImpl();
|
| show.shownNames = getIdentifiers(((combinator as ShowCombinator)).shownNames);
|
| combinators.add(show);
|
| }
|
| @@ -9112,10 +9111,10 @@ class NamespaceBuilder {
|
| */
|
| Map<String, Element> apply(Map<String, Element> definedNames, List<NamespaceCombinator> combinators) {
|
| for (NamespaceCombinator combinator in combinators) {
|
| - if (combinator is __imp_combi.HideCombinator) {
|
| - hide(definedNames, ((combinator as __imp_combi.HideCombinator)).hiddenNames);
|
| - } else if (combinator is __imp_combi.ShowCombinator) {
|
| - definedNames = show(definedNames, ((combinator as __imp_combi.ShowCombinator)).shownNames);
|
| + if (combinator is HideElementCombinator) {
|
| + hide(definedNames, ((combinator as HideElementCombinator)).hiddenNames);
|
| + } else if (combinator is ShowElementCombinator) {
|
| + definedNames = show(definedNames, ((combinator as ShowElementCombinator)).shownNames);
|
| } else {
|
| AnalysisEngine.instance.logger.logError("Unknown type of combinator: ${combinator.runtimeType.toString()}");
|
| }
|
|
|