diff --git a/cmd/guru/testdata/src/describe/main.golden b/cmd/guru/testdata/src/describe/main.golden index 3489635a..4ddb680c 100644 --- a/cmd/guru/testdata/src/describe/main.golden +++ b/cmd/guru/testdata/src/describe/main.golden @@ -206,7 +206,7 @@ Fields: inner.recursive.E bool -------- @describe call-unknown -------- -function call (or conversion) of type invalid type +function call of type invalid type -------- @describe def-iface-I -------- definition of type I (size 16, align 8) diff --git a/cmd/guru/testdata/src/what-json/main.golden b/cmd/guru/testdata/src/what-json/main.golden index 5d750bd9..639084e8 100644 --- a/cmd/guru/testdata/src/what-json/main.golden +++ b/cmd/guru/testdata/src/what-json/main.golden @@ -7,7 +7,7 @@ "end": 176 }, { - "desc": "function call (or conversion)", + "desc": "function call", "start": 175, "end": 178 }, diff --git a/cmd/guru/testdata/src/what/main.golden b/cmd/guru/testdata/src/what/main.golden index ac8568fe..74640c80 100644 --- a/cmd/guru/testdata/src/what/main.golden +++ b/cmd/guru/testdata/src/what/main.golden @@ -7,7 +7,7 @@ import path: what -------- @what call -------- identifier -function call (or conversion) +function call expression statement block function declaration diff --git a/go/ast/astutil/enclosing.go b/go/ast/astutil/enclosing.go index 340c9e6c..6b7052b8 100644 --- a/go/ast/astutil/enclosing.go +++ b/go/ast/astutil/enclosing.go @@ -509,7 +509,10 @@ func NodeDescription(n ast.Node) string { return "fall-through statement" } case *ast.CallExpr: - return "function call (or conversion)" + if len(n.Args) == 1 && !n.Ellipsis.IsValid() { + return "function call (or conversion)" + } + return "function call" case *ast.CaseClause: return "case clause" case *ast.ChanType: diff --git a/oracle/testdata/src/what-json/main.golden b/oracle/testdata/src/what-json/main.golden index 9a311901..602b4d55 100644 --- a/oracle/testdata/src/what-json/main.golden +++ b/oracle/testdata/src/what-json/main.golden @@ -9,7 +9,7 @@ "end": 180 }, { - "desc": "function call (or conversion)", + "desc": "function call", "start": 179, "end": 182 }, diff --git a/oracle/testdata/src/what/main.golden b/oracle/testdata/src/what/main.golden index 56b97dde..620eec03 100644 --- a/oracle/testdata/src/what/main.golden +++ b/oracle/testdata/src/what/main.golden @@ -7,7 +7,7 @@ import path: what -------- @what call -------- identifier -function call (or conversion) +function call expression statement block function declaration