Merge pull request mathworks#52 from development/dlilley/bugfix/use-default-configuration

dklilley · GitHub Enterprise · commit 19d22cb74900 · 2024-12-06T12:00:12.000-05:00
Use default settings when configuration is missing fields
diff --git a/src/lifecycle/ConfigurationManager.ts b/src/lifecycle/ConfigurationManager.ts
@@ -42,9 +42,6 @@ export interface Settings {
 
 type SettingName = 'installPath' | 'matlabConnectionTiming' | 'indexWorkspace' | 'telemetry' | 'maxFileSizeForAnalysis' | 'signIn'
 
-    
-
-
 const SETTING_NAMES: SettingName[] = [
     'installPath',
     'matlabConnectionTiming',
@@ -148,10 +145,10 @@ class ConfigurationManager {
                 this.configuration = await connection.workspace.getConfiguration('MATLAB') as Settings
             }
 
-            return this.configuration
+            return Object.assign(this.defaultConfiguration, this.configuration)
         }
 
-        return this.globalSettings
+        return Object.assign(this.defaultConfiguration, this.globalSettings)
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,6 @@ export interface Settings {`
`42`	`42`
`43`	`43`	`type SettingName = 'installPath' \| 'matlabConnectionTiming' \| 'indexWorkspace' \| 'telemetry' \| 'maxFileSizeForAnalysis' \| 'signIn'`
`44`	`44`
`45`		`-`
`46`		`-`
`47`		`-`
`48`	`45`	`const SETTING_NAMES: SettingName[] = [`
`49`	`46`	`'installPath',`
`50`	`47`	`'matlabConnectionTiming',`
`@@ -148,10 +145,10 @@ class ConfigurationManager {`
`148`	`145`	`this.configuration = await connection.workspace.getConfiguration('MATLAB') as Settings`
`149`	`146`	`}`
`150`	`147`
`151`		`- return this.configuration`
	`148`	`+ return Object.assign(this.defaultConfiguration, this.configuration)`
`152`	`149`	`}`
`153`	`150`
`154`		`- return this.globalSettings`
	`151`	`+ return Object.assign(this.defaultConfiguration, this.globalSettings)`
`155`	`152`	`}`
`156`	`153`
`157`	`154`	`/**`