Serialize scopes according to semantic structure.

dart/tests/try/poi/serialize_test.dart

Index: dart/tests/try/poi/serialize_test.dart
diff --git a/dart/tests/try/poi/serialize_test.dart b/dart/tests/try/poi/serialize_test.dart
index 26e872b19e9d8ae3766e210762d026aacb678e5c..583b49ac74d7a714e732b0e7b2de6ad22c030244 100644
--- a/dart/tests/try/poi/serialize_test.dart
+++ b/dart/tests/try/poi/serialize_test.dart
@@ -27,7 +27,7 @@ import 'package:compiler/implementation/elements/elements.dart' show
 import 'package:compiler/implementation/source_file_provider.dart' show
     FormattingDiagnosticHandler;
 
-Future testPoi() {
+Future testInteresting() {
   Uri script = Platform.script.resolve('data/interesting.dart');
   FormattingDiagnosticHandler handler = new FormattingDiagnosticHandler();
 
@@ -41,15 +41,34 @@ Future testPoi() {
 
     String scope = poi.scopeInformation(element, position);
     Expect.stringEquals(
-        JSON.encode(expected), JSON.encode(JSON.decode(scope)), scope);
+        JSON.encode(expectedInteresting), JSON.encode(JSON.decode(scope)),
+        scope);
+    return testSubclass(handler);
+  });
+}
+
+Future testSubclass(FormattingDiagnosticHandler handler) {
+  int position = 506;
+
+  Uri script = Platform.script.resolve('data/subclass.dart');
+
+  Future future = poi.runPoi(script, position, handler.provider, handler);
+  return future.then((Element element) {
+    Uri foundScript = element.compilationUnit.script.resourceUri;
+    Expect.stringEquals('$script', '$foundScript');
+    Expect.stringEquals('instanceMethod2', element.name);
+
+    String scope = poi.scopeInformation(element, position);
+    Expect.stringEquals(
+        JSON.encode(expectedSubclass), JSON.encode(JSON.decode(scope)), scope);
   });
 }
 
 void main() {
-  asyncTest(testPoi);
+  asyncTest(testInteresting);
 }
 
-final expected = {
+final expectedInteresting = {
   "name": "fisk",
   "kind": "function",
   "type": "() -> dynamic",
@@ -57,36 +76,459 @@ final expected = {
     "name": "Foo",
     "kind": "class",
     "members": [
+    ],
+    "enclosing": {
+      "name": "this(Foo)",
+      "kind": "class",
+      "members": [
+        {
+          "name": "fisk",
+          "kind": "function",
+          "type": "() -> dynamic"
+        },
+        {
+          "name": "hest",
+          "kind": "function",
+          "type": "() -> dynamic"
+        },
+        {
+          "kind": "generative_constructor",
+          "type": "() -> Foo"
+        }
+      ],
+      "enclosing": {
+        "name": "interesting",
+        "kind": "library",
+        "members": [
+          {
+            "name": "Foo",
+            "kind": "class"
+          },
+          {
+            "name": "main",
+            "kind": "function",
+            "type": "() -> dynamic"
+          }
+        ],
+        "enclosing": {
+          "kind": "imports",
+          "members": coreImports,
+          "enclosing": object,
+        }
+      }
+    }
+  }
+};
+
+final expectedSubclass = {
+  "name": "instanceMethod2",
+  "kind": "function",
+  "type": "() -> dynamic",
+  "enclosing": {
+    "name": "C",
+    "kind": "class",
+    "members": [
       {
-        "name": "fisk",
+        "name": "staticMethod1",
         "kind": "function",
         "type": "() -> dynamic"
       },
       {
-        "name": "hest",
+        "name": "staticMethod2",
         "kind": "function",
         "type": "() -> dynamic"
-      },
-      {
-        "name": "",
-        "kind": "generative_constructor",
-        "type": "() -> Foo"
       }
     ],
     "enclosing": {
-      "name": "interesting",
-      "kind": "library",
+      "name": "this(C)",
+      "kind": "class",
       "members": [
         {
-          "name": "main",
+          "name": "instanceMethod1",
+          "kind": "function",
+          "type": "() -> dynamic"
+        },
+        {
+          "name": "instanceMethod2",
           "kind": "function",
           "type": "() -> dynamic"
         },
         {
-          "name": "Foo",
-          "kind": "class"
+          "kind": "generative_constructor",
+          "type": "() -> C"
+        }
+      ],
+      "enclosing": {
+        "name": "subclass",
+        "kind": "library",
+        "members": [
+          {
+            "name": "S",
+            "kind": "class"
+          },
+          {
+            "name": "C",
+            "kind": "class"
+          },
+          {
+            "name": "main",
+            "kind": "function",
+            "type": "() -> dynamic"
+          },
+          {
+            "name": "p",
+            "kind": "prefix"
+          }
+        ],
+        "enclosing": {
+          "kind": "imports",
+          "members": [
+            {
+              "name": "Foo",
+              "kind": "class"
+            },
+            {
+              "name": "main",
+              "kind": "function",
+              "type": "() -> dynamic"
+            },
+          ]..addAll(coreImports),
+          "enclosing": {
+            "name": "this(S)",
+            "kind": "class",
+            "members": [
+              {
+                "name": "superMethod1",
+                "kind": "function",
+                "type": "() -> dynamic"
+              },
+              {
+                "name": "superMethod2",
+                "kind": "function",
+                "type": "() -> dynamic"
+              },
+              {
+                "kind": "generative_constructor",
+                "type": "() -> S"
+              }
+            ],
+            "enclosing": {
+              "name": "this(P)",
+              "kind": "class",
+              "members": [
+                {
+                  "name": "pMethod1",
+                  "kind": "function",
+                  "type": "() -> dynamic"
+                },
+                {
+                  "name": "pMethod2",
+                  "kind": "function",
+                  "type": "() -> dynamic"
+                },
+                {
+                  "name": "_pMethod1",
+                  "kind": "function",
+                  "type": "() -> dynamic"
+                },
+                {
+                  "name": "_pMethod2",
+                  "kind": "function",
+                  "type": "() -> dynamic"
+                },
+                {
+                  "kind": "generative_constructor",
+                  "type": "() -> P"
+                }
+              ],
+              "enclosing": object,
+            }
+          }
         }
-      ]
+      }
     }
   }
 };
+
+final coreImports = [
+  {
+    "name": "Deprecated",
+    "kind": "class"
+  },
+  {
+    "name": "deprecated",
+    "kind": "field",
+    "type": "Deprecated"
+  },
+  {
+    "name": "override",
+    "kind": "field",
+    "type": "Object"
+  },
+  {
+    "name": "proxy",
+    "kind": "field",
+    "type": "Object"
+  },
+  {
+    "name": "bool",
+    "kind": "class"
+  },
+  {
+    "name": "Comparator",
+    "kind": "typedef"
+  },
+  {
+    "name": "Comparable",
+    "kind": "class"
+  },
+  {
+    "name": "DateTime",
+    "kind": "class"
+  },
+  {
+    "name": "double",
+    "kind": "class"
+  },
+  {
+    "name": "Duration",
+    "kind": "class"
+  },
+  {
+    "name": "Error",
+    "kind": "class"
+  },
+  {
+    "name": "AssertionError",
+    "kind": "class"
+  },
+  {
+    "name": "TypeError",
+    "kind": "class"
+  },
+  {
+    "name": "CastError",
+    "kind": "class"
+  },
+  {
+    "name": "NullThrownError",
+    "kind": "class"
+  },
+  {
+    "name": "ArgumentError",
+    "kind": "class"
+  },
+  {
+    "name": "RangeError",
+    "kind": "class"
+  },
+  {
+    "name": "FallThroughError",
+    "kind": "class"
+  },
+  {
+    "name": "AbstractClassInstantiationError",
+    "kind": "class"
+  },
+  {
+    "name": "NoSuchMethodError",
+    "kind": "class"
+  },
+  {
+    "name": "UnsupportedError",
+    "kind": "class"
+  },
+  {
+    "name": "UnimplementedError",
+    "kind": "class"
+  },
+  {
+    "name": "StateError",
+    "kind": "class"
+  },
+  {
+    "name": "ConcurrentModificationError",
+    "kind": "class"
+  },
+  {
+    "name": "OutOfMemoryError",
+    "kind": "class"
+  },
+  {
+    "name": "StackOverflowError",
+    "kind": "class"
+  },
+  {
+    "name": "CyclicInitializationError",
+    "kind": "class"
+  },
+  {
+    "name": "Exception",
+    "kind": "class"
+  },
+  {
+    "name": "FormatException",
+    "kind": "class"
+  },
+  {
+    "name": "IntegerDivisionByZeroException",
+    "kind": "class"
+  },
+  {
+    "name": "Expando",
+    "kind": "class"
+  },
+  {
+    "name": "Function",
+    "kind": "class"
+  },
+  {
+    "name": "identical",
+    "kind": "function",
+    "type": "(Object, Object) -> bool"
+  },
+  {
+    "name": "identityHashCode",
+    "kind": "function",
+    "type": "(Object) -> int"
+  },
+  {
+    "name": "int",
+    "kind": "class"
+  },
+  {
+    "name": "Invocation",
+    "kind": "class"
+  },
+  {
+    "name": "Iterable",
+    "kind": "class"
+  },
+  {
+    "name": "BidirectionalIterator",
+    "kind": "class"
+  },
+  {
+    "name": "Iterator",
+    "kind": "class"
+  },
+  {
+    "name": "List",
+    "kind": "class"
+  },
+  {
+    "name": "Map",
+    "kind": "class"
+  },
+  {
+    "name": "Null",
+    "kind": "class"
+  },
+  {
+    "name": "num",
+    "kind": "class"
+  },
+  {
+    "name": "Object",
+    "kind": "class"
+  },
+  {
+    "name": "Pattern",
+    "kind": "class"
+  },
+  {
+    "name": "print",
+    "kind": "function",
+    "type": "(Object) -> void"
+  },
+  {
+    "name": "Match",
+    "kind": "class"
+  },
+  {
+    "name": "RegExp",
+    "kind": "class"
+  },
+  {
+    "name": "Set",
+    "kind": "class"
+  },
+  {
+    "name": "Sink",
+    "kind": "class"
+  },
+  {
+    "name": "StackTrace",
+    "kind": "class"
+  },
+  {
+    "name": "Stopwatch",
+    "kind": "class"
+  },
+  {
+    "name": "String",
+    "kind": "class"
+  },
+  {
+    "name": "Runes",
+    "kind": "class"
+  },
+  {
+    "name": "RuneIterator",
+    "kind": "class"
+  },
+  {
+    "name": "StringBuffer",
+    "kind": "class"
+  },
+  {
+    "name": "StringSink",
+    "kind": "class"
+  },
+  {
+    "name": "Symbol",
+    "kind": "class"
+  },
+  {
+    "name": "Type",
+    "kind": "class"
+  },
+  {
+    "name": "Uri",
+    "kind": "class"
+  }
+];
+
+final object = {
+  "name": "this(Object)",
+  "kind": "class",
+  "members": [
+    {
+      "kind": "generative_constructor",
+      "type": "() -> dynamic"
+    },
+    {
+      "name": "==",
+      "kind": "function",
+      "type": "(dynamic) -> bool"
+    },
+    {
+      "name": "hashCode",
+      "kind": "getter"
+    },
+    {
+      "name": "toString",
+      "kind": "function",
+      "type": "() -> String"
+    },
+    {
+      "name": "noSuchMethod",
+      "kind": "function",
+      "type": "(Invocation) -> dynamic"
+    },
+    {
+      "name": "runtimeType",
+      "kind": "getter"
+    }
+  ]
+};