fix weird fmt printing repetition

Author: dwhitena

internal/repl/commands.go

@@ -190,7 +190,7 @@ func actionDoc(s *Session, in string) (string, error) {
 	s.storeMainBody()
 	defer s.restoreMainBody()
 
-	expr, err := s.evalExpr(in)
+	exprs, err := s.evalExpr(in)
 	if err != nil {
 		return "", err
 	}
@@ -206,33 +206,35 @@ func actionDoc(s *Session, in string) (string, error) {
 		debugf("typecheck error (ignored): %s", err)
 	}
 
-	// :doc patterns:
-	// - "json" -> "encoding/json" (package name)
-	// - "json.Encoder" -> "encoding/json", "Encoder" (package member)
-	// - "json.NewEncoder(nil).Encode" -> "encoding/json", "Decode" (package type member)
 	var docObj types.Object
-	if sel, ok := expr.(*ast.SelectorExpr); ok {
-		// package member, package type member
-		docObj = s.TypeInfo.ObjectOf(sel.Sel)
-	} else if t := s.TypeInfo.TypeOf(expr); t != nil && t != types.Typ[types.Invalid] {
-		for {
-			if pt, ok := t.(*types.Pointer); ok {
-				t = pt.Elem()
-			} else {
-				break
+	for _, expr := range exprs {
+		// :doc patterns:
+		// - "json" -> "encoding/json" (package name)
+		// - "json.Encoder" -> "encoding/json", "Encoder" (package member)
+		// - "json.NewEncoder(nil).Encode" -> "encoding/json", "Decode" (package type member)
+		if sel, ok := expr.(*ast.SelectorExpr); ok {
+			// package member, package type member
+			docObj = s.TypeInfo.ObjectOf(sel.Sel)
+		} else if t := s.TypeInfo.TypeOf(expr); t != nil && t != types.Typ[types.Invalid] {
+			for {
+				if pt, ok := t.(*types.Pointer); ok {
+					t = pt.Elem()
+				} else {
+					break
+				}
 			}
+			switch t := t.(type) {
+			case *types.Named:
+				docObj = t.Obj()
+			case *types.Basic:
+				// builtin types
+				docObj = types.Universe.Lookup(t.Name())
+			}
+		} else if ident, ok := expr.(*ast.Ident); ok {
+			// package name
+			mainScope := s.TypeInfo.Scopes[s.mainFunc().Type]
+			_, docObj = mainScope.LookupParent(ident.Name, ident.NamePos)
 		}
-		switch t := t.(type) {
-		case *types.Named:
-			docObj = t.Obj()
-		case *types.Basic:
-			// builtin types
-			docObj = types.Universe.Lookup(t.Name())
-		}
-	} else if ident, ok := expr.(*ast.Ident); ok {
-		// package name
-		mainScope := s.TypeInfo.Scopes[s.mainFunc().Type]
-		_, docObj = mainScope.LookupParent(ident.Name, ident.NamePos)
 	}
 
 	if docObj == nil {

internal/repl/quickfix.go

@@ -74,7 +74,7 @@ quickFixAttempt:
 
 						stmts := s.mainBody.List[0:i]
 						for _, expr := range exprs {
-							stmts = append(stmts, &ast.ExprStmt{expr})
+							stmts = append(stmts, &ast.ExprStmt{X: expr})
 						}
 
 						s.mainBody.List = append(stmts, s.mainBody.List[i+1:]...)

internal/repl/repl.go

@@ -154,22 +154,29 @@ func goRun(files []string) ([]byte, bytes.Buffer, error) {
 	return out, stderr, err
 }
 
-func (s *Session) evalExpr(in string) (ast.Expr, error) {
-	expr, err := parser.ParseExpr(in)
-	if err != nil {
-		return nil, err
-	}
+func (s *Session) evalExpr(in string) ([]ast.Expr, error) {
+	inLines := strings.Split(in, "\n")
 
-	stmt := &ast.ExprStmt{
-		X: &ast.CallExpr{
-			Fun:  ast.NewIdent(printerName),
-			Args: []ast.Expr{expr},
-		},
-	}
+	var exprs []ast.Expr
+	for _, line := range inLines {
 
-	s.appendStatements(stmt)
+		expr, err := parser.ParseExpr(line)
+		if err != nil {
+			return nil, err
+		}
+		exprs = append(exprs, expr)
+
+		stmt := &ast.ExprStmt{
+			X: &ast.CallExpr{
+				Fun:  ast.NewIdent(printerName),
+				Args: []ast.Expr{expr},
+			},
+		}
+
+		s.appendStatements(stmt)
+	}
 
-	return expr, nil
+	return exprs, nil
 }
 
 func isNamedIdent(expr ast.Expr, name string) bool {
@@ -307,7 +314,6 @@ func (s *Session) Eval(in string) (string, bytes.Buffer, error) {
 				advance := 1
 				currentLine := inLines[idx+advance]
 				for !strings.Contains(currentLine, ")") {
-					fmt.Println(currentLine)
 					args = append(args, currentLine)
 					advance++
 					currentLine = inLines[idx+advance]