From 8faf556a82dfd0fa7b2c10a31c5bf321c39d0479 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ijc@docker.com>
Date: Fri, 16 Mar 2018 14:40:38 +0000
Subject: [PATCH] Support for type aliases

Fixes #71 and supercedes #69. Handles the case described in
https://github.com/rogpeppe/godef/pull/69#issuecomment-331399276, i.e.

```
$ cat <<EOF | ./godef -i -o 106
package main
import "encoding/json"
func xxxx() {
    type foo = json.Encoder
    x := new(foo)
    _ = x.Encode
}
EOF
/usr/lib/go-1.10/src/encoding/json/stream.go:195:21
```

i.e. it correctly finds the definition of `x.Encode` (offset 106 is on the `E`)

Also:

```
$ cat <<EOF | ./godef -i -o 91
package main
import "encoding/json"
func xxxx() {
    type foo = json.Encoder
    x := new(foo)
    _ = x.Encode
}
EOF

4:10
```

Where offset 91 is the `f` in `new(foo)` and `4:10` is the `json.Encoder`
---
 go/ast/ast.go            |  1 +
 go/parser/parser.go      |  6 +++++-
 go/parser/parser_test.go |  1 +
 go/types/types.go        | 12 ++++++++++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/go/ast/ast.go b/go/ast/ast.go
index cdc12f5..b559180 100644
--- a/go/ast/ast.go
+++ b/go/ast/ast.go
@@ -772,6 +772,7 @@ type (
 	TypeSpec struct {
 		Doc     *CommentGroup // associated documentation; or nil
 		Name    *Ident        // type name
+		Assign  token.Pos     // position of '=', if any
 		Type    Expr          // *Ident, *ParenExpr, *SelectorExpr, *StarExpr, or any of the *XxxTypes
 		Comment *CommentGroup // line comments; or nil
 	}
diff --git a/go/parser/parser.go b/go/parser/parser.go
index b6bfef7..5bfceb9 100644
--- a/go/parser/parser.go
+++ b/go/parser/parser.go
@@ -2027,8 +2027,12 @@ func parseTypeSpec(p *parser, doc *ast.CommentGroup, decl *ast.GenDecl, _ int) a
 	// at the identifier in the TypeSpec and ends at the end of the innermost
 	// containing block.
 	// (Global identifiers are resolved in a separate phase after parsing.)
-	spec := &ast.TypeSpec{doc, ident, nil, p.lineComment}
+	spec := &ast.TypeSpec{doc, ident, token.NoPos, nil, p.lineComment}
 	p.declare(spec, p.topScope, ast.Typ, ident)
+	if p.tok == token.ASSIGN {
+		spec.Assign = p.pos
+		p.next()
+	}
 	typ := p.parseType()
 	p.expectSemi() // call before accessing p.linecomment
 	spec.Type = typ
diff --git a/go/parser/parser_test.go b/go/parser/parser_test.go
index d544f11..2704867 100644
--- a/go/parser/parser_test.go
+++ b/go/parser/parser_test.go
@@ -46,6 +46,7 @@ var validPrograms = []interface{}{
 	`package p; type T []int; var a []bool; func f() { if a[T{42}[0]] {} };`,
 	`package p; type T []int; func g(int) bool { return true }; func f() { if g(T{42}[0]) {} };`,
 	`package p; type T []int; func f() { for _ = range []int{T{42}[0]} {} };`,
+	`package p; type T []int; type U = T; func f() int { return U{42}[0] };`,
 	`package p; var a = T{{1, 2}, {3, 4}}`,
 	`package p; func f() { select { case <- c: case c <- d: case c <- <- d: case <-c <- d: } };`,
 	`package p; func f() { if ; true {} };`,
diff --git a/go/types/types.go b/go/types/types.go
index 32906e2..37aaa50 100644
--- a/go/types/types.go
+++ b/go/types/types.go
@@ -230,8 +230,8 @@ func (ctxt *exprTypeContext) exprType(n ast.Node, expectTuple bool, pkg string)
 		if obj == nil || obj.Kind == ast.Bad {
 			break
 		}
-		// A type object represents itself.
-		if obj.Kind == ast.Typ {
+		// A non-aliased type object represents itself.
+		if obj.Kind == ast.Typ && !isTypeAlias(obj) {
 			// Objects in the universal scope don't live
 			// in any package.
 			if parser.Universe.Lookup(obj.Name) == obj {
@@ -871,6 +871,14 @@ func isNamedType(typ Type) bool {
 	return typ.Underlying(false).Node != typ.Node
 }
 
+func isTypeAlias(obj *ast.Object) bool {
+	if obj.Kind != ast.Typ {
+		return false
+	}
+	ts, ok := obj.Decl.(*ast.TypeSpec)
+	return ok && ts.Assign.IsValid()
+}
+
 func fields2type(fields *ast.FieldList) ast.Node {
 	if fields == nil {
 		return MultiValue{nil}