From 1320a6d5905413063eeb522defb5d86a2d8aace3 Mon Sep 17 00:00:00 2001 From: Manish Vasani Date: Wed, 7 Oct 2015 08:41:58 -0700 Subject: [PATCH] Don't treat template generated files with assembly attributes as generated code (e.g. AssemblyInfo.cs) Fixes #4390 --- .../Test/GenerateType/GenerateTypeViewModelTests.vb | 2 +- .../GeneratedCodeRecognitionServiceFactory.cs | 6 ++---- .../CoreTest/GeneratedCodeRecognitionTests.cs | 10 +++++----- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/VisualStudio/Core/Test/GenerateType/GenerateTypeViewModelTests.vb b/src/VisualStudio/Core/Test/GenerateType/GenerateTypeViewModelTests.vb index 4abc5fb64f1..26a1b28a73a 100644 --- a/src/VisualStudio/Core/Test/GenerateType/GenerateTypeViewModelTests.vb +++ b/src/VisualStudio/Core/Test/GenerateType/GenerateTypeViewModelTests.vb @@ -585,7 +585,7 @@ class Program Dim viewModel = GetViewModel(workspaceXml, LanguageNames.CSharp) - Dim expectedDocuments = {"Test1.cs", "Test2.cs", "Test3.cs"} + Dim expectedDocuments = {"Test1.cs", "Test2.cs", "AssemblyInfo.cs", "Test3.cs"} Assert.Equal(expectedDocuments, viewModel.DocumentList.Select(Function(d) d.Document.Name).ToArray()) End Sub diff --git a/src/Workspaces/Core/Portable/GeneratedCodeRecognition/GeneratedCodeRecognitionServiceFactory.cs b/src/Workspaces/Core/Portable/GeneratedCodeRecognition/GeneratedCodeRecognitionServiceFactory.cs index 3885fef6e7f..84b6cd58bd2 100644 --- a/src/Workspaces/Core/Portable/GeneratedCodeRecognition/GeneratedCodeRecognitionServiceFactory.cs +++ b/src/Workspaces/Core/Portable/GeneratedCodeRecognition/GeneratedCodeRecognitionServiceFactory.cs @@ -37,12 +37,10 @@ private static bool IsFileNameForGeneratedCode(string fileName) { fileName = Path.GetFileNameWithoutExtension(fileName); - if (fileName.EndsWith("AssemblyInfo", StringComparison.OrdinalIgnoreCase) || - fileName.EndsWith(".designer", StringComparison.OrdinalIgnoreCase) || + if (fileName.EndsWith(".designer", StringComparison.OrdinalIgnoreCase) || fileName.EndsWith(".generated", StringComparison.OrdinalIgnoreCase) || fileName.EndsWith(".g", StringComparison.OrdinalIgnoreCase) || - fileName.EndsWith(".g.i", StringComparison.OrdinalIgnoreCase) || - fileName.EndsWith(".AssemblyAttributes", StringComparison.OrdinalIgnoreCase)) + fileName.EndsWith(".g.i", StringComparison.OrdinalIgnoreCase)) { return true; } diff --git a/src/Workspaces/CoreTest/GeneratedCodeRecognitionTests.cs b/src/Workspaces/CoreTest/GeneratedCodeRecognitionTests.cs index 3fd65b75b6d..f6e35178849 100644 --- a/src/Workspaces/CoreTest/GeneratedCodeRecognitionTests.cs +++ b/src/Workspaces/CoreTest/GeneratedCodeRecognitionTests.cs @@ -16,6 +16,10 @@ public void TestFileNamesNotGenerated() "Test", "Test.cs", "Test.vb", + "AssemblyInfo.cs", + "AssemblyInfo.vb", + ".NETFramework,Version=v4.5.AssemblyAttributes.cs", + ".NETFramework,Version=v4.5.AssemblyAttributes.vb", "Test.notgenerated.cs", "Test.notgenerated.vb", "Test.generated", @@ -29,8 +33,6 @@ public void TestFileNamesGenerated() "TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92", "TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs", "TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.vb", - "AssemblyInfo.cs", - "AssemblyInfo.vb", "Test.designer.cs", "Test.designer.vb", "Test.Designer.cs", @@ -40,9 +42,7 @@ public void TestFileNamesGenerated() "Test.g.cs", "Test.g.vb", "Test.g.i.cs", - "Test.g.i.vb", - ".NETFramework,Version=v4.5.AssemblyAttributes.cs", - ".NETFramework,Version=v4.5.AssemblyAttributes.vb"); + "Test.g.i.vb"); } private static void TestFileNames(bool assertGenerated, params string[] fileNames) -- GitLab