Merge branch 'master' into vsts-866545-objectvaluetreeview

2 files changed, 21 insertions, 28 deletions

diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
index 38d4003d5b..30fbbd073e 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.QuickTasks/QuickTaskOverviewMode.cs
@@ -725,20 +725,18 @@ namespace MonoDevelop.SourceEditor.QuickTasks
 		{
 			var breakpointStore = parentStrip.SourceEditorView.Breakpoints;
 
-			lock (breakpointStore) {
-				var breakPoints = breakpointStore.GetBreakpointsAtFile (TextEditor.FileName);
+			var breakPoints = breakpointStore.GetBreakpointsAtFile (TextEditor.FileName);
 
-				if (breakPoints == null)
-					return;
+			if (breakPoints == null)
+				return;
 
-				foreach (var point in breakPoints) {
-					int y = (int)GetYPosition (point.Line);
+			foreach (var point in breakPoints) {
+				int y = (int)GetYPosition (point.Line);
 
-					cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.BreakpointMarker));
-					int r = 4;
-					cr.Rectangle (0, y - r / 2, r, r);
-					cr.Fill ();
-				}
+				cr.SetSourceColor (SyntaxHighlightingService.GetColor (TextEditor.EditorTheme, EditorThemeColors.BreakpointMarker));
+				int r = 4;
+				cr.Rectangle (0, y - r / 2, r, r);
+				cr.Fill ();
 			}
 		}
 
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
index c9407e4dbe..365927bafe 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
@@ -1348,17 +1348,15 @@ namespace MonoDevelop.SourceEditor
 				int i = 0, count = 0;
 				bool mismatch = false;
 
-				lock (breakpoints) {
-					foreach (var bp in breakpoints.GetBreakpointsAtFile (fp.FullPath)) {
-						count++;
-						if (i < breakpointSegments.Count) {
-							int lineNumber = document.OffsetToLineNumber (breakpointSegments [i].TextMarker.Offset);
-							if (lineNumber != bp.Line) {
-								mismatch = true;
-								break;
-							}
-							i++;
+				foreach (var bp in breakpoints.GetBreakpointsAtFile (fp.FullPath)) {
+					count++;
+					if (i < breakpointSegments.Count) {
+						int lineNumber = document.OffsetToLineNumber (breakpointSegments [i].TextMarker.Offset);
+						if (lineNumber != bp.Line) {
+							mismatch = true;
+							break;
 						}
+						i++;
 					}
 				}
 
@@ -1383,11 +1381,9 @@ namespace MonoDevelop.SourceEditor
 
 			breakpointSegments.Clear ();
 
-			lock (breakpoints) {
-				foreach (var bp in breakpoints.GetBreakpointsAtFile (fp.FullPath)) {
-					lineNumbers.Add (bp.Line);
-					AddBreakpoint (bp);
-				}
+			foreach (var bp in breakpoints.GetBreakpointsAtFile (fp.FullPath)) {
+				lineNumbers.Add (bp.Line);
+				AddBreakpoint (bp);
 			}
 
 			foreach (int lineNumber in lineNumbers) {
@@ -1506,8 +1502,7 @@ namespace MonoDevelop.SourceEditor
 						int column = TextEditor.Caret.Line == args.LineNumber ? 
 												Math.Min (TextEditor.Caret.Column, args.LineSegment.Length) : 1;
 							
-						lock (breakpoints)
-							breakpoints.Toggle (Document.FileName, args.LineNumber, column);
+						breakpoints.Toggle (Document.FileName, args.LineNumber, column);
 					}
 				}
 			}