qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-18 19:54:44 -07:00
Code Releases Activity

internal/lsp/cmd: don't create .orig files for rename by default

Browse Source 
Fixes golang/go#35551

Change-Id: I78086e0288da84a4c0b008d05e376f47b30d978a
Reviewed-on: https://go-review.googlesource.com/c/tools/+/207347
Run-TryBot: Rebecca Stambler <rstambler@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Cottrell <iancottrell@google.com>
This commit is contained in:
Rebecca Stambler 2019-11-15 13:03:47 -05:00
parent 11e13f1c3f
commit 6d480e29d4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/lsp/cmd/rename.go
View File

@ -25,6 +25,7 @@ import (
type rename struct { type rename struct {
Diff bool `flag:"d" help:"display diffs instead of rewriting files"` Diff bool `flag:"d" help:"display diffs instead of rewriting files"`
Write bool `flag:"w" help:"write result to (source) file instead of stdout"` Write bool `flag:"w" help:"write result to (source) file instead of stdout"`
Preserve bool `flag:"preserve" help:"preserve original files"`
app *Application app *Application
} }
@ -102,10 +103,11 @@ func (r *rename) Run(ctx context.Context, args ...string) error {
switch { switch {
case r.Write: case r.Write:
fmt.Fprintln(os.Stderr, filename) fmt.Fprintln(os.Stderr, filename)
err := os.Rename(filename, filename+".orig") if r.Preserve {
if err != nil { if err := os.Rename(filename, filename+".orig"); err != nil {
return errors.Errorf("%v: %v", edits, err) return errors.Errorf("%v: %v", edits, err)
} }
}
ioutil.WriteFile(filename, []byte(newContent), 0644) ioutil.WriteFile(filename, []byte(newContent), 0644)
case r.Diff: case r.Diff:
diffs := diff.ToUnified(filename+".orig", filename, string(cmdFile.mapper.Content), renameEdits) diffs := diff.ToUnified(filename+".orig", filename, string(cmdFile.mapper.Content), renameEdits)