Merge pull request #42 from ReconfigureIO/bugfix/interface-types

Fix interface type dumping.

Author: bohde

fixtures/packages/interface_type/interface.go

@@ -0,0 +1,10 @@
+package main
+
+func main() {
+	item := map[string]interface{}{
+		"foo": "bar",
+		"baz": 400,
+	}
+
+	println(item["foo"])
+}

fixtures/packages/interface_type/interface.json

@@ -0,0 +1,129 @@
+{
+  "all-comments": [],
+  "comments": [],
+  "declarations": [
+    {
+      "body": [
+        {
+          "kind": "statement",
+          "left": [
+            {
+              "kind": "expression",
+              "type": "identifier",
+              "value": {
+                "kind": "ident",
+                "value": "item"
+              }
+            }
+          ],
+          "right": [
+            {
+              "declared": {
+                "key": {
+                  "kind": "type",
+                  "type": "identifier",
+                  "value": {
+                    "kind": "ident",
+                    "value": "string"
+                  }
+                },
+                "kind": "type",
+                "type": "map",
+                "value": {
+                  "incomplete": false,
+                  "kind": "type",
+                  "methods": [],
+                  "type": "interface"
+                }
+              },
+              "kind": "literal",
+              "type": "composite",
+              "values": [
+                {
+                  "key": {
+                    "kind": "literal",
+                    "type": "STRING",
+                    "value": "\"foo\""
+                  },
+                  "kind": "expression",
+                  "type": "key-value",
+                  "value": {
+                    "kind": "literal",
+                    "type": "STRING",
+                    "value": "\"bar\""
+                  }
+                },
+                {
+                  "key": {
+                    "kind": "literal",
+                    "type": "STRING",
+                    "value": "\"baz\""
+                  },
+                  "kind": "expression",
+                  "type": "key-value",
+                  "value": {
+                    "kind": "literal",
+                    "type": "INT",
+                    "value": "400"
+                  }
+                }
+              ]
+            }
+          ],
+          "type": "define"
+        },
+        {
+          "kind": "statement",
+          "type": "expression",
+          "value": {
+            "arguments": [
+              {
+                "index": {
+                  "kind": "literal",
+                  "type": "STRING",
+                  "value": "\"foo\""
+                },
+                "kind": "expression",
+                "target": {
+                  "kind": "expression",
+                  "type": "identifier",
+                  "value": {
+                    "kind": "ident",
+                    "value": "item"
+                  }
+                },
+                "type": "index"
+              }
+            ],
+            "ellipsis": false,
+            "function": {
+              "kind": "expression",
+              "type": "identifier",
+              "value": {
+                "kind": "ident",
+                "value": "println"
+              }
+            },
+            "kind": "expression",
+            "type": "call"
+          }
+        }
+      ],
+      "comments": [],
+      "kind": "decl",
+      "name": {
+        "kind": "ident",
+        "value": "main"
+      },
+      "params": [],
+      "results": null,
+      "type": "function"
+    }
+  ],
+  "imports": [],
+  "kind": "file",
+  "name": {
+    "kind": "ident",
+    "value": "main"
+  }
+}

goblin.go

@@ -114,6 +114,15 @@ func AttemptExprAsType(e ast.Expr, fset *token.FileSet) map[string]interface{} {
 		}
 	}
 
+	if n, ok := e.(*ast.InterfaceType); ok {
+		return map[string]interface{}{
+			"kind":       "type",
+			"type":       "interface",
+			"incomplete": n.Incomplete,
+			"methods":    DumpFields(n.Methods, fset),
+		}
+	}
+
 	if n, ok := e.(*ast.MapType); ok {
 		return map[string]interface{}{
 			"kind":  "type",

goblin_test.go

@@ -66,6 +66,11 @@ func TestPackageFixtures(t *testing.T) {
 			"fixtures/packages/methoddecl/method.go",
 			"fixtures/packages/methoddecl/method.json",
 		},
+		Fixture{
+			"map with interface type",
+			"fixtures/packages/interface_type/interface.go",
+			"fixtures/packages/interface_type/interface.json",
+		},
 	}
 
 	for _, fix := range fixtures {