From b0bc9ea9b5f5bf8a5c2f33b1102abf4f649e60c7 Mon Sep 17 00:00:00 2001
From: Titus Wormer <tituswormer@gmail.com>
Date: Thu, 30 Jun 2022 12:25:48 +0200
Subject: Fix to prefer resource when given

---
 src/compiler.rs         | 12 ++++++------
 tests/link_reference.rs | 17 +++++++++++------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/compiler.rs b/src/compiler.rs
index 7a11870..fbc4792 100644
--- a/src/compiler.rs
+++ b/src/compiler.rs
@@ -1047,15 +1047,15 @@ fn on_exit_media(context: &mut CompileContext) {
         .map(|id| normalize_identifier(&id));
     let label = media.label.unwrap();
     let definition = id.and_then(|id| context.definitions.get(&id));
-    let destination = if let Some(definition) = definition {
-        &definition.destination
-    } else {
+    let destination = if media.destination.is_some() {
         &media.destination
-    };
-    let title = if let Some(definition) = definition {
-        &definition.title
     } else {
+        &definition.unwrap().destination
+    };
+    let title = if media.destination.is_some() {
         &media.title
+    } else {
+        &definition.unwrap().title
     };
 
     let destination = if let Some(destination) = destination {
diff --git a/tests/link_reference.rs b/tests/link_reference.rs
index cac1b39..0904995 100644
--- a/tests/link_reference.rs
+++ b/tests/link_reference.rs
@@ -256,12 +256,17 @@ fn link_reference() {
         "should prefer collapsed references over shortcut references"
     );
 
-    // To do: some bug!
-    // assert_eq!(
-    //     micromark("[foo]: /url1\n\n[foo]()"),
-    //     "<p><a href=\"\">foo</a></p>",
-    //     "should prefer resources over shortcut references"
-    // );
+    assert_eq!(
+        micromark("[foo]: /url\n\n[foo]()"),
+        "<p><a href=\"\">foo</a></p>",
+        "should prefer resources over shortcut references (1)"
+    );
+
+    assert_eq!(
+        micromark("[foo]: /url \"title\"\n\n[foo]()"),
+        "<p><a href=\"\">foo</a></p>",
+        "should prefer resources over shortcut references (2)"
+    );
 
     assert_eq!(
         micromark("[foo]: /url1\n\n[foo](not a link)"),
-- 
cgit