Re-enable source maps

lib/src/codegen/js_printer.dart

 // Copyright (c) 2015, 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 dev_compiler.src.codegen.js_printer;
 
 import 'dart:io' show Directory, File, Platform, Process;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:path/path.dart' as path;
@@ skipping 52 matching lines @@
 
   CompilationUnit unit;
   Uri uri;
 
   SourceMapPrintingContext(this.printer, this.outputDir);
 
   void emit(String string) {
     printer.add(string);
   }
 
+  final _topLevelDeclarations = new Set<AstNode>();
+
   void enterNode(JS.Node jsNode) {
     AstNode node = jsNode.sourceInformation;
-    if (node is CompilationUnit) {
-      unit = node;
+    if (node == null || node.offset == -1) return;
+    if (unit == null) {
+      // This is a top-level declaration.  Note: consecutive top-level
+      // declarations may come from different compilation units due to
+      // parts.
+      _topLevelDeclarations.add(node);
+      var containingUnit = node;
+      while (containingUnit is! CompilationUnit) {

[Jennifer Messerly, 2015/11/09 23:21:11]

I think this could be node.getAncestor((n) => n is CompilationUnit);

[vsm, 2015/11/10 14:35:47]

Done - thanks!

+        containingUnit = containingUnit.parent;
+      }
+      unit = containingUnit;
       uri = _makeRelativeUri(unit.element.source.uri);
-      return;
     }
-    if (unit == null || node == null || node.offset == -1) return;
 
+    assert(unit != null);
     var loc = _location(node.offset);
     var name = _getIdentifier(node);
     if (name != null) {
       // TODO(jmesserly): mark only uses the beginning of the span, but
       // we're required to pass this as a valid span.
       var end = _location(node.end);
       printer.mark(new SourceMapSpan(loc, end, name, isIdentifier: true));
     } else {
       printer.mark(loc);
     }
   }
 
   SourceLocation _location(int offset) =>
       locationForOffset(unit.lineInfo, uri, offset);
 
   Uri _makeRelativeUri(Uri src) {
     return new Uri(path: path.relative(src.path, from: outputDir));
   }
 
   void exitNode(JS.Node jsNode) {
     AstNode node = jsNode.sourceInformation;
-    if (node is CompilationUnit) {
+    if (unit == null || node == null || node.offset == -1) return;
+
+    // TODO(jmesserly): in many cases marking the end will be unnecessary.
+    printer.mark(_location(node.end));
+
+    if (_topLevelDeclarations.contains(node)) {

[Jennifer Messerly, 2015/11/09 23:21:11]

Could we just have a boolean "_isTopLevel" so we know to clear it? Or do they
nest sometimes? In which case, maybe a Stack. I presume enter/exit calls will
always be matched.

[vsm, 2015/11/10 14:35:47]

It does nest - I think it's proper nesting.  Modified to just keep track of the
current top-level decl.

       unit = null;
       uri = null;
       return;
     }
-    if (unit == null || node == null || node.offset == -1) return;
-
-    // TODO(jmesserly): in many cases marking the end will be unnecessary.
-    printer.mark(_location(node.end));
   }
 
   String _getIdentifier(AstNode node) {
     if (node is SimpleIdentifier) return node.name;
     return null;
   }
 }