Extract sort to its own function

BetterThanTomorrow · Jan 28, 2023 · 78e744b · 78e744b
1 parent 01f5c48
commit 78e744b
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/project-root.ts b/src/project-root.ts
@@ -134,18 +134,9 @@ export async function pickProjectRoot(
     return rootToUri(uris[0]);
   }
 
-  uris.sort((a, b) => {
-    if (!selected) {
-      return 0;
-    }
-    return rootToUri(a).fsPath === selected.fsPath
-      ? -1
-      : rootToUri(b).fsPath === selected.fsPath
-      ? 1
-      : 0;
-  });
+  const sorted = sortPreSelectedFirst(uris, selected);
 
-  const project_root_options = uris.map((root_or_uri) => {
+  const project_root_options = sorted.map((root_or_uri) => {
     let uri;
     let reason;
     if (root_or_uri instanceof vscode.Uri) {
@@ -180,3 +171,16 @@ export async function pickProjectRoot(
 
   return selected_root?.value;
 }
+
+function sortPreSelectedFirst(uris: (ProjectRoot | vscode.Uri)[], selected: vscode.Uri) {
+  return [...uris].sort((a, b) => {
+    if (!selected) {
+      return 0;
+    }
+    return rootToUri(a).fsPath === selected.fsPath
+      ? -1
+      : rootToUri(b).fsPath === selected.fsPath
+      ? 1
+      : 0;
+  });
+}