@@ -285,35 +285,35 @@ class SettingsApp {
285285
286286 // Basic settings
287287 ( < HTMLInputElement > document . getElementById ( elementId . configName ) ) . value = config . name ;
288- ( < HTMLInputElement > document . getElementById ( elementId . compilerPath ) ) . value = config . compilerPath ? config . compilerPath : "" ;
288+ ( < HTMLInputElement > document . getElementById ( elementId . compilerPath ) ) . value = config . compilerPath ?? "" ;
289289 this . fixKnownCompilerSelection ( ) ;
290290 ( < HTMLInputElement > document . getElementById ( elementId . compilerArgs ) ) . value = joinEntries ( config . compilerArgs ) ;
291291
292- ( < HTMLInputElement > document . getElementById ( elementId . intelliSenseMode ) ) . value = config . intelliSenseMode ? config . intelliSenseMode : "${default}" ;
292+ ( < HTMLInputElement > document . getElementById ( elementId . intelliSenseMode ) ) . value = config . intelliSenseMode ?? "${default}" ;
293293 ( < HTMLInputElement > document . getElementById ( elementId . includePath ) ) . value = joinEntries ( config . includePath ) ;
294294 ( < HTMLInputElement > document . getElementById ( elementId . defines ) ) . value = joinEntries ( config . defines ) ;
295295 ( < HTMLInputElement > document . getElementById ( elementId . cStandard ) ) . value = config . cStandard ;
296296 ( < HTMLInputElement > document . getElementById ( elementId . cppStandard ) ) . value = config . cppStandard ;
297297
298298 // Advanced settings
299- ( < HTMLInputElement > document . getElementById ( elementId . windowsSdkVersion ) ) . value = config . windowsSdkVersion ? config . windowsSdkVersion : "" ;
299+ ( < HTMLInputElement > document . getElementById ( elementId . windowsSdkVersion ) ) . value = config . windowsSdkVersion ?? "" ;
300300 ( < HTMLInputElement > document . getElementById ( elementId . macFrameworkPath ) ) . value = joinEntries ( config . macFrameworkPath ) ;
301301 ( < HTMLInputElement > document . getElementById ( elementId . compileCommands ) ) . value = joinEntries ( config . compileCommands ) ;
302302 ( < HTMLInputElement > document . getElementById ( elementId . mergeConfigurations ) ) . checked = config . mergeConfigurations ;
303- ( < HTMLInputElement > document . getElementById ( elementId . configurationProvider ) ) . value = config . configurationProvider ? config . configurationProvider : "" ;
303+ ( < HTMLInputElement > document . getElementById ( elementId . configurationProvider ) ) . value = config . configurationProvider ?? "" ;
304304 ( < HTMLInputElement > document . getElementById ( elementId . forcedInclude ) ) . value = joinEntries ( config . forcedInclude ) ;
305- ( < HTMLInputElement > document . getElementById ( elementId . dotConfig ) ) . value = config . dotConfig ? config . dotConfig : "" ;
305+ ( < HTMLInputElement > document . getElementById ( elementId . dotConfig ) ) . value = config . dotConfig ?? "" ;
306306 if ( config . recursiveIncludes ) {
307- ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesReduce ) ) . value = config . recursiveIncludes . reduce ;
308- ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesPriority ) ) . value = config . recursiveIncludes . priority ;
309- ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesOrder ) ) . value = config . recursiveIncludes . order ;
307+ ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesReduce ) ) . value = config . recursiveIncludes . reduce ?? "${default}" ;
308+ ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesPriority ) ) . value = config . recursiveIncludes . priority ?? "${default}" ;
309+ ( < HTMLInputElement > document . getElementById ( elementId . recursiveIncludesOrder ) ) . value = config . recursiveIncludes . order ?? "${default}" ;
310310 }
311311
312312 if ( config . browse ) {
313313 ( < HTMLInputElement > document . getElementById ( elementId . browsePath ) ) . value = joinEntries ( config . browse . path ) ;
314314 ( < HTMLInputElement > document . getElementById ( elementId . limitSymbolsToIncludedHeaders ) ) . checked =
315315 config . browse . limitSymbolsToIncludedHeaders && config . browse . limitSymbolsToIncludedHeaders ;
316- ( < HTMLInputElement > document . getElementById ( elementId . databaseFilename ) ) . value = config . browse . databaseFilename ? config . browse . databaseFilename : "" ;
316+ ( < HTMLInputElement > document . getElementById ( elementId . databaseFilename ) ) . value = config . browse . databaseFilename ?? "" ;
317317 } else {
318318 ( < HTMLInputElement > document . getElementById ( elementId . browsePath ) ) . value = "" ;
319319 ( < HTMLInputElement > document . getElementById ( elementId . limitSymbolsToIncludedHeaders ) ) . checked = false ;
0 commit comments