GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix issue when dragged deck is a prefix of target (#2149)

Browse source
This commit is contained in:
Abdo 2022-10-29 02:42:34 +03:00 committed by GitHub
parent abbfdbf420
commit 95d0c78b78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rslib/src/decks/name.rs
View file

@ -61,8 +61,10 @@ impl NativeDeckName {
/// The returned name should be used to replace `self`. /// The returned name should be used to replace `self`.
pub(crate) fn reparented_name(&self, target: Option<&NativeDeckName>) -> Option<Self> { pub(crate) fn reparented_name(&self, target: Option<&NativeDeckName>) -> Option<Self> {
let dragged_base = self.0.rsplit('\x1f').next().unwrap(); let dragged_base = self.0.rsplit('\x1f').next().unwrap();
let dragged_root = self.components().next().unwrap();
if let Some(target) = target { if let Some(target) = target {
if target.0.starts_with(&self.0) { let target_root = target.components().next().unwrap();
if target.0.starts_with(&self.0) && target_root == dragged_root {
// foo onto foo::bar, or foo onto itself -> no-op // foo onto foo::bar, or foo onto itself -> no-op
None None
} else { } else {
@ -273,5 +275,7 @@ mod test {
assert_eq!(reparented_name("drag", Some("drag:child:grandchild")), None); assert_eq!(reparented_name("drag", Some("drag:child:grandchild")), None);
// name doesn't change when deck dropped on itself // name doesn't change when deck dropped on itself
assert_eq!(reparented_name("foo:bar", Some("foo:bar")), None); assert_eq!(reparented_name("foo:bar", Some("foo:bar")), None);
// names that are prefixes of the target are handled correctly
assert_eq!(reparented_name("a", Some("ab")), n_opt("ab:a"));
} }
} }