Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout scm
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Go
uses: actions/setup-go@v5
Expand All @@ -25,14 +25,14 @@ jobs:
cache: false

- name: Lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v8

CodeQL:
needs: Lint
runs-on: ubuntu-latest
steps:
- name: Checkout scm
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Go
uses: actions/setup-go@v5
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

steps:
- name: Checkout scm
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Go
uses: actions/setup-go@v5
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:

steps:
- name: Checkout scm
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Go
uses: actions/setup-go@v5
Expand All @@ -144,7 +144,7 @@ jobs:
run: go install -a .

- name: Clone routine
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
repository: timandy/routine
ref: main
Expand Down
10 changes: 5 additions & 5 deletions inject/inject_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func init() {
}

func TestCompileRuntime(t *testing.T) {
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand Down Expand Up @@ -82,7 +82,7 @@ func TestCompileRuntime(t *testing.T) {
}

func TestCompileRoutine_Source(t *testing.T) {
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand Down Expand Up @@ -123,7 +123,7 @@ func TestCompileRoutine_Test(t *testing.T) {
}, appOpts)
exec.RunCmd(remainArgs)
//
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand Down Expand Up @@ -155,7 +155,7 @@ func TestCompileRoutine_Test(t *testing.T) {
}

func TestCoverRoutine_Go1_18(t *testing.T) {
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand Down Expand Up @@ -183,7 +183,7 @@ func TestCoverRoutine_Go1_18(t *testing.T) {
}

func TestCoverRoutine_Go1_20(t *testing.T) {
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand Down
6 changes: 3 additions & 3 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
var goToolDir = exec.RunCmdOutput([]string{"go", "env", "GOTOOLDIR"})

func TestHelp(t *testing.T) {
tracker := file.NewFileTracker(&os.Stderr)
tracker := file.NewFileTracker(os.Stderr)
tracker.Begin()
defer tracker.End()
//
Expand All @@ -27,7 +27,7 @@ func TestHelp(t *testing.T) {
}

func TestOtherCmd(t *testing.T) {
tracker := file.NewFileTracker(&os.Stdout)
tracker := file.NewFileTracker(os.Stdout)
tracker.Begin()
defer tracker.End()
//
Expand All @@ -40,7 +40,7 @@ func TestOtherCmd(t *testing.T) {
}

func TestOtherCmdHelp(t *testing.T) {
tracker := file.NewFileTracker(&os.Stdout)
tracker := file.NewFileTracker(os.Stdout)
tracker.Begin()
defer tracker.End()
//
Expand Down
2 changes: 1 addition & 1 deletion tools/astutil/ast.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func SaveAs(path string, fset *token.FileSet, af *ast.File) {
if err != nil {
panic(err)
}
defer destFile.Close()
defer destFile.Close() //nolint:errcheck
// write code to dest file
if err = printer.Fprint(destFile, fset, af); err != nil {
panic(err)
Expand Down
14 changes: 7 additions & 7 deletions tools/file/tracker.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import (
)

type FileTracker struct {
target **os.File
oldValue *os.File
tempValue *os.File
target *os.File
oldValue os.File
tempValue os.File
}

func NewFileTracker(target **os.File) *FileTracker {
func NewFileTracker(target *os.File) *FileTracker {
return &FileTracker{target: target, oldValue: *target}
}

Expand All @@ -20,8 +20,8 @@ func (f *FileTracker) Begin() {
if err != nil {
panic(err)
}
*f.target = file
f.tempValue = file
*f.target = *file
f.tempValue = *file
}

func (f *FileTracker) End() {
Expand All @@ -38,7 +38,7 @@ func (f *FileTracker) Value() string {
if _, err := f.tempValue.Seek(0, io.SeekStart); err != nil {
panic(err)
}
buff, err := io.ReadAll(f.tempValue)
buff, err := io.ReadAll(&f.tempValue)
if err != nil {
panic(err)
}
Expand Down
16 changes: 14 additions & 2 deletions tools/file/tracker_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,22 @@ import (

func TestFileTracker(t *testing.T) {
origin := os.Stdout
tracker := NewFileTracker(&os.Stdout)
tracker := NewFileTracker(os.Stdout)
tracker.Begin()
fmt.Println("hello world")
_, _ = fmt.Fprintln(os.Stdout, "hello world")
assert.Equal(t, "hello world\n", tracker.Value())
tracker.End()
assert.Equal(t, "/dev/stdout", origin.Name())
assert.Same(t, origin, os.Stdout)
}

func TestFileTrackerRef(t *testing.T) {
origin := os.Stdout
tracker := NewFileTracker(os.Stdout)
tracker.Begin()
_, _ = fmt.Fprintln(origin, "hello world")
assert.Equal(t, "hello world\n", tracker.Value())
tracker.End()
assert.Equal(t, "/dev/stdout", origin.Name())
assert.Same(t, origin, os.Stdout)
}
2 changes: 1 addition & 1 deletion tools/os/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func WriteFile(path, data string) {
if err != nil {
panic(err)
}
defer destFile.Close()
defer destFile.Close() //nolint:errcheck
// write data to dest file
if _, err = destFile.WriteString(data); err != nil {
panic(err)
Expand Down
Loading