Update release

Import/GacUI.UnitTest.UI.cpp

@@ -896,15 +896,15 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 			::vl::__vwsn::This(this->self)->SetClientSize([&](){ ::vl::presentation::Size __vwsn_temp__; __vwsn_temp__.x = static_cast<::vl::vint>(1920); __vwsn_temp__.y = static_cast<::vl::vint>(1080); return __vwsn_temp__; }());
 		}
 		(this->__vwsn_precompile_0 = new ::vl::presentation::compositions::GuiTableComposition());
-		{
-			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetCellPadding(static_cast<::vl::vint>(5));
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
 		}
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetMinSizeLimitation(::vl::presentation::compositions::GuiGraphicsComposition::MinSizeLimitation::LimitToElementAndChildren);
+		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowsAndColumns(static_cast<::vl::vint>(1), static_cast<::vl::vint>(4));
 			::vl::__vwsn::This(this->__vwsn_precompile_0)->SetRowOption(static_cast<::vl::vint>(0), [&](){ ::vl::presentation::compositions::GuiCellOption __vwsn_temp__; __vwsn_temp__.composeType = ::vl::presentation::compositions::GuiCellOption::ComposeType::Percentage; __vwsn_temp__.percentage = static_cast<double>(1.0); return __vwsn_temp__; }());
@@ -938,6 +938,12 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		{
 			::vl::__vwsn::This(this->treeViewFileNodes)->SetChildrenProperty(vl::Func(::vl_workflow_global::__vwsnf1_GuiUnitTestSnapshotViewer_gaclib_controls_UnitTestSnapshotViewerWindowConstructor___vwsn_gaclib_controls_UnitTestSnapshotViewerWindow_Initialize_(this)));
 		}
+		{
+			::vl::__vwsn::This(this->treeViewFileNodes)->SetHorizontalAlwaysVisible(false);
+		}
+		{
+			::vl::__vwsn::This(this->treeViewFileNodes)->SetVerticalAlwaysVisible(false);
+		}
 		{
 			::vl::__vwsn::This(this->treeViewFileNodes)->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf2_GuiUnitTestSnapshotViewer_gaclib_controls_UnitTestSnapshotViewerWindowConstructor___vwsn_gaclib_controls_UnitTestSnapshotViewerWindow_Initialize_(this)));
 		}
@@ -945,12 +951,6 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_4)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
 		}
-		{
-			::vl::__vwsn::This(this->treeViewFileNodes)->SetHorizontalAlwaysVisible(false);
-		}
-		{
-			::vl::__vwsn::This(this->treeViewFileNodes)->SetVerticalAlwaysVisible(false);
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_3)->AddChild(static_cast<::vl::presentation::compositions::GuiGraphicsComposition*>(::vl::__vwsn::This(this->treeViewFileNodes)->GetBoundsComposition()));
 		}
@@ -974,6 +974,12 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 			(this->textListFrames = new ::vl::presentation::controls::GuiBindableTextList(::vl::presentation::theme::ThemeName::TextList));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"textListFrames"), ::vl::__vwsn::Box(this->textListFrames));
 		}
+		{
+			::vl::__vwsn::This(this->textListFrames)->SetHorizontalAlwaysVisible(false);
+		}
+		{
+			::vl::__vwsn::This(this->textListFrames)->SetVerticalAlwaysVisible(false);
+		}
 		{
 			::vl::__vwsn::This(this->textListFrames)->SetTextProperty(vl::Func(::vl_workflow_global::__vwsnf3_GuiUnitTestSnapshotViewer_gaclib_controls_UnitTestSnapshotViewerWindowConstructor___vwsn_gaclib_controls_UnitTestSnapshotViewerWindow_Initialize_(this)));
 		}
@@ -981,12 +987,6 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_9)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
 		}
-		{
-			::vl::__vwsn::This(this->textListFrames)->SetHorizontalAlwaysVisible(false);
-		}
-		{
-			::vl::__vwsn::This(this->textListFrames)->SetVerticalAlwaysVisible(false);
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_8)->AddChild(static_cast<::vl::presentation::controls::GuiControl*>(this->textListFrames));
 		}
@@ -1021,16 +1021,16 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 			(this->scRendering = new ::vl::presentation::controls::GuiScrollContainer(::vl::presentation::theme::ThemeName::ScrollView));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"scRendering"), ::vl::__vwsn::Box(this->scRendering));
 		}
-		(this->__vwsn_precompile_14 = ::vl::__vwsn::This(this->scRendering)->GetBoundsComposition());
-		{
-			::vl::__vwsn::This(this->__vwsn_precompile_14)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
-		}
 		{
 			::vl::__vwsn::This(this->scRendering)->SetHorizontalAlwaysVisible(false);
 		}
 		{
 			::vl::__vwsn::This(this->scRendering)->SetVerticalAlwaysVisible(false);
 		}
+		(this->__vwsn_precompile_14 = ::vl::__vwsn::This(this->scRendering)->GetBoundsComposition());
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_14)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
+		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_13)->AddChild(static_cast<::vl::presentation::controls::GuiControl*>(this->scRendering));
 		}
@@ -1047,16 +1047,16 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		{
 			(this->__vwsn_precompile_16 = new ::vl::presentation::controls::GuiMultilineTextBox(::vl::presentation::theme::ThemeName::MultilineTextBox));
 		}
-		(this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_16)->GetBoundsComposition());
-		{
-			::vl::__vwsn::This(this->__vwsn_precompile_17)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_16)->SetHorizontalAlwaysVisible(false);
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_16)->SetVerticalAlwaysVisible(false);
 		}
+		(this->__vwsn_precompile_17 = ::vl::__vwsn::This(this->__vwsn_precompile_16)->GetBoundsComposition());
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_17)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
+		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_15)->AddChild(static_cast<::vl::presentation::controls::GuiControl*>(this->__vwsn_precompile_16));
 		}
@@ -1073,16 +1073,16 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		{
 			(this->__vwsn_precompile_19 = new ::vl::presentation::controls::GuiMultilineTextBox(::vl::presentation::theme::ThemeName::MultilineTextBox));
 		}
-		(this->__vwsn_precompile_20 = ::vl::__vwsn::This(this->__vwsn_precompile_19)->GetBoundsComposition());
-		{
-			::vl::__vwsn::This(this->__vwsn_precompile_20)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
-		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_19)->SetHorizontalAlwaysVisible(false);
 		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_19)->SetVerticalAlwaysVisible(false);
 		}
+		(this->__vwsn_precompile_20 = ::vl::__vwsn::This(this->__vwsn_precompile_19)->GetBoundsComposition());
+		{
+			::vl::__vwsn::This(this->__vwsn_precompile_20)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(5); __vwsn_temp__.top = static_cast<::vl::vint>(5); __vwsn_temp__.right = static_cast<::vl::vint>(5); __vwsn_temp__.bottom = static_cast<::vl::vint>(5); return __vwsn_temp__; }());
+		}
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_18)->AddChild(static_cast<::vl::presentation::controls::GuiControl*>(this->__vwsn_precompile_19));
 		}
@@ -1137,11 +1137,8 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 	}
 
 	UnitTestSnapshotViewerWindowConstructor::UnitTestSnapshotViewerWindowConstructor()
-		: ViewModel(::vl::Ptr<::gaclib_controls::IUnitTestSnapshotViewerViewModel>())
+		: self(static_cast<::gaclib_controls::UnitTestSnapshotViewerWindow*>(nullptr))
-		, self(static_cast<::gaclib_controls::UnitTestSnapshotViewerWindow*>(nullptr))
+		, ViewModel(::vl::Ptr<::gaclib_controls::IUnitTestSnapshotViewerViewModel>())
-		, treeViewFileNodes(static_cast<::vl::presentation::controls::GuiBindableTreeView*>(nullptr))
-		, textListFrames(static_cast<::vl::presentation::controls::GuiBindableTextList*>(nullptr))
-		, scRendering(static_cast<::vl::presentation::controls::GuiScrollContainer*>(nullptr))
 		, __vwsn_precompile_0(static_cast<::vl::presentation::compositions::GuiTableComposition*>(nullptr))
 		, __vwsn_precompile_1(static_cast<::vl::presentation::compositions::GuiColumnSplitterComposition*>(nullptr))
 		, __vwsn_precompile_2(static_cast<::vl::presentation::compositions::GuiColumnSplitterComposition*>(nullptr))
@@ -1163,6 +1160,9 @@ Class (::gaclib_controls::UnitTestSnapshotViewerWindowConstructor)
 		, __vwsn_precompile_18(static_cast<::vl::presentation::controls::GuiTabPage*>(nullptr))
 		, __vwsn_precompile_19(static_cast<::vl::presentation::controls::GuiMultilineTextBox*>(nullptr))
 		, __vwsn_precompile_20(static_cast<::vl::presentation::compositions::GuiBoundsComposition*>(nullptr))
+		, treeViewFileNodes(static_cast<::vl::presentation::controls::GuiBindableTreeView*>(nullptr))
+		, textListFrames(static_cast<::vl::presentation::controls::GuiBindableTextList*>(nullptr))
+		, scRendering(static_cast<::vl::presentation::controls::GuiScrollContainer*>(nullptr))
 	{
 	}
 

Import/GacUI.UnitTest.UI.h

@@ -153,11 +153,8 @@ namespace gaclib_controls
 		friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<UnitTestSnapshotViewerWindowConstructor>;
 #endif
 	protected:
-		::vl::Ptr<::gaclib_controls::IUnitTestSnapshotViewerViewModel> ViewModel;
 		::gaclib_controls::UnitTestSnapshotViewerWindow* self;
-		::vl::presentation::controls::GuiBindableTreeView* treeViewFileNodes;
+		::vl::Ptr<::gaclib_controls::IUnitTestSnapshotViewerViewModel> ViewModel;
-		::vl::presentation::controls::GuiBindableTextList* textListFrames;
-		::vl::presentation::controls::GuiScrollContainer* scRendering;
 		::vl::presentation::compositions::GuiTableComposition* __vwsn_precompile_0;
 		::vl::presentation::compositions::GuiColumnSplitterComposition* __vwsn_precompile_1;
 		::vl::presentation::compositions::GuiColumnSplitterComposition* __vwsn_precompile_2;
@@ -179,6 +176,9 @@ namespace gaclib_controls
 		::vl::presentation::controls::GuiTabPage* __vwsn_precompile_18;
 		::vl::presentation::controls::GuiMultilineTextBox* __vwsn_precompile_19;
 		::vl::presentation::compositions::GuiBoundsComposition* __vwsn_precompile_20;
+		::vl::presentation::controls::GuiBindableTreeView* treeViewFileNodes;
+		::vl::presentation::controls::GuiBindableTextList* textListFrames;
+		::vl::presentation::controls::GuiScrollContainer* scRendering;
 		void __vwsn_gaclib_controls_UnitTestSnapshotViewerWindow_Initialize(::gaclib_controls::UnitTestSnapshotViewerWindow* __vwsn_this_);
 	public:
 		UnitTestSnapshotViewerWindowConstructor();

Import/GacUI.UnitTest.cpp

@@ -54,6 +54,11 @@ namespace vl::presentation::unittest
 	}
 }
 
+namespace vl::presentation::GuiHostedController_UnitTestHelper
+{
+	extern bool ExceptionOccuredUnderUnitTestReleaseMode();
+}
+
 using namespace vl;
 using namespace vl::collections;
 using namespace vl::filesystem;
@@ -63,6 +68,7 @@ using namespace vl::presentation;
 using namespace vl::presentation::remoteprotocol;
 using namespace vl::presentation::controls;
 using namespace vl::presentation::unittest;
+using namespace vl::presentation::GuiHostedController_UnitTestHelper;
 
 class UnitTestContextImpl : public Object, public virtual IUnitTestContext
 {
@@ -362,6 +368,7 @@ void GacUIUnitTest_Start(const WString& appName, Nullable<UnitTestScreenConfig>
 		: &filteredProtocol
 		);
 	GacUIUnitTest_SetGuiMainProxy({});
+	TEST_ASSERT(!ExceptionOccuredUnderUnitTestReleaseMode());
 
 	GacUIUnitTest_LogUI(appName, unitTestProtocol);
 	if (!globalConfig.useDomDiff)
@@ -445,6 +452,8 @@ void GacUIUnitTest_StartAsync(const WString& appName, Nullable<UnitTestScreenCon
 		});
 
 	asyncChannelSender.WaitForStopped();
+	TEST_ASSERT(!ExceptionOccuredUnderUnitTestReleaseMode());
+
 	GacUIUnitTest_LogUI(appName, unitTestProtocol);
 	if (!config.Value().useDomDiff)
 	{
@@ -500,6 +509,16 @@ void GacUIUnitTest_Start_WithResourceAsText(const WString& appName, Nullable<Uni
 #undef ERROR_MESSAGE_PREFIX
 }
 
+void GacUIUnitTest_PrintErrors(GuiResourceError::List& errors)
+{
+	for (auto&& error : errors)
+	{
+		TEST_PRINT(L"Error in resource: " + error.location.resourcePath);
+		TEST_PRINT(L"  ROW: " + itow(error.position.row) + L", COLUMN: " + itow(error.position.column));
+		TEST_PRINT(L"  REASON: " + error.message);
+	}
+}
+
 Ptr<GuiResource> GacUIUnitTest_CompileAndLoad(const WString& xmlResource)
 {
 #define ERROR_MESSAGE_PREFIX L"GacUIUnitTest_CompileAndLoad(const WString&)#"
@@ -509,10 +528,18 @@ Ptr<GuiResource> GacUIUnitTest_CompileAndLoad(const WString& xmlResource)
 		auto resourcePath = (GetUnitTestFrameworkConfig().resourceFolder / L"Resource.xml").GetFullPath();
 		auto parser = GetParserManager()->GetParser<glr::xml::XmlDocument>(L"XML");
 		auto xml = parser->Parse({ WString::Empty,resourcePath }, xmlResource, errors);
-		CHECK_ERROR(xml && errors.Count() == 0, ERROR_MESSAGE_PREFIX L"Failed to parse XML resource.");
+		if(!xml || errors.Count()> 0)
+		{
+			GacUIUnitTest_PrintErrors(errors);
+			CHECK_FAIL(ERROR_MESSAGE_PREFIX L"Failed to parse XML resource.");
+		}
 
 		resource = GuiResource::LoadFromXml(xml, resourcePath, GetFolderPath(resourcePath), errors);
-		CHECK_ERROR(resource && errors.Count() == 0, ERROR_MESSAGE_PREFIX L"Failed to load XML resource.");
+		if (!resource || errors.Count() > 0)
+		{
+			GacUIUnitTest_PrintErrors(errors);
+			CHECK_FAIL(ERROR_MESSAGE_PREFIX L"Failed to load XML resource.");
+		}
 	}
 
 	auto precompiledFolder = resource->Precompile(
@@ -524,7 +551,11 @@ Ptr<GuiResource> GacUIUnitTest_CompileAndLoad(const WString& xmlResource)
 		nullptr,
 		errors
 		);
-	CHECK_ERROR(precompiledFolder && errors.Count() == 0, ERROR_MESSAGE_PREFIX L"Failed to precompile XML resource.");
+	if (!precompiledFolder || errors.Count() > 0)
+	{
+		GacUIUnitTest_PrintErrors(errors);
+		CHECK_FAIL(ERROR_MESSAGE_PREFIX L"Failed to precompile XML resource.");
+	}
 
 	auto compiledWorkflow = precompiledFolder->GetValueByPath(WString::Unmanaged(L"Workflow/InstanceClass")).Cast<GuiInstanceCompiledWorkflow>();
 	CHECK_ERROR(compiledWorkflow, ERROR_MESSAGE_PREFIX L"Failed to compile generated Workflow script.");

Import/GacUI.UnitTest.h

@@ -1388,9 +1388,11 @@ UnitTestRemoteProtocol
 	protected:
 		bool								everRendered = false;
 		Ptr<UnitTestLoggedFrame>			candidateFrame;
+		vint								idlingCounter = 0;
 
 		bool LogRenderingResult()
 		{
+#define ERROR_MESSAGE_PREFIX L"vl::presentation::unittest::UnitTestRemoteProtocol_Logging<TProtocol>::ProcessRemoteEvents()#"
 			if (auto lastFrame = this->TryGetLastRenderingFrameAndReset())
 			{
 				candidateFrame = lastFrame;
@@ -1400,6 +1402,7 @@ UnitTestRemoteProtocol
 			{
 				if (candidateFrame)
 				{
+					idlingCounter = 0;
 					auto descs = Ptr(new collections::Dictionary<vint, ElementDescVariant>);
 					CopyFrom(*descs.Obj(), this->lastElementDescs);
 					this->loggedTrace.frames->Add({
@@ -1412,8 +1415,20 @@ UnitTestRemoteProtocol
 					candidateFrame = {};
 					return true;
 				}
+				else
+				{
+					idlingCounter++;
+					if (idlingCounter == 100)
+					{
+						CHECK_ERROR(
+							idlingCounter < 100,
+							ERROR_MESSAGE_PREFIX L"The last frame didn't trigger UI updating. The action registered by OnNextIdleFrame should always make any element or layout to change."
+							);
+					}
+				}
 			}
 			return false;
+#undef ERROR_MESSAGE_PREFIX
 		}
 
 	public:
@@ -1555,6 +1570,8 @@ IGuiRemoteProtocol
 
 	protected:
 
+		bool								frameExecuting = false;
+
 		void ProcessRemoteEvents() override
 		{
 #define ERROR_MESSAGE_PREFIX L"vl::presentation::unittest::UnitTestRemoteProtocol::ProcessRemoteEvents()#"
@@ -1563,6 +1580,7 @@ IGuiRemoteProtocol
 				if (LogRenderingResult())
 				{
 					auto [name, func] = processRemoteEvents[nextEventIndex];
+					CHECK_ERROR(!frameExecuting, ERROR_MESSAGE_PREFIX L"The action registered by OnNextIdleFrame should not call any blocking function, consider using InvokeInMainThread.");
 					vl::unittest::UnitTest::PrintMessage(L"Execute idle frame[" + (name ? name.Value() : itow(nextEventIndex)) + L"]", vl::unittest::UnitTest::MessageKind::Info);
 					CHECK_ERROR(lastFrameIndex != loggedTrace.frames->Count() - 1, ERROR_MESSAGE_PREFIX L"No rendering occured after the last idle frame.");
 					lastFrameIndex = loggedTrace.frames->Count() - 1;
@@ -1572,7 +1590,9 @@ IGuiRemoteProtocol
 						auto&& lastFrame = (*loggedTrace.frames.Obj())[loggedTrace.frames->Count() - 1];
 						lastFrame.frameName = name;
 					}
+					frameExecuting = true;
 					func();
+					frameExecuting = false;
 					nextEventIndex++;
 				}
 			}

Import/GacUI.h

@@ -14184,8 +14184,12 @@ Buttons
 				GuiButton(theme::ThemeName themeName);
 				~GuiButton();
 
-				/// <summary>Mouse click event.</summary>
+				/// <summary>Mouse click event, but raised before Clicked. This event is for pre-UI effects.</summary>
+				compositions::GuiNotifyEvent			BeforeClicked;
+				/// <summary>Mouse click event. This event is for executing the actual task assigned with the button.</summary>
 				compositions::GuiNotifyEvent			Clicked;
+				/// <summary>Mouse click event, but raised after Clicked. This event is for post-UI effects.</summary>
+				compositions::GuiNotifyEvent			AfterClicked;
 
 				/// <summary>Test is the <see cref="Clicked"/> event raised when left mouse button up.</summary>
 				/// <returns>Returns true if this event is raised when left mouse button up</returns>
@@ -14255,7 +14259,7 @@ Buttons
 				bool									autoSelection = true;
 				bool									isSelected = false;
 
-				void									OnClicked(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
+				void									OnAfterClicked(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
 			public:
 				/// <summary>Create a control with a specified default theme.</summary>
 				/// <param name="themeName">The theme name for retriving a default control template.</param>
@@ -15506,6 +15510,7 @@ GuiVirtualTextList
 
 				void													OnStyleInstalled(vint itemIndex, ItemStyle* style, bool refreshPropertiesOnly)override;
 				void													OnItemTemplateChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
+				void													OnKeyDown(compositions::GuiGraphicsComposition* sender, compositions::GuiKeyEventArgs& arguments);
 			public:
 				/// <summary>Create a Text list control in virtual mode.</summary>
 				/// <param name="themeName">The theme name for retriving a default control template.</param>
@@ -18197,7 +18202,7 @@ MenuButton
 				void									OnSubMenuWindowOpened(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
 				void									OnSubMenuWindowClosed(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
 				void									OnMouseEnter(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
-				void									OnClicked(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
+				void									OnBeforeClicked(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
 
 				virtual IGuiMenuService::Direction		GetSubMenuDirection();
 
@@ -18328,13 +18333,23 @@ ComboBox Base
 				GUI_SPECIFY_CONTROL_TEMPLATE_TYPE(ComboBoxTemplate, GuiMenuButton)
 			protected:
 
+				compositions::IGuiAltActionHost*			GetActivatingAltHost()override;
 				IGuiMenuService::Direction					GetSubMenuDirection()override;
 				void										OnCachedBoundsChanged(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
+				void										OnKeyDown(compositions::GuiGraphicsComposition* sender, compositions::GuiKeyEventArgs& arguments);
+				void										OnAfterSubMenuOpening(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments);
+
+			private:
+				bool										autoFocusDropdown;
+				
 			public:
 				/// <summary>Create a control with a specified default theme.</summary>
 				/// <param name="themeName">The theme name for retriving a default control template.</param>
-				GuiComboBoxBase(theme::ThemeName themeName);
+				/// <param name="_autoFocusDropdown">Whether to automatically focus the dropdown when it opens.</param>
+				GuiComboBoxBase(theme::ThemeName themeName, bool _autoFocusDropdown);
 				~GuiComboBoxBase();
+
+				IDescriptable*								QueryService(const WString& identifier) override;
 			};
 
 /***********************************************************************

Import/GacUIReflection.cpp

@@ -2454,7 +2454,9 @@ Type Declaration (Class)
 				CLASS_MEMBER_BASE(GuiControl)
 				CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE(GuiButton)
 
+				CLASS_MEMBER_GUIEVENT(BeforeClicked)
 				CLASS_MEMBER_GUIEVENT(Clicked)
+				CLASS_MEMBER_GUIEVENT(AfterClicked)
 
 				CLASS_MEMBER_PROPERTY_FAST(ClickOnMouseUp)
 				CLASS_MEMBER_PROPERTY_FAST(AutoFocus)
@@ -2771,7 +2773,7 @@ Type Declaration (Class)
 
 			BEGIN_CLASS_MEMBER(GuiComboBoxBase)
 				CLASS_MEMBER_BASE(GuiMenuButton)
-				CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE(GuiComboBoxBase)
+				CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE_2(GuiComboBoxBase, bool, _autoFocusDropdown)
 			END_CLASS_MEMBER(GuiComboBoxBase)
 
 			BEGIN_CLASS_MEMBER(GuiComboButton)

Import/Skins/DarkSkin/DarkSkin.cpp

@@ -27299,6 +27299,9 @@ Class (::darkskin::ListViewColumnHeaderTemplateConstructor)
 			(this->buttonArrow = new ::vl::presentation::controls::GuiSelectableButton(::vl::presentation::theme::ThemeName::CheckBox));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"buttonArrow"), ::vl::__vwsn::Box(this->buttonArrow));
 		}
+		{
+			::vl::__vwsn::This(this->buttonArrow)->SetAutoSelection(false);
+		}
 		(this->__vwsn_precompile_14 = ::vl::__vwsn::This(this->buttonArrow)->GetBoundsComposition());
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_14)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
@@ -29687,6 +29690,9 @@ Class (::darkskin::RibbonLargeSplitButtonTemplateConstructor)
 			(this->buttonArrow = new ::vl::presentation::controls::GuiSelectableButton(::vl::presentation::theme::ThemeName::CheckBox));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"buttonArrow"), ::vl::__vwsn::Box(this->buttonArrow));
 		}
+		{
+			::vl::__vwsn::This(this->buttonArrow)->SetAutoSelection(false);
+		}
 		(this->__vwsn_precompile_9 = ::vl::__vwsn::This(this->buttonArrow)->GetBoundsComposition());
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_9)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
@@ -30449,6 +30455,9 @@ Class (::darkskin::RibbonSmallSplitButtonTemplateConstructor)
 			(this->buttonArrow = new ::vl::presentation::controls::GuiSelectableButton(::vl::presentation::theme::ThemeName::CheckBox));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"buttonArrow"), ::vl::__vwsn::Box(this->buttonArrow));
 		}
+		{
+			::vl::__vwsn::This(this->buttonArrow)->SetAutoSelection(false);
+		}
 		(this->__vwsn_precompile_11 = ::vl::__vwsn::This(this->buttonArrow)->GetBoundsComposition());
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_11)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());
@@ -32770,6 +32779,9 @@ Class (::darkskin::ToolstripSplitButtonTemplateConstructor)
 			(this->buttonArrow = new ::vl::presentation::controls::GuiSelectableButton(::vl::presentation::theme::ThemeName::CheckBox));
 			::vl::__vwsn::This(__vwsn_this_)->SetNamedObject(::vl::WString::Unmanaged(L"buttonArrow"), ::vl::__vwsn::Box(this->buttonArrow));
 		}
+		{
+			::vl::__vwsn::This(this->buttonArrow)->SetAutoSelection(false);
+		}
 		(this->__vwsn_precompile_8 = ::vl::__vwsn::This(this->buttonArrow)->GetBoundsComposition());
 		{
 			::vl::__vwsn::This(this->__vwsn_precompile_8)->SetAlignmentToParent([&](){ ::vl::presentation::Margin __vwsn_temp__; __vwsn_temp__.left = static_cast<::vl::vint>(0); __vwsn_temp__.top = static_cast<::vl::vint>(0); __vwsn_temp__.right = static_cast<::vl::vint>(0); __vwsn_temp__.bottom = static_cast<::vl::vint>(0); return __vwsn_temp__; }());

Import/Vlpp.cpp

@@ -1399,7 +1399,7 @@ UnitTest
 			vint							passedFiles = 0;
 			vint							totalCases = 0;
 			vint							passedCases = 0;
-			bool							suppressFailure = false;
+			UnitTest::FailureMode			failureMode = UnitTest::FailureMode::NotRunning;
 
 			template<typename TMessage>
 			void RecordFailure(TMessage errorMessage)
@@ -1423,22 +1423,46 @@ UnitTest
 				catch (const UnitTestAssertError& e)
 				{
 					RecordFailure(e.message);
+					if (failureMode == UnitTest::FailureMode::Copilot)
+					{
+						throw UnitTestJustCrashError{};
+					}
 				}
 				catch (const UnitTestConfigError& e)
 				{
 					RecordFailure(e.message);
+					if (failureMode == UnitTest::FailureMode::Copilot)
+					{
+						throw UnitTestJustCrashError{};
+					}
 				}
 				catch (const Error& e)
 				{
 					RecordFailure(e.Description());
+					if (failureMode == UnitTest::FailureMode::Copilot)
+					{
+						throw UnitTestJustCrashError{};
+					}
 				}
 				catch (const Exception& e)
 				{
 					RecordFailure(e.Message());
+					if (failureMode == UnitTest::FailureMode::Copilot)
+					{
+						throw UnitTestJustCrashError{};
+					}
+				}
+				catch (const UnitTestJustCrashError&)
+				{
+					throw;
 				}
 				catch (...)
 				{
 					RecordFailure(L"Unknown exception occurred!");
+					if (failureMode == UnitTest::FailureMode::Copilot)
+					{
+						throw UnitTestJustCrashError{};
+					}
 				}
 			}
 
@@ -1462,18 +1486,26 @@ UnitTest
 			template<typename TCallback>
 			void ExecuteAndSuppressFailure(TCallback&& callback)
 			{
-				if (suppressFailure)
+				switch (failureMode)
 				{
+				case UnitTest::FailureMode::Release:
 					SuppressCFailure(std::forward<TCallback&&>(callback));
-				}
+					break;
-				else
+				case UnitTest::FailureMode::Copilot:
-				{
+					SuppressCppFailure(std::forward<TCallback&&>(callback));
+					break;
+				default:
 					callback();
 				}
 			}
 		}
 		using namespace execution_impl;
 
+		UnitTest::FailureMode UnitTest::GetFailureMode()
+		{
+			return execution_impl::failureMode;
+		}
+
 		void UnitTest::PrintMessage(const WString& string, MessageKind kind)
 		{
 			if (kind != MessageKind::Error && !testContext)
@@ -1505,7 +1537,7 @@ UnitTest
 
 		int UnitTest::PrintUsages()
 		{
-			PrintMessage(L"Usage: [/D | /R] {/F:TestFile}", MessageKind::Error);
+			PrintMessage(L"Usage: [/D | /R | /C] {/F:TestFile}", MessageKind::Error);
 			return 1;
 		}
 
@@ -1517,6 +1549,7 @@ UnitTest
 			bool unrecognized = false;
 			bool _D = false;
 			bool _R = false;
+			bool _C = false;
 			List<AString> _Fs;
 
 			for (auto&& option : From(options))
@@ -1529,6 +1562,10 @@ UnitTest
 				{
 					_R = true;
 				}
+				else if (option == L"/C")
+				{
+					_C = true;
+				}
 				else if (option.Length() > 3 && option.Left(3) == L"/F:")
 				{
 					_Fs.Add(wtoa(option.Sub(3, option.Length() - 3)));
@@ -1539,22 +1576,30 @@ UnitTest
 				}
 			}
 
-			if (unrecognized || (_D && _R))
+			vint modeCount = 0;
+			if (_D) modeCount++;
+			if (_R) modeCount++;
+			if (_C) modeCount++;
+			if (unrecognized || modeCount > 1)
 			{
 				return PrintUsages();
 			}
 
 			if (_D)
 			{
-				suppressFailure = false;
+				failureMode = FailureMode::Debug;
 			}
 			else if (_R)
 			{
-				suppressFailure = true;
+				failureMode = FailureMode::Release;
+			}
+			else if (_C)
+			{
+				failureMode = FailureMode::Copilot;
 			}
 			else
 			{
-				suppressFailure = !IsDebuggerAttached();
+				failureMode = IsDebuggerAttached() ? FailureMode::Debug : FailureMode::Release;
 			}
 
 			{
@@ -1565,13 +1610,17 @@ UnitTest
 				totalCases = 0;
 				passedCases = 0;
 
-				if (suppressFailure)
+				switch (failureMode)
-				{
-					PrintMessage(L"Failures are suppressed.", MessageKind::Info);
-				}
-				else
 				{
+				case FailureMode::Debug:
 					PrintMessage(L"Failures are not suppressed.", MessageKind::Info);
+					break;
+				case FailureMode::Release:
+					PrintMessage(L"Failures are suppressed.", MessageKind::Info);
+					break;
+				case FailureMode::Copilot:
+					PrintMessage(L"Failures cause immediate exit.", MessageKind::Info);
+					break;
 				}
 
 				auto current = testHead;

Import/Vlpp.h

@@ -9404,6 +9404,12 @@ namespace vl
 		/// A <b>TEST_ASSERT</b> failure will report an error and skip rest of the current <b>TEST_CASE</b>, the execution will continue.
 		/// </p>
 		/// <p>
+		/// When the test program is started with command line option "/C" (Copilot mode),
+		/// A <b>TEST_ASSERT</b> failure will report an error and cause immediate program termination.
+		/// This mode is designed for automated testing where you want to stop at the first failure.
+		/// The "/D", "/R", and "/C" options are mutually exclusive.
+		/// </p>
+		/// <p>
 		/// <b>TEST_ERROR</b> execute one statement, it fails when no [T:vl.Error] is thrown.
 		/// </p>
 		/// <p>
@@ -9473,6 +9479,15 @@ namespace vl
 				Case,
 			};
 
+			enum class FailureMode
+			{
+				NotRunning,			// UnitTest is not running
+				Debug,				// corresponds to /D - no exception suppression
+				Release,			// corresponds to /R - suppress and continue  
+				Copilot				// corresponds to /C - suppress, record, and rethrow
+			};
+
+			static FailureMode		GetFailureMode();
 			static void				PrintMessage(const WString& string, MessageKind kind);
 
 			/// <summary>Run all test cases.</summary>
@@ -9520,6 +9535,10 @@ namespace vl
 			UnitTestConfigError(const wchar_t* _message) :message(_message) {}
 		};
 
+		struct UnitTestJustCrashError
+		{
+		};
+
 #define TEST_FILE\
 		static void VLPPTEST_TESTFILE();\
 		static ::vl::unittest::UnitTestFile VLPPTEST_TESTFILE_INSTANCE(__FILE__, &VLPPTEST_TESTFILE);\

Import/VlppOS.Linux.cpp

@@ -23,39 +23,46 @@ static_assert(false, "Do not build this file for Windows applications.");
 
 namespace vl
 {
+	namespace stream
+	{
+		extern Ptr<IFileStreamImpl>		CreateOSFileStreamImpl(const WString& fileName, FileStream::AccessRight accessRight);
+	}
+
 	namespace filesystem
 	{
 		using namespace collections;
 		using namespace stream;
 
 /***********************************************************************
-FilePath
+LinuxFileSystemImpl
 ***********************************************************************/
 
-		const wchar_t FilePath::Delimiter;
+		class LinuxFileSystemImpl : public Object, public virtual IFileSystemImpl
-
+		{
-		void FilePath::Initialize()
+		public:
+			// FilePath operations implementation
+			void Initialize(WString& fullPath) const override
 			{
 				{
 					Array<wchar_t> buffer(fullPath.Length() + 1);
 					wcscpy(&buffer[0], fullPath.Buffer());
-				NormalizeDelimiters(buffer);
+					FilePath::NormalizeDelimiters(buffer);
 					fullPath = &buffer[0];
 				}
 
 				if (fullPath.Length() == 0)
 					fullPath = WString::Unmanaged(L"/");
 
-			if (fullPath[0] != Delimiter)
+				if (fullPath[0] != FilePath::Delimiter)
 				{
 					char buffer[PATH_MAX] = { 0 };
 					getcwd(buffer, PATH_MAX);
-				fullPath = atow(AString(buffer)) + WString::FromChar(Delimiter) + fullPath;
+					fullPath = atow(AString(buffer)) + WString::FromChar(FilePath::Delimiter) + fullPath;
 				}
 
 				{
 					collections::List<WString> components;
-				GetPathComponents(fullPath, components);
+					FilePath::GetPathComponents(fullPath, components);
 					for (int i = 0; i < components.Count(); i++)
 					{
 						if (components[i] == L".")
@@ -78,13 +85,13 @@ FilePath
 						}
 					}
 
-				fullPath = ComponentsToPath(components);
+					fullPath = FilePath::ComponentsToPath(components);
 				}
 
-			TrimLastDelimiter(fullPath);
+				FilePath::TrimLastDelimiter(fullPath);
 			}
 
-		bool FilePath::IsFile()const
+			bool IsFile(const WString& fullPath) const override
 			{
 				struct stat info;
 				AString path = wtoa(fullPath);
@@ -93,7 +100,7 @@ FilePath
 				else return S_ISREG(info.st_mode);
 			}
 
-		bool FilePath::IsFolder()const
+			bool IsFolder(const WString& fullPath) const override
 			{
 				struct stat info;
 				AString path = wtoa(fullPath);
@@ -102,21 +109,21 @@ FilePath
 				else return S_ISDIR(info.st_mode);
 			}
 
-		bool FilePath::IsRoot()const
+			bool IsRoot(const WString& fullPath) const override
 			{
 				return fullPath == L"/";
 			}
 
-		WString FilePath::GetRelativePathFor(const FilePath& _filePath) const
+			WString GetRelativePathFor(const WString& fromPath, const WString& toPath) const override
 			{
-			if (fullPath.Length() == 0 || _filePath.fullPath.Length() == 0 || fullPath[0] != _filePath.fullPath[0])
+				if (fromPath.Length() == 0 || toPath.Length() == 0 || fromPath[0] != toPath[0])
 				{
-				return _filePath.fullPath;
+					return toPath;
 				}
 
 				collections::List<WString> srcComponents, tgtComponents, resultComponents;
-			GetPathComponents(IsFolder() ? fullPath : GetFolder().GetFullPath(), srcComponents);
+				FilePath::GetPathComponents(IsFolder(fromPath) ? fromPath : FilePath(fromPath).GetFolder().GetFullPath(), srcComponents);
-			GetPathComponents(_filePath.fullPath, tgtComponents);
+				FilePath::GetPathComponents(toPath, tgtComponents);
 
 				int minLength = srcComponents.Count() <= tgtComponents.Count() ? srcComponents.Count() : tgtComponents.Count();
 				int lastCommonComponent = 0;
@@ -140,36 +147,28 @@ FilePath
 					resultComponents.Add(tgtComponents[i]);
 				}
 
-			return ComponentsToPath(resultComponents);
+				return FilePath::ComponentsToPath(resultComponents);
 			}
 
-/***********************************************************************
+			// File operations implementation
-File
+			bool FileDelete(const FilePath& filePath) const override
-***********************************************************************/
-
-		bool File::Delete()const
 			{
 				AString path = wtoa(filePath.GetFullPath());
 				return unlink(path.Buffer()) == 0;
 			}
 
-		bool File::Rename(const WString& newName)const
+			bool FileRename(const FilePath& filePath, const WString& newName) const override
 			{
 				AString oldFileName = wtoa(filePath.GetFullPath());
 				AString newFileName = wtoa((filePath.GetFolder() / newName).GetFullPath());
 				return rename(oldFileName.Buffer(), newFileName.Buffer()) == 0;
 			}
 
-/***********************************************************************
+			// Folder operations implementation
-Folder
+			bool GetFolders(const FilePath& folderPath, collections::List<Folder>& folders) const override
-***********************************************************************/
-
-		bool Folder::GetFolders(collections::List<Folder>& folders)const
 			{
-			if (!Exists()) return false;
-
 				DIR *dir;
-			AString searchPath = wtoa(filePath.GetFullPath());
+				AString searchPath = wtoa(folderPath.GetFullPath());
 
 				if ((dir = opendir(searchPath.Buffer())) == NULL)
 				{
@@ -180,7 +179,7 @@ Folder
 				while ((entry = readdir(dir)) != NULL)
 				{
 					WString childName = atow(AString(entry->d_name));
-				FilePath childFullPath = filePath / childName;
+					FilePath childFullPath = folderPath / childName;
 					if (childName != L"." && childName != L".." && childFullPath.IsFolder())
 					{
 						folders.Add(Folder(childFullPath));
@@ -195,12 +194,10 @@ Folder
 				return true;
 			}
 
-		bool Folder::GetFiles(collections::List<File>& files)const
+			bool GetFiles(const FilePath& folderPath, collections::List<File>& files) const override
 			{
-			if (!Exists()) return false;
-
 				DIR* dir;
-			AString searchPath = wtoa(filePath.GetFullPath());
+				AString searchPath = wtoa(folderPath.GetFullPath());
 
 				if ((dir = opendir(searchPath.Buffer())) == NULL)
 				{
@@ -210,7 +207,7 @@ Folder
 				struct dirent* entry;
 				while ((entry = readdir(dir)) != NULL)
 				{
-				FilePath childFullPath = filePath / (atow(AString(entry->d_name)));
+					FilePath childFullPath = folderPath / (atow(AString(entry->d_name)));
 					if (childFullPath.IsFile())
 					{
 						files.Add(File(childFullPath));
@@ -225,24 +222,41 @@ Folder
 				return true;
 			}
 
-		bool Folder::CreateNonRecursively()const
+			bool CreateFolder(const FilePath& folderPath) const override
 			{
-			AString path = wtoa(filePath.GetFullPath());
+				AString path = wtoa(folderPath.GetFullPath());
 				return mkdir(path.Buffer(), 0777) == 0;
 			}
 
-		bool Folder::DeleteNonRecursively()const
+			bool DeleteFolder(const FilePath& folderPath) const override
 			{
-			AString path = wtoa(filePath.GetFullPath());
+				AString path = wtoa(folderPath.GetFullPath());
 				return rmdir(path.Buffer()) == 0;
 			}
 
-		bool Folder::Rename(const WString& newName)const
+			bool FolderRename(const FilePath& folderPath, const WString& newName) const override
 			{
-			AString oldFileName = wtoa(filePath.GetFullPath());
+				AString oldFileName = wtoa(folderPath.GetFullPath());
-			AString newFileName = wtoa((filePath.GetFolder() / newName).GetFullPath());
+				AString newFileName = wtoa((folderPath.GetFolder() / newName).GetFullPath());
 				return rename(oldFileName.Buffer(), newFileName.Buffer()) == 0;
 			}
+
+			Ptr<stream::IFileStreamImpl> GetFileStreamImpl(const WString& fileName, stream::FileStream::AccessRight accessRight) const override
+			{
+				return stream::CreateOSFileStreamImpl(fileName, accessRight);
+			}
+		};
+
+/***********************************************************************
+Global FileSystem Implementation
+***********************************************************************/
+
+		LinuxFileSystemImpl osFileSystemImpl;
+
+		IFileSystemImpl* GetOSFileSystemImpl()
+		{
+			return &osFileSystemImpl;
+		}
 	}
 }
 

Import/VlppOS.Windows.cpp

@@ -24,21 +24,29 @@ static_assert(false, "Do not build this file for non-Windows applications.");
 
 namespace vl
 {
+	namespace stream
+	{
+		extern Ptr<IFileStreamImpl>		CreateOSFileStreamImpl(const WString& fileName, FileStream::AccessRight accessRight);
+	}
+
 	namespace filesystem
 	{
 		using namespace collections;
 		using namespace stream;
 
 /***********************************************************************
-FilePath
+WindowsFileSystemImpl
 ***********************************************************************/
 
-		void FilePath::Initialize()
+		class WindowsFileSystemImpl : public Object, public virtual IFileSystemImpl
+		{
+		public:
+			void Initialize(WString& fullPath) const override
 			{
 				{
 					Array<wchar_t> buffer(fullPath.Length() + 1);
 					wcscpy_s(&buffer[0], fullPath.Length() + 1, fullPath.Buffer());
-				NormalizeDelimiters(buffer);
+					FilePath::NormalizeDelimiters(buffer);
 					fullPath = &buffer[0];
 				}
 
@@ -81,10 +89,10 @@ FilePath
 					}
 				}
 
-			TrimLastDelimiter(fullPath);
+				FilePath::TrimLastDelimiter(fullPath);
 			}
 
-		bool FilePath::IsFile()const
+			bool IsFile(const WString& fullPath) const override
 			{
 				WIN32_FILE_ATTRIBUTE_DATA info;
 				BOOL result = GetFileAttributesEx(fullPath.Buffer(), GetFileExInfoStandard, &info);
@@ -92,7 +100,7 @@ FilePath
 				return (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0;
 			}
 
-		bool FilePath::IsFolder()const
+			bool IsFolder(const WString& fullPath) const override
 			{
 				WIN32_FILE_ATTRIBUTE_DATA info;
 				BOOL result = GetFileAttributesEx(fullPath.Buffer(), GetFileExInfoStandard, &info);
@@ -100,52 +108,44 @@ FilePath
 				return (info.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
 			}
 
-		bool FilePath::IsRoot()const
+			bool IsRoot(const WString& fullPath) const override
 			{
 				return fullPath == L"";
 			}
 
-		WString FilePath::GetRelativePathFor(const FilePath& _filePath) const
+			WString GetRelativePathFor(const WString& fromPath, const WString& toPath) const override
 			{
-			if (fullPath.Length() == 0 || _filePath.fullPath.Length() == 0 || fullPath[0] != _filePath.fullPath[0])
+				if (fromPath.Length() == 0 || toPath.Length() == 0 || fromPath[0] != toPath[0])
 				{
-				return _filePath.fullPath;
+					return toPath;
 				}
 
 				wchar_t buffer[MAX_PATH + 1] = { 0 };
 				PathRelativePathTo(
 					buffer,
-				fullPath.Buffer(),
+					fromPath.Buffer(),
-				(IsFolder() ? FILE_ATTRIBUTE_DIRECTORY : 0),
+					(IsFolder(fromPath) ? FILE_ATTRIBUTE_DIRECTORY : 0),
-				_filePath.fullPath.Buffer(),
+					toPath.Buffer(),
-				(_filePath.IsFolder() ? FILE_ATTRIBUTE_DIRECTORY : 0)
+					(IsFolder(toPath) ? FILE_ATTRIBUTE_DIRECTORY : 0)
 				);
 				return buffer;
 			}
 
-/***********************************************************************
+			bool FileDelete(const FilePath& filePath) const override
-File
-***********************************************************************/
-
-		bool File::Delete()const
 			{
 				return DeleteFile(filePath.GetFullPath().Buffer()) != 0;
 			}
 
-		bool File::Rename(const WString& newName)const
+			bool FileRename(const FilePath& filePath, const WString& newName) const override
 			{
 				WString oldFileName = filePath.GetFullPath();
 				WString newFileName = (filePath.GetFolder() / newName).GetFullPath();
 				return MoveFile(oldFileName.Buffer(), newFileName.Buffer()) != 0;
 			}
 
-/***********************************************************************
+			bool GetFolders(const FilePath& folderPath, collections::List<Folder>& folders) const override
-Folder
-***********************************************************************/
-
-		bool Folder::GetFolders(collections::List<Folder>& folders)const
 			{
-			if (filePath.IsRoot())
+				if (folderPath.IsRoot())
 				{
 					auto bufferSize = GetLogicalDriveStrings(0, nullptr);
 					if (bufferSize > 0)
@@ -168,7 +168,7 @@ Folder
 				}
 				else
 				{
-				if (!Exists()) return false;
+					if (!IsFolder(folderPath.GetFullPath())) return false;
 					WIN32_FIND_DATA findData;
 					HANDLE findHandle = INVALID_HANDLE_VALUE;
 
@@ -176,7 +176,7 @@ Folder
 					{
 						if (findHandle == INVALID_HANDLE_VALUE)
 						{
-						WString searchPath = (filePath / L"*").GetFullPath();
+							WString searchPath = (folderPath / L"*").GetFullPath();
 							findHandle = FindFirstFile(searchPath.Buffer(), &findData);
 							if (findHandle == INVALID_HANDLE_VALUE)
 							{
@@ -197,7 +197,7 @@ Folder
 						{
 							if (wcscmp(findData.cFileName, L".") != 0 && wcscmp(findData.cFileName, L"..") != 0)
 							{
-							folders.Add(Folder(filePath / findData.cFileName));
+								folders.Add(Folder(folderPath / findData.cFileName));
 							}
 						}
 					}
@@ -205,13 +205,13 @@ Folder
 				}
 			}
 
-		bool Folder::GetFiles(collections::List<File>& files)const
+			bool GetFiles(const FilePath& folderPath, collections::List<File>& files) const override
 			{
-			if (filePath.IsRoot())
+				if (IsRoot(folderPath.GetFullPath()))
 				{
 					return true;
 				}
-			if (!Exists()) return false;
+				if (!IsFolder(folderPath.GetFullPath())) return false;
 				WIN32_FIND_DATA findData;
 				HANDLE findHandle = INVALID_HANDLE_VALUE;
 
@@ -219,7 +219,7 @@ Folder
 				{
 					if (findHandle == INVALID_HANDLE_VALUE)
 					{
-					WString searchPath = (filePath / L"*").GetFullPath();
+						WString searchPath = (folderPath / L"*").GetFullPath();
 						findHandle = FindFirstFile(searchPath.Buffer(), &findData);
 						if (findHandle == INVALID_HANDLE_VALUE)
 						{
@@ -238,28 +238,41 @@ Folder
 
 					if (!(findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
 					{
-					files.Add(File(filePath / findData.cFileName));
+						files.Add(File(folderPath / findData.cFileName));
 					}
 				}
 				return true;
 			}
 
-		bool Folder::CreateNonRecursively()const
+			bool CreateFolder(const FilePath& folderPath) const override
 			{
-			return CreateDirectory(filePath.GetFullPath().Buffer(), NULL) != 0;
+				return CreateDirectory(folderPath.GetFullPath().Buffer(), NULL) != 0;
 			}
 
-		bool Folder::DeleteNonRecursively()const
+			bool DeleteFolder(const FilePath& folderPath) const override
 			{
-			return RemoveDirectory(filePath.GetFullPath().Buffer()) != 0;
+				return RemoveDirectory(folderPath.GetFullPath().Buffer()) != 0;
 			}
 
-		bool Folder::Rename(const WString& newName)const
+			bool FolderRename(const FilePath& folderPath, const WString& newName) const override
 			{
-			WString oldFileName = filePath.GetFullPath();
+				WString oldFileName = folderPath.GetFullPath();
-			WString newFileName = (filePath.GetFolder() / newName).GetFullPath();
+				WString newFileName = (folderPath.GetFolder() / newName).GetFullPath();
 				return MoveFile(oldFileName.Buffer(), newFileName.Buffer()) != 0;
 			}
+
+			Ptr<stream::IFileStreamImpl> GetFileStreamImpl(const WString& fileName, stream::FileStream::AccessRight accessRight) const override
+			{
+				return stream::CreateOSFileStreamImpl(fileName, accessRight);
+			}
+		};
+
+		WindowsFileSystemImpl osFileSystemImpl;
+
+		IFileSystemImpl* GetOSFileSystemImpl()
+		{
+			return &osFileSystemImpl;
+		}
 	}
 }
 

Import/VlppOS.cpp

@@ -428,6 +428,107 @@ Folder
 }
 
 
+/***********************************************************************
+.\FILESYSTEM.INJECTABLE.CPP
+***********************************************************************/
+/***********************************************************************
+Author: Zihan Chen (vczh)
+Licensed under https://github.com/vczh-libraries/License
+***********************************************************************/
+
+
+namespace vl
+{
+	namespace filesystem
+	{
+		extern IFileSystemImpl* GetOSFileSystemImpl();
+
+		IFileSystemImpl* injectedFileSystemImpl = nullptr;
+
+		void InjectFileSystemImpl(IFileSystemImpl* impl)
+		{
+			injectedFileSystemImpl = impl;
+		}
+
+		IFileSystemImpl* GetFileSystemImpl()
+		{
+			return injectedFileSystemImpl ? injectedFileSystemImpl : GetOSFileSystemImpl();
+		}
+
+/***********************************************************************
+FilePath
+***********************************************************************/
+
+		void FilePath::Initialize()
+		{
+			GetFileSystemImpl()->Initialize(fullPath);
+		}
+
+		bool FilePath::IsFile() const
+		{
+			return GetFileSystemImpl()->IsFile(fullPath);
+		}
+
+		bool FilePath::IsFolder() const
+		{
+			return GetFileSystemImpl()->IsFolder(fullPath);
+		}
+
+		bool FilePath::IsRoot() const
+		{
+			return GetFileSystemImpl()->IsRoot(fullPath);
+		}
+
+		WString FilePath::GetRelativePathFor(const FilePath& _filePath) const
+		{
+			return GetFileSystemImpl()->GetRelativePathFor(fullPath, _filePath.GetFullPath());
+		}
+
+/***********************************************************************
+File
+***********************************************************************/
+
+		bool File::Delete() const
+		{
+			return GetFileSystemImpl()->FileDelete(filePath);
+		}
+
+		bool File::Rename(const WString& newName) const
+		{
+			return GetFileSystemImpl()->FileRename(filePath, newName);
+		}
+
+/***********************************************************************
+Folder
+***********************************************************************/
+
+		bool Folder::GetFolders(collections::List<Folder>& folders) const
+		{
+			return GetFileSystemImpl()->GetFolders(filePath, folders);
+		}
+
+		bool Folder::GetFiles(collections::List<File>& files) const
+		{
+			return GetFileSystemImpl()->GetFiles(filePath, files);
+		}
+
+		bool Folder::CreateNonRecursively() const
+		{
+			return GetFileSystemImpl()->CreateFolder(filePath);
+		}
+
+		bool Folder::DeleteNonRecursively() const
+		{
+			return GetFileSystemImpl()->DeleteFolder(filePath);
+		}
+
+		bool Folder::Rename(const WString& newName) const
+		{
+			return GetFileSystemImpl()->FolderRename(filePath, newName);
+		}
+	}
+}
+
 /***********************************************************************
 .\LOCALE.CPP
 ***********************************************************************/
@@ -3846,9 +3947,13 @@ Licensed under https://github.com/vczh-libraries/License
 
 namespace vl
 {
+	namespace filesystem
+	{
+		extern IFileSystemImpl*			GetFileSystemImpl();
+	}
+
 	namespace stream
 	{
-
 #if defined VCZH_GCC
 		void _fseeki64(FILE* file, pos_t offset, int origin)
 		{
@@ -3857,22 +3962,39 @@ namespace vl
 #endif
 
 /***********************************************************************
-FileStream
+OSFileStreamImpl
 ***********************************************************************/
 
-		FileStream::FileStream(const WString& fileName, AccessRight _accessRight)
+		class OSFileStreamImpl : public Object, public virtual IFileStreamImpl
-			:accessRight(_accessRight)
+		{
+		private:
+			WString					fileName;
+			FileStream::AccessRight	accessRight;
+			FILE*					file;
+
+		public:
+			OSFileStreamImpl(const WString& _fileName, FileStream::AccessRight _accessRight)
+				: fileName(_fileName), accessRight(_accessRight), file(nullptr)
+			{
+			}
+
+			~OSFileStreamImpl()
+			{
+				Close();
+			}
+
+			bool Open() override
 			{
 				const wchar_t* mode = L"rb";
 				switch(accessRight)
 				{
-			case ReadOnly:
+				case FileStream::ReadOnly:
 					mode = L"rb";
 					break;
-			case WriteOnly:
+				case FileStream::WriteOnly:
 					mode = L"wb";
 					break;
-			case ReadWrite:
+				case FileStream::ReadWrite:
 					mode = L"w+b";
 					break;
 				}
@@ -3880,62 +4002,33 @@ FileStream
 #if defined VCZH_MSVC
 				if(_wfopen_s(&file, fileName.Buffer(), mode) != 0)
 				{
-				file=0;
+					file = nullptr;
+					return false;
 				}
 #elif defined VCZH_GCC
 				AString fileNameA = wtoa(fileName);
 				AString modeA = wtoa(mode);
 				file = fopen(fileNameA.Buffer(), modeA.Buffer());
+				if(file == nullptr)
+				{
+					return false;
+				}
 #endif
+				return true;
 			}
 
-		FileStream::~FileStream()
+			void Close() override
 			{
-			Close();
+				if(file != nullptr)
-		}
-
-		bool FileStream::CanRead()const
-		{
-			return file!=0 && (accessRight==ReadOnly || accessRight==ReadWrite);
-		}
-
-		bool FileStream::CanWrite()const
-		{
-			return file!=0 && (accessRight==WriteOnly || accessRight==ReadWrite);
-		}
-
-		bool FileStream::CanSeek()const
-		{
-			return file!=0;
-		}
-
-		bool FileStream::CanPeek()const
-		{
-			return file!=0 && (accessRight==ReadOnly || accessRight==ReadWrite);
-		}
-
-		bool FileStream::IsLimited()const
-		{
-			return file!=0 && accessRight==ReadOnly;
-		}
-
-		bool FileStream::IsAvailable()const
-		{
-			return file!=0;
-		}
-
-		void FileStream::Close()
-		{
-			if(file!=0)
 				{
 					fclose(file);
-				file=0;
+					file = nullptr;
 				}
 			}
 
-		pos_t FileStream::Position()const
+			pos_t Position() const override
 			{
-			if(file!=0)
+				if(file != nullptr)
 				{
 #if defined VCZH_MSVC
 					fpos_t position = 0;
@@ -3950,9 +4043,9 @@ FileStream
 				return -1;
 			}
 
-		pos_t FileStream::Size()const
+			pos_t Size() const override
 			{
-			if(file!=0)
+				if(file != nullptr)
 				{
 #if defined VCZH_MSVC
 					fpos_t position = 0;
@@ -3978,7 +4071,7 @@ FileStream
 				return -1;
 			}
 
-		void FileStream::Seek(pos_t _size)
+			void Seek(pos_t _size) override
 			{
 				if(Position() + _size > Size())
 				{
@@ -3994,7 +4087,7 @@ FileStream
 				}
 			}
 
-		void FileStream::SeekFromBegin(pos_t _size)
+			void SeekFromBegin(pos_t _size) override
 			{
 				if(_size > Size())
 				{
@@ -4010,7 +4103,7 @@ FileStream
 				}
 			}
 
-		void FileStream::SeekFromEnd(pos_t _size)
+			void SeekFromEnd(pos_t _size) override
 			{
 				if(_size < 0)
 				{
@@ -4026,23 +4119,23 @@ FileStream
 				}
 			}
 
-		vint FileStream::Read(void* _buffer, vint _size)
+			vint Read(void* _buffer, vint _size) override
 			{
-			CHECK_ERROR(file!=0, L"FileStream::Read(pos_t)#Stream is closed, cannot perform this operation.");
+				CHECK_ERROR(file != nullptr, L"FileStream::Read(pos_t)#Stream is closed, cannot perform this operation.");
 				CHECK_ERROR(_size >= 0, L"FileStream::Read(void*, vint)#Argument size cannot be negative.");
 				return fread(_buffer, 1, _size, file);
 			}
 
-		vint FileStream::Write(void* _buffer, vint _size)
+			vint Write(void* _buffer, vint _size) override
 			{
-			CHECK_ERROR(file!=0, L"FileStream::Write(pos_t)#Stream is closed, cannot perform this operation.");
+				CHECK_ERROR(file != nullptr, L"FileStream::Write(pos_t)#Stream is closed, cannot perform this operation.");
 				CHECK_ERROR(_size >= 0, L"FileStream::Write(void*, vint)#Argument size cannot be negative.");
 				return fwrite(_buffer, 1, _size, file);
 			}
 
-		vint FileStream::Peek(void* _buffer, vint _size)
+			vint Peek(void* _buffer, vint _size) override
 			{
-			CHECK_ERROR(file!=0, L"FileStream::Peek(pos_t)#Stream is closed, cannot perform this operation.");
+				CHECK_ERROR(file != nullptr, L"FileStream::Peek(pos_t)#Stream is closed, cannot perform this operation.");
 				CHECK_ERROR(_size >= 0, L"FileStream::Peek(void*, vint)#Argument size cannot be negative.");
 #if defined VCZH_MSVC
 				fpos_t position = 0;
@@ -4062,6 +4155,120 @@ FileStream
 				return count;
 #endif
 			}
+		};
+
+/***********************************************************************
+CreateOSFileStreamImpl
+***********************************************************************/
+
+		Ptr<IFileStreamImpl> CreateOSFileStreamImpl(const WString& fileName, FileStream::AccessRight accessRight)
+		{
+			return Ptr(new OSFileStreamImpl(fileName, accessRight));
+		}
+
+/***********************************************************************
+FileStream
+***********************************************************************/
+
+		FileStream::FileStream(const WString& fileName, AccessRight _accessRight)
+			: accessRight(_accessRight)
+		{
+			impl = filesystem::GetFileSystemImpl()->GetFileStreamImpl(fileName, _accessRight);
+			if(!impl->Open())
+			{
+				impl = nullptr;
+			}
+		}
+
+		FileStream::~FileStream()
+		{
+			Close();
+		}
+
+		bool FileStream::CanRead() const
+		{
+			return impl != nullptr && (accessRight == ReadOnly || accessRight == ReadWrite);
+		}
+
+		bool FileStream::CanWrite() const
+		{
+			return impl != nullptr && (accessRight == WriteOnly || accessRight == ReadWrite);
+		}
+
+		bool FileStream::CanSeek() const
+		{
+			return impl != nullptr;
+		}
+
+		bool FileStream::CanPeek() const
+		{
+			return impl != nullptr && (accessRight == ReadOnly || accessRight == ReadWrite);
+		}
+
+		bool FileStream::IsLimited() const
+		{
+			return impl != nullptr && accessRight == ReadOnly;
+		}
+
+		bool FileStream::IsAvailable() const
+		{
+			return impl != nullptr;
+		}
+
+		void FileStream::Close()
+		{
+			if(impl != nullptr)
+			{
+				impl->Close();
+				impl = nullptr;
+			}
+		}
+
+		pos_t FileStream::Position() const
+		{
+			return impl != nullptr ? impl->Position() : -1;
+		}
+
+		pos_t FileStream::Size() const
+		{
+			return impl != nullptr ? impl->Size() : -1;
+		}
+
+		void FileStream::Seek(pos_t _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::Seek(pos_t)#Stream is closed, cannot perform this operation.");
+			impl->Seek(_size);
+		}
+
+		void FileStream::SeekFromBegin(pos_t _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::SeekFromBegin(pos_t)#Stream is closed, cannot perform this operation.");
+			impl->SeekFromBegin(_size);
+		}
+
+		void FileStream::SeekFromEnd(pos_t _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::SeekFromEnd(pos_t)#Stream is closed, cannot perform this operation.");
+			impl->SeekFromEnd(_size);
+		}
+
+		vint FileStream::Read(void* _buffer, vint _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::Read(pos_t)#Stream is closed, cannot perform this operation.");
+			return impl->Read(_buffer, _size);
+		}
+
+		vint FileStream::Write(void* _buffer, vint _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::Write(pos_t)#Stream is closed, cannot perform this operation.");
+			return impl->Write(_buffer, _size);
+		}
+
+		vint FileStream::Peek(void* _buffer, vint _size)
+		{
+			CHECK_ERROR(impl != nullptr, L"FileStream::Peek(pos_t)#Stream is closed, cannot perform this operation.");
+			return impl->Peek(_buffer, _size);
+		}
 	}
 }
 

Import/VlppRegex.h

@@ -653,8 +653,8 @@ Tokenizer
 			///         }
 			///     };
 			/// 
-			///     RegexLexer lexer(tokenDefs, proc);
+			///     RegexLexer lexer(tokenDefs);
-			///     RegexLexerColorizer colorizer = lexer.Colorize();
+			///     RegexLexerColorizer colorizer = lexer.Colorize(proc);
 			/// 
 			///     void* lastInterTokenState = nullptr;
 			///     for (auto [line, index] : indexed(From(lines)))
@@ -712,7 +712,7 @@ Tokenizer
 		///     tokenDefs.Add(L"/w+");
 		///     tokenDefs.Add(L"/s+");
 		/// 
-		///     RegexLexer lexer(tokenDefs, {});
+		///     RegexLexer lexer(tokenDefs);
 		///     WString input = L"I have 2 books.";
 		///     auto tokenResult = lexer.Parse(input);
 		/// 
@@ -753,7 +753,7 @@ Tokenizer
 			///     tokenDefs.Add(L"/w+");
 			///     tokenDefs.Add(L"/s+");
 			/// 
-			///     RegexLexer lexer(tokenDefs, {});
+			///     RegexLexer lexer(tokenDefs);
 			///     WString input = L"I have 2 books.";
 			///     auto tokenResult = lexer.Parse(input);
 			/// 
@@ -786,7 +786,7 @@ RegexLexerWalker
 		///     tokenDefs.Add(L"/w+");
 		///     tokenDefs.Add(L"/s+");
 		/// 
-		///     RegexLexer lexer(tokenDefs, {});
+		///     RegexLexer lexer(tokenDefs);
 		///     RegexLexerWalker walker = lexer.Walk();
 		/// 
 		///     WString input = L"This book costs 2.5. That book costs 2.";
@@ -919,7 +919,7 @@ RegexLexerWalker
 			///     tokenDefs.Add(L"/d+./d+");
 			///     tokenDefs.Add(L"/d+");
 			/// 
-			///     RegexLexer lexer(tokenDefs, {});
+			///     RegexLexer lexer(tokenDefs);
 			///     RegexLexerWalker walker = lexer.Walk();
 			/// 
 			///     WString tests[] = { L".", L"2", L"2.", L"2.5", L"2.5." };
@@ -969,7 +969,7 @@ RegexLexerWalker
 			///     tokenDefs.Add(L"/d+./d+");
 			///     tokenDefs.Add(L"/d+");
 			/// 
-			///     RegexLexer lexer(tokenDefs, {});
+			///     RegexLexer lexer(tokenDefs);
 			///     RegexLexerWalker walker = lexer.Walk();
 			/// 
 			///     WString tests[] = { L".", L"2", L"2.", L"2.5", L"2.5." };
@@ -1034,8 +1034,8 @@ RegexLexerColorizer
 		///         Console::WriteLine(itow(token) + L": <" + WString(text + start, length) + L">");
 		///     };
 		/// 
-		///     RegexLexer lexer(tokenDefs, proc);
+		///     RegexLexer lexer(tokenDefs);
-		///     RegexLexerColorizer colorizer = lexer.Colorize();
+		///     RegexLexerColorizer colorizer = lexer.Colorize(proc);
 		/// 
 		///     for (auto [line, index] : indexed(From(lines)))
 		///     {