Load default profile environment when Init is called

Author: MatteoPologruto

commands/instances.go

@@ -242,19 +242,25 @@ func Init(req *rpc.InitRequest, responseCallback func(r *rpc.InitResponse)) erro
 
 	// Try to extract profile if specified
 	var profile *sketch.Profile
-	if req.GetProfile() != "" {
+	if req.GetProfile() != "" || req.GetDefaultProfile() {
 		sk, err := sketch.New(paths.New(req.GetSketchPath()))
 		if err != nil {
 			return &arduino.InvalidArgumentError{Cause: err}
 		}
-		profile = sk.GetProfile(req.GetProfile())
+		var profileName string
+		if req.GetProfile() != "" {
+			profileName = req.GetProfile()
+		} else {
+			profileName = sk.Project.DefaultProfile
+		}
+		profile = sk.GetProfile(profileName)
 		if profile == nil {
-			return &arduino.UnknownProfileError{Profile: req.GetProfile()}
+			return &arduino.UnknownProfileError{Profile: profileName}
 		}
 		responseCallback(&rpc.InitResponse{
 			Message: &rpc.InitResponse_Profile{
 				Profile: &rpc.Profile{
-					Name: req.GetProfile(),
+					Name: profileName,
 					Fqbn: profile.FQBN,
 					// TODO: Other profile infos may be provided here...
 				},

internal/cli/instance/instance.go

@@ -33,19 +33,19 @@ var tr = i18n.Tr
 // to execute further operations a valid Instance is mandatory.
 // If Init returns errors they're printed only.
 func CreateAndInit() *rpc.Instance {
-	inst, _ := CreateAndInitWithProfile("", nil)
+	inst, _ := CreateAndInitWithProfile("", nil, false)
 	return inst
 }
 
 // CreateAndInitWithProfile returns a new initialized instance using the given profile of the given sketch.
 // If Create fails the CLI prints an error and exits since to execute further operations a valid Instance is mandatory.
 // If Init returns errors they're printed only.
-func CreateAndInitWithProfile(profileName string, sketchPath *paths.Path) (*rpc.Instance, *rpc.Profile) {
+func CreateAndInitWithProfile(profileName string, sketchPath *paths.Path, defaultProfile bool) (*rpc.Instance, *rpc.Profile) {
 	instance, err := Create()
 	if err != nil {
 		feedback.Fatal(tr("Error creating instance: %v", err), feedback.ErrGeneric)
 	}
-	profile := InitWithProfile(instance, profileName, sketchPath)
+	profile := InitWithProfile(instance, profileName, sketchPath, defaultProfile)
 	return instance, profile
 }
 
@@ -64,13 +64,13 @@ func Create() (*rpc.Instance, error) {
 // Package and library indexes files are automatically updated if the
 // CLI is run for the first time.
 func Init(instance *rpc.Instance) {
-	InitWithProfile(instance, "", nil)
+	InitWithProfile(instance, "", nil, false)
 }
 
 // InitWithProfile initializes instance by loading libraries and platforms specified in the given profile of the given sketch.
 // In case of loading failures return a list of errors for each platform or library that we failed to load.
 // Required Package and library indexes files are automatically downloaded.
-func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *paths.Path) *rpc.Profile {
+func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *paths.Path, defaultProfile bool) *rpc.Profile {
 	// In case the CLI is executed for the first time
 	if err := FirstUpdate(instance); err != nil {
 		feedback.Warning(tr("Error initializing instance: %v", err))
@@ -84,6 +84,7 @@ func InitWithProfile(instance *rpc.Instance, profileName string, sketchPath *pat
 	if sketchPath != nil {
 		initReq.SketchPath = sketchPath.String()
 		initReq.Profile = profileName
+		initReq.DefaultProfile = defaultProfile
 	}
 	var profile *rpc.Profile
 	err := commands.Init(initReq, func(res *rpc.InitResponse) {