From 07bb2f701e5bae0da724068bbce1920458df9cda Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Thu, 27 Oct 2022 11:16:30 -0700 Subject: rustdoc: change `.src-line-numbers > span` to `.src-line-numbers > a` This allows people to treat them like real links, such as right-click to copy URL, and makes the line numbers in a scraped example work at all, when before this commit was added, they had the clickable pointer cursor but did not actually do anything when clicked. --- src/librustdoc/html/static/css/rustdoc.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/librustdoc/html/static/css') diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index 894499e5c4f..df7b6e9b99a 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -575,8 +575,7 @@ ul.block, .block li { border-color: var(--example-line-numbers-border-color); } -.src-line-numbers span { - cursor: pointer; +.src-line-numbers a { color: var(--src-line-numbers-span-color); } .src-line-numbers .line-highlighted { @@ -2060,7 +2059,7 @@ in storage.js padding: 14px 0; } -.scraped-example .code-wrapper .src-line-numbers span { +.scraped-example .code-wrapper .src-line-numbers a { padding: 0 14px; } -- cgit 1.4.1-3-g733a5 From ba4ae13528428cf770701ea5d9203cbf64b5a1cd Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Fri, 28 Oct 2022 09:51:57 -0700 Subject: rustdoc: remove left border from `.src-line-numbers > a` --- src/librustdoc/html/static/css/rustdoc.css | 8 +++++--- src/test/rustdoc-gui/source-code-page.goml | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'src/librustdoc/html/static/css') diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index df7b6e9b99a..b64fe74e960 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -578,11 +578,13 @@ ul.block, .block li { .src-line-numbers a { color: var(--src-line-numbers-span-color); } -.src-line-numbers .line-highlighted { - background-color: var(--src-line-number-highlighted-background-color); -} .src-line-numbers :target { background-color: transparent; + border-right: none; + padding-right: 0; +} +.src-line-numbers .line-highlighted { + background-color: var(--src-line-number-highlighted-background-color); } .search-loading { diff --git a/src/test/rustdoc-gui/source-code-page.goml b/src/test/rustdoc-gui/source-code-page.goml index 31d55cd7885..c71a3d64d0c 100644 --- a/src/test/rustdoc-gui/source-code-page.goml +++ b/src/test/rustdoc-gui/source-code-page.goml @@ -6,6 +6,11 @@ click: ".src-line-numbers > a:nth-child(4)" // This is the anchor for line 4. // Ensure that the page URL was updated. assert-document-property: ({"URL": "lib.rs.html#4"}, ENDS_WITH) assert-attribute: ("//*[@id='4']", {"class": "line-highlighted"}) +// Ensure that the default style, with the right border, isn't used. +assert-css: ("//*[@id='4']", {"border-right-width": "0px"}) +reload: +assert-attribute: ("//*[@id='4']", {"class": "line-highlighted"}) +assert-css: ("//*[@id='4']", {"border-right-width": "0px"}) // We now check that the good anchors are highlighted goto: "file://" + |DOC_PATH| + "/src/test_docs/lib.rs.html#4-6" assert-attribute-false: (".src-line-numbers > a:nth-child(3)", {"class": "line-highlighted"}) -- cgit 1.4.1-3-g733a5 From cb3a04b6ef4db1b16d5e8dac5fcc00d66183eed6 Mon Sep 17 00:00:00 2001 From: Michael Howell Date: Sat, 12 Nov 2022 08:53:12 -0700 Subject: rustdoc: avoid excessive HTML generated in example sources --- src/librustdoc/html/render/mod.rs | 6 +----- src/librustdoc/html/sources.rs | 10 +++++----- src/librustdoc/html/static/css/rustdoc.css | 5 +++-- 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'src/librustdoc/html/static/css') diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index e09106077f7..1fe52353449 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -2899,11 +2899,7 @@ fn render_call_locations(w: &mut Buffer, cx: &mut Context<'_>, item: &clean::Ite cx, &cx.root_path(), highlight::DecorationInfo(decoration_info), - sources::SourceContext::Embedded { - url: &call_data.url, - offset: line_min, - needs_expansion, - }, + sources::SourceContext::Embedded { offset: line_min, needs_expansion }, ); write!(w, ""); diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs index 99b4678c457..50135d60190 100644 --- a/src/librustdoc/html/sources.rs +++ b/src/librustdoc/html/sources.rs @@ -256,9 +256,9 @@ where } } -pub(crate) enum SourceContext<'a> { +pub(crate) enum SourceContext { Standalone, - Embedded { url: &'a str, offset: usize, needs_expansion: bool }, + Embedded { offset: usize, needs_expansion: bool }, } /// Wrapper struct to render the source code of a file. This will do things like @@ -270,7 +270,7 @@ pub(crate) fn print_src( context: &Context<'_>, root_path: &str, decoration_info: highlight::DecorationInfo, - source_context: SourceContext<'_>, + source_context: SourceContext, ) { let lines = s.lines().count(); let mut line_numbers = Buffer::empty_from(buf); @@ -286,12 +286,12 @@ pub(crate) fn print_src( writeln!(line_numbers, "{line}") } } - SourceContext::Embedded { url, offset, needs_expansion } => { + SourceContext::Embedded { offset, needs_expansion } => { extra = if needs_expansion { Some(r#"↕"#) } else { None }; for line_number in 1..=lines { let line = line_number + offset; - writeln!(line_numbers, "{line}") + writeln!(line_numbers, "{line}") } } } diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css index b64fe74e960..bbcce726668 100644 --- a/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css @@ -575,7 +575,7 @@ ul.block, .block li { border-color: var(--example-line-numbers-border-color); } -.src-line-numbers a { +.src-line-numbers a, .src-line-numbers span { color: var(--src-line-numbers-span-color); } .src-line-numbers :target { @@ -2061,7 +2061,8 @@ in storage.js padding: 14px 0; } -.scraped-example .code-wrapper .src-line-numbers a { +.scraped-example .code-wrapper .src-line-numbers a, +.scraped-example .code-wrapper .src-line-numbers span { padding: 0 14px; } -- cgit 1.4.1-3-g733a5