reformatted spacing and final touches

bchadwic · bchadwic · commit 679d396c8d78 · 2021-06-14T22:31:29.000-07:00
diff --git a/pkg/cmd/browse/browse.go b/pkg/cmd/browse/browse.go
@@ -105,7 +105,6 @@ func NewCmdBrowse(f *cmdutil.Factory, runF func(*BrowseOptions) error) *cobra.Co
 }
 
 func runBrowse(opts *BrowseOptions) error {
-
 	baseRepo, err := opts.BaseRepo()
 	if err != nil {
 		return fmt.Errorf("unable to determine base repository: %w\nUse 'gh browse --help' for more information about browse\n", err)
@@ -115,19 +114,15 @@ func runBrowse(opts *BrowseOptions) error {
 	if err != nil {
 		return fmt.Errorf("unable to create an http client: %w\nUse 'gh browse --help' for more information about browse\n", err)
 	}
-
 	url := ghrepo.GenerateRepoURL(baseRepo, "")
 
 	if opts.SelectorArg == "" {
-
 		if opts.ProjectsFlag {
 			url += "/projects"
 		}
-
 		if opts.SettingsFlag {
 			url += "/settings"
 		}
-
 		if opts.WikiFlag {
 			url += "/wiki"
 		}
@@ -161,13 +156,15 @@ func runBrowse(opts *BrowseOptions) error {
 			}
 		}
 	}
+
 	err = opts.Browser.Browse(url)
 	if opts.IO.IsStdoutTTY() && err == nil {
 		fmt.Fprintf(opts.IO.Out, "now opening %s in browser\n", url)
 	}
 
 	return err
 }
+
 func parseFileArg(fileArg string) ([]string, error) {
 	arr := strings.Split(fileArg, ":")
 	if len(arr) > 2 {
@@ -176,7 +173,6 @@ func parseFileArg(fileArg string) ([]string, error) {
 	if len(arr) > 1 && !isNumber(arr[1]) {
 		return arr, fmt.Errorf("invalid line number after colon\nUse 'gh browse --help' for more information about browse\n")
 	}
-
 	return arr, nil
 }
 
diff --git a/pkg/cmd/browse/browse_test.go b/pkg/cmd/browse/browse_test.go
@@ -185,8 +185,8 @@ func Test_runBrowse(t *testing.T) {
 			opts: BrowseOptions{
 				Branch: "trunk",
 			},
-			baseRepo:    ghrepo.New("jlsestak", "vegan"),
-			expectedURL: "https://github.com/jlsestak/vegan/tree/trunk/",
+			baseRepo:    ghrepo.New("jlsestak", "CouldNotThinkOfARepoName"),
+			expectedURL: "https://github.com/jlsestak/CouldNotThinkOfARepoName/tree/trunk/",
 		},
 		{
 			name: "branch flag with file",
@@ -225,13 +225,14 @@ func Test_runBrowse(t *testing.T) {
 			expectedURL: "https://github.com/ken/grc/issues/217",
 		},
 		{
-			name: "opening branch",
+			name: "opening branch file with line number",
 			opts: BrowseOptions{
-				Branch: "first-browse-pull",
+				Branch:      "first-browse-pull",
+				SelectorArg: "browse.go:32",
 			},
 			baseRepo:    ghrepo.New("github", "ThankYouGitHub"),
 			wantsErr:    false,
-			expectedURL: "https://github.com/github/ThankYouGitHub/tree/first-browse-pull/",
+			expectedURL: "https://github.com/github/ThankYouGitHub/tree/first-browse-pull/browse.go#L32",
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,6 @@ func NewCmdBrowse(f cmdutil.Factory, runF func(BrowseOptions) error) *cobra.Co`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`func runBrowse(opts *BrowseOptions) error {`
`108`		`-`
`109`	`108`	`baseRepo, err := opts.BaseRepo()`
`110`	`109`	`if err != nil {`
`111`	`110`	`return fmt.Errorf("unable to determine base repository: %w\nUse 'gh browse --help' for more information about browse\n", err)`
`@@ -115,19 +114,15 @@ func runBrowse(opts *BrowseOptions) error {`
`115`	`114`	`if err != nil {`
`116`	`115`	`return fmt.Errorf("unable to create an http client: %w\nUse 'gh browse --help' for more information about browse\n", err)`
`117`	`116`	`}`
`118`		`-`
`119`	`117`	`url := ghrepo.GenerateRepoURL(baseRepo, "")`
`120`	`118`
`121`	`119`	`if opts.SelectorArg == "" {`
`122`		`-`
`123`	`120`	`if opts.ProjectsFlag {`
`124`	`121`	`url += "/projects"`
`125`	`122`	`}`
`126`		`-`
`127`	`123`	`if opts.SettingsFlag {`
`128`	`124`	`url += "/settings"`
`129`	`125`	`}`
`130`		`-`
`131`	`126`	`if opts.WikiFlag {`
`132`	`127`	`url += "/wiki"`
`133`	`128`	`}`
`@@ -161,13 +156,15 @@ func runBrowse(opts *BrowseOptions) error {`
`161`	`156`	`}`
`162`	`157`	`}`
`163`	`158`	`}`
	`159`	`+`
`164`	`160`	`err = opts.Browser.Browse(url)`
`165`	`161`	`if opts.IO.IsStdoutTTY() && err == nil {`
`166`	`162`	`fmt.Fprintf(opts.IO.Out, "now opening %s in browser\n", url)`
`167`	`163`	`}`
`168`	`164`
`169`	`165`	`return err`
`170`	`166`	`}`
	`167`	`+`
`171`	`168`	`func parseFileArg(fileArg string) ([]string, error) {`
`172`	`169`	`arr := strings.Split(fileArg, ":")`
`173`	`170`	`if len(arr) > 2 {`
`@@ -176,7 +173,6 @@ func parseFileArg(fileArg string) ([]string, error) {`
`176`	`173`	`if len(arr) > 1 && !isNumber(arr[1]) {`
`177`	`174`	`return arr, fmt.Errorf("invalid line number after colon\nUse 'gh browse --help' for more information about browse\n")`
`178`	`175`	`}`
`179`		`-`
`180`	`176`	`return arr, nil`
`181`	`177`	`}`
`182`	`178`