Fix #736: "Move to Resource" does not work at the end of the string literal

Author: tom-englert

src/ResXManager.Model/ResourceManager.cs

@@ -22,7 +22,7 @@
 /// </summary>
 [Shared]
 [Export]
-public sealed class ResourceManager : INotifyPropertyChanged
+public sealed partial class ResourceManager : INotifyPropertyChanged
 {
     private string? _snapshot;
 
@@ -310,11 +310,4 @@ public string CreateSnapshot()
     {
         return _snapshot = ResourceEntities.CreateSnapshot();
     }
-
-    public event PropertyChangedEventHandler? PropertyChanged;
-
-    private void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }

src/ResXManager.VSIX.Compatibility.Shared/DteExtensions.cs

@@ -77,14 +77,14 @@ public static ICollection<VSITEMSELECTION> GetSelectedProjectItems(this IVsMonit
             if ((hierarchyPtr == IntPtr.Zero) || (itemId == VSConstants.VSITEMID_ROOT))
                 return Array.Empty<VSITEMSELECTION>();
 
-            return new[]
-            {
+            return
+            [
                 new VSITEMSELECTION
                 {
                     pHier = Marshal.GetObjectForIUnknown(hierarchyPtr) as IVsHierarchy,
                     itemid = itemId
                 }
-            };
+            ];
         }
         finally
         {
@@ -144,12 +144,12 @@ public static ICollection<VSITEMSELECTION> GetSelectedProjectItems(this IVsMonit
 
     public static IEnumerable<EnvDTE.ProjectItem> Children(this EnvDTE.ProjectItem? projectItem)
     {
-        return projectItem?.TryGetProjectItems() ?? Enumerable.Empty<EnvDTE.ProjectItem>();
+        return projectItem?.TryGetProjectItems() ?? [];
     }
 
     public static IEnumerable<EnvDTE.ProjectItem> Descendants(this EnvDTE.ProjectItem? projectItem)
     {
-        return projectItem?.TryGetProjectItems()?.SelectMany(p => p.DescendantsAndSelf()) ?? Enumerable.Empty<EnvDTE.ProjectItem>();
+        return projectItem?.TryGetProjectItems()?.SelectMany(p => p.DescendantsAndSelf()) ?? [];
     }
 
     public static IEnumerable<EnvDTE.ProjectItem> DescendantsAndSelf(this EnvDTE.ProjectItem? projectItem)
@@ -167,7 +167,7 @@ public static ICollection<VSITEMSELECTION> GetSelectedProjectItems(this IVsMonit
 
     public static IEnumerable<SolutionItem> Descendants(this SolutionItem? projectItem)
     {
-        return projectItem?.Children.SelectMany(p => p.DescendantsAndSelf()) ?? Enumerable.Empty<SolutionItem>();
+        return projectItem?.Children.SelectMany(p => p.DescendantsAndSelf()) ?? [];
     }
 
     public static IEnumerable<SolutionItem> DescendantsAndSelf(this SolutionItem? projectItem)
@@ -327,4 +327,4 @@ public static void SetFontSize(this EnvDTE80.DTE2 dte, DependencyObject view)
             return null;
         }
     }
-}
+}

src/ResXManager.VSIX.Compatibility.Shared/Refactorings.cs

@@ -136,7 +136,7 @@ public bool CanMoveToResource()
         var projectResources = new HashSet<ResourceEntity>(GetResourceEntriesFromProject(document, entities));
 
         // put resources from the same project on top
-        entities.RemoveAll(entity => projectResources.Contains(entity));
+        entities.RemoveAll(projectResources.Contains);
         entities.InsertRange(0, projectResources);
 
         // put the last used entry on top, if it's in the same project, or the last access was cross-project.
@@ -197,7 +197,7 @@ private static IEnumerable<ResourceEntity> GetResourceEntriesFromProject(Documen
         }
         catch (Exception)
         {
-            return Enumerable.Empty<ResourceEntity>();
+            return [];
         }
     }
 
@@ -256,7 +256,7 @@ private static bool IsInProject(ResourceEntity entity, Project? project)
         if (document is null)
             return null;
 
-        var textDocument = (TextDocument?)document.Object(@"TextDocument");
+        var textDocument = (TextDocument?)document.Object("TextDocument");
         if (textDocument is null)
             return null;
 
@@ -396,60 +396,46 @@ private sealed class GenericParser : IParser
             return locator.Locate(@"""") ?? locator.Locate("'") ?? locator.Locate("`");
         }
 
-        private sealed class Locator
+        private sealed class Locator(string line, int column, Selection? selection)
         {
-            private readonly string _line;
-            private readonly int _column;
-            private readonly Selection? _selection;
-
-            public Locator(string line, int column, Selection? selection)
-            {
-                _line = line;
-                _column = column;
-                _selection = selection;
-            }
-
             public string? Locate(string quote)
             {
                 ThrowIfNotOnUIThread();
 
                 var secondQuote = -1;
 
-                while (secondQuote < _line.Length)
+                while (secondQuote < line.Length)
                 {
-                    var firstQuote = _line.IndexOf(quote, secondQuote + 1, StringComparison.Ordinal);
+                    var firstQuote = line.IndexOf(quote, secondQuote + 1, StringComparison.Ordinal);
                     if (firstQuote == -1)
                         return null;
 
-                    if (_line.Length <= firstQuote + 1)
+                    var startIndex = firstQuote + 1;
+
+                    if (line.Length <= startIndex)
                         return null;
 
-                    if (_column < firstQuote)
+                    if (column < firstQuote)
                         return null;
 
-                    secondQuote = _line.IndexOf(quote, firstQuote + 1, StringComparison.Ordinal);
+                    secondQuote = line.IndexOf(quote, startIndex, StringComparison.Ordinal);
                     if (secondQuote == -1)
                         return null;
 
-                    if (_column >= secondQuote)
-                        continue;
+                    var endIndex = secondQuote + 2;
 
-                    var startIndex = firstQuote + 1;
-                    var length = secondQuote - firstQuote - 1;
+                    if (column >= endIndex)
+                        continue;
 
-                    if (_selection != null)
-                    {
-                        var startColumn = firstQuote + 1;
-                        var endColumn = secondQuote + 2;
+                    var length = secondQuote - startIndex;
 
-                        _selection.MoveTo(startColumn, endColumn);
-                    }
+                    selection?.MoveTo(startIndex, endIndex);
 
-                    return _line.Substring(startIndex, length);
+                    return line.Substring(startIndex, length);
                 }
 
                 return null;
             }
         }
     }
-}
+}

src/ResXManager.VSIX/Visuals/MoveToResourceViewModel.cs

@@ -57,7 +57,7 @@ public MoveToResourceViewModel(IVsixCompatibility vsixCompatibility, ICollection
         Key = Keys.Skip(SelectedKeyIndex).FirstOrDefault() ?? Keys.FirstOrDefault();
         Value = text;
 
-        PropertyChanged += ((_, _) => Update());
+        PropertyChanged += (_, _) => Update();
     }
 
     private static string BaseFileName(string fileName)
@@ -197,28 +197,12 @@ private static bool IsCharValidForSymbolStart(char c)
     string? IDataErrorInfo.Error => null;
 }
 
-public sealed class Replacement : INotifyPropertyChanged
+public sealed partial class Replacement(string pattern, Func<string, string> evaluator) : INotifyPropertyChanged
 {
-    private readonly string _pattern;
-    private readonly Func<string, string> _evaluator;
-
-    public Replacement(string pattern, Func<string, string> evaluator)
-    {
-        _pattern = pattern;
-        _evaluator = evaluator;
-    }
-
-    public string? Value => _evaluator(_pattern);
-
-    public event PropertyChangedEventHandler? PropertyChanged;
+    public string? Value => evaluator(pattern);
 
     public void Update()
     {
         OnPropertyChanged(nameof(Value));
     }
-
-    private void OnPropertyChanged(string propertyName)
-    {
-        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-    }
 }