Commit1e76cb9

authored and

committed

fix options regression (dotnet#5863)

1 parent1463066 commit1e76cb9Copy full SHA for 1e76cb9

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,12 @@ type SettingsStore(serviceProvider: IServiceProvider) =`
`48`	`48`	`settingsManager.SetValueAsync(settings.GetType()\|> storageKey, JsonConvert.SerializeObject settings,false)`
`49`	`49`	`\|> Async.AwaitTask\|> Async.StartImmediate`
`50`	`50`
`51`		`-member__.Register defaultSettings=`
	`51`	`+member__.Register(defaultSettings:'options)=`
`52`	`52`	`defaultSettings\|> updateFromStore\|> write`
`53`	`53`	`letsubset= defaultSettings.GetType()\|> storageKey\|> settingsManager.GetSubset`
`54`	`54`
`55`	`55`	`PropertyChangedAsyncEventHandler(fun _ _->`
`56`		`- read()\|> updateFromStore\|> write`
	`56`	`+(read():'options)\|> updateFromStore\|> write`
`57`	`57`	`System.Threading.Tasks.Task.CompletedTask)`
`58`	`58`	`\|> subset.add_SettingChangedAsync`
`59`	`59`

Lines changed: 3 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ open Microsoft.VisualStudio.ComponentModelHost`
`10`	`10`	`moduleinternalOptionsUIHelpers=`
`11`	`11`
`12`	`12`	`[<AbstractClass>]`
`13`		`-typeAbstractOptionPage<'t>()as this=`
	`13`	`+typeAbstractOptionPage<'options>()as this=`
`14`	`14`	`inherit UIElementDialogPage()`
`15`	`15`
`16`	`16`	`letview=lazy this.CreateView()`
`@@ -26,20 +26,10 @@ module internal OptionsUIHelpers =`
`26`	`26`	`overridethis.Child=upcast view.Value`
`27`	`27`
`28`	`28`	`overridethis.SaveSettingsToStorage()=`
`29`		`-this.GetResult()\|> optionService.Value.Write`
	`29`	`+downcast view.Value.DataContext\|> optionService.Value.Write<'options>`
`30`	`30`
`31`	`31`	`overridethis.LoadSettingsFromStorage()=`
`32`		`- optionService.Value.Read()\|> this.SetViewModel`
`33`		`-`
`34`		`-//Override this method when using immutable settings type`
`35`		`-member__.SetViewModel(settings:'t)=`
`36`		`-// in case settings are a CLIMutable record`
`37`		`- view.Value.DataContext<-null`
`38`		`- view.Value.DataContext<- settings`
`39`		`-`
`40`		`-//Override this method when using immutable settings type`
`41`		`-member__.GetResult():'t=`
`42`		`-downcast view.Value.DataContext`
	`32`	`+ view.Value.DataContext<- optionService.Value.Read<'options>()`
`43`	`33`
`44`	`34`	`//data binding helpers`
`45`	`35`	`letradioButtonCoverter=`

Comments

(0)