From d24bd7609c731fadb13717aac5d62adb39156fc7 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 17 Aug 2020 19:44:09 +1000
Subject: [PATCH] allow setting sort field before add

---
 rslib/src/notetype/mod.rs | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/rslib/src/notetype/mod.rs b/rslib/src/notetype/mod.rs
index 57ce56d2d..63fd95a39 100644
--- a/rslib/src/notetype/mod.rs
+++ b/rslib/src/notetype/mod.rs
@@ -163,15 +163,26 @@ impl NoteType {
             .collect()
     }
 
+    /// Adjust sort index to match repositioned fields.
     fn reposition_sort_idx(&mut self) {
-        let adjusted_idx = self.fields.iter().enumerate().find_map(|(idx, f)| {
-            if f.ord == Some(self.config.sort_field_idx) {
-                Some(idx)
-            } else {
-                None
-            }
-        });
-        self.config.sort_field_idx = adjusted_idx.unwrap_or(0) as u32;
+        self.config.sort_field_idx = self
+            .fields
+            .iter()
+            .enumerate()
+            .find_map(|(idx, f)| {
+                if f.ord == Some(self.config.sort_field_idx) {
+                    Some(idx as u32)
+                } else {
+                    None
+                }
+            })
+            .unwrap_or_else(|| {
+                // provided ordinal not on any existing field; cap to bounds
+                self.config
+                    .sort_field_idx
+                    .max(0)
+                    .min((self.fields.len() - 1) as u32)
+            });
     }
 
     pub(crate) fn normalize_names(&mut self) {