From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Thu, 6 Mar 2025 13:32:54 +0000 (+0100)
Subject: exceptions highlight, controled update loop
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=e5d65bbc9bd48b45291eae4279e15beb5a7cd03d;p=jp%2Fcrowedit.git

exceptions highlight, controled update loop
---

diff --git a/CrowEditBase/src/Compiler/SourceDocument.cs b/CrowEditBase/src/Compiler/SourceDocument.cs
index a341853..b7126be 100644
--- a/CrowEditBase/src/Compiler/SourceDocument.cs
+++ b/CrowEditBase/src/Compiler/SourceDocument.cs
@@ -18,11 +18,12 @@ namespace CrowEditBase
 		}
 		protected SyntaxRootNode root;
 
-
 		public Command CMDRefreshSyntaxTree;
+
         protected override void initCommands()
         {
             base.initCommands();
+
 			CMDRefreshSyntaxTree = new ActionCommand ("Reparse", parse, "#icons.refresh.svg", true);
         }
         public SyntaxRootNode Root => root;
@@ -152,5 +153,13 @@ namespace CrowEditBase
 			//CrowEditBase.App.Log (LogType.Low, $"Syntax Analysis done in {sw.ElapsedMilliseconds}(ms) {sw.ElapsedTicks}(ticks)");
 		}
 
+		public SyntaxException CurrentException {
+			get => CrowEditBase.App.CurrentException;
+			set {
+				CrowEditBase.App.CurrentException = value;
+				SetLocation(value.Location);
+			} 
+		}
+
 	}
 }
\ No newline at end of file
diff --git a/CrowEditBase/src/CrowEditBase.cs b/CrowEditBase/src/CrowEditBase.cs
index 9dd7833..8af5540 100644
--- a/CrowEditBase/src/CrowEditBase.cs
+++ b/CrowEditBase/src/CrowEditBase.cs
@@ -193,6 +193,8 @@ namespace CrowEditBase
 			return false;
 		}
 
+		public CommandGroup SyntaxViewCommands => 
+			currentDocument is SourceDocument src ? new CommandGroup (src.CMDRefreshSyntaxTree) : null;
 		public Document CurrentDocument {
 			get => currentDocument;
 			set {
@@ -214,6 +216,7 @@ namespace CrowEditBase
 				EditCommands[0] = currentDocument.CMDUndo;
 				EditCommands[1] = currentDocument.CMDRedo;
 
+				NotifyValueChanged("SyntaxViewCommands", SyntaxViewCommands);
 			}
 		}
 		public Project CurrentProject {
@@ -240,6 +243,16 @@ namespace CrowEditBase
 				EditCommands[4] = currentEditor.CMDPaste;
 			}
 		}
+		SyntaxException currentException;
+		public SyntaxException CurrentException {
+			get => currentException;
+			set {
+				if (currentException == value)
+					return;
+				currentException = value;
+				NotifyValueChanged(currentException);
+			}
+		} 
 		public string CurrentDir {
 			get => Configuration.Global.Get<string>("CurrentDir");
 			set {
@@ -552,7 +565,6 @@ namespace CrowEditBase
 				CurrentEditor?.RegisterForGraphicUpdate ();
 			}
 		}
-
 		public bool IndentWithSpace {
 			get => Configuration.Global.Get<bool> ("IndentWithSpace", false);
 			set {
diff --git a/CrowEditBase/src/LogViewerWidget.cs b/CrowEditBase/src/LogViewerWidget.cs
index 835d2f4..898435b 100644
--- a/CrowEditBase/src/LogViewerWidget.cs
+++ b/CrowEditBase/src/LogViewerWidget.cs
@@ -136,7 +136,7 @@ namespace Crow
 				lock (filteredLinesMutex) {
 					//Console.WriteLine("updatefilteredlines");
 					lock (logger.LogMutext)
-						filteredLines = logger.log.Where (l=>((int)l.Type & (int)filter) > 0);
+						filteredLines = logger.log.Where (l=>((int)l.Type & (int)filter) > 0).ToArray();
 					MaxScrollY = filteredLines == null ? 0 : filteredLines.Count() - visibleLines;
 					NotifyValueChanged ("ChildHeightRatio", Math.Min (1.0, (double)visibleLines / filteredLines.Count()));
 				}
@@ -318,7 +318,7 @@ namespace Crow
 
 			IEnumerable<LogEntry> entries;
 			lock (filteredLinesMutex) {
-				entries = filteredLines.Skip(ScrollY).Take(visibleLines);
+				entries = filteredLines.Skip(ScrollY).Take(visibleLines).ToArray();
 			}
 
 			//perf.Restart();
diff --git a/CrowEditBase/src/SourceEditor.cs b/CrowEditBase/src/SourceEditor.cs
index 8775135..27b4d16 100644
--- a/CrowEditBase/src/SourceEditor.cs
+++ b/CrowEditBase/src/SourceEditor.cs
@@ -104,7 +104,7 @@ namespace CrowEditBase
 										<!--<Label Text='{Caption}' HorizontalAlignment='Left' Width='Stretched'/>-->
 									</ListItem>
 								</ItemTemplate>
-								<ItemTemplate DataType='CrowEditBase.ColorSuggestion'>
+								<ItemTemplate DataType='CECrowPlugin.ColorSuggestion'>
 									<ListItem Height='Fit' Margin='0' Focusable='false' HorizontalAlignment='Left' Width='Stretched'
 																	Selected = '{Background=${ControlHighlight}}'
 																	Unselected = '{Background=Transparent}'>
@@ -112,7 +112,6 @@ namespace CrowEditBase
 											<Image Margin='6' Path='{Icon}' Width='32' Height='24' Background='{Fill}' CornerRadius='2'/>
 											<Label Text='{Caption}' HorizontalAlignment='Left' Width='Stretched'/>
 										</HorizontalStack>
-										<!--<Label Text='{Caption}' HorizontalAlignment='Left' Width='Stretched'/>-->
 									</ListItem>
 								</ItemTemplate>
 							</ListBox>
@@ -646,6 +645,7 @@ namespace CrowEditBase
 				
 				int printedLines = 0;
 				int linesToSkip = (int)Math.Floor(ScrollY / lineHeight);
+
 				
 				IEnumerator<SyntaxNode> foldsEnum = doc.Root.VisibleFoldableNodes.GetEnumerator ();
 				bool notEndOfFolds = foldsEnum.MoveNext();
@@ -659,7 +659,14 @@ namespace CrowEditBase
 				int curLine = linesToSkip;
 				pixY = -(ScrollY % lineHeight);
 
+				IEnumerator<int> exceptionLines = doc.Root.GetAllExceptions()?.Select(e=>e.Location.Line).Order().GetEnumerator();
+				bool hasExceptions = exceptionLines.MoveNext();
+
 				while (curLine < doc.LinesCount && printedLines < Math.Min(visibleLines, doc.LinesCount)) {
+
+					while (hasExceptions && exceptionLines.Current < curLine) {
+						hasExceptions = exceptionLines.MoveNext();
+					}
 										
 					int encodedChar = 0;
 					TextLine curTxtLine = doc.GetLine (curLine);
@@ -722,7 +729,14 @@ namespace CrowEditBase
 						fillHighlight (gr, curLine, hoverNodeStart.Value, hoverNodeEnd.Value, lineRect, new Color(0,0,0.8,0.1));;
 #endif
 					if (selectionNotEmpty && curLine >= selStart.Line && curLine <= selEnd.Line)
-						fillHighlight (gr, curLine, selStart, selEnd, lineRect, SelectionBackground);				
+						fillHighlight (gr, curLine, selStart, selEnd, lineRect, SelectionBackground);
+					if (hasExceptions && exceptionLines.Current == curLine) {
+						gr.Operator = Operator.DestOver;
+						gr.SetSource (new Color(1.0,0,0.0,0.3));
+						gr.Rectangle (lineRect);
+						gr.Fill ();
+						gr.Operator = Operator.Over;						
+					}
 					
 					//Draw line numbering
 					if (printLineNumbers){
diff --git a/CrowEditBase/src/TextDocument.cs b/CrowEditBase/src/TextDocument.cs
index 3fa2d66..12fbf26 100644
--- a/CrowEditBase/src/TextDocument.cs
+++ b/CrowEditBase/src/TextDocument.cs
@@ -56,14 +56,14 @@ namespace CrowEditBase
 			registeredClients.Remove (client);
 			ExitWriteLock();
 		}
-		void notifyClients (TextChange tc, object triggeringClient = null) {
+		protected void notifyClients (TextChange tc, object triggeringClient = null) {
 			object[] clients = registeredClients.Keys.ToArray ();
 			for (int i = 0; i < clients.Length; i++) {
 				if (clients[i] != triggeringClient)
 					notifyClient (clients[i], tc);
 			}
 		}
-		void notifyClient (object client, TextChange tc) {
+		protected void notifyClient (object client, TextChange tc) {
 			if (registeredClients[client] == null)
 				registeredClients[client] = new List<TextChange> ();
 			registeredClients[client].Add (tc);
diff --git a/CrowEditBase/ui/DockWindow.template b/CrowEditBase/ui/DockWindow.template
index befd6e0..6cb14e8 100644
--- a/CrowEditBase/ui/DockWindow.template
+++ b/CrowEditBase/ui/DockWindow.template
@@ -5,6 +5,7 @@
 	<VerticalStack Spacing="0" Name="MoveHandle">
 		<HorizontalStack Visible="{./IsDockedInStack}" Height="Fit" Margin="1" Background="Jet" Width="Stretched">
 			<Label  Text="{./Caption}" TextAlignment="Left" Width="Stretched" Foreground="DimGrey" Font="${SmallUIFont}"/>
+			<ListBox Style="DockWinTitleBarIconMenu" Data="{./AdditionalCommands}"/>
 			<ListBox Style="DockWinTitleBarIconMenu" Data="{./DockCommands}"/>
 			<ListBox Style="DockWinTitleBarIconMenu" Data="{./Commands}"/>
 		</HorizontalStack>
@@ -13,6 +14,7 @@
 			<Widget Width="5"/>
 			<Image Margin="1" Width="10" Height="10" Path="{./Icon}"/>
 			<Label Width="Stretched" Foreground="White" Margin="1" TextAlignment="Left" Text="{./Caption}"  />
+			<ListBox Style="DockWinTitleBarIconMenu" Data="{./AdditionalCommands}"/>
 			<ListBox Style="DockWinTitleBarIconMenu" Data="{./DockCommands}"/>
 			<ListBox Style="DockWinTitleBarIconMenu" Data="{./Commands}"/>
 			<Widget Width="5"/>
diff --git a/plugins/CECrowPlugin/src/DebugInterface.cs b/plugins/CECrowPlugin/src/DebugInterface.cs
index a4f0317..ff760be 100644
--- a/plugins/CECrowPlugin/src/DebugInterface.cs
+++ b/plugins/CECrowPlugin/src/DebugInterface.cs
@@ -50,11 +50,26 @@ namespace CECrowPlugin
 			t.Start ();
 		}
 		public bool Terminate;
+		public bool Edition = true;
+		public bool FirstRenderingFinished = false;
 		void interfaceThread () {
 			while (!Terminate) {
 				try
 				{
-					Update();
+					if (Edition) {
+						if (FirstRenderingFinished)
+							Thread.Sleep(500);	
+
+						int lqiCount;
+						lock(LayoutMutex)
+							lqiCount = LayoutingQueue.Count;
+						while(lqiCount > 0) {
+							Update();
+							lock(LayoutMutex)
+								lqiCount = LayoutingQueue.Count;
+						}
+						FirstRenderingFinished = true;
+					}
 				}
 				catch (System.Exception ex)
 				{
@@ -79,7 +94,7 @@ namespace CECrowPlugin
 					delCrowServiceSetCurrentException (ex);
 					Console.WriteLine ($"[DbgIFace] {ex}");
 					ClearInterface();
-					Thread.Sleep(1000);
+					Thread.Sleep(2000);
 				}
 
 				/*if (IsDirty)
@@ -131,6 +146,7 @@ namespace CECrowPlugin
 						resetInterface ();
 						if (string.IsNullOrEmpty(source))
 							return;
+						FirstRenderingFinished = false;
 						Widget tmp = CreateITorFromIMLFragment (source).CreateInstance();
 						AddWidget (tmp);
 						tmp.DataSource = this;
@@ -169,6 +185,7 @@ namespace CECrowPlugin
 		}
 		public void Resize (int width, int height) {
 			ProcessResize (new Rectangle(0, 0, width, height));
+			FirstRenderingFinished = false;
 		}
         /*public override void ProcessResize(Rectangle bounds) {
 			lock (UpdateMutex) {
diff --git a/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs b/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
index 2f0c73b..6e18918 100644
--- a/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
+++ b/plugins/CECrowPlugin/src/DebugInterfaceWidget.cs
@@ -27,7 +27,8 @@ namespace CECrowPlugin
 				NotifyValueChangedAuto (crowIFaceService);
 			}
 		}
-		Command CMDRefresh, CMDZoomIn, CMDZoomOut;
+		
+		Command CMDRefresh, CMDZoomIn, CMDZoomOut, CMDRun;
 		public DebugInterfaceWidget () : base () {
 			CMDRefresh = new ActionCommand (this, "Refresh",
 				() => {
@@ -51,6 +52,7 @@ namespace CECrowPlugin
 						RegisterForGraphicUpdate ();
 					}
 				}, "#icons.zoom-out.svg");
+			//CMDRun = new ToggleCommand(this,"Run",,)
 
 			Thread t = new Thread (backgroundThreadFunc);
 			t.IsBackground = true;
@@ -74,12 +76,17 @@ namespace CECrowPlugin
 			}
 		}
 		void updateIMLSource (TextChange change) {
+			if (string.IsNullOrEmpty(change.ChangedText) && change.CharDiff == 0)
+				return;
 			ReadOnlySpan<char> src = imlSource.AsSpan ();
-			Span<char> tmp = stackalloc char[src.Length + (change.ChangedText.Length - change.Length)];
+			Span<char> tmp = stackalloc char[src.Length + change.CharDiff];
 			//Console.WriteLine ($"{Text.Length,-4} {change.Start,-4} {change.Length,-4} {change.ChangedText.Length,-4} tmp:{tmp.Length,-4}");
 			src.Slice (0, change.Start).CopyTo (tmp);
-			change.ChangedText.AsSpan ().CopyTo (tmp.Slice (change.Start));
-			src.Slice (change.End).CopyTo (tmp.Slice (change.Start + change.ChangedText.Length));
+
+			if (!string.IsNullOrEmpty(change.ChangedText)) {
+				change.ChangedText.AsSpan ().CopyTo (tmp.Slice (change.Start));
+			}
+			src.Slice (change.End).CopyTo (tmp.Slice (change.End2));
 
 			imlSource = tmp.ToString ();
 
diff --git a/plugins/CECrowPlugin/src/ForeignWidgetContainer.cs b/plugins/CECrowPlugin/src/ForeignWidgetContainer.cs
index ddc9ddd..bb11241 100644
--- a/plugins/CECrowPlugin/src/ForeignWidgetContainer.cs
+++ b/plugins/CECrowPlugin/src/ForeignWidgetContainer.cs
@@ -29,7 +29,6 @@ namespace CECrowPlugin
 			delGetName = (Func<string>)Delegate.CreateDelegate(typeof(Func<string>), instance, type.GetProperty("Name").GetGetMethod());
 		}
 
-		public string Icon => $"#icons.{type.FullName}.svg";
 
 		public IEnumerable<MemberInfo> Members => type.GetMembers (BindingFlags.Public | BindingFlags.Instance).
 				Where (m=>((m is PropertyInfo pi && pi.CanWrite) || (m is EventInfo)) &&
@@ -38,6 +37,10 @@ namespace CECrowPlugin
 		public IEnumerable<PropertyContainer> Properties => Members.Where(m=>m.MemberType == MemberTypes.Property).Select(p=> new PropertyContainer(this, p as PropertyInfo));
 
 		public string Name => delGetName();
+		public string DesignId => (string)fiWidget_design_id?.GetValue(instance);
+		public string Icon => $"#icons.{type.FullName}.svg";
+
+		public string TypeName => type.FullName;
 
 		public IEnumerable<ForeignWidgetContainer> Children  {
 			get {
diff --git a/plugins/CECrowPlugin/ui/winProperties.crow b/plugins/CECrowPlugin/ui/winProperties.crow
index 065020a..8b19e38 100644
--- a/plugins/CECrowPlugin/ui/winProperties.crow
+++ b/plugins/CECrowPlugin/ui/winProperties.crow
@@ -4,7 +4,11 @@
         <ListBox Data="{Properties}">
             <Template>
                 <VerticalStack Background="{./Background}">
-                    <Label Text="{Name}"/>
+                    <HorizontalStack Height="Fit" Spacing="10" Margin="10" Background="DimGrey">
+                        <Image Width="40" Height="40" Margin="4" Path="{Icon}" Background="Jet"/>
+                        <Label Text="{TypeName}" Width="Stretched" TextAlignment="Left" />
+                        <Label Font="mono bold, 16" Foreground="PaleGreen" Text="{DesignId}" Width="Fit" Margin="4" />
+                    </HorizontalStack>
                     <HorizontalStack Margin="1">
                         <Scroller Name="ItemsScroller" Margin="2">
                             <VerticalStack Height="Fit" MinimumSize="10,10"
diff --git a/ui/windows/winExceptions.crow b/ui/windows/winExceptions.crow
index 15c2eaa..543c678 100644
--- a/ui/windows/winExceptions.crow
+++ b/ui/windows/winExceptions.crow
@@ -1,6 +1,21 @@
 <?xml version="1.0"?>
 <DockWindow Caption="Exceptions"  Width="40%" Height="20%">
-	<ListBox DataSource="{CurrentDocument}" Data='{Exceptions}' Height='Stretched' Width='Stretched'/>
+	<ListBox DataSource="{CurrentDocument}" Data='{Exceptions}' SelectedItem="{²CurrentException}"
+		Height='Stretched' Width='Stretched'>
+		<Template>
+			<Scroller  Name="scroller1"  >
+				<Table Columns="Message,Stretched;Location,Fit"
+					Height="Fit" Name="ItemsContainer" VerticalAlignment="Top"/>
+			</Scroller>
+		</Template>
+		<ItemTemplate>
+			<TableRow 	Selected = "{Background=${ControlHighlight}}"
+						Unselected = "{Background=Transparent}">
+				<Label Text="{Message}" />
+				<Label Text="{Location}"/>
+			</TableRow>
+		</ItemTemplate>
+	</ListBox>
 </DockWindow>
 
 
diff --git a/ui/windows/winSyntaxExplorer.crow b/ui/windows/winSyntaxExplorer.crow
index 0118bf7..f52acb3 100644
--- a/ui/windows/winSyntaxExplorer.crow
+++ b/ui/windows/winSyntaxExplorer.crow
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
-<DockWindow Caption="Syntax"  Width="30%">
+<DockWindow Caption="Syntax"  Width="30%" AdditionalCommands="{SyntaxViewCommands}">
 	<VerticalStack RootDataLevel="true" Spacing="0" DataSource="{CurrentDocument}">
-		<Button Command="{CMDRefreshSyntaxTree}"/>
 		<Label Text="{}"/>
 		<Label Text="{SyntaxRootNode}"/>
 		<Label Text="{CurrentNode}"/>