Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 10 insertions, 3 deletions

diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
index 0e32af6ed..a3a682833 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/ScriptEditor.cs
@@ -2458,9 +2458,16 @@ namespace Tango.Scripting.Editors
 
         public void HighlighError(int position, int length)
         {
-            ITextMarker marker = errorMarkerService.Create(position, length);
-            marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
-            marker.MarkerColor = Colors.Red;
+            try
+            {
+                ITextMarker marker = errorMarkerService.Create(position, length);
+                marker.MarkerTypes = TextMarkerTypes.SquigglyUnderline;
+                marker.MarkerColor = Colors.Red;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error highlighting script error.\n{ex.ToString()}");
+            }
         }
 
         public void ClearErrors()