language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge #10685

Browse source 
10685: fix: Enable markdown tables r=Veykril a=Veykril

Should fix https://github.com/rust-analyzer/rust-analyzer/issues/10655
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-11-05 11:25:17 +00:00 • committed by GitHub
commit 10782bbb39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ide/src/doc_links.rs
View file

@ -32,11 +32,13 @@ use crate::{
/// Weblink to an item's documentation. /// Weblink to an item's documentation.
pub(crate) type DocumentationLink = String; pub(crate) type DocumentationLink = String;
const MARKDOWN_OPTIONS: Options =
Options::ENABLE_FOOTNOTES.union(Options::ENABLE_TABLES).union(Options::ENABLE_TASKLISTS);
/// Rewrite documentation links in markdown to point to an online host (e.g. docs.rs) /// Rewrite documentation links in markdown to point to an online host (e.g. docs.rs)
pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: Definition) -> String { pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: Definition) -> String {
let mut cb = broken_link_clone_cb; let mut cb = broken_link_clone_cb;
let doc = let doc = Parser::new_with_broken_link_callback(markdown, MARKDOWN_OPTIONS, Some(&mut cb));
Parser::new_with_broken_link_callback(markdown, Options::ENABLE_TASKLISTS, Some(&mut cb));
let doc = map_links(doc, |target, title| { let doc = map_links(doc, |target, title| {
// This check is imperfect, there's some overlap between valid intra-doc links // This check is imperfect, there's some overlap between valid intra-doc links
@ -75,13 +77,11 @@ pub(crate) fn rewrite_links(db: &RootDatabase, markdown: &str, definition: Defin
pub(crate) fn remove_links(markdown: &str) -> String { pub(crate) fn remove_links(markdown: &str) -> String {
let mut drop_link = false; let mut drop_link = false;
let opts = Options::ENABLE_TASKLISTS | Options::ENABLE_FOOTNOTES;
let mut cb = |_: BrokenLink| { let mut cb = |_: BrokenLink| {
let empty = InlineStr::try_from("").unwrap(); let empty = InlineStr::try_from("").unwrap();
Some((CowStr::Inlined(empty), CowStr::Inlined(empty))) Some((CowStr::Inlined(empty), CowStr::Inlined(empty)))
}; };
let doc = Parser::new_with_broken_link_callback(markdown, opts, Some(&mut cb)); let doc = Parser::new_with_broken_link_callback(markdown, MARKDOWN_OPTIONS, Some(&mut cb));
let doc = doc.filter_map(move |evt| match evt { let doc = doc.filter_map(move |evt| match evt {
Event::Start(Tag::Link(link_type, target, title)) => { Event::Start(Tag::Link(link_type, target, title)) => {
if link_type == LinkType::Inline && target.contains("://") { if link_type == LinkType::Inline && target.contains("://") {
@ -151,7 +151,7 @@ pub(crate) fn extract_definitions_from_docs(
) -> Vec<(TextRange, String, Option<hir::Namespace>)> { ) -> Vec<(TextRange, String, Option<hir::Namespace>)> {
Parser::new_with_broken_link_callback( Parser::new_with_broken_link_callback(
docs.as_str(), docs.as_str(),
Options::ENABLE_TASKLISTS, MARKDOWN_OPTIONS,
Some(&mut broken_link_clone_cb), Some(&mut broken_link_clone_cb),
) )
.into_offset_iter() .into_offset_iter()