Skip to content

Commit

Permalink
Sort imports.
Browse files Browse the repository at this point in the history
  • Loading branch information
i-sevostyanov committed Oct 1, 2019
1 parent 9c89257 commit 1a9cc54
Show file tree
Hide file tree
Showing 19 changed files with 33 additions and 14 deletions.
5 changes: 3 additions & 2 deletions cmd/reviewdog/doghouse.go
Expand Up @@ -11,13 +11,14 @@ import (
"sort"
"strings"

"golang.org/x/oauth2"
"golang.org/x/sync/errgroup"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/cienv"
"github.com/reviewdog/reviewdog/doghouse"
"github.com/reviewdog/reviewdog/doghouse/client"
"github.com/reviewdog/reviewdog/project"
"golang.org/x/oauth2"
"golang.org/x/sync/errgroup"
)

func runDoghouse(ctx context.Context, r io.Reader, w io.Writer, opt *option, isProject bool, allowNonPR bool) error {
Expand Down
3 changes: 2 additions & 1 deletion cmd/reviewdog/doghouse_test.go
Expand Up @@ -9,12 +9,13 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"golang.org/x/oauth2"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/cienv"
"github.com/reviewdog/reviewdog/doghouse"
"github.com/reviewdog/reviewdog/doghouse/client"
"github.com/reviewdog/reviewdog/project"
"golang.org/x/oauth2"
)

func setupEnvs(testEnvs map[string]string) (cleanup func()) {
Expand Down
3 changes: 2 additions & 1 deletion cmd/reviewdog/main.go
Expand Up @@ -22,13 +22,14 @@ import (
"github.com/google/go-github/v28/github"
shellwords "github.com/mattn/go-shellwords"
"github.com/reviewdog/errorformat/fmts"
gitlab "github.com/xanzy/go-gitlab"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/cienv"
"github.com/reviewdog/reviewdog/commands"
"github.com/reviewdog/reviewdog/project"
githubservice "github.com/reviewdog/reviewdog/service/github"
gitlabservice "github.com/reviewdog/reviewdog/service/gitlab"
gitlab "github.com/xanzy/go-gitlab"
)

const usageMessage = "" +
Expand Down
3 changes: 2 additions & 1 deletion doghouse/appengine/github.go
Expand Up @@ -16,10 +16,11 @@ import (

"github.com/google/go-github/v28/github"
"github.com/justinas/nosurf"
"golang.org/x/oauth2"

"github.com/reviewdog/reviewdog/doghouse/server"
"github.com/reviewdog/reviewdog/doghouse/server/cookieman"
"github.com/reviewdog/reviewdog/doghouse/server/storage"
"golang.org/x/oauth2"
)

type GitHubHandler struct {
Expand Down
1 change: 1 addition & 0 deletions doghouse/appengine/github_webhook.go
Expand Up @@ -7,6 +7,7 @@ import (
"net/http"

"github.com/google/go-github/v28/github"

"github.com/reviewdog/reviewdog/doghouse/server/storage"
)

Expand Down
1 change: 1 addition & 0 deletions doghouse/appengine/main.go
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/haya14busa/secretbox"
"github.com/justinas/nosurf"

"github.com/reviewdog/reviewdog/doghouse/server/cookieman"
"github.com/reviewdog/reviewdog/doghouse/server/storage"
)
Expand Down
1 change: 1 addition & 0 deletions doghouse/appengine/template.go
Expand Up @@ -7,6 +7,7 @@ import (
"net/http"

"github.com/rakyll/statik/fs"

_ "github.com/reviewdog/reviewdog/doghouse/appengine/statik"
)

Expand Down
1 change: 1 addition & 0 deletions doghouse/client/github_client.go
Expand Up @@ -4,6 +4,7 @@ import (
"context"

"github.com/google/go-github/v28/github"

"github.com/reviewdog/reviewdog/doghouse"
"github.com/reviewdog/reviewdog/doghouse/server"
)
Expand Down
1 change: 1 addition & 0 deletions doghouse/server/doghouse.go
Expand Up @@ -9,6 +9,7 @@ import (
"time"

"github.com/google/go-github/v28/github"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/diff"
"github.com/reviewdog/reviewdog/doghouse"
Expand Down
1 change: 1 addition & 0 deletions doghouse/server/doghouse_test.go
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-github/v28/github"

"github.com/reviewdog/reviewdog/doghouse"
)

Expand Down
1 change: 1 addition & 0 deletions filter_test.go
Expand Up @@ -9,6 +9,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"

"github.com/reviewdog/reviewdog/diff"
)

Expand Down
3 changes: 2 additions & 1 deletion project/run.go
Expand Up @@ -11,9 +11,10 @@ import (
"runtime"
"strings"

"golang.org/x/sync/errgroup"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/diff"
"golang.org/x/sync/errgroup"
)

// RunAndParse runs commands and parse results. Returns map of tool name to check results.
Expand Down
1 change: 1 addition & 0 deletions service/github/github.go
Expand Up @@ -8,6 +8,7 @@ import (
"sync"

"github.com/google/go-github/v28/github"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/github/githubutils"
"github.com/reviewdog/reviewdog/service/serviceutil"
Expand Down
3 changes: 2 additions & 1 deletion service/github/github_test.go
Expand Up @@ -12,9 +12,10 @@ import (

"github.com/google/go-github/v28/github"
"github.com/kylelemons/godebug/pretty"
"golang.org/x/oauth2"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
"golang.org/x/oauth2"
)

const notokenSkipTestMes = "skipping test (requires actual Personal access tokens. export REVIEWDOG_TEST_GITHUB_API_TOKEN=<GitHub Personal Access Token>)"
Expand Down
5 changes: 3 additions & 2 deletions service/gitlab/gitlab_mr_commit.go
Expand Up @@ -8,10 +8,11 @@ import (
"strings"
"sync"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
"github.com/xanzy/go-gitlab"
"golang.org/x/sync/errgroup"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
)

var _ reviewdog.CommentService = &GitLabMergeRequestCommitCommenter{}
Expand Down
3 changes: 2 additions & 1 deletion service/gitlab/gitlab_mr_commit_test.go
Expand Up @@ -9,9 +9,10 @@ import (
"testing"

"github.com/kylelemons/godebug/pretty"
"github.com/xanzy/go-gitlab"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
"github.com/xanzy/go-gitlab"
)

func TestGitLabMergeRequestCommitCommenter_Post_Flush_review_api(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion service/gitlab/gitlab_mr_diff.go
Expand Up @@ -6,9 +6,10 @@ import (
"os/exec"
"strings"

gitlab "github.com/xanzy/go-gitlab"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
gitlab "github.com/xanzy/go-gitlab"
)

var _ reviewdog.DiffService = &GitLabMergeRequestDiff{}
Expand Down
5 changes: 3 additions & 2 deletions service/gitlab/gitlab_mr_discussion.go
Expand Up @@ -8,10 +8,11 @@ import (
"path/filepath"
"sync"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
gitlab "github.com/xanzy/go-gitlab"
"golang.org/x/sync/errgroup"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
)

// GitLabMergeRequestDiscussionCommenter is a comment and diff service for GitLab MergeRequest.
Expand Down
3 changes: 2 additions & 1 deletion service/gitlab/gitlab_mr_discussion_test.go
Expand Up @@ -9,9 +9,10 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
gitlab "github.com/xanzy/go-gitlab"

"github.com/reviewdog/reviewdog"
"github.com/reviewdog/reviewdog/service/serviceutil"
gitlab "github.com/xanzy/go-gitlab"
)

func TestGitLabMergeRequestDiscussionCommenter_Post_Flush_review_api(t *testing.T) {
Expand Down

0 comments on commit 1a9cc54

Please sign in to comment.