Handle new(js.Object) and pointer-to-pointer-to-pointer....

flimzy · flimzy · commit 86f02df3ef58 · 2023-07-31T16:51:39.000+02:00
diff --git a/analysis/passes/directjsobject/directjsobject.go b/analysis/passes/directjsobject/directjsobject.go
@@ -56,6 +56,13 @@ func detectRawJSObject(pass *analysis.Pass, node ast.Node) {
 		if valExpr, ok := derefPointer(t.Value); ok {
 			objMustBeEmbedded(pass, node, valExpr)
 		}
+	case *ast.CallExpr:
+		ident, ok := t.Fun.(*ast.Ident)
+		if ok && ident.Name == "new" {
+			if arg0, ok := derefPointer(t.Args[0]); ok {
+				objMustBeEmbedded(pass, node, arg0)
+			}
+		}
 	case *ast.CompositeLit:
 		var expr *ast.SelectorExpr
 		switch et := t.Type.(type) {
@@ -78,10 +85,7 @@ func derefPointer(node ast.Node) (*ast.SelectorExpr, bool) {
 	case *ast.SelectorExpr:
 		return x, true
 	case *ast.StarExpr:
-		child, ok := x.X.(*ast.SelectorExpr)
-		if ok {
-			return child, true
-		}
+		return derefPointer(x.X)
 	}
 	return nil, false
 }
diff --git a/analysis/passes/directjsobject/testdata/src/directjsobject/directjsobject.go b/analysis/passes/directjsobject/testdata/src/directjsobject/directjsobject.go
@@ -40,6 +40,7 @@ var _ = struct {
 var (
 	_ js.Object             // want "js.Object must be embedded in a struct"
 	_ *js.Object            // want "js.Object must be embedded in a struct"
+	_ ******js.Object       // want "js.Object must be embedded in a struct"
 	_ []js.Object           // want "js.Object must be embedded in a struct"
 	_ []*js.Object          // want "js.Object must be embedded in a struct"
 	_ [10]js.Object         // want "js.Object must be embedded in a struct"
@@ -51,6 +52,12 @@ var (
 )
 
 var (
-	_ chan js.Object  // want "js.Object must be embedded in a struct"
-	_ chan *js.Object // want "js.Object must be embedded in a struct"
+	_ chan js.Object   // want "js.Object must be embedded in a struct"
+	_ chan *js.Object  // want "js.Object must be embedded in a struct"
+	_ chan []js.Object // want "js.Object must be embedded in a struct"
+
+	_ = make(chan js.Object) // want "js.Object must be embedded in a struct"
+	_ = new(js.Object)       // want "js.Object must be embedded in a struct"
+	_ = new(*js.Object)      // want "js.Object must be embedded in a struct"
+	_ = new(**js.Object)     // want "js.Object must be embedded in a struct"
 )
