Another case of duplicate files fix.

sergey-visual-studio · Oct 22, 2023 · 6d72a24 · 6d72a24
1 parent d533d0f
commit 6d72a24
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/DPackRx.Tests/Features/FileBrowserViewModelTests.cs b/DPackRx.Tests/Features/FileBrowserViewModelTests.cs
@@ -149,9 +149,9 @@ public void OnInitialize(string search, bool allFiles, string ignoreFiles, strin
 			_optionsServiceMock.Setup(o => o.GetStringOption(viewModel.Feature, "ShowFiles", null)).Returns(showFiles).Verifiable();
 			_optionsServiceMock.Setup(o => o.GetStringOption(viewModel.Feature, "IgnoreFolders", null)).Returns(ignoreFolders).Verifiable();
 
-			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.Code, true)).Returns(true).Verifiable();
-			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.None, true)).Returns(false).Verifiable();
-			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.ImageFile, true)).Returns(false).Verifiable();
+			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.Code)).Returns(true).Verifiable();
+			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.None)).Returns(false).Verifiable();
+			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.ImageFile)).Returns(false).Verifiable();
 
 			viewModel.OnInitialize(null);
 
@@ -170,15 +170,15 @@ public void OnInitialize(string search, bool allFiles, string ignoreFiles, strin
 			_optionsServiceMock.Verify(o => o.GetStringOption(viewModel.Feature, "IgnoreFolders", null), Times.Once);
 			if (allFiles)
 			{
-				_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.Code, true), Times.Never);
-				_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.None, true), Times.Never);
+				_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.Code), Times.Never);
+				_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.None), Times.Never);
 			}
 			else
 			{
 				if (expectedCodeFileCount > 0)
-					_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.Code, true), Times.AtLeast(expectedCodeFileCount));
+					_fileTypeResolverMock.Verify(r => r.IsCodeSubType(FileSubType.Code), Times.AtLeast(expectedCodeFileCount));
 				if (expectedNoneCodeFileCount > 0)
-					_fileTypeResolverMock.Verify(r => r.IsCodeSubType(It.IsNotIn(FileSubType.Code), true), Times.AtLeast(expectedNoneCodeFileCount));
+					_fileTypeResolverMock.Verify(r => r.IsCodeSubType(It.IsNotIn(FileSubType.Code)), Times.AtLeast(expectedNoneCodeFileCount));
 			}
 			_searchMatchServiceMock.Verify(s => s.MatchItems(search, It.IsAny<IEnumerable<IMatchItem>>()), Times.Once);
 		}

diff --git a/DPackRx.Tests/Services/SearchMatchServiceTests.cs b/DPackRx.Tests/Services/SearchMatchServiceTests.cs
@@ -59,8 +59,8 @@ public int CompareTo(object obj)
 		public void Setup()
 		{
 			_fileTypeResolverMock = new Mock<IFileTypeResolver>();
-			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(It.IsAny<FileSubType>(), true)).Returns(false).Verifiable();
-			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.Code, true)).Returns(true).Verifiable();
+			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(It.IsAny<FileSubType>())).Returns(false).Verifiable();
+			_fileTypeResolverMock.Setup(r => r.IsCodeSubType(FileSubType.Code)).Returns(true).Verifiable();
 
 			_wildcardMatchMock = new Mock<IWildcardMatch>();
 		}
@@ -136,7 +136,7 @@ public void MatchItems(string filter, int codeRank, int nonCodeRank, string erro
 			Assert.That(codeItem.Rank, Is.EqualTo(codeRank), $"Code item: {error}");
 			Assert.That(nonCodeItem.Rank, Is.EqualTo(nonCodeRank), $"Non-code item: {error}");
 
-			_fileTypeResolverMock.Verify(r => r.IsCodeSubType(It.IsAny<FileSubType>(), true), Times.Exactly(items.Count));
+			_fileTypeResolverMock.Verify(r => r.IsCodeSubType(It.IsAny<FileSubType>()), Times.Exactly(items.Count));
 		}
 
 		[TestCase("test", false)]

diff --git a/DPackRx/CodeModel/FileTypeResolver.cs b/DPackRx/CodeModel/FileTypeResolver.cs
@@ -156,7 +156,7 @@ public FileSubType GetExtensionSubType(object projectItem, LanguageSettings lang
 		/// <param name="itemSubType">File sub-type.</param>
 		/// <param name="miscFilesAsCode">Treat miscellaneous files as code ones.</param>
 		/// <returns>File sub-type status.</returns>
-		public bool IsCodeSubType(FileSubType itemSubType, bool miscFilesAsCode = true)
+		public bool IsCodeSubType(FileSubType itemSubType)
 		{
 			switch (itemSubType)
 			{
@@ -173,8 +173,9 @@ public bool IsCodeSubType(FileSubType itemSubType, bool miscFilesAsCode = true)
 					return true;
 				case FileSubType.JScript:
 				case FileSubType.XmlFile:
+					return true;
 				case FileSubType.ConfigFile:
-					return miscFilesAsCode;
+					return false;
 				default:
 					return false;
 			}

diff --git a/DPackRx/CodeModel/IFileTypeResolver.cs b/DPackRx/CodeModel/IFileTypeResolver.cs
@@ -37,9 +37,8 @@ public interface IFileTypeResolver
 		/// Checks whether a given file sub-type is a code one.
 		/// </summary>
 		/// <param name="itemSubType">File sub-type.</param>
-		/// <param name="miscFilesAsCode">Treat miscellaneous files as code ones.</param>
 		/// <returns>File sub-type status.</returns>
-		bool IsCodeSubType(FileSubType itemSubType, bool miscFilesAsCode = true);
+		bool IsCodeSubType(FileSubType itemSubType);
 
 		/// <summary>
 		/// Checks whether a given file sub-type is a web one with both design and code views.

diff --git a/DPackRx/CodeModel/ProjectProcessor.cs b/DPackRx/CodeModel/ProjectProcessor.cs
@@ -189,6 +189,16 @@ private void ProcessProjectItems(List<FileModel> model, ProcessorFlags flags, Co
 						add = false;
 					}
 
+					// Check for nested duplicate files
+					if (add)
+					{
+						if ((parentItem != null) &&
+								(parentItem.FileCount > 0) &&
+								(projectItem.FileCount > 0) &&
+								parentItem.FileNames[0].Equals(projectItem.FileNames[0], StringComparison.OrdinalIgnoreCase))
+							add = false;
+					}
+
 					// Used to collect skipped files here as well... something to keep an eye out out for
 					if (add)
 					{