CodeRefactor.OrganizeImports: sort imports by package then by name. ASCompletion.ASGenerator: sort imports by package then by name.

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 &&
-                        String.Compare(mImport.Groups["package"].Value, fullPath) > 0)
+                        ComparePackages(mImport.Groups["package"].Value, fullPath) > 0)
                     {
                         line--;
                         break;
@@ -4427,6 +4427,23 @@ private static void AddLookupPosition()
                 ASContext.Panel.SetLastLookupPosition(ASContext.Context.CurrentFile, lookupLine, lookupCol);
             }
         }
+
+        private static Int32 ComparePackages(String package1, String package2)
+        {
+            IComparer cmp = new CaseInsensitiveComparer();
+            String[] parts1 = package1.Split('.');
+            String[] parts2 = package2.Split('.');
+            int pkgLen1 = parts1.Length - 1;
+            int pkgLen2 = parts2.Length - 1;
+            int commonLen = (pkgLen1 <= pkgLen2) ? pkgLen1 : pkgLen2;
+            for (int i = 0; i < commonLen; ++i)
+            {
+                int cmpResult = cmp.Compare(parts1[i], parts2[i]);
+                if (cmpResult != 0)
+                    return cmpResult;
+            }
+            return pkgLen1 - pkgLen2;
+        }
         #endregion     
     }
 

External/Plugins/CodeRefactor/Commands/OrganizeImports.cs

@@ -149,8 +149,7 @@ private void InsertImports(List<MemberModel> imports, String searchInText, Scint
         {
             String eol = LineEndDetector.GetNewLineMarker(sci.EOLMode);
             Int32 line = imports[0].LineFrom - DeletedImportsCompensation;
-            ImportsComparerType comparerType = new ImportsComparerType();
-            imports.Sort(comparerType);
+            imports.Sort(new ImportsComparerType());
             sci.GotoLine(line);
             Int32 curLine = 0;
             List<String> uniques = this.GetUniqueImports(imports, searchInText, sci.FileName);
@@ -226,7 +225,19 @@ class ImportsComparerType : IComparer<MemberModel>
     {
         public Int32 Compare(MemberModel item1, MemberModel item2)
         {
-            return new CaseInsensitiveComparer().Compare(item1.Type, item2.Type);
+            IComparer cmp = new CaseInsensitiveComparer();
+            String[] parts1 = item1.Type.Split('.');
+            String[] parts2 = item2.Type.Split('.');
+            int pkgLen1 = parts1.Length - 1;
+            int pkgLen2 = parts2.Length - 1;
+            int commonLen = (pkgLen1 <= pkgLen2) ? pkgLen1 : pkgLen2;
+            for (int i = 0; i < commonLen; ++i)
+            {
+                int cmpResult = cmp.Compare(parts1[i], parts2[i]);
+                if (cmpResult != 0)
+                    return cmpResult;
+            }
+            return pkgLen1 - pkgLen2;
         }
     }