Merge branch 'master' into major-200-20240511

abhishek72850 · May 11, 2024 · ff4f9cb · ff4f9cb
2 parents e8fb1da + bcb7b73
commit ff4f9cb
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/commands/import_symbol.py b/src/commands/import_symbol.py
@@ -253,7 +253,15 @@ def run(self, copy: bool = False):
             )
 
         self.import_statements = dict(
-            sorted(self.import_statements.items(), key=lambda k: k[0])
+            sorted(
+                self.import_statements.items(),
+                # put imports first, then sort by depth, then by name
+                key=lambda k: (
+                    not k[0].startswith("import "),
+                    k[0].count("."),
+                    k[0],
+                ),
+            )
         )
 
         self.view.erase_status(PyRockConstants.PACKAGE_NAME)