From 719663ac08fd8ef62b722729b56993700a7cb8d4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Mon, 11 Oct 2021 08:09:02 +0000
Subject: [PATCH] wip, save commit before node editing

---
 CrowEditBase/src/CrowEditBase.cs              |   2 +-
 CrowEditBase/src/Project.cs                   |   5 +-
 CrowEditBase/src/SourceEditor.cs              |   8 +-
 CrowEditBase/src/TreeNode.cs                  |   1 +
 CrowEditBase/ui/CrowEdit.style                |   1 +
 CrowEditBase/ui/TreeExpandable.template       |   1 +
 plugins/CECrowPlugin/src/CrowService.cs       | 156 +++++++++++-------
 plugins/CECrowPlugin/src/DebugInterface.cs    |  40 +++--
 .../CECrowPlugin/src/DebugInterfaceWidget.cs  |  19 ++-
 plugins/CECrowPlugin/src/ImlDocument.cs       |   1 +
 .../CECrowPlugin/src/Parsing/ImlTokenizer.cs  |  34 ++++
 .../StyleTokenType.cs                         |   0
 .../StyleTokenizer.cs                         |   0
 .../SyntaxAnalyser.cs                         |   0
 .../{StyleParsing => Parsing}/SyntaxNodes.cs  |   0
 plugins/CECrowPlugin/ui/winConfiguration.crow |   5 +-
 plugins/CERoslynPlugin/CERoslynPlugin.csproj  |   8 +-
 plugins/CERoslynPlugin/src/CELogger.cs        | 123 ++++++--------
 plugins/CERoslynPlugin/src/MSBuildProject.cs  |  64 ++++---
 plugins/CERoslynPlugin/src/RoslynService.cs   |  21 ++-
 plugins/CERoslynPlugin/src/SolutionProject.cs |  22 ++-
 .../ui/MSBuildProjectNode.template            |   2 +-
 .../CERoslynPlugin/ui/winConfiguration.crow   |   2 +-
 .../CEXmlPlugin/src/Parsing/XmlTokenizer.cs   |  23 ++-
 src/CrowEdit.cs                               |   3 +-
 ui/main.crow                                  |   4 +-
 ui/windows/winProjects.crow                   |   3 +-
 27 files changed, 337 insertions(+), 211 deletions(-)
 create mode 100644 plugins/CECrowPlugin/src/Parsing/ImlTokenizer.cs
 rename plugins/CECrowPlugin/src/{StyleParsing => Parsing}/StyleTokenType.cs (100%)
 rename plugins/CECrowPlugin/src/{StyleParsing => Parsing}/StyleTokenizer.cs (100%)
 rename plugins/CECrowPlugin/src/{StyleParsing => Parsing}/SyntaxAnalyser.cs (100%)
 rename plugins/CECrowPlugin/src/{StyleParsing => Parsing}/SyntaxNodes.cs (100%)

diff --git a/CrowEditBase/src/CrowEditBase.cs b/CrowEditBase/src/CrowEditBase.cs
index f89d437..8c13f2b 100644
--- a/CrowEditBase/src/CrowEditBase.cs
+++ b/CrowEditBase/src/CrowEditBase.cs
@@ -95,7 +95,7 @@ namespace CrowEditBase
 		//TODO:flattened project
 		public IEnumerable<Project> FlattenProjects {
 			get {
-				foreach (var node in Projects.SelectMany (child => child.FlattenSubProjetcs))
+				foreach (var node in Projects.SelectMany (child => child.FlattenProjetcs))
 					yield return node;
 			}
 		}
diff --git a/CrowEditBase/src/Project.cs b/CrowEditBase/src/Project.cs
index 0b7c049..a4c3926 100644
--- a/CrowEditBase/src/Project.cs
+++ b/CrowEditBase/src/Project.cs
@@ -14,9 +14,10 @@ namespace CrowEditBase
 		protected Project parent;
 		public abstract bool ContainsFile (string fullPath);
 		public IEnumerable<Project> SubProjetcs => Childs.OfType<Project> ();
-		public IEnumerable<Project> FlattenSubProjetcs {
+		public virtual IEnumerable<Project> FlattenProjetcs {
 			get {
-				foreach (var node in SubProjetcs.SelectMany (sp => sp.FlattenSubProjetcs))
+				yield return this;
+				foreach (var node in SubProjetcs.SelectMany (sp => sp.FlattenProjetcs))
 					yield return node;
 			}
 		}
diff --git a/CrowEditBase/src/SourceEditor.cs b/CrowEditBase/src/SourceEditor.cs
index 41d5b7d..81bfd55 100644
--- a/CrowEditBase/src/SourceEditor.cs
+++ b/CrowEditBase/src/SourceEditor.cs
@@ -135,8 +135,12 @@ namespace Crow
 				if (currentLoc == value)
 					return;
 				currentLoc = value;
-				if (currentLoc.HasValue)
-					getFoldContainingLine (currentLoc.Value.Line)?.UnfoldToTheTop();
+				if (currentLoc.HasValue) {
+					SyntaxNode fold = getFoldContainingLine (currentLoc.Value.Line);
+					while (fold != null && fold.StartLine == currentLoc.Value.Line)
+						fold = fold.Parent;
+					fold?.UnfoldToTheTop();
+				}
 				NotifyValueChanged ("CurrentLine", CurrentLine);
 				NotifyValueChanged ("CurrentColumn", CurrentColumn);
 				CMDCopy.CanExecute = CMDCut.CanExecute = !SelectionIsEmpty;
diff --git a/CrowEditBase/src/TreeNode.cs b/CrowEditBase/src/TreeNode.cs
index 195216f..a980465 100644
--- a/CrowEditBase/src/TreeNode.cs
+++ b/CrowEditBase/src/TreeNode.cs
@@ -40,6 +40,7 @@ namespace CrowEditBase
 		public abstract NodeType NodeType { get; }
 		public abstract string Icon { get; }
 		public virtual string IconSub => null;
+		public virtual string StatusIcon => null;
 		public T GetFirstAncestorOfType<T> () where T : TreeNode {
 			TreeNode n = this;
 			while (n.Parent != null && !(n is T))
diff --git a/CrowEditBase/ui/CrowEdit.style b/CrowEditBase/ui/CrowEdit.style
index 147c1ec..89d08c6 100644
--- a/CrowEditBase/ui/CrowEdit.style
+++ b/CrowEditBase/ui/CrowEdit.style
@@ -29,6 +29,7 @@ Editor {
 	MouseWheelSpeed = "20";
 	BubbleEvents ="None";
 	ClipToClientRect = "true";
+	MouseCursor = "ibeam";
 }
 
 icon {
diff --git a/CrowEditBase/ui/TreeExpandable.template b/CrowEditBase/ui/TreeExpandable.template
index ea45ddb..0a46eca 100644
--- a/CrowEditBase/ui/TreeExpandable.template
+++ b/CrowEditBase/ui/TreeExpandable.template
@@ -27,6 +27,7 @@
 						<Image Style="TreeIcon"
 							Path="{Icon}" SvgSub="{IconSub}"/>
 						<Label Style="TreeLabel" Text="{./Caption}"/>
+						<Image Style="TreeIconSmall" Path="{StatusIcon}" />
 					</HorizontalStack>
 				</Border>
 			</ListItem>
diff --git a/plugins/CECrowPlugin/src/CrowService.cs b/plugins/CECrowPlugin/src/CrowService.cs
index c146d22..eda163f 100644
--- a/plugins/CECrowPlugin/src/CrowService.cs
+++ b/plugins/CECrowPlugin/src/CrowService.cs
@@ -65,13 +65,34 @@ namespace Crow
 
 
 		}
-
-
+		#region Commands
 		public Command CMDStartRecording, CMDStopRecording, CMDRefresh;
 		public Command CMDGotoParentEvent, CMDEventHistoryForward, CMDEventHistoryBackward;
 		public CommandGroup LoggerCommands => new CommandGroup (CMDRefresh, CMDStartRecording, CMDStopRecording);
 		public CommandGroup EventCommands => new CommandGroup(
 				CMDGotoParentEvent, CMDEventHistoryBackward, CMDEventHistoryForward);
+		public ActionCommand CMDOptions_SelectCrowAssemblyLocation => new ActionCommand ("...",
+			() => {
+				FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
+				<FileDialog Caption='Select Crow.dll assembly' CurrentDirectory='{CrowDbgAssemblyLocation}'
+							ShowFiles='true' ShowHidden='true' />");
+				dlg.OkClicked += (sender, e) => CrowDbgAssemblyLocation = (sender as FileDialog).SelectedFileFullPath;
+				dlg.DataSource = this;
+			}
+		);
+		public ActionCommand CMDOptions_AddCrowAssembly => new ActionCommand ("Add Assembly with Crow Ressource",
+			() => {
+				FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
+				<FileDialog Caption='Select Assembly with Crow Ressources' CurrentDirectory='{CrowDbgAssemblyLocation}'
+							ShowFiles='true' ShowHidden='true' />");
+				dlg.OkClicked += (sender, e) => {
+					crowAssemblies.Add ((sender as FileDialog).SelectedFileFullPath);
+					saveCrowAssemblies ();
+				};
+				dlg.DataSource = this;
+			}
+		);
+
 		void initCommands ()
 		{
 			App.ViewCommands.Add (
@@ -84,11 +105,15 @@ namespace Crow
 			CMDEventHistoryBackward = new ActionCommand("back.", currentEventHistoryGoBack, "#icons.previous.svg", false);
 			CMDEventHistoryForward = new ActionCommand("forw.", currentEventHistoryGoForward, "#icons.forward-arrow.svg", false);
 		}
+		#endregion
+
 		public void LoadIML (string imlSource) {
 			if (CurrentState == Status.Running)
 				delSetSource (imlSource);
 		}
 		Exception currentException;
+		public string ErrorMessage = "";
+		public bool ServiceIsInError;
 		object dbgIFace;
 		AssemblyLoadContext crowLoadCtx;
 		Assembly crowAssembly, thisAssembly;
@@ -107,6 +132,9 @@ namespace Crow
 		Func<IntPtr> delGetSurfacePointer;
 		Action<string> delSetSource;
 		Action delReloadIml;
+		Func<double> delGetZoomFactor;
+		Action<double> delSetZoomFactor;
+
 
 		FieldInfo fiDbg_IncludeEvents, fiDbg_DiscardEvents, fiDbg_ConsoleOutput, fiDbgIFace_MaxLayoutingTries, fiDbgIFace_MaxDiscardCount;
 		#endregion
@@ -146,7 +174,7 @@ namespace Crow
 		public bool PreviewHasError => currentException != null;
 		public Exception CurrentException {
 			get => currentException;
-			set {
+			private set {
 				if (currentException == value)
 					return;
 				currentException = value;
@@ -216,32 +244,38 @@ namespace Crow
 				NotifyValueChanged (value);
 			}
 		}
-		public string ErrorMessage = "";
-		public bool ServiceIsInError;
 		void updateCrowDebuggerState (string errorMsg = null) {
 			ErrorMessage = errorMsg;
 			ServiceIsInError = errorMsg != null;
 			NotifyValueChanged ("ServiceErrorMessage", (object)ErrorMessage);
 			NotifyValueChanged ("ServiceIsInError",  ServiceIsInError);
 		}
-		public void GetMouseScreenCoordinates (out int x, out int y) {
+
+		#region DesignInterface callbacks
+		//those methods are called by designed interface
+		void getMouseScreenCoordinates (out int x, out int y) {
 			x = mouseScreenPos.X;
 			y = mouseScreenPos.Y;
 		}
-		void saveCrowAssemblies () {
-			if (crowAssemblies.Count > 0)
-				Configuration.Global.Set ("CrowAssemblies", crowAssemblies.Aggregate ((a, b)=> $"{a};{b}"));
-			else
-				Configuration.Global.Set ("CrowAssemblies", "");
+		IEnumerable<object> getStyling () {
+			if (App.CurrentProject is CERoslynPlugin.SolutionProject sol) {
+				if (sol.StartupProject is CERoslynPlugin.MSBuildProject csprj) {
+					foreach (var style in csprj.Flatten.OfType<CERoslynPlugin.ProjectItemNode>()
+						.Where (pin=>pin.NodeType == NodeType.EmbeddedResource && pin.FullPath.EndsWith (".style", StringComparison.OrdinalIgnoreCase)))
+						yield return style.FullPath;
+				}
+			}
+			yield return crowAssembly;
 		}
-		void loadCrowAssemblies () {
-			crowAssemblies.Clear ();
-			if (!Configuration.Global.TryGet<string> ("CrowAssemblies", out string assemblies))
-				return;
-			foreach (string a in assemblies.Split (';'))
-				crowAssemblies.Add (a);
+		Stream getStreamFromPath (string path) {
+			if (App.CurrentProject is CERoslynPlugin.SolutionProject sol) {
+				if (sol.StartupProject is CERoslynPlugin.MSBuildProject csprj) {
+					return csprj.GetStreamFromTargetPath (path);
+				}
+			}
+			return null;
 		}
-
+		#endregion
 		public override void Start()
 		{
 			if (CurrentState == Status.Running)
@@ -315,6 +349,11 @@ namespace Crow
 											dbgIFace, dbgIfaceType.GetProperty("Source").GetSetMethod());
 				delReloadIml = (Action)Delegate.CreateDelegate(typeof(Action), dbgIFace, dbgIfaceType.GetMethod("ReloadIml"));
 
+				delGetZoomFactor = (Func<double>)Delegate.CreateDelegate(typeof(Func<double>),
+											dbgIFace, dbgIfaceType.GetProperty("ZoomFactor").GetGetMethod());
+				delSetZoomFactor = (Action<double>)Delegate.CreateDelegate(typeof(Action<double>),
+											dbgIFace, dbgIfaceType.GetProperty("ZoomFactor").GetSetMethod());
+
 				fiDbgIFace_IsDirty = dbgIfaceType.GetField("IsDirty");
 				fiDbgIFace_MaxLayoutingTries = dbgIfaceType.GetField("MaxLayoutingTries", BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy);
 				fiDbgIFace_MaxDiscardCount = dbgIfaceType.GetField("MaxDiscardCount", BindingFlags.Static | BindingFlags.Public | BindingFlags.FlattenHierarchy);
@@ -335,6 +374,8 @@ namespace Crow
 				CurrentState = Status.Running;
 
 				updateCrowDebuggerState();
+
+				delSetZoomFactor (ZoomFactor);
 		}
 		public override void Stop()
 		{
@@ -348,7 +389,17 @@ namespace Crow
 			CurrentState = Status.Paused;
 		}
 		public override string ConfigurationWindowPath => "#CECrowPlugin.ui.winConfiguration.crow";
-
+		Project activeSolution;
+		public Project ActiveSolution {
+			get => activeSolution;
+			set {
+				CERoslynPlugin.SolutionProject sol = value as CERoslynPlugin.SolutionProject;
+				if (activeSolution == sol)
+					return;
+				activeSolution = sol;
+				NotifyValueChanged (activeSolution);
+			}
+		}
 		public string CrowDbgAssemblyLocation {
 			get => Configuration.Global.Get<string> ("CrowDbgAssemblyLocation");
 			set {
@@ -358,32 +409,35 @@ namespace Crow
 				NotifyValueChanged(value);
 			}
 		}
+		public double ZoomFactor {
+			get => Configuration.Global.Get<Double> ("CrowPreviewZoomFactor", 1.0);
+			set {
+				if (ZoomFactor == value)
+					return;
+				Configuration.Global.Set<Double> ("CrowPreviewZoomFactor", value);
+				NotifyValueChanged (value);
+				if (CurrentState == Status.Running)
+					delSetZoomFactor (value);
+			}
+		}
 		//assemblies with crow resources in order of loading
 		IList<string> crowAssemblies = new ObservableList<string> ();
 		public IList<string> CrowAssemblies => crowAssemblies;
+		void saveCrowAssemblies () {
+			if (crowAssemblies.Count > 0)
+				Configuration.Global.Set ("CrowAssemblies", crowAssemblies.Aggregate ((a, b)=> $"{a};{b}"));
+			else
+				Configuration.Global.Set ("CrowAssemblies", "");
+		}
+		void loadCrowAssemblies () {
+			crowAssemblies.Clear ();
+			if (!Configuration.Global.TryGet<string> ("CrowAssemblies", out string assemblies))
+				return;
+			foreach (string a in assemblies.Split (';'))
+				crowAssemblies.Add (a);
+		}
+
 
-		public ActionCommand CMDOptions_SelectCrowAssemblyLocation => new ActionCommand ("...",
-			() => {
-				FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
-				<FileDialog Caption='Select Crow.dll assembly' CurrentDirectory='{CrowDbgAssemblyLocation}'
-							ShowFiles='true' ShowHidden='true' />");
-				dlg.OkClicked += (sender, e) => CrowDbgAssemblyLocation = (sender as FileDialog).SelectedFileFullPath;
-				dlg.DataSource = this;
-			}
-		);
-		public ActionCommand CMDOptions_AddCrowAssembly => new ActionCommand ("Add Assembly with Crow Ressource",
-			() => {
-				FileDialog dlg = App.LoadIMLFragment<FileDialog> (@"
-				<FileDialog Caption='Select Assembly with Crow Ressources' CurrentDirectory='{CrowDbgAssemblyLocation}'
-							ShowFiles='true' ShowHidden='true' />");
-				dlg.OkClicked += (sender, e) => {
-					crowAssemblies.Add ((sender as FileDialog).SelectedFileFullPath);
-					saveCrowAssemblies ();
-				};
-				dlg.DataSource = this;
-			}
-		);
-		
 
 		protected override void onStateChange(Status previousState, Status newState)
 		{
@@ -437,7 +491,7 @@ namespace Crow
 				try
 				{
 					mouseScreenPos = _mouseScreenPos;//absolute on screen position.
-					e.Handled = delMouseMove (e.X, e.Y);//DebugInterface local coordinate for mouse.
+					e.Handled = delMouseMove ((int)(e.X / ZoomFactor), (int)(e.Y / ZoomFactor));//DebugInterface local coordinate for mouse.
 				}
 				catch (System.Exception ex)
 				{
@@ -495,24 +549,6 @@ namespace Crow
 				fiDbgIFace_IsDirty.SetValue (dbgIFace, false);
 		}
 		public bool GetDirtyState => IsRunning ? (bool)fiDbgIFace_IsDirty.GetValue (dbgIFace) : false;
-		public IEnumerable<object> GetStyling () {
-			if (App.CurrentProject is CERoslynPlugin.SolutionProject sol) {
-				if (sol.StartupProject is CERoslynPlugin.MSBuildProject csprj) {
-					foreach (var style in csprj.Flatten.OfType<CERoslynPlugin.ProjectItemNode>()
-						.Where (pin=>pin.NodeType == NodeType.EmbeddedResource && pin.FullPath.EndsWith (".style", StringComparison.OrdinalIgnoreCase)))
-						yield return style.FullPath;
-				}
-			}
-			yield return crowAssembly;
-		}
-		public Stream GetStreamFromPath (string path) {
-			if (App.CurrentProject is CERoslynPlugin.SolutionProject sol) {
-				if (sol.StartupProject is CERoslynPlugin.MSBuildProject csprj) {
-					return csprj.GetStreamFromTargetPath (path);
-				}
-			}
-			return null;
-		}
 
 		#region Debug log
 		IList<DbgEvent> events;
diff --git a/plugins/CECrowPlugin/src/DebugInterface.cs b/plugins/CECrowPlugin/src/DebugInterface.cs
index cffbc91..f179d25 100644
--- a/plugins/CECrowPlugin/src/DebugInterface.cs
+++ b/plugins/CECrowPlugin/src/DebugInterface.cs
@@ -38,12 +38,12 @@ namespace CECrowPlugin
 		public bool Terminate;
 		string source;
 		Action delRegisterForRepaint;//call RegisterForRepaint in the container widget (DebugInterfaceWidget)
-		Action<Exception> delSetCurrentException;
+		Action<Exception> delCrowServiceSetCurrentException;
 
 		delegate void GetScreenCoordinateDelegateType(out int x, out int y);
-		GetScreenCoordinateDelegateType delGetScreenCoordinate;
-		Func<IEnumerable<object>> delGetStyling;
-		Func<string, Stream> delGetStreamFromPath;
+		GetScreenCoordinateDelegateType delCrowServiceGetScreenCoordinate;
+		Func<IEnumerable<object>> delCrowServiceGetStyling;
+		Func<string, Stream> delCrowServiceGetStreamFromPath;
 
 		void interfaceThread () {
 			while (!Terminate) {
@@ -73,7 +73,7 @@ namespace CECrowPlugin
 						Monitor.Exit (UpdateMutex);
 					while (Monitor.IsEntered(ClippingMutex))
 						Monitor.Exit (ClippingMutex);*/
-					delSetCurrentException (ex);
+					delCrowServiceSetCurrentException (ex);
 					Console.WriteLine ($"[DbgIFace] {ex}");
 					ClearInterface();
 					Thread.Sleep(1000);
@@ -85,19 +85,23 @@ namespace CECrowPlugin
 				Thread.Sleep (UPDATE_INTERVAL);
 			}
 		}
-		public IntPtr SurfacePointer {
+		public new IntPtr SurfacePointer {
 			get {
 				lock(UpdateMutex)
 					return surf.Handle;
 			}
 		}
-		public void RegisterDebugInterfaceCallback (object w){
-			Type t = w.GetType();
+		public void RegisterDebugInterfaceCallback (object crowService){
+			Type t = crowService.GetType();
 			//delRegisterForRepaint = (Action)Delegate.CreateDelegate(typeof(Action), w, t.GetMethod("RegisterForRepaint"));
-			delSetCurrentException = (Action<Exception>)Delegate.CreateDelegate(typeof(Action<Exception>), w, t.GetProperty("CurrentException").GetSetMethod());
-			delGetScreenCoordinate = (GetScreenCoordinateDelegateType)Delegate.CreateDelegate(typeof(GetScreenCoordinateDelegateType), w, t.GetMethod("GetMouseScreenCoordinates"));
-			delGetStyling = (Func<IEnumerable<object>>)Delegate.CreateDelegate (typeof (Func<IEnumerable<object>>), w, t.GetMethod ("GetStyling"));
-			delGetStreamFromPath = (Func<string, Stream>)Delegate.CreateDelegate (typeof (Func<string, Stream>), w, t.GetMethod ("GetStreamFromPath"));
+			delCrowServiceSetCurrentException = (Action<Exception>)Delegate.CreateDelegate(typeof(Action<Exception>), crowService,
+				t.GetProperty("CurrentException").GetSetMethod(true));
+			delCrowServiceGetScreenCoordinate = (GetScreenCoordinateDelegateType)Delegate.CreateDelegate(typeof(GetScreenCoordinateDelegateType), crowService,
+				t.GetMethod("getMouseScreenCoordinates", BindingFlags.Instance | BindingFlags.NonPublic));
+			delCrowServiceGetStyling = (Func<IEnumerable<object>>)Delegate.CreateDelegate (typeof (Func<IEnumerable<object>>), crowService,
+				t.GetMethod ("getStyling", BindingFlags.Instance | BindingFlags.NonPublic));
+			delCrowServiceGetStreamFromPath = (Func<string, Stream>)Delegate.CreateDelegate (typeof (Func<string, Stream>), crowService,
+				t.GetMethod ("getStreamFromPath", BindingFlags.Instance | BindingFlags.NonPublic));
 		}
 		/*public void ResetDirtyState () {
 			IsDirty = false;
@@ -107,7 +111,7 @@ namespace CECrowPlugin
 				if (source == value)
 					return;
 				source = value;
-				delSetCurrentException(null);
+				delCrowServiceSetCurrentException(null);
 				try
 				{
 					lock (UpdateMutex) {
@@ -121,18 +125,18 @@ namespace CECrowPlugin
 				}
 				catch (IML.InstantiatorException iTorEx)
 				{
-					delSetCurrentException(iTorEx.InnerException);
+					delCrowServiceSetCurrentException(iTorEx.InnerException);
 				}
 				catch (System.Exception ex)
 				{
-					delSetCurrentException(ex);
+					delCrowServiceSetCurrentException(ex);
 				}
 			}
 		}
 		void resetInterface () {
 			ClearInterface();
 			initDictionaries();
-			foreach (object style in delGetStyling ()) {
+			foreach (object style in delCrowServiceGetStyling ()) {
 				if (style is string stylePath)
 					LoadStyle (stylePath);
 				else if (style is Assembly styleAssembly)
@@ -164,7 +168,7 @@ namespace CECrowPlugin
 		}
 		public override void ForceMousePosition()
 		{
-			delGetScreenCoordinate(out int x, out int y);
+			delCrowServiceGetScreenCoordinate(out int x, out int y);
 			Glfw.Glfw3.SetCursorPosition (WindowHandle, x, y);
 		}
 
@@ -178,7 +182,7 @@ namespace CECrowPlugin
 
 		public override Stream GetStreamFromPath(string path)
 		{
-			Stream result = delGetStreamFromPath (path);
+			Stream result = delCrowServiceGetStreamFromPath (path);
 			if (result != null)
 				return result;
 			return base.GetStreamFromPath (path);
diff --git a/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs b/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
index 20b2705..13a5dcf 100644
--- a/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
+++ b/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
@@ -33,7 +33,7 @@ namespace Crow
 				NotifyValueChangedAuto (crowIFaceService);
 			}
 		}
-		Command CMDRefresh;
+		Command CMDRefresh, CMDZoomIn, CMDZoomOut;
 		public DebugInterfaceWidget () : base () {
 			CMDRefresh = new ActionCommand (this, "Refresh",
 				() => {
@@ -43,6 +43,20 @@ namespace Crow
 				},
 				"#icons.refresh.svg",
 				new KeyBinding (Key.F3));
+			CMDZoomIn = new ActionCommand ("Zoom in",
+				() => {
+					if (crowIFaceService != null) {
+						crowIFaceService.ZoomFactor *= 2.0;
+						RegisterForGraphicUpdate ();
+					}
+				}, "#icons.zoom-in.svg");
+			CMDZoomOut = new ActionCommand ("Zoom out",
+				() => {
+					if (crowIFaceService != null) {
+						crowIFaceService.ZoomFactor /= 2.0;
+						RegisterForGraphicUpdate ();
+					}
+				}, "#icons.zoom-out.svg");
 
 			Thread t = new Thread (backgroundThreadFunc);
 			t.IsBackground = true;
@@ -116,14 +130,13 @@ namespace Crow
 				new Command("Load from file", () => loadLogFromDebugLogFilePath ())
 			);*/
 		public CommandGroup WindowCommands => new CommandGroup (
-			CMDRefresh,
+			CMDRefresh, CMDZoomIn, CMDZoomOut,
 			crowIFaceService.CMDStartRecording,
 			crowIFaceService.CMDStopRecording,
 			crowIFaceService.CMDOpenConfig,
 			(Parent.LogicalParent as DockWindow).CMDClose
 		);
 
-
 		protected override void onDraw(Context gr)
 		{
 			Console.WriteLine("onDraw");
diff --git a/plugins/CECrowPlugin/src/ImlDocument.cs b/plugins/CECrowPlugin/src/ImlDocument.cs
index 1b4c1ad..72d5798 100644
--- a/plugins/CECrowPlugin/src/ImlDocument.cs
+++ b/plugins/CECrowPlugin/src/ImlDocument.cs
@@ -29,6 +29,7 @@ namespace CECrowPlugin
 				if (msbp.IsCrowProject)
 			}*/
 		}
+		protected override Tokenizer CreateTokenizer() => new ImlTokenizer ();
 
 		string[] allWidgetNames = typeof (Widget).Assembly.GetExportedTypes ().Where(t=>typeof(Widget).IsAssignableFrom (t))
 					.Select (s => s.Name).ToArray ();
diff --git a/plugins/CECrowPlugin/src/Parsing/ImlTokenizer.cs b/plugins/CECrowPlugin/src/Parsing/ImlTokenizer.cs
new file mode 100644
index 0000000..b3e4259
--- /dev/null
+++ b/plugins/CECrowPlugin/src/Parsing/ImlTokenizer.cs
@@ -0,0 +1,34 @@
+// Copyright (c) 2013-2021  Bruyère Jean-Philippe <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+
+using System;
+using Crow.Text;
+using System.Collections.Generic;
+using CrowEditBase;
+using CrowEdit.Xml;
+
+namespace CECrowPlugin
+{
+	public class ImlTokenizer : XmlTokenizer {
+		protected override void parseAttributeValue (ref SpanCharReader reader) {
+			char q = reader.Read();
+			addTok (ref reader, XmlTokenType.AttributeValueOpen);
+			while (!reader.EndOfSpan) {
+				if (reader.Eol()) {
+					addTok (ref reader, XmlTokenType.AttributeValue);
+					reader.ReadEol();
+					addTok (ref reader, XmlTokenType.LineBreak);
+					continue;
+				}
+				if (reader.TryPeak (q)) {
+					addTok (ref reader, XmlTokenType.AttributeValue);
+					reader.Advance (1);
+					addTok (ref reader, XmlTokenType.AttributeValueClose);
+					return;
+				} else
+					reader.Read ();
+			}
+		}
+	}
+}
diff --git a/plugins/CECrowPlugin/src/StyleParsing/StyleTokenType.cs b/plugins/CECrowPlugin/src/Parsing/StyleTokenType.cs
similarity index 100%
rename from plugins/CECrowPlugin/src/StyleParsing/StyleTokenType.cs
rename to plugins/CECrowPlugin/src/Parsing/StyleTokenType.cs
diff --git a/plugins/CECrowPlugin/src/StyleParsing/StyleTokenizer.cs b/plugins/CECrowPlugin/src/Parsing/StyleTokenizer.cs
similarity index 100%
rename from plugins/CECrowPlugin/src/StyleParsing/StyleTokenizer.cs
rename to plugins/CECrowPlugin/src/Parsing/StyleTokenizer.cs
diff --git a/plugins/CECrowPlugin/src/StyleParsing/SyntaxAnalyser.cs b/plugins/CECrowPlugin/src/Parsing/SyntaxAnalyser.cs
similarity index 100%
rename from plugins/CECrowPlugin/src/StyleParsing/SyntaxAnalyser.cs
rename to plugins/CECrowPlugin/src/Parsing/SyntaxAnalyser.cs
diff --git a/plugins/CECrowPlugin/src/StyleParsing/SyntaxNodes.cs b/plugins/CECrowPlugin/src/Parsing/SyntaxNodes.cs
similarity index 100%
rename from plugins/CECrowPlugin/src/StyleParsing/SyntaxNodes.cs
rename to plugins/CECrowPlugin/src/Parsing/SyntaxNodes.cs
diff --git a/plugins/CECrowPlugin/ui/winConfiguration.crow b/plugins/CECrowPlugin/ui/winConfiguration.crow
index 8ad2c70..8ca5a54 100644
--- a/plugins/CECrowPlugin/ui/winConfiguration.crow
+++ b/plugins/CECrowPlugin/ui/winConfiguration.crow
@@ -22,9 +22,10 @@
 			IsVisible="{ServiceIsInError}"/>
 		<ListBox Style="ScrollingListBox" Data="{CrowAssemblies}"/>
 		<HorizontalStack Height="Fit" Width="Fit" HorizontalAlignment="Right">
-			<Button Command="{CMDOptions_AddCrowAssembly}"/>
-			<Button Command="{CMDOptions_AddCrowAssembly}"/>
+			<Button Command="{CMDOptions_AddCrowAssembly}" Fit="true"/>
+			
 		</HorizontalStack>
+		<Spinner Caption="Zoom Factor" Value="{²ZoomFactor}" Minimum="0.2" Maximum="4.0" SmallIncrement="0.1" LargeIncrement="0.2"/>
 		<Spinner Caption="Refresh Rate (ms)" Value="{²RefreshRate}" Maximum="1000"/>
 		<Spinner Caption="Max Layout Try" Value="{²MaxLayoutingTries}" Maximum="1000"/>
 		<Spinner Caption="Max Layout Discard" Value="{²MaxDiscardCount}" Maximum="1000"/>
diff --git a/plugins/CERoslynPlugin/CERoslynPlugin.csproj b/plugins/CERoslynPlugin/CERoslynPlugin.csproj
index 2986f3b..03295c0 100644
--- a/plugins/CERoslynPlugin/CERoslynPlugin.csproj
+++ b/plugins/CERoslynPlugin/CERoslynPlugin.csproj
@@ -2,9 +2,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-		<EnableDefaultItems>false</EnableDefaultItems>		
+		<EnableDefaultItems>false</EnableDefaultItems>
 	</PropertyGroup>
-	
+
 	<ItemGroup>
 		<Compile Include="src\**\*.cs" />
 		<EmbeddedResource Include="ui\**\*.*" />
@@ -41,7 +41,7 @@
 		</PackageReference>
 	</ItemGroup>
 
-	<ItemGroup>    
+	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.7.*" >
 			<IncludeAssets>all</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
@@ -55,5 +55,5 @@
 			<Visible>False</Visible>
 		</PackageReference>
 		<!--<PackageReference Include="Microsoft.VisualStudio.TestPlatform.ObjectModel" />-->
-	</ItemGroup>	
+	</ItemGroup>
 </Project>
diff --git a/plugins/CERoslynPlugin/src/CELogger.cs b/plugins/CERoslynPlugin/src/CELogger.cs
index 0d41c96..c935394 100644
--- a/plugins/CERoslynPlugin/src/CELogger.cs
+++ b/plugins/CERoslynPlugin/src/CELogger.cs
@@ -13,8 +13,14 @@ using static CrowEditBase.CrowEditBase;
 
 namespace CERoslynPlugin
 {
-	internal class CELogger : ILogger
-	{
+	internal class CELogger : ILogger, IValueChange {
+		#region IValueChange implementation
+		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+		public void NotifyValueChanged (string MemberName, object _value)
+		{
+			ValueChanged.Raise (this, new ValueChangeEventArgs (MemberName, _value));
+		}
+		#endregion
 		IEventSource eventSource;
 		LoggerVerbosity verbosity;
 		MessageImportance maxMsgImportance;
@@ -24,18 +30,32 @@ namespace CERoslynPlugin
 			set {
 				if (verbosity == value)
 					return;
-				if (eventSource != null)
-					unregisterHandles ();
 				verbosity = value;
-				if (eventSource != null)
-					registerHandles ();
+				NotifyValueChanged ("Verbosity", verbosity);
+				Configuration.Global.Set<Microsoft.Build.Framework.LoggerVerbosity> ("CERoslyn.LoggerVerbosity", verbosity);
+
+				switch (verbosity) {
+				case LoggerVerbosity.Minimal:
+					maxMsgImportance = MessageImportance.High;
+					break;
+				case LoggerVerbosity.Normal:
+					maxMsgImportance = MessageImportance.High;
+					break;
+				case LoggerVerbosity.Detailed:
+					maxMsgImportance = MessageImportance.Normal;
+					break;
+				case LoggerVerbosity.Diagnostic:
+					maxMsgImportance = MessageImportance.Low;
+					break;
+				}
+
 			}
 		}
 		public string Parameters { get; set; }
 
 		public CELogger (LoggerVerbosity verbosity = LoggerVerbosity.Detailed)
 		{
-			this.verbosity = verbosity;
+			Verbosity = verbosity;
 		}
 		public void Initialize (IEventSource eventSource) {
 			this.eventSource = eventSource;
@@ -49,34 +69,12 @@ namespace CERoslynPlugin
 			eventSource.BuildStarted += EventSource_Progress_BuildStarted;
 			eventSource.BuildFinished += EventSource_Progress_BuildFinished;
 			eventSource.MessageRaised += EventSource_MessageRaised;
-
-			switch (Verbosity) {
-			case LoggerVerbosity.Minimal:
-				maxMsgImportance = MessageImportance.High;
-
-				break;
-			case LoggerVerbosity.Normal:
-				maxMsgImportance = MessageImportance.Normal;
-
-				eventSource.ProjectStarted += EventSource_ProjectStarted;
-				eventSource.ProjectFinished += EventSource_ProjectFinished;
-				break;
-			case LoggerVerbosity.Detailed:
-				maxMsgImportance = MessageImportance.Normal;
-
-				eventSource.ProjectStarted += EventSource_ProjectStarted;
-				eventSource.ProjectFinished += EventSource_ProjectFinished;
-				eventSource.TargetStarted += EventSource_TargetStarted;
-				eventSource.TargetFinished += EventSource_TargetFinished;
-				eventSource.TaskStarted += EventSource_TaskStarted;
-				eventSource.TaskFinished += EventSource_TaskFinished;
-				break;
-			case LoggerVerbosity.Diagnostic:
-				maxMsgImportance = MessageImportance.Low;
-
-				eventSource.AnyEventRaised += EventSource_AnyEventRaised;
-				break;
-			}
+			eventSource.ProjectStarted += EventSource_ProjectStarted;
+			eventSource.ProjectFinished += EventSource_ProjectFinished;
+			eventSource.TargetStarted += EventSource_TargetStarted;
+			eventSource.TargetFinished += EventSource_TargetFinished;
+			eventSource.TaskStarted += EventSource_TaskStarted;
+			eventSource.TaskFinished += EventSource_TaskFinished;
 		}
 
 		void unregisterHandles () {
@@ -85,24 +83,12 @@ namespace CERoslynPlugin
 			eventSource.BuildStarted -= EventSource_Progress_BuildStarted;
 			eventSource.BuildFinished -= EventSource_Progress_BuildFinished;
 			eventSource.MessageRaised -= EventSource_MessageRaised;
-
-			switch (Verbosity) {
-			case LoggerVerbosity.Normal:
-				eventSource.ProjectStarted -= EventSource_ProjectStarted;
-				eventSource.ProjectFinished -= EventSource_ProjectFinished;
-				break;
-			case LoggerVerbosity.Detailed:
-				eventSource.ProjectStarted -= EventSource_ProjectStarted;
-				eventSource.ProjectFinished -= EventSource_ProjectFinished;
-				eventSource.TargetStarted -= EventSource_TargetStarted;
-				eventSource.TargetFinished -= EventSource_TargetFinished;
-				eventSource.TaskStarted -= EventSource_TaskStarted;
-				eventSource.TaskFinished -= EventSource_TaskFinished;
-				break;
-			case LoggerVerbosity.Diagnostic:
-				eventSource.AnyEventRaised -= EventSource_AnyEventRaised;
-				break;
-			}
+			eventSource.ProjectStarted -= EventSource_ProjectStarted;
+			eventSource.ProjectFinished -= EventSource_ProjectFinished;
+			eventSource.TargetStarted -= EventSource_TargetStarted;
+			eventSource.TargetFinished -= EventSource_TargetFinished;
+			eventSource.TaskStarted -= EventSource_TaskStarted;
+			eventSource.TaskFinished -= EventSource_TaskFinished;
 		}
 		void log (LogType type, string message) {
 			string[] lines = Regex.Split (message, "\r\n|\r|\n");//|\r|\n|\\\\n");
@@ -120,22 +106,26 @@ namespace CERoslynPlugin
 		}
 
 		private void EventSource_TaskFinished (object sender, TaskFinishedEventArgs e) {
-			log (LogType.Custom1, e.Message);
+			if (Verbosity == LoggerVerbosity.Diagnostic)
+				log (LogType.Custom1, e.Message);
 		}
 
 		private void EventSource_TaskStarted (object sender, TaskStartedEventArgs e) {
-			log (LogType.Custom1, e.Message);
+			if (Verbosity == LoggerVerbosity.Diagnostic)
+				log (LogType.Custom1, e.Message);
 		}
 
 		private void EventSource_TargetFinished (object sender, TargetFinishedEventArgs e) {
-			log (LogType.Custom2, e.Message);
+			if (Verbosity >= LoggerVerbosity.Detailed)
+				log (LogType.Custom2, e.Message);
 		}
 
 		private void EventSource_TargetStarted (object sender, TargetStartedEventArgs e) {
-			log (LogType.Custom2, e.Message);
+			if (Verbosity >= LoggerVerbosity.Detailed)
+				log (LogType.Custom2, e.Message);
 		}
 		private void EventSource_MessageRaised (object sender, BuildMessageEventArgs e) {
-			if (e.Importance > maxMsgImportance)
+			if (Verbosity == LoggerVerbosity.Quiet || e.Importance > maxMsgImportance)
 				return;
 			if (e.Importance == MessageImportance.High)
 				log (LogType.High, e.Message);
@@ -144,23 +134,6 @@ namespace CERoslynPlugin
 			else
 				log (LogType.Low, e.Message);
 		}
-		private void EventSource_AnyEventRaised (object sender, BuildEventArgs e) {
-			if (e is BuildErrorEventArgs ||
-					e is BuildWarningEventArgs ||
-					e is BuildStartedEventArgs ||
-					e is BuildMessageEventArgs ||
-					e is BuildFinishedEventArgs)
-				return;
-			else if (e is TargetFinishedEventArgs || e is TargetStartedEventArgs)
-				log (LogType.Custom2, e.Message);
-			else if (e is TaskStartedEventArgs || e is TaskFinishedEventArgs)
-				log (LogType.Custom1, e.Message);
-			else if (e is BuildStatusEventArgs)
-				log (LogType.High, e.Message);
-			else
-				log (LogType.Custom3, e.Message);
-		}
-
 		void EventSource_ProjectStarted (object sender, ProjectStartedEventArgs e)
 		{
 			log (LogType.Custom3, e.Message);
diff --git a/plugins/CERoslynPlugin/src/MSBuildProject.cs b/plugins/CERoslynPlugin/src/MSBuildProject.cs
index 8041cec..6a6685a 100644
--- a/plugins/CERoslynPlugin/src/MSBuildProject.cs
+++ b/plugins/CERoslynPlugin/src/MSBuildProject.cs
@@ -23,6 +23,7 @@ using static CrowEditBase.CrowEditBase;
 using Project = CrowEditBase.Project;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using System.Threading.Tasks;
 
 namespace CERoslynPlugin
 {
@@ -43,6 +44,7 @@ namespace CERoslynPlugin
 		public CommandGroup CMDSBuild { get; private set; }
 		public Command CMDSetAsStartupProject { get; private set; }
 
+		BuildResult lastBuildResult;
 
 		internal MSBuildProject (SolutionProject solution, ProjectInSolution projectInSolution) : base (projectInSolution.AbsolutePath) {
 			this.projectInSolution = projectInSolution;
@@ -114,22 +116,7 @@ namespace CERoslynPlugin
 				Console.WriteLine (ex);
 			}
 		}
-		void printEvaluatedProperties (ProjectInstance pi) {
-			Console.ForegroundColor = ConsoleColor.Green;
-			Console.WriteLine ($"Evaluated Globals properties for {Name}");
-			foreach (ProjectPropertyInstance item in pi.Properties.OrderBy (p => p.Name)) {
-				Console.ForegroundColor = ConsoleColor.White;
-				Console.Write ($"\t{item.Name,-40} = ");
-				Console.ForegroundColor = ConsoleColor.Gray;
-				Console.WriteLine ($"{item.EvaluatedValue}");
 
-			}
-			ICollection<ProjectItemInstance> pii = pi.GetItems ("InnerOutput");
-			ProjectRootElement pre = pi.ToProjectRootElement();
-			pre.FullPath = "/home/jp/test.csproj";
-			pre.Save();
-
-		}
 		public override void Unload () {
 			CMDSBuild.ToggleAllCommand (false);
 			if (commands.Contains (CMDSetAsStartupProject))
@@ -150,14 +137,27 @@ namespace CERoslynPlugin
 				BuildRequestData request = new BuildRequestData (pi, targets, null,
 					BuildRequestDataFlags.ProvideProjectStateAfterBuild);
 
-				BuildResult result = BuildManager.DefaultBuildManager.Build (solutionProject.buildParams, request);
+				lastBuildResult = BuildManager.DefaultBuildManager.Build (solutionProject.buildParams, request);
 
-				printEvaluatedProperties (result.ProjectStateAfterBuild);
+				printEvaluatedProperties (lastBuildResult.ProjectStateAfterBuild);
 
-				var test = result.ProjectStateAfterBuild.GetItems ("Reference");
+				var test = lastBuildResult.ProjectStateAfterBuild.GetItems ("Reference");
+
+				Console.WriteLine (IsCrowProject);
 
 			//}
 		}
+		public async void DesignBuild () {
+			lastBuildResult = await Task.Run (()=> designBuild());
+		}
+		BuildResult designBuild () {
+			string[] targets = {"Build"};
+			BuildManager.DefaultBuildManager.ResetCaches ();
+			ProjectInstance pi = BuildManager.DefaultBuildManager.GetProjectInstanceForBuild (project);
+			BuildRequestData request = new BuildRequestData (pi, targets, null,
+				BuildRequestDataFlags.ProvideProjectStateAfterBuild);
+			return BuildManager.DefaultBuildManager.Build (solutionProject.buildParams, request);
+		}
 		public override string Icon {
 			get {
 				switch (Path.GetExtension (FullPath)) {
@@ -171,7 +171,7 @@ namespace CERoslynPlugin
 
 		public bool IsCrowProject {
 			get {
-				foreach (ProjectItemNode reference in Childs[0].Flatten.OfType<ProjectItemNode>()) {
+				/*foreach (ProjectItemNode reference in Childs[0].Flatten.OfType<ProjectItemNode>()) {
 					switch (reference.NodeType)	{
 						case NodeType.PackageReference:
 							if (reference.Caption == "Crow")
@@ -182,11 +182,15 @@ namespace CERoslynPlugin
 								return true;
 							break;
 					}
+				}*/
+				if (lastBuildResult != null) {
+					var references = lastBuildResult.ProjectStateAfterBuild.GetItems ("Reference");
+					return references.Any (r=>r.GetMetadataValue("PackageName") == "Crow");
 				}
 				return false;
 			}
 		}
-		public bool IsStartupProject => solutionProject.StartupProject == this;
+		public override string StatusIcon => solutionProject.StartupProject == this ? "#icons.startup.svg" : null;
 		public override bool ContainsFile (string fullPath) =>
 			Flatten.OfType<ProjectItemNode> ().Any (f => f.FullPath == fullPath);
 
@@ -328,5 +332,25 @@ namespace CERoslynPlugin
 			}
 			return null;
 		}
+
+
+#region debug
+		void printEvaluatedProperties (ProjectInstance pi) {
+			Console.ForegroundColor = ConsoleColor.Green;
+			Console.WriteLine ($"Evaluated Globals properties for {Name}");
+			foreach (ProjectPropertyInstance item in pi.Properties.OrderBy (p => p.Name)) {
+				Console.ForegroundColor = ConsoleColor.White;
+				Console.Write ($"\t{item.Name,-40} = ");
+				Console.ForegroundColor = ConsoleColor.Gray;
+				Console.WriteLine ($"{item.EvaluatedValue}");
+
+			}
+			ICollection<ProjectItemInstance> pii = pi.GetItems ("InnerOutput");
+			ProjectRootElement pre = pi.ToProjectRootElement();
+			pre.FullPath = "/home/jp/test.csproj";
+			pre.Save();
+
+		}
+#endregion
 	}
 }
\ No newline at end of file
diff --git a/plugins/CERoslynPlugin/src/RoslynService.cs b/plugins/CERoslynPlugin/src/RoslynService.cs
index 53bdf25..3652ec8 100644
--- a/plugins/CERoslynPlugin/src/RoslynService.cs
+++ b/plugins/CERoslynPlugin/src/RoslynService.cs
@@ -18,8 +18,17 @@ using Crow;
 namespace CERoslynPlugin
 {
 	public class RoslynService : Service {
-		internal CELogger Logger { get; private set; }
-		public LogLevel LogLevel {
+		CELogger logger;
+		internal CELogger Logger {
+			get => logger;
+			private set {
+				if (logger == value)
+					return;
+				logger = value;
+				NotifyValueChanged (logger);
+			}
+		}
+		/*public LogLevel LogLevel {
 			get => Crow.Configuration.Global.Get<LogLevel>("LogLevel");
 			set {
 				if (LogLevel == value)
@@ -44,7 +53,7 @@ namespace CERoslynPlugin
 				Logger.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic;
 				break;
 			}
-		}
+		}*/
 
 		public RoslynService () : base () {
 			configureDefaultSDKPathes ();
@@ -76,8 +85,10 @@ namespace CERoslynPlugin
 		}
 
 		public override void Start() {
-			Logger = new CELogger ();
-			updateLogLevel ();
+			Logger = new CELogger (
+				Configuration.Global.Get<Microsoft.Build.Framework.LoggerVerbosity> ("CERoslyn.LoggerVerbosity",
+					Microsoft.Build.Framework.LoggerVerbosity.Normal));
+			//updateLogLevel ();
 
 			Environment.SetEnvironmentVariable ("MSBUILD_EXE_PATH", Path.Combine (MSBuildRoot, "MSBuild.dll"));
 			Environment.SetEnvironmentVariable ("MSBuildSDKsPath", Path.Combine (MSBuildRoot, "Sdks"));
diff --git a/plugins/CERoslynPlugin/src/SolutionProject.cs b/plugins/CERoslynPlugin/src/SolutionProject.cs
index 5cfd86c..735a380 100644
--- a/plugins/CERoslynPlugin/src/SolutionProject.cs
+++ b/plugins/CERoslynPlugin/src/SolutionProject.cs
@@ -31,7 +31,7 @@ namespace CERoslynPlugin
 
 			Load();
 
-			if (Flatten.OfType<MSBuildProject>().Any (msb => msb.IsCrowProject)) {
+			if (FlattenProjetcs.OfType<MSBuildProject>().Any (msb => msb.IsCrowProject)) {
 				Console.WriteLine ("Is crow project!!");
 			}
 		}
@@ -62,28 +62,34 @@ namespace CERoslynPlugin
 			}*/
 		}
 		public override bool ContainsFile (string fullPath) =>
-				FlattenSubProjetcs.Any (f => f.ContainsFile (fullPath));
+				FlattenProjetcs.Any (f => f.ContainsFile (fullPath));
 		public override string Name => Path.GetFileNameWithoutExtension (FullPath);
 		public override string Icon => "#icons.file_type_sln2.svg";
 		public Project StartupProject {
-			get => FlattenSubProjetcs.FirstOrDefault (p => p.FullPath == UserConfig.Get<string> ("StartupProject"));
+			get => FlattenProjetcs.FirstOrDefault (p => p.FullPath == UserConfig.Get<string> ("StartupProject"));
 			set {
 				if (value == StartupProject)
 					return;
 
-				StartupProject?.NotifyValueChanged ("IsStartupProject", false);
+				StartupProject?.NotifyValueChanged ("StatusIcon", (object)StartupProject?.StatusIcon);
 
 				if (value == null)
 					UserConfig.Set ("StartupProject", "");
 				else {
 					UserConfig.Set ("StartupProject", value.FullPath);
-					value.NotifyValueChanged("IsStartupProject", true);
+					value.NotifyValueChanged ("StatusIcon", (object)value.StatusIcon);
 				}
 				NotifyValueChanged ("StartupProject", StartupProject);
 			}
 		}
 
 		public override NodeType NodeType => NodeType.ProjectGroup;
+		public override IEnumerable<Project> FlattenProjetcs {
+			get {
+				foreach (var node in SubProjetcs.SelectMany (sp => sp.FlattenProjetcs))
+					yield return node;
+			}
+		}
 
 		public override void Load () {
 			Dictionary<string,string> globalProperties = new Dictionary<string, string>();
@@ -121,7 +127,8 @@ namespace CERoslynPlugin
 				LogInitialPropertiesAndItems = true,
 				LogTaskInputs = true,
 				UseSynchronousLogging = true,
-				ResetCaches = true
+				ResetCaches = true,
+				DetailedSummary = true
 			};
 
 			//projectCollection.IsBuildEnabled = false;
@@ -169,6 +176,9 @@ namespace CERoslynPlugin
 			}
 
 			IsLoaded = true;
+
+			if (StartupProject is MSBuildProject msbProj)
+				msbProj?.DesignBuild();
 		}
 
 		void build (params string[] targets) {
diff --git a/plugins/CERoslynPlugin/ui/MSBuildProjectNode.template b/plugins/CERoslynPlugin/ui/MSBuildProjectNode.template
index 46cd438..d2589de 100644
--- a/plugins/CERoslynPlugin/ui/MSBuildProjectNode.template
+++ b/plugins/CERoslynPlugin/ui/MSBuildProjectNode.template
@@ -20,7 +20,7 @@
 					<Image Style="TreeIcon"
 						Path="{Icon}" SvgSub="{IconSub}"/>
 					<Label Style="TreeLabel" Text="{./Caption}"/>
-					<Image Style="TreeIconSmall"	Path="#icons.startup.svg" IsVisible="{IsStartupProject}"/>
+					<Image Style="TreeIconSmall" Path="#icons.startup.svg" IsVisible="{IsStartupProject}"/>
 				</HorizontalStack>
 			</ListItem>
 			<Container Name="Content" Visible="false"/>
diff --git a/plugins/CERoslynPlugin/ui/winConfiguration.crow b/plugins/CERoslynPlugin/ui/winConfiguration.crow
index 57fb382..b8875bc 100644
--- a/plugins/CERoslynPlugin/ui/winConfiguration.crow
+++ b/plugins/CERoslynPlugin/ui/winConfiguration.crow
@@ -11,7 +11,7 @@
 			<TextBox Width="Stretched" Text="{²MSBuildRoot}"/>
 			<Button Command="{CMDOptions_SelectMSBuildRoot}" MinimumSize="0,0"/>
 		</HorizontalStack>
-		<EnumSelector Caption="Log Level" EnumValue="{²LogLevel}" />
+		<EnumSelector DataSource="{Logger}" Caption="Log Level" EnumValue="{²Verbosity}" />
 	</VerticalStack>
 </DockWindow>
 
diff --git a/plugins/CEXmlPlugin/src/Parsing/XmlTokenizer.cs b/plugins/CEXmlPlugin/src/Parsing/XmlTokenizer.cs
index a349a7f..fd97073 100644
--- a/plugins/CEXmlPlugin/src/Parsing/XmlTokenizer.cs
+++ b/plugins/CEXmlPlugin/src/Parsing/XmlTokenizer.cs
@@ -110,8 +110,8 @@ namespace CrowEdit.Xml
 						addTok (ref reader, XmlTokenType.ElementOpen);
 						if (readName (ref reader)) {
 							addTok (ref reader, XmlTokenType.ElementName);
-							curState = States.StartTag;
 						}
+						curState = States.StartTag;
 					}
 					break;
 				case '?':
@@ -127,12 +127,21 @@ namespace CrowEdit.Xml
 				case '"':
 					char q = reader.Read();
 					addTok (ref reader, XmlTokenType.AttributeValueOpen);
-					if (reader.TryReadUntil (q)) {
-						addTok (ref reader, XmlTokenType.AttributeValue);
-						reader.Advance ();
-						addTok (ref reader, XmlTokenType.AttributeValueClose);
-					} else
-						addTok (ref reader, XmlTokenType.AttributeValue);
+					while (!reader.EndOfSpan) {
+						if (reader.Eol()) {
+							addTok (ref reader, XmlTokenType.AttributeValue);
+							reader.ReadEol();
+							addTok (ref reader, XmlTokenType.LineBreak);
+							continue;
+						}
+						if (reader.TryPeak (q)) {
+							addTok (ref reader, XmlTokenType.AttributeValue);
+							reader.Advance (1);
+							addTok (ref reader, XmlTokenType.AttributeValueClose);
+							break;
+						} else
+							reader.Read ();
+					}
 					break;
 				case '=':
 					reader.Advance();
diff --git a/src/CrowEdit.cs b/src/CrowEdit.cs
index aedb6af..0b303e5 100644
--- a/src/CrowEdit.cs
+++ b/src/CrowEdit.cs
@@ -79,7 +79,6 @@ namespace CrowEdit
 			base.OnInitialized ();
 
 			loadPlugins ();
-			reopenLastProjectList ();
 
 			SetWindowIcon ("#Crow.Icons.crow.png");
 
@@ -95,6 +94,8 @@ namespace CrowEdit
 
 			reloadWinConfigs ();
 
+			reopenLastProjectList ();
+
 			reopenLastDocumentList ();
 		}
 		public override void Terminate()
diff --git a/ui/main.crow b/ui/main.crow
index cbc0924..caa59ca 100755
--- a/ui/main.crow
+++ b/ui/main.crow
@@ -6,7 +6,7 @@
 			<MenuItem Data="{Commands}" Width="Fit" IsEnabled="{CanExecute}"
 						ItemTemplate="#ui.MenuItem.itmp">
 				<Template>
-					<Popper PopDirection="Bottom" Caption="{Caption}" Width="Fit" 
+					<Popper PopDirection="Bottom" Caption="{Caption}" Width="Fit"
 									MouseEnter="{Background=${ControlHighlight}}"
 									MouseLeave="{Background=Transparent}">
 						<Template>
@@ -17,7 +17,7 @@
 					</Popper>
 				</Template>
 			</MenuItem>
-		</ItemTemplate>	
+		</ItemTemplate>
 	</Menu>
 	<DockStack Name="mainDock"  RootDataLevel="true" Background="DarkGrey"/>
 </VerticalStack>
diff --git a/ui/windows/winProjects.crow b/ui/windows/winProjects.crow
index b646c6e..6f4d5fc 100644
--- a/ui/windows/winProjects.crow
+++ b/ui/windows/winProjects.crow
@@ -36,9 +36,10 @@
 		</ItemTemplate>
 
 		<!--<ItemTemplate DataType="CERoslynPlugin.MSBuildProject" Data="Childs" Path="#CERoslynPlugin.ui.MSBuildProjectNode.template" />-->
-		<ItemTemplate DataType="CrowEditBase.VirtualNode" Data="Childs" Path="#ui.TreeExpandable.template" />
 
+		<ItemTemplate DataType="CrowEditBase.VirtualNode" Data="Childs" Path="#ui.TreeExpandable.template" />
 		<ItemTemplate DataType="CrowEditBase.Project" Data="Childs" Path="#ui.TreeExpandable.template" />
+
 		<!--<ItemTemplate DataType="CrowEditBase.TreeNode" DataTest="NodeType" Data="Childs" Path="#ui.TreeExpandable.template" />-->
 	</TreeView>
 </DockWindow>
-- 
2.47.3