Relaxed bookmarks setting to allow more than 1 bookmark per the same …

…line.

DPackRx.Tests/Features/BookmarksServiceTests.cs

@@ -329,14 +329,11 @@ public void SetBookmark_SameLine()
 			var repeatResult = service.SetBookmark(1);
 
 			var bookmarks = service.GetFileBookmarks("test");
-			var bookmark = bookmarks.FirstOrDefault();
 
 			Assert.That(result, Is.True);
-			Assert.That(repeatResult, Is.False);
+			Assert.That(repeatResult, Is.True);
 			Assert.That(bookmarks, Is.Not.Null);
-			Assert.That(bookmarks.Count(), Is.EqualTo(1));
-			Assert.That(bookmark, Is.Not.Null);
-			Assert.That(bookmark.Number, Is.EqualTo(5));
+			Assert.That(bookmarks.Count(), Is.EqualTo(2));
 		}
 
 		[Test]
@@ -525,14 +522,11 @@ public void SetGlobalBookmark_SameLine()
 			var repeatResult = service.SetGlobalBookmark(1);
 
 			var bookmarks = service.GetFileBookmarks("test");
-			var bookmark = bookmarks.FirstOrDefault();
 
 			Assert.That(result, Is.True);
-			Assert.That(repeatResult, Is.False);
+			Assert.That(repeatResult, Is.True);
 			Assert.That(bookmarks, Is.Not.Null);
-			Assert.That(bookmarks.Count(), Is.EqualTo(1));
-			Assert.That(bookmark, Is.Not.Null);
-			Assert.That(bookmark.Number, Is.EqualTo(5));
+			Assert.That(bookmarks.Count(), Is.EqualTo(2));
 		}
 
 		[Test]

DPackRx/Features/Bookmarks/BookmarksService.cs

@@ -200,12 +200,7 @@ public bool SetBookmark(int number)
 				_bookmarks.Add(fileName, bookmarks);
 			}
 
-			// 1 bookmark per line check
-			var bookmark = bookmarks.FirstOrDefault(b => (b.Number != number) && (b.Type == BookmarkType.Local) && (GetBookmarkLine(fileName, b) == position.Line));
-			if (bookmark != null)
-				return false;
-
-			bookmark = bookmarks.FirstOrDefault(b => (b.Number == number) && (b.Type == BookmarkType.Local));
+			var bookmark = bookmarks.FirstOrDefault(b => (b.Number == number) && (b.Type == BookmarkType.Local));
 			if (bookmark != null)
 			{
 				var line = GetBookmarkLine(fileName, bookmark);
@@ -301,13 +296,6 @@ public bool SetGlobalBookmark(int number)
 			if (position.IsEmpty())
 				return false;
 
-			// 1 bookmark per line check
-			foreach (var file in _bookmarks.Keys)
-			{
-				if (_bookmarks[file].FirstOrDefault(b => (b.Type == BookmarkType.Global) && (GetBookmarkLine(file, b) == position.Line)) != null)
-					return false;
-			}
-
 			// Find existing global bookmark and file it's in
 			var bookmarkFileName = string.Empty;
 			Bookmark bookmark = null;