code review fixes

- use LINQ when possible
- TryGetSourceCodeSearchID -> return string instead of bool

Author: vkovec

Assets/com.unity.formats.fbx/Editor/Scripts/FbxExporterRepairMissingScripts.cs

@@ -16,17 +16,18 @@ public class RepairMissingScripts
         private const string m_idFormat = "{{fileID: {0}, guid: {1}, type:";
 
         private static List<string> m_searchIDsToReplace;
-        private static string[] SearchIDsToReplace
+        private static List<string> SearchIDsToReplace
         {
             get
             {
-                if(m_searchIDsToReplace == null || m_searchIDsToReplace.Count <= 0)
+                if (m_searchIDsToReplace == null || m_searchIDsToReplace.Count <= 0)
                 {
-                    m_searchIDsToReplace = new List<string>();
-                    m_searchIDsToReplace.Add(string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_forumPackageGUID));
-                    m_searchIDsToReplace.Add(string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_assetStorePackageGUID));
+                    m_searchIDsToReplace = new List<string>() {
+                        string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_forumPackageGUID),
+                        string.Format(m_idFormat, m_fbxPrefabDLLFileId, m_assetStorePackageGUID)
+                    };
                 }
-                return m_searchIDsToReplace.ToArray();
+                return m_searchIDsToReplace;
             }
         }
 
@@ -40,18 +41,17 @@ private string[] AssetsToRepair{
             }
         }
 
-        public static bool TryGetSourceCodeSearchID(out string searchID)
+        public static string GetSourceCodeSearchID()
         {
             var fbxPrefabObj = AssetDatabase.LoadMainAssetAtPath(FbxExporters.FbxPrefabAutoUpdater.FindFbxPrefabAssetPath());
-            searchID = null;
+            string searchID = null;
             string guid;
             long fileId;
             if(AssetDatabase.TryGetGUIDAndLocalFileIdentifier(fbxPrefabObj, out guid, out fileId))
             {
                 searchID = string.Format(m_idFormat, fileId, guid);
-                return true;
             }
-            return false;
+            return searchID;
         }
 
         public int GetAssetsToRepairCount(){
@@ -98,13 +98,10 @@ private static bool AssetNeedsRepair(string filePath)
                     }
 
                     var contents = sr.ReadToEnd();
-                    foreach(var searchId in SearchIDsToReplace)
+                    if (SearchIDsToReplace.Exists(searchId => contents.Contains(searchId)))
                     {
-                        if (contents.Contains(searchId))
-                        {
-                            sr.Close();
-                            return true;
-                        }
+                        sr.Close();
+                        return true;
                     }
                 }
             }
@@ -116,8 +113,8 @@ private static bool AssetNeedsRepair(string filePath)
 
         public bool ReplaceGUIDInTextAssets ()
         {
-            string sourceCodeSearchID;
-            if(!TryGetSourceCodeSearchID(out sourceCodeSearchID))
+            string sourceCodeSearchID = GetSourceCodeSearchID();
+            if(string.IsNullOrEmpty(sourceCodeSearchID))
             {
                 return false;
             }
@@ -131,6 +128,16 @@ public bool ReplaceGUIDInTextAssets ()
             return replacedGUID;
         }
 
+        private static bool ReplaceID(string searchId, string replacementId, ref string line)
+        {
+            if (line.Contains(searchId))
+            {
+                line = line.Replace(searchId, replacementId);
+                return true;
+            }
+            return false;
+        }
+
         private static bool ReplaceGUIDInFile (string path, string replacementSearchID)
         {
             // try to read file, assume it's a text file for now
@@ -160,15 +167,9 @@ private static bool ReplaceGUIDInFile (string path, string replacementSearchID)
 
                         while (sr.Peek () > -1) {
                             var line = sr.ReadLine ();
-
-                            foreach(var searchId in SearchIDsToReplace)
-                            {
-                                if (line.Contains(searchId))
-                                {
-                                    line = line.Replace(searchId, replacementSearchID);
-                                    modified = true;
-                                }
-                            }
+                            SearchIDsToReplace.ForEach(searchId =>
+                                modified |= ReplaceID(searchId, replacementSearchID, ref line)
+                            );
 
                             sw.WriteLine (line);
                         }