fix: complete new workspace global options

thedadams · thedadams · commit 82a0de4f919f · 2024-10-18T09:07:19.000-04:00
Signed-off-by: Donnie Adams &lt;donnie@acorn.io&gt;
diff --git a/opts.go b/opts.go
@@ -48,6 +48,8 @@ func completeGlobalOptions(opts ...GlobalOptions) GlobalOptions {
 		result.DefaultModel = firstSet(opt.DefaultModel, result.DefaultModel)
 		result.DefaultModelProvider = firstSet(opt.DefaultModelProvider, result.DefaultModelProvider)
 		result.DatasetToolRepo = firstSet(opt.DatasetToolRepo, result.DatasetToolRepo)
+		result.WorkspaceTool = firstSet(opt.WorkspaceTool, result.WorkspaceTool)
+		result.WorkspaceDirectoryDataHome = firstSet(opt.WorkspaceDirectoryDataHome, result.WorkspaceDirectoryDataHome)
 		result.Env = append(result.Env, opt.Env...)
 	}
 	return result

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ func completeGlobalOptions(opts ...GlobalOptions) GlobalOptions {`
`48`	`48`	`result.DefaultModel = firstSet(opt.DefaultModel, result.DefaultModel)`
`49`	`49`	`result.DefaultModelProvider = firstSet(opt.DefaultModelProvider, result.DefaultModelProvider)`
`50`	`50`	`result.DatasetToolRepo = firstSet(opt.DatasetToolRepo, result.DatasetToolRepo)`
	`51`	`+ result.WorkspaceTool = firstSet(opt.WorkspaceTool, result.WorkspaceTool)`
	`52`	`+ result.WorkspaceDirectoryDataHome = firstSet(opt.WorkspaceDirectoryDataHome, result.WorkspaceDirectoryDataHome)`
`51`	`53`	`result.Env = append(result.Env, opt.Env...)`
`52`	`54`	`}`
`53`	`55`	`return result`