From 0bf6e3937f052a70be716e39d9523cf36c36c928 Mon Sep 17 00:00:00 2001
From: pagran <67878280+pagran@users.noreply.github.com>
Date: Sat, 1 Aug 2020 18:11:10 +0300
Subject: [PATCH] Fix three dots notation

---
 internal/literals/split.go | 26 +++++++++-----------------
 1 file changed, 9 insertions(+), 17 deletions(-)

diff --git a/internal/literals/split.go b/internal/literals/split.go
index b497e95..0b1c1d0 100644
--- a/internal/literals/split.go
+++ b/internal/literals/split.go
@@ -1,7 +1,6 @@
 package literals
 
 import (
-	"fmt"
 	"go/ast"
 	"go/token"
 	mathrand "math/rand"
@@ -116,15 +115,16 @@ func (x split) obfuscate(data []byte) *ast.BlockStmt {
 		nextIndex := indexes[i+1]
 		chunk := chunks[i]
 
-		var literal *ast.BasicLit
+		appendCallExpr := &ast.CallExpr{
+			Fun:  ah.Ident("append"),
+			Args: []ast.Expr{ah.Ident("data")},
+		}
+
 		if len(chunk) != 1 {
-			literal = &ast.BasicLit{
-				Kind: token.STRING,
-				// TODO: Is it correct to generate append(arr, "str"...) expressions like this?
-				Value: fmt.Sprintf("%q...", chunk),
-			}
+			appendCallExpr.Args = append(appendCallExpr.Args, ah.StringLit(string(chunk)))
+			appendCallExpr.Ellipsis = 1
 		} else {
-			literal = ah.IntLit(int(chunk[0]))
+			appendCallExpr.Args = append(appendCallExpr.Args, ah.IntLit(int(chunk[0])))
 		}
 
 		switchCases = append(switchCases, &ast.CaseClause{
@@ -138,15 +138,7 @@ func (x split) obfuscate(data []byte) *ast.BlockStmt {
 				&ast.AssignStmt{
 					Lhs: []ast.Expr{ah.Ident("data")},
 					Tok: token.ASSIGN,
-					Rhs: []ast.Expr{
-						&ast.CallExpr{
-							Fun: ah.Ident("append"),
-							Args: []ast.Expr{
-								ah.Ident("data"),
-								literal,
-							},
-						},
-					},
+					Rhs: []ast.Expr{appendCallExpr},
 				},
 			),
 		})