merge upstream

josebalius · josebalius · commit e4e77a42943c · 2021-08-26T08:55:38.000-04:00
diff --git a/cmd/ghcs/code.go b/cmd/ghcs/code.go
@@ -13,7 +13,9 @@ import (
 )
 
 func NewCodeCmd() *cobra.Command {
-	return &cobra.Command{
+	useInsiders := false
+
+	codeCmd := &cobra.Command{
 		Use:   "code [<codespace>]",
 		Short: "Open a Codespace in VS Code",
 		Args:  cobra.MaximumNArgs(1),
@@ -22,16 +24,20 @@ func NewCodeCmd() *cobra.Command {
 			if len(args) > 0 {
 				codespaceName = args[0]
 			}
-			return Code(codespaceName)
+			return Code(codespaceName, useInsiders)
 		},
 	}
+
+	codeCmd.Flags().BoolVar(&useInsiders, "insiders", false, "Use the insiders version of VS Code")
+
+	return codeCmd
 }
 
 func init() {
 	rootCmd.AddCommand(NewCodeCmd())
 }
 
-func Code(codespaceName string) error {
+func Code(codespaceName string, useInsiders bool) error {
 	apiClient := api.New(os.Getenv("GITHUB_TOKEN"))
 	ctx := context.Background()
 
@@ -51,13 +57,17 @@ func Code(codespaceName string) error {
 		codespaceName = codespace.Name
 	}
 
-	if err := open.Run(vscodeProtocolURL(codespaceName)); err != nil {
+	if err := open.Run(vscodeProtocolURL(codespaceName, useInsiders)); err != nil {
 		return fmt.Errorf("error opening vscode URL")
 	}
 
 	return nil
 }
 
-func vscodeProtocolURL(codespaceName string) string {
-	return fmt.Sprintf("vscode://github.codespaces/connect?name=%s", url.QueryEscape(codespaceName))
+func vscodeProtocolURL(codespaceName string, useInsiders bool) string {
+	application := "vscode"
+	if useInsiders {
+		application = "vscode-insiders"
+	}
+	return fmt.Sprintf("%s://github.codespaces/connect?name=%s", application, url.QueryEscape(codespaceName))
 }
diff --git a/cmd/ghcs/create.go b/cmd/ghcs/create.go
@@ -98,7 +98,9 @@ func Create(opts *CreateOptions) error {
 		}
 	}
 
-	log.Printf("Codespace created: %s\n", codespace.Name)
+	log.Printf("Codespace created: ")
+
+	fmt.Fprintln(os.Stdout, codespace.Name)
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func NewCodeCmd() *cobra.Command {`
`16`		`- return &cobra.Command{`
	`16`	`+ useInsiders := false`
	`17`	`+`
	`18`	`+ codeCmd := &cobra.Command{`
`17`	`19`	`Use: "code [<codespace>]",`
`18`	`20`	`Short: "Open a Codespace in VS Code",`
`19`	`21`	`Args: cobra.MaximumNArgs(1),`
`@@ -22,16 +24,20 @@ func NewCodeCmd() *cobra.Command {`
`22`	`24`	`if len(args) > 0 {`
`23`	`25`	`codespaceName = args[0]`
`24`	`26`	`}`
`25`		`- return Code(codespaceName)`
	`27`	`+ return Code(codespaceName, useInsiders)`
`26`	`28`	`},`
`27`	`29`	`}`
	`30`	`+`
	`31`	`+ codeCmd.Flags().BoolVar(&useInsiders, "insiders", false, "Use the insiders version of VS Code")`
	`32`	`+`
	`33`	`+ return codeCmd`
`28`	`34`	`}`
`29`	`35`
`30`	`36`	`func init() {`
`31`	`37`	`rootCmd.AddCommand(NewCodeCmd())`
`32`	`38`	`}`
`33`	`39`
`34`		`-func Code(codespaceName string) error {`
	`40`	`+func Code(codespaceName string, useInsiders bool) error {`
`35`	`41`	`apiClient := api.New(os.Getenv("GITHUB_TOKEN"))`
`36`	`42`	`ctx := context.Background()`
`37`	`43`
`@@ -51,13 +57,17 @@ func Code(codespaceName string) error {`
`51`	`57`	`codespaceName = codespace.Name`
`52`	`58`	`}`
`53`	`59`
`54`		`- if err := open.Run(vscodeProtocolURL(codespaceName)); err != nil {`
	`60`	`+ if err := open.Run(vscodeProtocolURL(codespaceName, useInsiders)); err != nil {`
`55`	`61`	`return fmt.Errorf("error opening vscode URL")`
`56`	`62`	`}`
`57`	`63`
`58`	`64`	`return nil`
`59`	`65`	`}`
`60`	`66`
`61`		`-func vscodeProtocolURL(codespaceName string) string {`
`62`		`- return fmt.Sprintf("vscode://github.codespaces/connect?name=%s", url.QueryEscape(codespaceName))`
	`67`	`+func vscodeProtocolURL(codespaceName string, useInsiders bool) string {`
	`68`	`+ application := "vscode"`
	`69`	`+ if useInsiders {`
	`70`	`+ application = "vscode-insiders"`
	`71`	`+ }`
	`72`	`+ return fmt.Sprintf("%s://github.codespaces/connect?name=%s", application, url.QueryEscape(codespaceName))`
`63`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,9 @@ func Create(opts *CreateOptions) error {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- log.Printf("Codespace created: %s\n", codespace.Name)`
	`101`	`+ log.Printf("Codespace created: ")`
	`102`	`+`
	`103`	`+ fmt.Fprintln(os.Stdout, codespace.Name)`
`102`	`104`
`103`	`105`	`return nil`
`104`	`106`	`}`