Fixed bookmarks assignment/processing issue for Xaml files.

DPackRx/Extensions/TextBufferExtensions.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.Text;
+using Microsoft.VisualStudio.Text.Projection;
 
 namespace DPackRx.Extensions
 {
@@ -11,6 +12,27 @@ public static class TextBufferExtensions
 		/// Custom: returns <typeparamref name="T"/> service from the text buffer.
 		/// </summary>
 		public static T GetService<T>(this ITextBuffer textBuffer)
+		{
+			T service = TryGetService<T>(textBuffer);
+			if (service != null)
+				return service;
+
+			if (textBuffer is IProjectionBufferBase projectionBuffer)
+			{
+				foreach (ITextBuffer sourceTextBuffer in projectionBuffer.SourceBuffers)
+				{
+					service = TryGetService<T>(sourceTextBuffer);
+					if (service != null)
+						return service;
+				}
+			}
+
+			return default;
+		}
+
+		#region Private Methods
+
+		private static T TryGetService<T>(this ITextBuffer textBuffer)
 		{
 			T service = default;
 			var result = textBuffer.Properties?.TryGetProperty(typeof(T), out service);
@@ -19,5 +41,7 @@ public static T GetService<T>(this ITextBuffer textBuffer)
 			else
 				return default;
 		}
+
+		#endregion
 	}
 }

DPackRx/Features/Bookmarks/BookmarksService.cs

@@ -110,7 +110,7 @@ public void RegisterCallback(IBookmarkCallbackClient client, string fileName)
 
 			if (_bookmarkCallbacks.ContainsKey(fileName) || _bookmarkCallbacks.ContainsValue(client))
 			{
-				_log.LogMessage("Callback client has already been registered", LOG_CATEGORY);
+				_log.LogMessage($"Callback client has already been registered: {Path.GetFileName(fileName)}", LOG_CATEGORY);
 				return;
 			}
 
@@ -251,7 +251,11 @@ public bool GoToBookmark(int number)
 				return false;
 
 			if (!_bookmarks.ContainsKey(fileName))
+			{
+				_shellStatusBarService.SetStatusBarText($"Bookmark {number} not found");
+				_log.LogMessage($"Bookmark # {number} is not found", LOG_CATEGORY);
 				return false;
+			}
 
 			_log.LogMessage($"Looking for '{fileName}' bookmark # {number}", LOG_CATEGORY);
 			var bookmarks = _bookmarks[fileName];