Added ThisVariable in scoping and the captured scope of initialized fields.

pkg/compiler/lib/src/kernel/kernel_strategy.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 library dart2js.kernel.frontend_strategy;
 
 import '../../compiler_new.dart' as api;
 import '../common.dart';
 import '../common_elements.dart';
 import '../common/backend_api.dart';
 import '../common/resolution.dart';
 import '../common/tasks.dart';
 import '../common/work.dart';
 import '../elements/elements.dart';
 import '../elements/entities.dart';
 import '../elements/types.dart';
 import '../environment.dart' as env;
 import '../enqueue.dart';
 import '../frontend_strategy.dart';
 import '../js_backend/backend.dart';
 import '../js_backend/backend_usage.dart';
 import '../js_backend/interceptor_data.dart';
 import '../js_backend/mirrors_analysis.dart';
 import '../js_backend/mirrors_data.dart';
 import '../js_backend/native_data.dart';
 import '../js_backend/no_such_method_registry.dart';
 import '../js_backend/runtime_types.dart';
-import '../js_model/closure.dart' show ClosureModel;
+import '../js_model/closure.dart' show ScopeModel;
 import '../library_loader.dart';
 import '../native/enqueue.dart' show NativeResolutionEnqueuer;
 import '../native/resolver.dart';
 import '../options.dart';
 import '../serialization/task.dart';
 import '../patch_parser.dart';
 import '../resolved_uri_translator.dart';
 import '../universe/world_builder.dart';
 import '../universe/world_impact.dart';
 import '../world.dart';
 import 'element_map.dart';
 import 'element_map_impl.dart';
 
 /// Front end strategy that loads '.dill' files and builds a resolved element
 /// model from kernel IR nodes.
 class KernelFrontEndStrategy extends FrontendStrategyBase {
   CompilerOptions _options;
   KernelToElementMapForImpactImpl _elementMap;
 
   KernelAnnotationProcessor _annotationProcesser;
 
-  final Map<MemberEntity, ClosureModel> closureModels =
-      <MemberEntity, ClosureModel>{};
+  final Map<MemberEntity, ScopeModel> closureModels =
+      <MemberEntity, ScopeModel>{};
 
   KernelFrontEndStrategy(
       this._options, DiagnosticReporter reporter, env.Environment environment) {
     _elementMap =
         new KernelToElementMapForImpactImpl(reporter, environment, this);
   }
 
   @override
   LibraryLoaderTask createLibraryLoader(
       ResolvedUriTranslator uriTranslator,
@@ skipping 86 matching lines @@
   @override
   SourceSpan spanFromSpannable(Spannable spannable, Entity currentElement) {
     return _elementMap.getSourceSpan(spannable, currentElement);
   }
 }
 
 class KernelWorkItemBuilder implements WorkItemBuilder {
   final KernelToElementMapForImpactImpl _elementMap;
   final ImpactTransformer _impactTransformer;
   final NativeMemberResolver _nativeMemberResolver;
-  final Map<MemberEntity, ClosureModel> closureModels;
+  final Map<MemberEntity, ScopeModel> closureModels;
 
   KernelWorkItemBuilder(
       this._elementMap,
       NativeBasicData nativeBasicData,
       NativeDataBuilder nativeDataBuilder,
       this._impactTransformer,
       this.closureModels)
       : _nativeMemberResolver = new KernelNativeMemberResolver(
             _elementMap, nativeBasicData, nativeDataBuilder);
 
   @override
   WorkItem createWorkItem(MemberEntity entity) {
     return new KernelWorkItem(_elementMap, _impactTransformer,
         _nativeMemberResolver, entity, closureModels);
   }
 }
 
 class KernelWorkItem implements ResolutionWorkItem {
   final KernelToElementMapForImpactImpl _elementMap;
   final ImpactTransformer _impactTransformer;
   final NativeMemberResolver _nativeMemberResolver;
   final MemberEntity element;
-  final Map<MemberEntity, ClosureModel> closureModels;
+  final Map<MemberEntity, ScopeModel> closureModels;
 
   KernelWorkItem(this._elementMap, this._impactTransformer,
       this._nativeMemberResolver, this.element, this.closureModels);
 
   @override
   WorldImpact run() {
     _nativeMemberResolver.resolveNativeMember(element);
     ResolutionImpact impact = _elementMap.computeWorldImpact(element);
-    ClosureModel closureModel = _elementMap.computeClosureModel(element);
+    ScopeModel closureModel = _elementMap.computeScopeModel(element);
     if (closureModel != null) {
       closureModels[element] = closureModel;
     }
     return _impactTransformer.transformResolutionImpact(impact);
   }
 }
 
 /// Mock implementation of [MirrorsDataImpl].
 class MirrorsDataBuilderImpl extends MirrorsDataImpl {
   MirrorsDataBuilderImpl(
@@ skipping 42 matching lines @@
   int get preMirrorsMethodCount {
     // TODO(redemption): Implement this.
     return null;
   }
 
   @override
   void onQueueEmpty(Enqueuer enqueuer, Iterable<ClassEntity> recentClasses) {
     // TODO(redemption): Implement this.
   }
 }