@@ -1023,6 +1023,8 @@ const getOverlayDatabaseModeMacro = test.macro({
10231023 expected : {
10241024 overlayDatabaseMode : OverlayDatabaseMode ;
10251025 useOverlayDatabaseCaching : boolean ;
1026+ preliminaryOverlayDatabaseMode ?: OverlayDatabaseMode ;
1027+ preliminaryUseOverlayDatabaseCaching ?: boolean ;
10261028 } ,
10271029 ) => {
10281030 return await withTmpDir ( async ( tempDir ) => {
@@ -1091,7 +1093,44 @@ const getOverlayDatabaseModeMacro = test.macro({
10911093 logger ,
10921094 ) ;
10931095
1094- t . deepEqual ( result , expected ) ;
1096+ const expectedResult = {
1097+ overlayDatabaseMode : expected . overlayDatabaseMode ,
1098+ useOverlayDatabaseCaching : expected . useOverlayDatabaseCaching ,
1099+ } ;
1100+ t . deepEqual ( result , expectedResult ) ;
1101+
1102+ let configFile : string | undefined ;
1103+ if ( Object . keys ( setup . codeScanningConfig ) . length > 0 ) {
1104+ configFile = createConfigFile (
1105+ yaml . dump ( setup . codeScanningConfig ) ,
1106+ tempDir ,
1107+ ) ;
1108+ }
1109+
1110+ // Test getPreliminaryOverlayDatabaseMode as well
1111+ const preliminaryResult =
1112+ await configUtils . getPreliminaryOverlayDatabaseMode (
1113+ createTestInitConfigInputs ( {
1114+ languagesInput : setup . languages . join ( "," ) ,
1115+ configFile,
1116+ features,
1117+ tempDir,
1118+ workspacePath : tempDir ,
1119+ sourceRoot : tempDir ,
1120+ repository,
1121+ logger,
1122+ } ) ,
1123+ ) ;
1124+
1125+ const expectedPreliminaryResult = {
1126+ overlayDatabaseMode :
1127+ expected . preliminaryOverlayDatabaseMode ??
1128+ expected . overlayDatabaseMode ,
1129+ useOverlayDatabaseCaching :
1130+ expected . preliminaryUseOverlayDatabaseCaching ??
1131+ expected . useOverlayDatabaseCaching ,
1132+ } ;
1133+ t . deepEqual ( preliminaryResult , expectedPreliminaryResult ) ;
10951134 } finally {
10961135 // Restore the original environment
10971136 process . env = originalEnv ;
@@ -1597,6 +1636,8 @@ test(
15971636 {
15981637 overlayDatabaseMode : OverlayDatabaseMode . None ,
15991638 useOverlayDatabaseCaching : false ,
1639+ preliminaryOverlayDatabaseMode : OverlayDatabaseMode . Overlay ,
1640+ preliminaryUseOverlayDatabaseCaching : false ,
16001641 } ,
16011642) ;
16021643
@@ -1611,6 +1652,8 @@ test(
16111652 {
16121653 overlayDatabaseMode : OverlayDatabaseMode . None ,
16131654 useOverlayDatabaseCaching : false ,
1655+ preliminaryOverlayDatabaseMode : OverlayDatabaseMode . Overlay ,
1656+ preliminaryUseOverlayDatabaseCaching : false ,
16141657 } ,
16151658) ;
16161659
@@ -1624,6 +1667,8 @@ test(
16241667 {
16251668 overlayDatabaseMode : OverlayDatabaseMode . None ,
16261669 useOverlayDatabaseCaching : false ,
1670+ preliminaryOverlayDatabaseMode : OverlayDatabaseMode . Overlay ,
1671+ preliminaryUseOverlayDatabaseCaching : false ,
16271672 } ,
16281673) ;
16291674
0 commit comments