From 0fe91954d6e18a6cdfaae5e36d6ebbdf5976e129 Mon Sep 17 00:00:00 2001 From: j178 <10510431+j178@users.noreply.github.com> Date: Thu, 4 Jan 2024 16:11:03 +0800 Subject: [PATCH] refactor: use slices.Clone and slices.Replace --- editor/editor.go | 6 +++--- scripts/update_readme.go | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/editor/editor.go b/editor/editor.go index 219b7901..3051c673 100644 --- a/editor/editor.go +++ b/editor/editor.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "os/exec" + "slices" "strings" "text/template" @@ -72,8 +73,7 @@ func (ed *editor) substituteArgs(result *lang.GenerateResult) ([]string, error) TestCasesFile: getPath(lang.TestCasesFile), } - args := make([]string, len(ed.args)) - copy(args, ed.args) + args := slices.Clone(ed.args) for i, arg := range args { if !strings.Contains(arg, "{{") { continue @@ -99,7 +99,7 @@ func (ed *editor) substituteArgs(result *lang.GenerateResult) ([]string, error) for j, f := range result.Files { allFiles[j] = f.GetPath() } - args = append(args[:i], append(allFiles, args[i+1:]...)...) + args = slices.Replace(args, i, i+1, allFiles...) break } } diff --git a/scripts/update_readme.go b/scripts/update_readme.go index 9595d50b..b5527330 100644 --- a/scripts/update_readme.go +++ b/scripts/update_readme.go @@ -4,6 +4,7 @@ import ( "bytes" "fmt" "os" + "slices" "strings" "github.com/fatih/color" @@ -33,10 +34,7 @@ func replace(mark string, origin []byte, new []byte) []byte { endMark := fmt.Appendf(nil, "", mark) begin := bytes.Index(origin, beginMark) + len(beginMark) end := bytes.Index(origin, endMark) - result := append([]byte(nil), origin[:begin]...) - result = append(result, new...) - result = append(result, origin[end:]...) - return result + return slices.Replace(origin, begin, end, new...) } func updateUsage(readme []byte) []byte {