[cfe] Move src/fasta/ subfolders to src/

Part of removing uses of 'fasta'.

TEST=existing

Change-Id: Ice027678e11b7da8c1a7e756a1e1c8c8284722bf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/372623
Reviewed-by: Jens Johansen <jensj@google.com>
Reviewed-by: Mayank Patke <fishythefish@google.com>
Reviewed-by: Ömer Ağacan <omersa@google.com>
Commit-Queue: Johnni Winther <johnniwinther@google.com>
Reviewed-by: Alexander Markov <alexmarkov@google.com>

pkg/compiler/lib/src/phase/load_kernel.dart

@@ -7,7 +7,7 @@ import 'dart:async';
 import 'package:_js_interop_checks/src/transformations/static_interop_class_eraser.dart';
 import 'package:collection/collection.dart';
 import 'package:front_end/src/api_unstable/dart2js.dart' as fe;
-import 'package:front_end/src/fasta/kernel/utils.dart';
+import 'package:front_end/src/kernel/utils.dart';
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
 import 'package:kernel/class_hierarchy.dart' as ir;

pkg/compiler/lib/src/serialization/strategies.dart

@@ -4,9 +4,8 @@
 
 import 'dart:io';
 
-import 'package:front_end/src/fasta/kernel/utils.dart' as ir
-    show serializeComponent;
-import 'package:front_end/src/fasta/kernel/utils.dart';
+import 'package:front_end/src/kernel/utils.dart' as ir show serializeComponent;
+import 'package:front_end/src/kernel/utils.dart';
 import 'package:kernel/ast.dart' as ir;
 import 'package:kernel/binary/ast_from_binary.dart' show BinaryBuilder;
 

pkg/compiler/test/end_to_end/dill_loader_test.dart

@@ -13,7 +13,7 @@ import 'package:compiler/src/kernel/dart2js_target.dart';
 import 'package:compiler/src/phase/load_kernel.dart' as load_kernel;
 import 'package:expect/expect.dart';
 import 'package:front_end/src/api_unstable/dart2js.dart';
-import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent;
+import 'package:front_end/src/kernel/utils.dart' show serializeComponent;
 import 'package:kernel/target/targets.dart' show TargetFlags;
 
 /// Test that the compiler can successfully read in .dill kernel files rather

pkg/compiler/test/end_to_end/modular_loader_test.dart

@@ -16,7 +16,7 @@ import 'package:front_end/src/api_prototype/front_end.dart';
 import 'package:front_end/src/api_prototype/memory_file_system.dart';
 import 'package:front_end/src/api_prototype/standard_file_system.dart';
 import 'package:front_end/src/api_unstable/dart2js.dart';
-import 'package:front_end/src/fasta/kernel/utils.dart' show serializeComponent;
+import 'package:front_end/src/kernel/utils.dart' show serializeComponent;
 import 'package:kernel/ast.dart';
 import 'package:kernel/target/targets.dart' show TargetFlags;
 

pkg/dart2wasm/lib/constant_evaluator.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/src/fasta/kernel/constant_evaluator.dart' as kernel;
+import 'package:front_end/src/kernel/constant_evaluator.dart' as kernel;
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/core_types.dart';

pkg/dev_compiler/lib/src/kernel/module_symbols_collector.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/src/fasta/kernel/constructor_tearoff_lowering.dart'
+import 'package:front_end/src/kernel/constructor_tearoff_lowering.dart'
     show isTearOffLowering;
 import 'package:kernel/kernel.dart';
 

pkg/front_end/lib/src/api_prototype/const_conditional_simplifier.dart

@@ -4,5 +4,5 @@
 
 library front_end.const_conditional_simplifier;
 
-export '../fasta/kernel/const_conditional_simplifier.dart'
+export '../kernel/const_conditional_simplifier.dart'
     show ConstConditionalSimplifier;

pkg/front_end/lib/src/api_prototype/constant_evaluator.dart

@@ -4,7 +4,7 @@
 
 library front_end.constant_evaluator;
 
-export '../fasta/kernel/constant_evaluator.dart'
+export '../kernel/constant_evaluator.dart'
     show
         ConstantEvaluator,
         ConstantsTransformer,

pkg/front_end/lib/src/api_prototype/lowering_predicates.dart

@@ -3,8 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:kernel/ast.dart';
-import '../fasta/kernel/late_lowering.dart';
-export '../fasta/kernel/constructor_tearoff_lowering.dart'
+import '../kernel/late_lowering.dart';
+export '../kernel/constructor_tearoff_lowering.dart'
     show
         extractConstructorNameFromTearOff,
         isConstructorTearOffLowering,

pkg/front_end/lib/src/api_prototype/static_weak_references.dart

@@ -2,4 +2,4 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export '../fasta/kernel/static_weak_references.dart' show StaticWeakReferences;
+export '../kernel/static_weak_references.dart' show StaticWeakReferences;

pkg/front_end/lib/src/api_prototype/try_constant_evaluator.dart

@@ -4,5 +4,5 @@
 
 library front_end.try_constant_evaluator;
 
-export '../fasta/kernel/try_constant_evaluator.dart'
+export '../kernel/try_constant_evaluator.dart'
     show ReportErrorFunction, TryConstantEvaluator;

pkg/front_end/lib/src/api_unstable/bazel_worker.dart

@@ -34,7 +34,7 @@ export '../api_prototype/standard_file_system.dart' show StandardFileSystem;
 export '../api_prototype/terminal_color_support.dart'
     show printDiagnosticMessage;
 export '../base/nnbd_mode.dart' show NnbdMode;
-export '../fasta/kernel/utils.dart' show serializeComponent;
+export '../kernel/utils.dart' show serializeComponent;
 export 'compiler_state.dart' show InitializedCompilerState;
 
 /// Initializes the compiler for a modular build.

pkg/front_end/lib/src/api_unstable/ddc.dart

@@ -41,10 +41,9 @@ export '../base/processed_options.dart' show ProcessedOptions;
 export '../fasta/compiler_context.dart' show CompilerContext;
 export '../fasta/hybrid_file_system.dart' show HybridFileSystem;
 export '../fasta/incremental_compiler.dart' show IncrementalCompiler;
-export '../fasta/kernel/constructor_tearoff_lowering.dart'
-    show isTearOffLowering;
+export '../kernel/constructor_tearoff_lowering.dart' show isTearOffLowering;
 export '../fasta/ticker.dart' show Ticker;
-export '../fasta/type_inference/type_schema_environment.dart'
+export '../type_inference/type_schema_environment.dart'
     show TypeSchemaEnvironment;
 export 'compiler_state.dart'
     show InitializedCompilerState, WorkerInputComponent, digestsEqual;

pkg/front_end/lib/src/api_unstable/vm.dart

@@ -99,7 +99,7 @@ export '../codes/cfe_codes.dart'
         templateFfiTypeMismatch;
 export '../fasta/compiler_context.dart' show CompilerContext;
 export '../fasta/hybrid_file_system.dart' show HybridFileSystem;
-export '../fasta/kernel/utils.dart'
+export '../kernel/utils.dart'
     show
         createExpressionEvaluationComponent,
         serializeComponent,

pkg/front_end/lib/src/builder/builder.dart

@@ -4,7 +4,7 @@
 
 library fasta.declaration;
 
-import '../problems.dart' show unsupported;
+import '../fasta/problems.dart' show unsupported;
 
 abstract class Builder {
   /// Used when multiple things with the same name are declared within the same

pkg/front_end/lib/src/builder/builder_mixins.dart

@@ -5,9 +5,9 @@
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 
-import '../messages.dart';
-import '../problems.dart';
-import '../scope.dart';
+import '../fasta/messages.dart';
+import '../fasta/problems.dart';
+import '../fasta/scope.dart';
 import 'builder.dart';
 import 'declaration_builders.dart';
 import 'field_builder.dart';

pkg/front_end/lib/src/builder/constructor_reference_builder.dart

@@ -4,9 +4,9 @@
 
 library fasta.constructor_reference_builder;
 
-import '../messages.dart' show noLength, templateConstructorNotFound;
+import '../fasta/messages.dart' show noLength, templateConstructorNotFound;
 
-import '../scope.dart';
+import '../fasta/scope.dart';
 
 import 'builder.dart';
 import 'declaration_builders.dart';

pkg/front_end/lib/src/builder/declaration_builders.dart

@@ -7,16 +7,16 @@ import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/src/bounds_checks.dart';
 import 'package:kernel/src/unaliasing.dart';
 
-import '../../codes/cfe_codes.dart';
+import '../codes/cfe_codes.dart';
 import '../kernel/body_builder_context.dart';
-import '../loader.dart';
-import '../messages.dart';
-import '../modifier.dart';
-import '../problems.dart' show internalProblem, unexpected, unhandled;
-import '../scope.dart';
+import '../fasta/loader.dart';
+import '../fasta/messages.dart';
+import '../fasta/modifier.dart';
+import '../fasta/problems.dart' show internalProblem, unexpected, unhandled;
+import '../fasta/scope.dart';
 import '../source/source_library_builder.dart';
 import '../type_inference/type_schema.dart' show UnknownType;
-import '../uris.dart';
+import '../fasta/uris.dart';
 import '../util/helpers.dart';
 import 'builder.dart';
 import 'builder_mixins.dart';

pkg/front_end/lib/src/builder/fixed_type_builder.dart

@@ -5,7 +5,7 @@
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 
-import '../problems.dart';
+import '../fasta/problems.dart';
 import '../source/source_library_builder.dart';
 import 'library_builder.dart';
 import 'nullability_builder.dart';

pkg/front_end/lib/src/builder/formal_parameter_builder.dart

@@ -7,17 +7,17 @@ library fasta.formal_parameter_builder;
 import 'package:_fe_analyzer_shared/src/parser/formal_parameter_kind.dart'
     show FormalParameterKind;
 import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token;
-import 'package:front_end/src/fasta/source/constructor_declaration.dart';
+import 'package:front_end/src/source/constructor_declaration.dart';
 import 'package:kernel/ast.dart'
     show DartType, DynamicType, Expression, NullLiteral, VariableDeclaration;
 import 'package:kernel/class_hierarchy.dart';
 
-import '../constant_context.dart' show ConstantContext;
+import '../fasta/constant_context.dart' show ConstantContext;
 import '../kernel/body_builder.dart' show BodyBuilder;
 import '../kernel/body_builder_context.dart';
 import '../kernel/internal_ast.dart' show VariableDeclarationImpl;
-import '../modifier.dart';
-import '../scope.dart' show Scope;
+import '../fasta/modifier.dart';
+import '../fasta/scope.dart' show Scope;
 import '../source/source_factory_builder.dart';
 import '../source/source_field_builder.dart';
 import '../source/source_library_builder.dart';

pkg/front_end/lib/src/builder/function_type_builder.dart

@@ -9,7 +9,7 @@ import 'package:kernel/ast.dart'
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/src/unaliasing.dart';
 
-import '../../codes/cfe_codes.dart' show messageSupertypeIsFunction, noLength;
+import '../codes/cfe_codes.dart' show messageSupertypeIsFunction, noLength;
 import '../kernel/implicit_field_type.dart';
 import '../source/source_library_builder.dart';
 import 'declaration_builders.dart';

pkg/front_end/lib/src/builder/invalid_type_builder.dart

@@ -2,16 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/src/fasta/builder/library_builder.dart';
-
-import 'package:front_end/src/fasta/builder/nullability_builder.dart';
-
-import 'package:front_end/src/fasta/source/source_library_builder.dart';
-
 import 'package:kernel/ast.dart';
-
 import 'package:kernel/class_hierarchy.dart';
 
+import '../source/source_library_builder.dart';
+import 'library_builder.dart';
+import 'nullability_builder.dart';
 import 'type_builder.dart';
 
 /// Type builder for invalid types as a type builder.

pkg/front_end/lib/src/builder/library_builder.dart

@@ -11,13 +11,13 @@ import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
 import 'package:kernel/ast.dart'
     show AsyncMarker, Class, Library, ProcedureKind;
 
-import '../../api_prototype/experimental_flags.dart';
-import '../combinator.dart' show CombinatorBuilder;
-import '../configuration.dart';
-import '../export.dart' show Export;
-import '../identifiers.dart';
-import '../loader.dart' show Loader;
-import '../messages.dart'
+import '../api_prototype/experimental_flags.dart';
+import '../fasta/combinator.dart' show CombinatorBuilder;
+import '../fasta/configuration.dart';
+import '../fasta/export.dart' show Export;
+import '../fasta/identifiers.dart';
+import '../fasta/loader.dart' show Loader;
+import '../fasta/messages.dart'
     show
         FormattedMessage,
         LocatedMessage,
@@ -25,8 +25,8 @@ import '../messages.dart'
         templateInternalProblemConstructorNotFound,
         templateInternalProblemNotFoundIn,
         templateInternalProblemPrivateConstructorAccess;
-import '../problems.dart' show internalProblem;
-import '../scope.dart';
+import '../fasta/problems.dart' show internalProblem;
+import '../fasta/scope.dart';
 import '../source/name_scheme.dart';
 import '../source/offset_map.dart';
 import '../source/source_class_builder.dart';

pkg/front_end/lib/src/builder/member_builder.dart

@@ -8,7 +8,7 @@ import 'package:kernel/ast.dart';
 
 import '../kernel/hierarchy/class_member.dart';
 import '../kernel/hierarchy/members_builder.dart';
-import '../modifier.dart';
+import '../fasta/modifier.dart';
 import 'builder.dart';
 import 'declaration_builders.dart';
 import 'library_builder.dart';

pkg/front_end/lib/src/builder/metadata_builder.dart

@@ -10,7 +10,7 @@ import 'package:kernel/clone.dart';
 
 import '../kernel/body_builder.dart' show BodyBuilder;
 import '../kernel/body_builder_context.dart';
-import '../scope.dart' show Scope;
+import '../fasta/scope.dart' show Scope;
 import '../source/source_library_builder.dart' show SourceLibraryBuilder;
 
 class MetadataBuilder {

pkg/front_end/lib/src/builder/modifier_builder.dart

@@ -4,7 +4,7 @@
 
 library fasta.modifier_builder;
 
-import '../modifier.dart';
+import '../fasta/modifier.dart';
 
 import 'builder.dart';
 

pkg/front_end/lib/src/builder/named_type_builder.dart

@@ -4,12 +4,12 @@
 
 library fasta.named_type_builder;
 
-import 'package:front_end/src/fasta/util/helpers.dart';
+import 'package:front_end/src/util/helpers.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/src/unaliasing.dart' as unaliasing;
 
-import '../../codes/cfe_codes.dart'
+import '../codes/cfe_codes.dart'
     show
         LocatedMessage,
         Message,
@@ -34,9 +34,9 @@ import '../../codes/cfe_codes.dart'
         templateTypeArgumentsOnTypeVariable,
         templateTypeNotFound;
 import '../kernel/implicit_field_type.dart';
-import '../scope.dart';
+import '../fasta/scope.dart';
 import '../source/source_library_builder.dart';
-import '../uris.dart';
+import '../fasta/uris.dart';
 import 'builder.dart';
 import 'declaration_builders.dart';
 import 'inferable_type_builder.dart';

pkg/front_end/lib/src/builder/never_type_declaration_builder.dart

@@ -7,7 +7,7 @@ library fasta.never_type_builder;
 import 'package:kernel/ast.dart' show DartType, Nullability;
 import 'package:kernel/class_hierarchy.dart';
 
-import '../uris.dart';
+import '../fasta/uris.dart';
 import 'declaration_builders.dart';
 import 'library_builder.dart';
 import 'nullability_builder.dart';

pkg/front_end/lib/src/builder/prefix_builder.dart

@@ -6,9 +6,9 @@ library fasta.prefix_builder;
 
 import 'package:kernel/ast.dart' show LibraryDependency;
 
-import '../../codes/cfe_codes.dart';
+import '../codes/cfe_codes.dart';
 import '../kernel/load_library_builder.dart' show LoadLibraryBuilder;
-import '../scope.dart';
+import '../fasta/scope.dart';
 import '../source/source_library_builder.dart';
 import 'builder.dart';
 import 'declaration_builders.dart';

pkg/front_end/lib/src/builder/record_type_builder.dart

@@ -7,7 +7,7 @@ import 'package:kernel/ast.dart'
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/src/unaliasing.dart';
 
-import '../../codes/cfe_codes.dart'
+import '../codes/cfe_codes.dart'
     show
         messageNamedFieldClashesWithPositionalFieldInRecord,
         messageObjectMemberNameUsedForRecordField,

pkg/front_end/lib/src/builder/type_builder.dart

@@ -8,8 +8,8 @@ import 'package:kernel/ast.dart' show DartType, Supertype, TreeNode;
 import 'package:kernel/class_hierarchy.dart';
 
 import '../kernel/type_algorithms.dart';
-import '../messages.dart';
-import '../scope.dart';
+import '../fasta/messages.dart';
+import '../fasta/scope.dart';
 import '../source/source_library_builder.dart';
 import 'declaration_builders.dart';
 import 'formal_parameter_builder.dart';

pkg/front_end/lib/src/dill/dill_class_builder.dart

@@ -13,10 +13,10 @@ import '../builder/library_builder.dart';
 import '../builder/member_builder.dart';
 import '../builder/name_iterator.dart';
 import '../builder/type_builder.dart';
-import '../loader.dart';
-import '../modifier.dart' show abstractMask, namedMixinApplicationMask;
-import '../problems.dart' show unimplemented;
-import '../scope.dart';
+import '../fasta/loader.dart';
+import '../fasta/modifier.dart' show abstractMask, namedMixinApplicationMask;
+import '../fasta/problems.dart' show unimplemented;
+import '../fasta/scope.dart';
 import 'dill_library_builder.dart' show DillLibraryBuilder;
 import 'dill_member_builder.dart';
 

pkg/front_end/lib/src/dill/dill_extension_builder.dart

@@ -8,7 +8,7 @@ import '../builder/declaration_builders.dart';
 import '../builder/library_builder.dart';
 import '../builder/member_builder.dart';
 import '../builder/type_builder.dart';
-import '../scope.dart';
+import '../fasta/scope.dart';
 import 'dill_class_builder.dart';
 import 'dill_extension_member_builder.dart';
 import 'dill_builder_mixins.dart';

pkg/front_end/lib/src/dill/dill_extension_type_declaration_builder.dart

@@ -7,7 +7,7 @@ import 'package:kernel/ast.dart';
 import '../builder/declaration_builders.dart';
 import '../builder/member_builder.dart';
 import '../builder/type_builder.dart';
-import '../scope.dart';
+import '../fasta/scope.dart';
 import 'dill_builder_mixins.dart';
 import 'dill_class_builder.dart';
 import 'dill_extension_type_member_builder.dart';

pkg/front_end/lib/src/dill/dill_library_builder.dart

@@ -17,7 +17,7 @@ import '../builder/library_builder.dart';
 import '../builder/member_builder.dart';
 import '../builder/name_iterator.dart';
 import '../builder/never_type_declaration_builder.dart';
-import '../../codes/cfe_codes.dart'
+import '../codes/cfe_codes.dart'
     show
         LocatedMessage,
         Message,
@@ -25,12 +25,12 @@ import '../../codes/cfe_codes.dart'
         noLength,
         templateDuplicatedDeclaration,
         templateUnspecified;
-import '../export.dart';
+import '../fasta/export.dart';
 import '../kernel/constructor_tearoff_lowering.dart';
 import '../kernel/utils.dart';
-import '../problems.dart' show internalProblem, unhandled;
-import '../scope.dart';
-import '../uris.dart';
+import '../fasta/problems.dart' show internalProblem, unhandled;
+import '../fasta/scope.dart';
+import '../fasta/uris.dart';
 import 'dill_class_builder.dart' show DillClassBuilder;
 import 'dill_extension_builder.dart';
 import 'dill_extension_type_declaration_builder.dart';

pkg/front_end/lib/src/dill/dill_loader.dart

@@ -13,12 +13,12 @@ import 'package:kernel/ast.dart'
 import '../builder/declaration_builders.dart';
 import '../builder/library_builder.dart';
 import '../builder/type_builder.dart';
-import '../../codes/cfe_codes.dart'
+import '../codes/cfe_codes.dart'
     show SummaryTemplate, Template, templateDillOutlineSummary;
-import '../crash.dart' show firstSourceUri;
+import '../fasta/crash.dart' show firstSourceUri;
 import '../kernel/type_builder_computer.dart' show TypeBuilderComputer;
-import '../loader.dart';
-import '../messages.dart'
+import '../fasta/loader.dart';
+import '../fasta/messages.dart'
     show
         FormattedMessage,
         LocatedMessage,
@@ -28,10 +28,10 @@ import '../messages.dart'
         Template,
         messagePlatformPrivateLibraryAccess,
         templateInternalProblemContextSeverity;
-import '../problems.dart' show internalProblem;
+import '../fasta/problems.dart' show internalProblem;
 import '../source/source_loader.dart' show SourceLoader;
-import '../ticker.dart' show Ticker;
-import '../uris.dart';
+import '../fasta/ticker.dart' show Ticker;
+import '../fasta/uris.dart';
 import 'dill_library_builder.dart' show DillLibraryBuilder;
 import 'dill_target.dart' show DillTarget;
 

pkg/front_end/lib/src/dill/dill_member_builder.dart

@@ -26,10 +26,10 @@ import '../kernel/hierarchy/class_member.dart';
 import '../kernel/hierarchy/members_builder.dart' show ClassMembersBuilder;
 import '../kernel/member_covariance.dart';
 
-import '../modifier.dart'
+import '../fasta/modifier.dart'
     show abstractMask, constMask, externalMask, finalMask, lateMask, staticMask;
 
-import '../problems.dart' show unhandled;
+import '../fasta/problems.dart' show unhandled;
 
 abstract class DillMemberBuilder extends MemberBuilderImpl {
   @override

pkg/front_end/lib/src/dill/dill_target.dart

@@ -8,17 +8,17 @@ import 'package:kernel/ast.dart' show Source;
 
 import 'package:kernel/target/targets.dart' show Target;
 
-import '../../base/processed_options.dart' show ProcessedOptions;
+import '../base/processed_options.dart' show ProcessedOptions;
 
-import '../compiler_context.dart' show CompilerContext;
+import '../fasta/compiler_context.dart' show CompilerContext;
 
 import '../kernel/benchmarker.dart' show BenchmarkPhases, Benchmarker;
 
-import '../messages.dart' show FormattedMessage, LocatedMessage, Message;
+import '../fasta/messages.dart' show FormattedMessage, LocatedMessage, Message;
 
-import '../ticker.dart' show Ticker;
+import '../fasta/ticker.dart' show Ticker;
 
-import '../uri_translator.dart' show UriTranslator;
+import '../fasta/uri_translator.dart' show UriTranslator;
 
 import 'dill_loader.dart' show DillLoader;
 

pkg/front_end/lib/src/dill/dill_type_alias_builder.dart

@@ -11,7 +11,7 @@ import '../builder/declaration_builders.dart';
 import '../builder/library_builder.dart';
 import '../builder/metadata_builder.dart';
 import '../builder/type_builder.dart';
-import '../problems.dart' show unimplemented;
+import '../fasta/problems.dart' show unimplemented;
 import 'dill_class_builder.dart' show computeTypeVariableBuilders;
 import 'dill_library_builder.dart' show DillLibraryBuilder;
 

pkg/front_end/lib/src/fasta/builder_graph.dart

@@ -6,7 +6,7 @@ library fasta.builder_graph;
 
 import 'package:kernel/util/graph.dart' show Graph;
 
-import 'builder/library_builder.dart';
+import '../builder/library_builder.dart';
 
 class BuilderGraph implements Graph<Uri> {
   final Map<Uri, LibraryBuilder> libraryBuilders;

pkg/front_end/lib/src/fasta/export.dart

@@ -6,8 +6,8 @@ library fasta.export;
 
 import 'package:kernel/ast.dart';
 
-import 'builder/builder.dart';
-import 'builder/library_builder.dart';
+import '../builder/builder.dart';
+import '../builder/library_builder.dart';
 import 'combinator.dart' show CombinatorBuilder;
 
 class Export {

pkg/front_end/lib/src/fasta/get_dependencies.dart

@@ -16,9 +16,9 @@ import '../base/processed_options.dart' show ProcessedOptions;
 
 import 'compiler_context.dart' show CompilerContext;
 
-import 'dill/dill_target.dart' show DillTarget;
+import '../dill/dill_target.dart' show DillTarget;
 
-import 'kernel/kernel_target.dart' show KernelTarget;
+import '../kernel/kernel_target.dart' show KernelTarget;
 
 import 'uri_translator.dart' show UriTranslator;
 

pkg/front_end/lib/src/fasta/identifiers.dart

@@ -8,7 +8,7 @@ import 'package:_fe_analyzer_shared/src/scanner/scanner.dart' show Token;
 
 import 'package:kernel/ast.dart' show Expression;
 
-import 'builder/type_builder.dart';
+import '../builder/type_builder.dart';
 import 'operator.dart';
 import 'problems.dart' show unhandled, unsupported;
 

pkg/front_end/lib/src/fasta/import.dart

@@ -6,19 +6,19 @@ library fasta.import;
 
 import 'package:kernel/ast.dart' show LibraryDependency;
 
-import 'builder/builder.dart';
-import 'builder/library_builder.dart';
-import 'builder/name_iterator.dart';
-import 'builder/prefix_builder.dart';
+import '../builder/builder.dart';
+import '../builder/library_builder.dart';
+import '../builder/name_iterator.dart';
+import '../builder/prefix_builder.dart';
 
-import 'kernel/load_library_builder.dart';
-import 'kernel/utils.dart' show toKernelCombinators;
+import '../kernel/load_library_builder.dart';
+import '../kernel/utils.dart' show toKernelCombinators;
 
 import 'combinator.dart' show CombinatorBuilder;
 
 import 'configuration.dart' show Configuration;
 
-import 'source/source_library_builder.dart';
+import '../source/source_library_builder.dart';
 
 class Import {
   /// The library that is importing [imported];

pkg/front_end/lib/src/fasta/import_chains.dart

@@ -4,7 +4,7 @@
 
 import 'package:_fe_analyzer_shared/src/util/link.dart';
 import 'package:_fe_analyzer_shared/src/util/relativize.dart' as uri_extras;
-import 'builder/library_builder.dart';
+import '../builder/library_builder.dart';
 
 /// Compute the set of distinct import chains to the library at [uri] within
 /// [loadedLibraries].

pkg/front_end/lib/src/fasta/incremental_compiler.dart

@@ -9,7 +9,7 @@ import 'dart:convert' show JsonEncoder;
 
 import 'package:_fe_analyzer_shared/src/scanner/abstract_scanner.dart'
     show ScannerConfiguration;
-import 'package:front_end/src/fasta/kernel/benchmarker.dart'
+import 'package:front_end/src/kernel/benchmarker.dart'
     show BenchmarkPhases, Benchmarker;
 import 'package:kernel/binary/ast_from_binary.dart'
     show
@@ -72,40 +72,40 @@ import '../api_prototype/memory_file_system.dart' show MemoryFileSystem;
 import '../base/nnbd_mode.dart';
 import '../base/processed_options.dart' show ProcessedOptions;
 import '../kernel_generator_impl.dart' show precompileMacros;
-import 'builder/builder.dart' show Builder;
-import 'builder/declaration_builders.dart'
+import '../builder/builder.dart' show Builder;
+import '../builder/declaration_builders.dart'
     show ClassBuilder, ExtensionBuilder, ExtensionTypeDeclarationBuilder;
-import 'builder/field_builder.dart' show FieldBuilder;
-import 'builder/library_builder.dart' show CompilationUnit, LibraryBuilder;
-import 'builder/member_builder.dart' show MemberBuilder;
-import 'builder/name_iterator.dart' show NameIterator;
+import '../builder/field_builder.dart' show FieldBuilder;
+import '../builder/library_builder.dart' show CompilationUnit, LibraryBuilder;
+import '../builder/member_builder.dart' show MemberBuilder;
+import '../builder/name_iterator.dart' show NameIterator;
 import 'builder_graph.dart' show BuilderGraph;
 import '../codes/cfe_codes.dart';
 import 'combinator.dart' show CombinatorBuilder;
 import 'compiler_context.dart' show CompilerContext;
-import 'dill/dill_class_builder.dart' show DillClassBuilder;
-import 'dill/dill_library_builder.dart' show DillLibraryBuilder;
-import 'dill/dill_loader.dart' show DillLoader;
-import 'dill/dill_target.dart' show DillTarget;
+import '../dill/dill_class_builder.dart' show DillClassBuilder;
+import '../dill/dill_library_builder.dart' show DillLibraryBuilder;
+import '../dill/dill_loader.dart' show DillLoader;
+import '../dill/dill_target.dart' show DillTarget;
 import 'hybrid_file_system.dart' show HybridFileSystem;
 import 'incremental_serializer.dart' show IncrementalSerializer;
-import 'kernel/hierarchy/hierarchy_builder.dart' show ClassHierarchyBuilder;
-import 'kernel/internal_ast.dart' show VariableDeclarationImpl;
-import 'kernel/kernel_target.dart' show BuildResult, KernelTarget;
-import 'kernel/macro/macro.dart' show NeededPrecompilations;
+import '../kernel/hierarchy/hierarchy_builder.dart' show ClassHierarchyBuilder;
+import '../kernel/internal_ast.dart' show VariableDeclarationImpl;
+import '../kernel/kernel_target.dart' show BuildResult, KernelTarget;
+import '../kernel/macro/macro.dart' show NeededPrecompilations;
 import 'library_graph.dart' show LibraryGraph;
 import 'scope.dart' show ScopeKind;
-import 'source/source_extension_builder.dart';
-import 'source/source_library_builder.dart'
+import '../source/source_extension_builder.dart';
+import '../source/source_library_builder.dart'
     show ImplicitLanguageVersion, SourceLibraryBuilder;
-import 'source/source_loader.dart';
+import '../source/source_loader.dart';
 import 'ticker.dart' show Ticker;
 import 'uri_translator.dart' show UriTranslator;
 import 'uris.dart' show dartCore, getPartUri;
-import 'util/error_reporter_file_copier.dart' show saveAsGzip;
-import 'util/experiment_environment_getter.dart'
+import '../util/error_reporter_file_copier.dart' show saveAsGzip;
+import '../util/experiment_environment_getter.dart'
     show enableIncrementalCompilerBenchmarking, getExperimentEnvironment;
-import 'util/textual_outline.dart' show textualOutline;
+import '../util/textual_outline.dart' show textualOutline;
 
 final Uri dartFfiUri = Uri.parse("dart:ffi");
 

pkg/front_end/lib/src/fasta/incremental_serializer.dart

@@ -12,7 +12,7 @@ import 'package:kernel/binary/ast_to_binary.dart' show BinaryPrinter;
 
 import 'package:kernel/kernel.dart' show Component, Library, LibraryDependency;
 
-import 'kernel/utils.dart' show ByteSink;
+import '../kernel/utils.dart' show ByteSink;
 
 class IncrementalSerializer {
   final Map<Uri, SerializationGroup> uriToGroup =

pkg/front_end/lib/src/fasta/loader.dart

@@ -8,9 +8,9 @@ import 'package:_fe_analyzer_shared/src/messages/severity.dart' show Severity;
 
 import 'package:kernel/ast.dart' show Class, DartType, ExtensionTypeDeclaration;
 
-import 'builder/declaration_builders.dart';
-import 'builder/library_builder.dart';
-import 'builder/type_builder.dart';
+import '../builder/declaration_builders.dart';
+import '../builder/library_builder.dart';
+import '../builder/type_builder.dart';
 
 import 'messages.dart' show FormattedMessage, LocatedMessage, Message;
 

pkg/front_end/lib/src/fasta/scope.dart

@@ -8,25 +8,25 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/type_environment.dart';
 
-import 'builder/builder.dart';
-import 'builder/declaration_builders.dart';
-import 'builder/library_builder.dart';
-import 'builder/member_builder.dart';
-import 'builder/metadata_builder.dart';
-import 'builder/name_iterator.dart';
+import '../builder/builder.dart';
+import '../builder/declaration_builders.dart';
+import '../builder/library_builder.dart';
+import '../builder/member_builder.dart';
+import '../builder/metadata_builder.dart';
+import '../builder/name_iterator.dart';
 import '../codes/cfe_codes.dart';
-import 'kernel/body_builder.dart' show JumpTarget;
-import 'kernel/body_builder_context.dart';
-import 'kernel/hierarchy/class_member.dart' show ClassMember;
-import 'kernel/kernel_helper.dart';
+import '../kernel/body_builder.dart' show JumpTarget;
+import '../kernel/body_builder_context.dart';
+import '../kernel/hierarchy/class_member.dart' show ClassMember;
+import '../kernel/kernel_helper.dart';
 import 'problems.dart' show internalProblem, unsupported;
-import 'source/source_class_builder.dart';
-import 'source/source_extension_builder.dart';
-import 'source/source_extension_type_declaration_builder.dart';
-import 'source/source_function_builder.dart';
-import 'source/source_library_builder.dart';
-import 'source/source_member_builder.dart';
-import 'util/helpers.dart' show DelayedActionPerformer;
+import '../source/source_class_builder.dart';
+import '../source/source_extension_builder.dart';
+import '../source/source_extension_type_declaration_builder.dart';
+import '../source/source_function_builder.dart';
+import '../source/source_library_builder.dart';
+import '../source/source_member_builder.dart';
+import '../util/helpers.dart' show DelayedActionPerformer;
 
 enum ScopeKind {
   /// Scope of pattern switch-case statements

pkg/front_end/lib/src/kernel/body_builder.dart

@@ -34,7 +34,7 @@ import 'package:_fe_analyzer_shared/src/type_inference/assigned_variables.dart';
 import 'package:_fe_analyzer_shared/src/util/link.dart';
 import 'package:_fe_analyzer_shared/src/util/value_kind.dart';
 import 'package:front_end/src/api_prototype/experimental_flags.dart';
-import 'package:front_end/src/fasta/kernel/benchmarker.dart' show Benchmarker;
+import 'package:front_end/src/kernel/benchmarker.dart' show Benchmarker;
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/clone.dart';
@@ -59,7 +59,7 @@ import '../builder/record_type_builder.dart';
 import '../builder/type_builder.dart';
 import '../builder/variable_builder.dart';
 import '../builder/void_type_declaration_builder.dart';
-import '../../codes/cfe_codes.dart'
+import '../codes/cfe_codes.dart'
     show
         LocatedMessage,
         Message,
@@ -71,20 +71,20 @@ import '../../codes/cfe_codes.dart'
         templateExperimentNotEnabledOffByDefault,
         templateLocalVariableUsedBeforeDeclared,
         templateLocalVariableUsedBeforeDeclaredContext;
-import '../../codes/cfe_codes.dart' as fasta;
-import '../constant_context.dart' show ConstantContext;
+import '../codes/cfe_codes.dart' as fasta;
+import '../fasta/constant_context.dart' show ConstantContext;
 import '../dill/dill_library_builder.dart' show DillLibraryBuilder;
-import '../identifiers.dart'
+import '../fasta/identifiers.dart'
     show
         Identifier,
         InitializedIdentifier,
         QualifiedName,
         SimpleIdentifier,
         flattenName;
-import '../modifier.dart'
+import '../fasta/modifier.dart'
     show Modifier, constMask, covariantMask, finalMask, lateMask, requiredMask;
-import '../problems.dart' show internalProblem, unhandled, unsupported;
-import '../scope.dart';
+import '../fasta/problems.dart' show internalProblem, unhandled, unsupported;
+import '../fasta/scope.dart';
 import '../source/diet_parser.dart';
 import '../source/source_field_builder.dart';
 import '../source/source_library_builder.dart';

pkg/front_end/lib/src/kernel/body_builder_context.dart

@@ -13,10 +13,10 @@ import '../builder/formal_parameter_builder.dart';
 import '../builder/library_builder.dart';
 import '../builder/named_type_builder.dart';
 import '../builder/type_builder.dart';
-import '../constant_context.dart' show ConstantContext;
+import '../fasta/constant_context.dart' show ConstantContext;
 import '../dill/dill_class_builder.dart';
-import '../identifiers.dart' show Identifier;
-import '../scope.dart';
+import '../fasta/identifiers.dart' show Identifier;
+import '../fasta/scope.dart';
 import '../source/constructor_declaration.dart';
 import '../source/diet_listener.dart';
 import '../source/source_class_builder.dart';

pkg/front_end/lib/src/kernel/collections.dart

@@ -10,10 +10,10 @@ import 'package:kernel/src/printer.dart';
 
 import 'package:kernel/type_environment.dart' show StaticTypeContext;
 
-import '../messages.dart'
+import '../fasta/messages.dart'
     show noLength, templateExpectedAfterButGot, templateExpectedButGot;
 
-import '../problems.dart' show getFileUri, unsupported;
+import '../fasta/problems.dart' show getFileUri, unsupported;
 
 import '../type_inference/inference_helper.dart' show InferenceHelper;
 

pkg/front_end/lib/src/kernel/combined_member_signature.dart

@@ -13,7 +13,7 @@ import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
 import '../builder/declaration_builders.dart';
-import '../problems.dart' show unhandled;
+import '../fasta/problems.dart' show unhandled;
 import '../source/source_class_builder.dart';
 import 'hierarchy/class_member.dart';
 import 'hierarchy/hierarchy_builder.dart';

pkg/front_end/lib/src/kernel/constant_evaluator.dart

@@ -36,9 +36,9 @@ import 'package:kernel/target/targets.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
-import '../../api_prototype/lowering_predicates.dart';
-import '../../base/nnbd_mode.dart';
-import '../../codes/cfe_codes.dart';
+import '../api_prototype/lowering_predicates.dart';
+import '../base/nnbd_mode.dart';
+import '../codes/cfe_codes.dart';
 import '../type_inference/delayed_expressions.dart';
 import '../type_inference/external_ast_helper.dart';
 import '../type_inference/matching_cache.dart';

pkg/front_end/lib/src/kernel/constant_int_folder.dart

@@ -5,7 +5,7 @@
 import 'package:kernel/ast.dart';
 import 'package:kernel/target/targets.dart';
 
-import '../../codes/cfe_codes.dart';
+import '../codes/cfe_codes.dart';
 import 'constant_evaluator.dart';
 
 abstract class ConstantIntFolder {

pkg/front_end/lib/src/kernel/exhaustiveness.dart

@@ -9,7 +9,7 @@ import 'package:_fe_analyzer_shared/src/exhaustiveness/shared.dart';
 import 'package:_fe_analyzer_shared/src/exhaustiveness/space.dart';
 import 'package:_fe_analyzer_shared/src/exhaustiveness/static_type.dart';
 import 'package:_fe_analyzer_shared/src/exhaustiveness/types.dart';
-import 'package:front_end/src/fasta/kernel/constant_evaluator.dart';
+import 'package:front_end/src/kernel/constant_evaluator.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/class_hierarchy.dart';
 import 'package:kernel/core_types.dart';

pkg/front_end/lib/src/kernel/expression_generator.dart

@@ -41,10 +41,10 @@ import '../builder/nullability_builder.dart';
 import '../builder/omitted_type_builder.dart';
 import '../builder/prefix_builder.dart';
 import '../builder/type_builder.dart';
-import '../../codes/cfe_codes.dart';
-import '../constant_context.dart' show ConstantContext;
-import '../problems.dart';
-import '../scope.dart';
+import '../codes/cfe_codes.dart';
+import '../fasta/constant_context.dart' show ConstantContext;
+import '../fasta/problems.dart';
+import '../fasta/scope.dart';
 import '../source/source_member_builder.dart';
 import '../source/stack_listener_impl.dart' show offsetForToken;
 import 'constness.dart' show Constness;

pkg/front_end/lib/src/kernel/expression_generator_helper.dart

@@ -9,17 +9,17 @@ import 'package:kernel/ast.dart';
 import 'package:kernel/type_algebra.dart';
 import 'package:kernel/type_environment.dart';
 
-import '../../api_prototype/experimental_flags.dart';
+import '../api_prototype/experimental_flags.dart';
 import '../builder/builder.dart';
 import '../builder/declaration_builders.dart';
 import '../builder/formal_parameter_builder.dart';
 import '../builder/named_type_builder.dart';
 import '../builder/prefix_builder.dart';
 import '../builder/type_builder.dart';
-import '../../codes/cfe_codes.dart' show LocatedMessage;
-import '../constant_context.dart' show ConstantContext;
-import '../messages.dart' show Message;
-import '../scope.dart';
+import '../codes/cfe_codes.dart' show LocatedMessage;
+import '../fasta/constant_context.dart' show ConstantContext;
+import '../fasta/messages.dart' show Message;
+import '../fasta/scope.dart';
 import '../source/source_library_builder.dart' show SourceLibraryBuilder;
 import '../type_inference/inference_helper.dart' show InferenceHelper;
 import 'constness.dart' show Constness;

pkg/front_end/lib/src/kernel/forest.dart

@@ -7,7 +7,7 @@ library fasta.fangorn;
 import 'package:kernel/ast.dart';
 import 'package:kernel/src/printer.dart';
 
-import '../problems.dart' show unsupported;
+import '../fasta/problems.dart' show unsupported;
 
 import '../type_inference/type_schema.dart';
 

pkg/front_end/lib/src/kernel/forwarding_node.dart

@@ -12,7 +12,7 @@ import 'package:kernel/type_environment.dart';
 
 import '../builder/declaration_builders.dart';
 
-import "../problems.dart" show unhandled;
+import "../fasta/problems.dart" show unhandled;
 
 import '../source/source_library_builder.dart';
 import 'hierarchy/class_member.dart';

pkg/front_end/lib/src/kernel/hierarchy/class_member.dart

@@ -4,12 +4,11 @@
 
 library fasta.class_hierarchy_builder;
 
-import 'package:front_end/src/fasta/source/source_extension_type_declaration_builder.dart';
 import 'package:kernel/ast.dart';
 import 'package:kernel/type_algebra.dart';
 
 import '../../builder/declaration_builders.dart';
-import '../../messages.dart'
+import '../../fasta/messages.dart'
     show
         LocatedMessage,
         messageDeclaredMemberConflictsWithInheritedMembersCause,
@@ -17,6 +16,7 @@ import '../../messages.dart'
         templateCombinedMemberSignatureFailed,
         templateExtensionTypeCombinedMemberSignatureFailed;
 import '../../source/source_class_builder.dart';
+import '../../source/source_extension_type_declaration_builder.dart';
 import '../../source/source_library_builder.dart' show SourceLibraryBuilder;
 import '../combined_member_signature.dart';
 import '../forwarding_node.dart' show ForwardingNode;

pkg/front_end/lib/src/kernel/hierarchy/delayed.dart

@@ -11,7 +11,7 @@ import 'package:kernel/type_environment.dart';
 
 import '../../builder/declaration_builders.dart';
 import '../../builder/library_builder.dart';
-import '../../messages.dart';
+import '../../fasta/messages.dart';
 import '../../source/source_class_builder.dart';
 import '../../source/source_extension_type_declaration_builder.dart';
 import 'class_member.dart';

pkg/front_end/lib/src/kernel/hierarchy/extension_type_members.dart

@@ -2,12 +2,12 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'package:front_end/src/fasta/source/source_extension_type_declaration_builder.dart';
 import 'package:kernel/ast.dart';
 
 import '../../builder/declaration_builders.dart';
 import '../../builder/member_builder.dart';
-import '../../messages.dart';
+import '../../source/source_extension_type_declaration_builder.dart';
+import '../../fasta/messages.dart';
 import 'class_member.dart';
 import 'delayed.dart';
 import 'hierarchy_node.dart';