refactor

Author: mob-sakai

Editor/AssemblyFilterDrawer.cs

@@ -27,7 +27,7 @@ private void Initialize(SerializedProperty property)
             _roIncludedAssemblies = new ReorderableList(property.serializedObject, _includedAssemblies, true, true, true, true);
             _roIncludedAssemblies.drawHeaderCallback = rect =>
             {
-                EditorGUI.PrefixLabel(rect, new GUIContent(_includedAssemblies.displayName));
+                EditorGUI.PrefixLabel(rect, new GUIContent("Target Assemblies"));
 
                 rect.x += rect.width - 110;
                 rect.width = 110;

Editor/CSharpProjectModifier.cs

@@ -45,7 +45,8 @@ private static string OnGeneratedCSProject(string path, string content)
             }
 
             // Additional contents.
-            content = Regex.Replace(content, "[\r\n]+</Project>[\r\n]*", "\r\n<!-- C# Settings For Unity -->");
+            content = Regex.Replace(content, NewLine + AdditionalContentComment + ".*" + AdditionalContentComment, "", RegexOptions.Singleline);
+            content = Regex.Replace(content, "[\r\n]+</Project>[\r\n]*", NewLine + AdditionalContentComment);
             {
                 content += NewLine + "  <ItemGroup>";
                 {
@@ -55,17 +56,17 @@ private static string OnGeneratedCSProject(string path, string content)
 
                     // Add analyzer packages.
                     foreach (var package in setting.AnalyzerPackages)
-                        content = AddPackage(content, package.Name, package.Version);
+                        content = AddAnalyzer(content, package.PackageId);
                 }
                 content += NewLine + "  </ItemGroup>";
 
                 // Add rule set files.
                 content += NewLine + "  <PropertyGroup>";
                 {
                     // Ruleset.
-                    var rulesets = new[] {"Assets/Default.ruleset"} // Add default rule set for project.
+                    var rulesets = new[] { "Assets/Default.ruleset" } // Add default rule set for project.
                         .Concat(string.IsNullOrEmpty(asmdefPath)
-                            ? new[] {"Assets/" + assemblyName + ".ruleset"} // Add rule set for predefined assemblies (e.g. Assembly-CSharp.dll).
+                            ? new[] { "Assets/" + assemblyName + ".ruleset" } // Add rule set for predefined assemblies (e.g. Assembly-CSharp.dll).
                             : Directory.GetFiles(Path.GetDirectoryName(asmdefPath), "*.ruleset")) // Add rule sets for asmdef.
                         .Where(File.Exists);
 
@@ -74,7 +75,7 @@ private static string OnGeneratedCSProject(string path, string content)
                 }
                 content += NewLine + "  </PropertyGroup>";
             }
-            content += NewLine + "<!-- C# Settings For Unity -->" + NewLine + NewLine + "</Project>" + NewLine;
+            content += NewLine + AdditionalContentComment + NewLine + "</Project>" + NewLine;
 
             return content;
         }
@@ -88,13 +89,22 @@ private static string AddPackage(string content, string name, string version)
             return content;
         }
 
+        private static string AddAnalyzer(string content, string packageId)
+        {
+            var info = AnalyzerInfo.GetInstalledInfo(packageId);
+            foreach (var dll in info.DllFiles)
+                content += NewLine + "    <Analyzer Include=\"" + dll.Replace('/', '\\') + "\" />";
+            return content;
+        }
+
         private static string AddRuleSet(string content, string ruleset)
         {
             if (File.Exists(ruleset))
                 content += NewLine + "    <CodeAnalysisRuleSet>" + ruleset.Replace('/', '\\') + "</CodeAnalysisRuleSet>";
             return content;
         }
 
-        private static string NewLine = "\r\n";
+        private const string NewLine = "\r\n";
+        private const string AdditionalContentComment = "<!-- C# Settings For Unity -->";
     }
 }

Editor/CscSettingsProvider.cs

@@ -16,7 +16,7 @@ internal class CscSettingsProvider
         private static ReorderableList s_RoAnalyzerPackages;
 
         private static GUIContent s_HeaderCompiler = new GUIContent("Compiler");
-        private static GUIContent s_HeaderAnalyzer = new GUIContent("Analyzer");
+        private static GUIContent s_HeaderAnalyzer = new GUIContent("Analyzer / Source Generator");
         private static GUIContent s_HeaderDebug = new GUIContent("Debug");
 
 
@@ -30,7 +30,7 @@ private static SettingsProvider CreateSettingsProvider()
 
             var analyzerPackages = serializedObject.FindProperty("m_AnalyzerPackages");
             s_RoAnalyzerPackages = new ReorderableList(serializedObject, analyzerPackages);
-            s_RoAnalyzerPackages.drawHeaderCallback = rect => EditorGUI.PrefixLabel(rect, GUIUtility.GetControlID(FocusType.Passive), new GUIContent("Analyzer Packages"));
+            s_RoAnalyzerPackages.drawHeaderCallback = rect => EditorGUI.PrefixLabel(rect, GUIUtility.GetControlID(FocusType.Passive), new GUIContent("Packages"));
             s_RoAnalyzerPackages.elementHeight = NugetPackageDrawer.Height;
             s_RoAnalyzerPackages.drawElementCallback = (rect, index, active, focused) =>
             {
@@ -42,7 +42,7 @@ private static SettingsProvider CreateSettingsProvider()
                 for (var i = 0; i < analyzerPackages.arraySize; i++)
                 {
                     var sp = analyzerPackages.GetArrayElementAtIndex(i);
-                    sp.FindPropertyRelative("m_Category").intValue = (int) NugetPackage.CategoryType.Analyzer;
+                    sp.FindPropertyRelative("m_Category").intValue = (int)NugetPackage.CategoryType.Analyzer;
                 }
             };
 

Editor/InspectorGUI.cs

@@ -144,7 +144,7 @@ public static bool DrawCompilerPackage(SerializedObject so)
             var spCompilerType = so.FindProperty("m_CompilerType");
             EditorGUILayout.PropertyField(spCompilerType);
 
-            bool isCustomPackage = spCompilerType.intValue == (int) CompilerType.CustomPackage;
+            bool isCustomPackage = spCompilerType.intValue == (int)CompilerType.CustomPackage;
             if (isCustomPackage)
             {
                 EditorGUI.indentLevel++;

Plugins/CSharpCompilerSettings/Utils.cs

@@ -43,7 +43,7 @@ public static string[] ModifySymbols(IEnumerable<string> defines, string modifyS
         public static void RequestCompilation(string assemblyName = null)
         {
             var unityVersions = Application.unityVersion.Split('.');
-            if(2021 <= int.Parse(unityVersions[0]))
+            if (2021 <= int.Parse(unityVersions[0]))
             {
                 typeof(CompilationPipeline).Call("RequestScriptCompilation");
                 return;