Fix #144: Avoid usage of file info to not fail on long file names according to provided stack trace.

Author: tom-englert

ResXManager.Model/FileFilter.cs

@@ -1,53 +1,53 @@
-namespace tomenglertde.ResXManager.Model
-{
-    using System;
-    using System.Diagnostics;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Diagnostics.Contracts;
-    using System.IO;
-    using System.Linq;
-    using System.Text.RegularExpressions;
-
-    using JetBrains.Annotations;
-
-    using tomenglertde.ResXManager.Infrastructure;
-
-    public class FileFilter : IFileFilter
-    {
+namespace tomenglertde.ResXManager.Model
+{
+    using System;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Diagnostics.Contracts;
+    using System.IO;
+    using System.Linq;
+    using System.Text.RegularExpressions;
+
+    using JetBrains.Annotations;
+
+    using tomenglertde.ResXManager.Infrastructure;
+
+    public class FileFilter : IFileFilter
+    {
         [NotNull]
         [ItemNotNull]
         private readonly string[] _extensions;
         [CanBeNull]
-        private readonly Regex _fileExclusionFilter;
-
-        public FileFilter([NotNull] Configuration configuration)
-        {
-            Contract.Requires(configuration != null);
-
-            _extensions = configuration.CodeReferences
-                .Items.SelectMany(item => item.ParseExtensions())
-                .Distinct()
-                .ToArray();
-
-            _fileExclusionFilter = configuration.FileExclusionFilter.TryCreateRegex();
-        }
-
-        public bool IsSourceFile(ProjectFile file)
-        {
-            return _extensions.Contains(file.Extension, StringComparer.OrdinalIgnoreCase);
-        }
-
-        public bool IncludeFile(FileInfo fileInfo)
-        {
-            return _fileExclusionFilter?.IsMatch(fileInfo.FullName) != true;
-        }
-
-        [ContractInvariantMethod]
-        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Required for code contracts.")]
-        [Conditional("CONTRACTS_FULL")]
-        private void ObjectInvariant()
-        {
-            Contract.Invariant(_extensions != null);
-        }
-    }
+        private readonly Regex _fileExclusionFilter;
+
+        public FileFilter([NotNull] Configuration configuration)
+        {
+            Contract.Requires(configuration != null);
+
+            _extensions = configuration.CodeReferences
+                .Items.SelectMany(item => item.ParseExtensions())
+                .Distinct()
+                .ToArray();
+
+            _fileExclusionFilter = configuration.FileExclusionFilter.TryCreateRegex();
+        }
+
+        public bool IsSourceFile(ProjectFile file)
+        {
+            return _extensions.Contains(file.Extension, StringComparer.OrdinalIgnoreCase);
+        }
+
+        public bool IncludeFile(ProjectFile file)
+        {
+            return _fileExclusionFilter?.IsMatch(file.RelativeFilePath) != true;
+        }
+
+        [ContractInvariantMethod]
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification = "Required for code contracts.")]
+        [Conditional("CONTRACTS_FULL")]
+        private void ObjectInvariant()
+        {
+            Contract.Invariant(_extensions != null);
+        }
+    }
 }

ResXManager.Model/IFileFilter.cs

@@ -1,33 +1,11 @@
 namespace tomenglertde.ResXManager.Model
 {
-    using System.Diagnostics.Contracts;
-    using System.IO;
-
     using JetBrains.Annotations;
 
-    [ContractClass(typeof(FileFilterContract))]
     public interface IFileFilter
     {
         bool IsSourceFile([NotNull] ProjectFile file);
 
-        bool IncludeFile([NotNull] FileInfo fileInfo);
-    }
-
-    [ContractClassFor(typeof(IFileFilter))]
-    internal abstract class FileFilterContract : IFileFilter
-    {
-        public bool IsSourceFile(ProjectFile file)
-        {
-            Contract.Requires(file != null);
-
-            throw new System.NotImplementedException();
-        }
-
-        public bool IncludeFile(FileInfo fileInfo)
-        {
-            Contract.Requires(fileInfo != null);
-
-            throw new System.NotImplementedException();
-        }
+        bool IncludeFile([NotNull] ProjectFile file);
     }
 }

ResXManager.Model/ResourceManagerExtensions.cs

@@ -26,8 +26,8 @@ public static IList<ProjectFile> GetAllSourceFiles([NotNull] this DirectoryInfo
             Contract.Assume(fileInfos != null);
 
             var allProjectFiles = fileInfos
-                .Where(fileFilter.IncludeFile)
                 .Select(fileInfo => new ProjectFile(fileInfo.FullName, solutionFolder.FullName, @"<unknown>", null))
+                .Where(fileFilter.IncludeFile)
                 .Where(file => file.IsResourceFile() || fileFilter.IsSourceFile(file))
                 .ToArray();
 

ResXManager.Scripting/SourceFilesProvider.cs

@@ -44,9 +44,9 @@ public bool IsSourceFile(ProjectFile file)
             return false;
         }
 
-        public bool IncludeFile(FileInfo fileInfo)
+        public bool IncludeFile(ProjectFile file)
         {
-            return _fileExclusionFilter?.IsMatch(fileInfo.FullName) != true;
+            return _fileExclusionFilter?.IsMatch(file.RelativeFilePath) != true;
         }
     }
 }

ResXManager.VSIX/DteSourceFilesProvider.cs

@@ -54,7 +54,7 @@ private IEnumerable<DteProjectFile> DteSourceFiles
             {
                 var fileFilter = new FileFilter(_configuration);
 
-                return GetProjectFiles().Where(p => fileFilter.IncludeFile(new FileInfo(p.FilePath)) && (p.IsResourceFile() || fileFilter.IsSourceFile(p)));
+                return GetProjectFiles().Where(p => fileFilter.IncludeFile(p) && (p.IsResourceFile() || fileFilter.IsSourceFile(p)));
             }
         }
 

ResXManager.View/Visuals/ResourceView.xaml.cs

@@ -36,6 +36,8 @@ public partial class ResourceView
         private readonly Configuration _configuration;
         [NotNull]
         private readonly ResourceViewModel _resourceViewModel;
+        [NotNull]
+        private readonly ITracer _tracer;
 
         [ImportingConstructor]
         public ResourceView([NotNull] ExportProvider exportProvider)
@@ -45,6 +47,7 @@ public ResourceView([NotNull] ExportProvider exportProvider)
             _resourceManager = exportProvider.GetExportedValue<ResourceManager>();
             _resourceViewModel = exportProvider.GetExportedValue<ResourceViewModel>();
             _configuration = exportProvider.GetExportedValue<Configuration>();
+            _tracer = exportProvider.GetExportedValue<ITracer>();
 
             try
             {
@@ -205,9 +208,9 @@ private void CommandConverter_Error([NotNull] object sender, [NotNull] ErrorEven
             if (ex == null)
                 return;
 
-            var text = ex is ImportException ? ex.Message : ex.ToString();
+            MessageBox.Show(ex.Message, Properties.Resources.Title);
 
-            MessageBox.Show(text, Properties.Resources.Title);
+            _tracer.TraceError(ex.ToString());
         }
 
         private class ExportParameters : IExportParameters

ResXManager.View/Visuals/ResourceViewModel.cs

@@ -527,7 +527,14 @@ private void Reload(bool forceFindCodeReferences)
         [Throttled(typeof(DispatcherThrottle), (int)DispatcherPriority.ContextIdle)]
         private void BeginFindCodeReferences()
         {
-            BeginFindCodeReferences(_sourceFilesProvider.SourceFiles);
+            try
+            {
+                BeginFindCodeReferences(_sourceFilesProvider.SourceFiles);
+            }
+            catch (Exception ex)
+            {
+                _tracer.TraceError(ex.ToString());
+            }
         }
 
         private void BeginFindCodeReferences([NotNull, ItemNotNull] IList<ProjectFile> allSourceFiles)