mirror of
https://github.com/rust-lang/rust.git
synced 2025-06-05 19:58:32 +00:00
Rollup merge of #106602 - GuillaumeGomez:tidy-goml-scripts, r=Mark-Simulacrum
Add goml scripts to tidy checks r? ``@notriddle``
This commit is contained in:
commit
bb6a88ad5e
@ -5,7 +5,7 @@ goto: "file://" + |DOC_PATH| + "/test_docs/index.html"
|
|||||||
write: (".search-input", "test")
|
write: (".search-input", "test")
|
||||||
// To be SURE that the search will be run.
|
// To be SURE that the search will be run.
|
||||||
press-key: 'Enter'
|
press-key: 'Enter'
|
||||||
wait-for: "#search h1" // The search element is empty before the first search
|
wait-for: "#search h1" // The search element is empty before the first search
|
||||||
// Check that the currently displayed element is search.
|
// Check that the currently displayed element is search.
|
||||||
wait-for: "#alternative-display #search"
|
wait-for: "#alternative-display #search"
|
||||||
assert-attribute: ("#main-content", {"class": "content hidden"})
|
assert-attribute: ("#main-content", {"class": "content hidden"})
|
||||||
|
@ -3,7 +3,7 @@ goto: "file://" + |DOC_PATH| + "/test_docs/struct.TypeWithImplDoc.html"
|
|||||||
|
|
||||||
// The text is about 24px tall, so if there's a margin, then their position will be >24px apart
|
// The text is about 24px tall, so if there's a margin, then their position will be >24px apart
|
||||||
compare-elements-position-near-false: (
|
compare-elements-position-near-false: (
|
||||||
"#implementations-list > .implementors-toggle > .docblock > p",
|
"#implementations-list > .implementors-toggle > .docblock > p",
|
||||||
"#implementations-list > .implementors-toggle > .impl-items",
|
"#implementations-list > .implementors-toggle > .impl-items",
|
||||||
{"y": 24}
|
{"y": 24}
|
||||||
)
|
)
|
||||||
|
@ -27,4 +27,8 @@ assert-css-false: (".content .out-of-band .since::before", { "content": "\"Since
|
|||||||
goto: "file://" + |DOC_PATH| + "/settings.html"
|
goto: "file://" + |DOC_PATH| + "/settings.html"
|
||||||
size: (400, 600)
|
size: (400, 600)
|
||||||
// Ignored for now https://github.com/rust-lang/rust/issues/93784.
|
// Ignored for now https://github.com/rust-lang/rust/issues/93784.
|
||||||
// compare-elements-position-near-false: ("#preferred-light-theme .setting-name", "#preferred-light-theme .choice", {"y": 16})
|
// compare-elements-position-near-false: (
|
||||||
|
// "#preferred-light-theme .setting-name",
|
||||||
|
// "#preferred-light-theme .choice",
|
||||||
|
// {"y": 16},
|
||||||
|
// )
|
||||||
|
@ -31,13 +31,28 @@ define-function: (
|
|||||||
|
|
||||||
call-function: (
|
call-function: (
|
||||||
"check-logo",
|
"check-logo",
|
||||||
("ayu", "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) drop-shadow(rgb(255, 255, 255) 0px 1px 0px) drop-shadow(rgb(255, 255, 255) -1px 0px 0px) drop-shadow(rgb(255, 255, 255) 0px -1px 0px)"),
|
{
|
||||||
|
"theme": "ayu",
|
||||||
|
"filter": "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) 0px 1px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) -1px 0px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) 0px -1px 0px)",
|
||||||
|
},
|
||||||
)
|
)
|
||||||
call-function: (
|
call-function: (
|
||||||
"check-logo",
|
"check-logo",
|
||||||
("dark", "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) drop-shadow(rgb(255, 255, 255) 0px 1px 0px) drop-shadow(rgb(255, 255, 255) -1px 0px 0px) drop-shadow(rgb(255, 255, 255) 0px -1px 0px)"),
|
{
|
||||||
|
"theme": "dark",
|
||||||
|
"filter": "drop-shadow(rgb(255, 255, 255) 1px 0px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) 0px 1px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) -1px 0px 0px) " +
|
||||||
|
"drop-shadow(rgb(255, 255, 255) 0px -1px 0px)",
|
||||||
|
},
|
||||||
)
|
)
|
||||||
call-function: (
|
call-function: (
|
||||||
"check-logo",
|
"check-logo",
|
||||||
("light", "none"),
|
{
|
||||||
|
"theme": "light",
|
||||||
|
"filter": "none",
|
||||||
|
},
|
||||||
)
|
)
|
||||||
|
@ -5,25 +5,25 @@ store-property: (initialScrollTop, ".scraped-example-list > .scraped-example pre
|
|||||||
focus: ".scraped-example-list > .scraped-example .next"
|
focus: ".scraped-example-list > .scraped-example .next"
|
||||||
press-key: "Enter"
|
press-key: "Enter"
|
||||||
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
||||||
"scrollTop": |initialScrollTop|
|
"scrollTop": |initialScrollTop|
|
||||||
})
|
})
|
||||||
focus: ".scraped-example-list > .scraped-example .prev"
|
focus: ".scraped-example-list > .scraped-example .prev"
|
||||||
press-key: "Enter"
|
press-key: "Enter"
|
||||||
assert-property: (".scraped-example-list > .scraped-example pre", {
|
assert-property: (".scraped-example-list > .scraped-example pre", {
|
||||||
"scrollTop": |initialScrollTop|
|
"scrollTop": |initialScrollTop|
|
||||||
})
|
})
|
||||||
|
|
||||||
// The expand button increases the scrollHeight of the minimized code viewport
|
// The expand button increases the scrollHeight of the minimized code viewport
|
||||||
store-property: (smallOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
|
store-property: (smallOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
|
||||||
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
||||||
"scrollHeight": |smallOffsetHeight|
|
"scrollHeight": |smallOffsetHeight|
|
||||||
})
|
})
|
||||||
focus: ".scraped-example-list > .scraped-example .expand"
|
focus: ".scraped-example-list > .scraped-example .expand"
|
||||||
press-key: "Enter"
|
press-key: "Enter"
|
||||||
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
assert-property-false: (".scraped-example-list > .scraped-example pre", {
|
||||||
"offsetHeight": |smallOffsetHeight|
|
"offsetHeight": |smallOffsetHeight|
|
||||||
})
|
})
|
||||||
store-property: (fullOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
|
store-property: (fullOffsetHeight, ".scraped-example-list > .scraped-example pre", "offsetHeight")
|
||||||
assert-property: (".scraped-example-list > .scraped-example pre", {
|
assert-property: (".scraped-example-list > .scraped-example pre", {
|
||||||
"scrollHeight": |fullOffsetHeight|
|
"scrollHeight": |fullOffsetHeight|
|
||||||
})
|
})
|
||||||
|
@ -148,4 +148,4 @@ assert-text: ("#toggle-all-docs", "[+]")
|
|||||||
assert-property: (".sidebar", {"clientWidth": "200"})
|
assert-property: (".sidebar", {"clientWidth": "200"})
|
||||||
click: "#toggle-all-docs"
|
click: "#toggle-all-docs"
|
||||||
assert-text: ("#toggle-all-docs", "[−]")
|
assert-text: ("#toggle-all-docs", "[−]")
|
||||||
assert-property: (".sidebar", {"clientWidth": "200"})
|
assert-property: (".sidebar", {"clientWidth": "200"})
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
// ignore-tidy-linelength
|
||||||
// This test ensures that the items declaration content overflow is handled inside the <pre> directly.
|
// This test ensures that the items declaration content overflow is handled inside the <pre> directly.
|
||||||
|
|
||||||
// We need to disable this check because
|
// We need to disable this check because
|
||||||
|
@ -25,6 +25,7 @@ use std::path::Path;
|
|||||||
/// displayed on the console with --example.
|
/// displayed on the console with --example.
|
||||||
const ERROR_CODE_COLS: usize = 80;
|
const ERROR_CODE_COLS: usize = 80;
|
||||||
const COLS: usize = 100;
|
const COLS: usize = 100;
|
||||||
|
const GOML_COLS: usize = 120;
|
||||||
|
|
||||||
const LINES: usize = 3000;
|
const LINES: usize = 3000;
|
||||||
|
|
||||||
@ -230,7 +231,8 @@ pub fn check(path: &Path, bad: &mut bool) {
|
|||||||
walk(path, &mut skip, &mut |entry, contents| {
|
walk(path, &mut skip, &mut |entry, contents| {
|
||||||
let file = entry.path();
|
let file = entry.path();
|
||||||
let filename = file.file_name().unwrap().to_string_lossy();
|
let filename = file.file_name().unwrap().to_string_lossy();
|
||||||
let extensions = [".rs", ".py", ".js", ".sh", ".c", ".cpp", ".h", ".md", ".css", ".ftl"];
|
let extensions =
|
||||||
|
[".rs", ".py", ".js", ".sh", ".c", ".cpp", ".h", ".md", ".css", ".ftl", ".goml"];
|
||||||
if extensions.iter().all(|e| !filename.ends_with(e)) || filename.starts_with(".#") {
|
if extensions.iter().all(|e| !filename.ends_with(e)) || filename.starts_with(".#") {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -255,8 +257,15 @@ pub fn check(path: &Path, bad: &mut bool) {
|
|||||||
|
|
||||||
let extension = file.extension().unwrap().to_string_lossy();
|
let extension = file.extension().unwrap().to_string_lossy();
|
||||||
let is_error_code = extension == "md" && is_in(file, "src", "error_codes");
|
let is_error_code = extension == "md" && is_in(file, "src", "error_codes");
|
||||||
|
let is_goml_code = extension == "goml";
|
||||||
|
|
||||||
let max_columns = if is_error_code { ERROR_CODE_COLS } else { COLS };
|
let max_columns = if is_error_code {
|
||||||
|
ERROR_CODE_COLS
|
||||||
|
} else if is_goml_code {
|
||||||
|
GOML_COLS
|
||||||
|
} else {
|
||||||
|
COLS
|
||||||
|
};
|
||||||
|
|
||||||
let can_contain = contents.contains("// ignore-tidy-")
|
let can_contain = contents.contains("// ignore-tidy-")
|
||||||
|| contents.contains("# ignore-tidy-")
|
|| contents.contains("# ignore-tidy-")
|
||||||
|
Loading…
Reference in New Issue
Block a user