Merge pull request CocoaPods#835 from igor-makarov/sort-fallback

Add fallback to sort group by full path
igor-makarov · Jul 14, 2021 · 2700820 · 2700820
2 parents 4f2acfc + 01ac097
commit 2700820
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/xcodeproj/project/object/group.rb b/lib/xcodeproj/project/object/group.rb
@@ -440,10 +440,12 @@ def sort(options = nil)
 
  result = File.basename(x.display_name.downcase, '.*') <=> File.basename(y.display_name.downcase, '.*')
  if result.zero?
- File.extname(x.display_name.downcase) <=> File.extname(y.display_name.downcase)
- else
- result
+ result = File.extname(x.display_name.downcase) <=> File.extname(y.display_name.downcase)
+ if result.zero?
+ result = x.path.downcase <=> y.path.downcase
+ end
  end
+ result
  end
  end
  end