Skip to content

Commit c7d0aaa

Browse files
committed
Fix warning QF1004: could use strings.ReplaceAll instead
1 parent 4604227 commit c7d0aaa

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

pkg/commands/git_commands/commit_loader_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ import (
1616
"github.com/stretchr/testify/assert"
1717
)
1818

19-
var commitsOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode
19+
var commitsOutput = strings.ReplaceAll(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode
2020
b21997d6b4cbdf84b149d8e6a2c4d06a8e9ec164|1640824515|Jesse Duffield|jessedduffield@gmail.com|origin/better-tests|e94e8fc5b6fab4cb755f|>|fix logging
2121
e94e8fc5b6fab4cb755f29f1bdb3ee5e001df35c|1640823749|Jesse Duffield|jessedduffield@gmail.com|tag: 123, tag: 456|d8084cd558925eb7c9c3|>|refactor
2222
d8084cd558925eb7c9c38afeed5725c21653ab90|1640821426|Jesse Duffield|jessedduffield@gmail.com||65f910ebd85283b5cce9|>|WIP
2323
65f910ebd85283b5cce9bf67d03d3f1a9ea3813a|1640821275|Jesse Duffield|jessedduffield@gmail.com||26c07b1ab33860a1a759|>|WIP
2424
26c07b1ab33860a1a7591a0638f9925ccf497ffa|1640750752|Jesse Duffield|jessedduffield@gmail.com||3d4470a6c072208722e5|>|WIP
2525
3d4470a6c072208722e5ae9a54bcb9634959a1c5|1640748818|Jesse Duffield|jessedduffield@gmail.com||053a66a7be3da43aacdc|>|WIP
26-
053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|>|refactoring the config struct`, "|", "\x00", -1)
26+
053a66a7be3da43aacdc7aa78e1fe757b82c4dd2|1640739815|Jesse Duffield|jessedduffield@gmail.com||985fe482e806b172aea4|>|refactoring the config struct`, "|", "\x00")
2727

28-
var singleCommitOutput = strings.Replace(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode`, "|", "\x00", -1)
28+
var singleCommitOutput = strings.ReplaceAll(`0eea75e8c631fba6b58135697835d58ba4c18dbc|1640826609|Jesse Duffield|jessedduffield@gmail.com|HEAD -> better-tests|b21997d6b4cbdf84b149|>|better typing for rebase mode`, "|", "\x00")
2929

3030
func TestGetCommits(t *testing.T) {
3131
type scenario struct {

pkg/commands/git_commands/reflog_commit_loader_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414
"github.com/stretchr/testify/assert"
1515
)
1616

17-
var reflogOutput = strings.Replace(`c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1
17+
var reflogOutput = strings.ReplaceAll(`c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1
1818
c3c4b66b64c97ffeecde|1643150483|checkout: moving from B to A|51baa8c1
1919
c3c4b66b64c97ffeecde|1643150483|checkout: moving from A to B|51baa8c1
2020
c3c4b66b64c97ffeecde|1643150483|checkout: moving from master to A|51baa8c1
2121
f4ddf2f0d4be4ccc7efa|1643149435|checkout: moving from A to master|51baa8c1
22-
`, "|", "\x00", -1)
22+
`, "|", "\x00")
2323

2424
func TestGetReflogCommits(t *testing.T) {
2525
type scenario struct {

pkg/commands/oscommands/os.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ func PrepareForChildren(cmd *exec.Cmd) {
283283
}
284284

285285
func (c *OSCommand) CopyToClipboard(str string) error {
286-
escaped := strings.Replace(str, "\n", "\\n", -1)
286+
escaped := strings.ReplaceAll(str, "\n", "\\n")
287287
truncated := utils.TruncateWithEllipsis(escaped, 40)
288288

289289
msg := utils.ResolvePlaceholderString(

pkg/gui/command_log_panel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func (gui *Gui) LogCommand(cmdStr string, commandLine bool) {
4848
textStyle = style.FgMagenta
4949
}
5050
gui.GuiLog = append(gui.GuiLog, cmdStr)
51-
indentedCmdStr := " " + strings.Replace(cmdStr, "\n", "\n ", -1)
51+
indentedCmdStr := " " + strings.ReplaceAll(cmdStr, "\n", "\n ")
5252
fmt.Fprint(gui.Views.Extras, "\n"+textStyle.Sprint(indentedCmdStr))
5353
}
5454

pkg/gui/controllers/helpers/refs_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ func (self *RefsHelper) CanMoveCommitsToNewBranch() *types.DisabledReason {
563563
// SanitizedBranchName will remove all spaces in favor of a dash "-" to meet
564564
// git's branch naming requirement.
565565
func SanitizedBranchName(input string) string {
566-
return strings.Replace(input, " ", "-", -1)
566+
return strings.ReplaceAll(input, " ", "-")
567567
}
568568

569569
// Checks if the given branch name is a remote branch, and returns the name of

pkg/gui/global_handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (gui *Gui) handleCopySelectedSideContextItemToClipboardWithTruncation(maxWi
185185
return err
186186
}
187187

188-
truncatedItemId := utils.TruncateWithEllipsis(strings.Replace(itemId, "\n", " ", -1), 50)
188+
truncatedItemId := utils.TruncateWithEllipsis(strings.ReplaceAll(itemId, "\n", " "), 50)
189189

190190
gui.c.Toast(fmt.Sprintf("'%s' %s", truncatedItemId, gui.c.Tr.CopiedToClipboard))
191191

pkg/utils/lines.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
// currently we are also stripping \r's which may have adverse effects for
1212
// windows users (but no issues have been raised yet)
1313
func SplitLines(multilineString string) []string {
14-
multilineString = strings.Replace(multilineString, "\r", "", -1)
14+
multilineString = strings.ReplaceAll(multilineString, "\r", "")
1515
if multilineString == "" || multilineString == "\n" {
1616
return make([]string, 0)
1717
}
@@ -32,8 +32,8 @@ func SplitNul(str string) []string {
3232

3333
// NormalizeLinefeeds - Removes all Windows and Mac style line feeds
3434
func NormalizeLinefeeds(str string) string {
35-
str = strings.Replace(str, "\r\n", "\n", -1)
36-
str = strings.Replace(str, "\r", "", -1)
35+
str = strings.ReplaceAll(str, "\r\n", "\n")
36+
str = strings.ReplaceAll(str, "\r", "")
3737
return str
3838
}
3939

0 commit comments

Comments
 (0)