OrganizeImports: moved comparer code to MemberModel to avoid duplicate code.

Author: gene-pavlovsky

External/Plugins/ASCompletion/Completion/ASGenerator.cs

@@ -4326,7 +4326,7 @@ public static int InsertImport(MemberModel member, bool fixScrolling)
                     // insert in alphabetical order
                     mImport = ASFileParserRegexes.Import.Match(txt);
                     if (mImport.Success &&
-                        CompareImports(mImport.Groups["package"].Value, fullPath) > 0)
+                        ByImportTypeMemberComparer.CompareImports(mImport.Groups["package"].Value, fullPath) > 0)
                     {
                         line--;
                         break;
@@ -4427,28 +4427,6 @@ private static void AddLookupPosition()
                 ASContext.Panel.SetLastLookupPosition(ASContext.Context.CurrentFile, lookupLine, lookupCol);
             }
         }
-
-        private static Int32 CompareImports(String import1, String import2)
-        {
-            IComparer cmp = StringComparer.Ordinal;
-            String[] parts1 = import1.Split('.');
-            String[] parts2 = import2.Split('.');
-            int len1 = parts1.Length;
-            int len2 = parts2.Length;
-            // If the imports are at the same depth, compare them alphabetically.
-            if (len1 == len2)
-                return cmp.Compare(import1, import2);
-            int minPackageLen = ((len1 <= len2) ? len1 : len2) - 1;
-            // Alphabetically compare import packages part by part.
-            for (int i = 0; i < minPackageLen; ++i)
-            {
-                int cmpResult = cmp.Compare(parts1[i], parts2[i]);
-                if (cmpResult != 0)
-                    return cmpResult;
-            }
-            // One of the packages is a sub-package of the other one. Consider the parent package to compare as less than the sub-package.
-            return len1 - len2;
-        }
         #endregion     
     }
 

External/Plugins/ASCompletion/Model/MemberModel.cs

@@ -538,4 +538,40 @@ public int Compare(MemberModel a, MemberModel b)
         }
 
     }
+
+    /// <summary>
+    /// Compare members based on import name
+    /// </summary>
+    public class ByImportTypeMemberComparer : IComparer<MemberModel>
+    {
+        public static Int32 CompareImports(String import1, String import2)
+        {
+            // Use case-insensitive comparison.
+            //IComparer cmp = StringComparer.OrdinalIgnoreCase;
+            // Use case-sensitive comparison.
+            IComparer cmp = StringComparer.Ordinal;
+            String[] parts1 = import1.Split('.');
+            String[] parts2 = import2.Split('.');
+            int len1 = parts1.Length;
+            int len2 = parts2.Length;
+            // If the imports are at the same depth, compare them alphabetically.
+            if (len1 == len2)
+                return cmp.Compare(import1, import2);
+            int minPackageLen = ((len1 <= len2) ? len1 : len2) - 1;
+            // Alphabetically compare import packages part by part.
+            for (int i = 0; i < minPackageLen; ++i)
+            {
+                int cmpResult = cmp.Compare(parts1[i], parts2[i]);
+                if (cmpResult != 0)
+                    return cmpResult;
+            }
+            // One of the packages is a sub-package of the other one. Consider the parent package to compare as less than the sub-package.
+            return len1 - len2;
+        }
+
+        public Int32 Compare(MemberModel item1, MemberModel item2)
+        {
+            return CompareImports(item1.Type, item2.Type);
+        }
+    }
 }

External/Plugins/CodeRefactor/Commands/OrganizeImports.cs

@@ -149,7 +149,7 @@ private void InsertImports(List<MemberModel> imports, String searchInText, Scint
         {
             String eol = LineEndDetector.GetNewLineMarker(sci.EOLMode);
             Int32 line = imports[0].LineFrom - DeletedImportsCompensation;
-            imports.Sort(new ImportsComparerType());
+            imports.Sort(new ByImportTypeMemberComparer());
             sci.GotoLine(line);
             Int32 curLine = 0;
             List<String> uniques = this.GetUniqueImports(imports, searchInText, sci.FileName);
@@ -218,34 +218,6 @@ public override Boolean IsValid()
 
     }
 
-    /// <summary>
-    /// Compare import statements based on import name
-    /// </summary>
-    class ImportsComparerType : IComparer<MemberModel>
-    {
-        public Int32 Compare(MemberModel item1, MemberModel item2)
-        {
-            IComparer cmp = StringComparer.Ordinal;
-            String[] parts1 = item1.Type.Split('.');
-            String[] parts2 = item2.Type.Split('.');
-            int len1 = parts1.Length;
-            int len2 = parts2.Length;
-            // If the imports are at the same depth, compare them alphabetically.
-            if (len1 == len2)
-                return cmp.Compare(item1.Type, item2.Type);
-            int minPackageLen = ((len1 <= len2) ? len1 : len2) - 1;
-            // Alphabetically compare import packages part by part.
-            for (int i = 0; i < minPackageLen; ++i)
-            {
-                int cmpResult = cmp.Compare(parts1[i], parts2[i]);
-                if (cmpResult != 0)
-                    return cmpResult;
-            }
-            // One of the packages is a sub-package of the other one. Consider the parent package to compare as less than the sub-package.
-            return len1 - len2;
-        }
-    }
-
     /// <summary>
     /// Compare import statements based on declaration line
     /// </summary>