Skip to content

Commit

Permalink
internal: Move ide-assists codegen tests into an xtask codegen command
Browse files Browse the repository at this point in the history
  • Loading branch information
Veykril committed Feb 28, 2024
1 parent 0ac05c0 commit 4411770
Show file tree
Hide file tree
Showing 11 changed files with 273 additions and 29 deletions.
1 change: 1 addition & 0 deletions .cargo/config.toml
Expand Up @@ -3,6 +3,7 @@ xtask = "run --package xtask --bin xtask --"
tq = "test -- -q"
qt = "tq"
lint = "clippy --all-targets -- --cap-lints warn"
codegen = "run --package xtask --bin xtask -- codegen"

[target.x86_64-pc-windows-msvc]
linker = "rust-lld"
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yaml
Expand Up @@ -79,6 +79,9 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml

- name: Codegen checks (rust-analyzer)
run: cargo codegen --check

- name: Compile (tests)
run: cargo test --no-run --locked ${{ env.USE_SYSROOT_ABI }}

Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion crates/ide-assists/Cargo.toml
Expand Up @@ -33,7 +33,6 @@ expect-test = "1.4.0"
# local deps
test-utils.workspace = true
test-fixture.workspace = true
sourcegen.workspace = true

[features]
in-rust-tree = []
Expand Down
2 changes: 0 additions & 2 deletions crates/ide-assists/src/tests.rs
@@ -1,6 +1,4 @@
mod generated;
#[cfg(not(feature = "in-rust-tree"))]
mod sourcegen;

use expect_test::expect;
use hir::Semantics;
Expand Down
3 changes: 2 additions & 1 deletion xtask/Cargo.toml
Expand Up @@ -14,7 +14,8 @@ xshell.workspace = true
xflags = "0.3.0"
time = { version = "0.3", default-features = false }
zip = { version = "0.6", default-features = false, features = ["deflate", "time"] }
stdx.workspace = true
# Avoid adding more dependencies to this crate

[lints]
workspace = true
workspace = true
211 changes: 211 additions & 0 deletions xtask/src/codegen.rs
@@ -0,0 +1,211 @@
use std::{
fmt, fs, mem,
path::{Path, PathBuf},
};

use xshell::{cmd, Shell};

use crate::{flags, project_root};

pub mod assists_doc_tests;

Check failure on line 10 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` item

impl flags::Codegen {
pub(crate) fn run(self, _sh: &Shell) -> anyhow::Result<()> {
match self.codegen_type.unwrap_or_default() {
flags::CodegenType::All => {
assists_doc_tests::generate(self.check);
}
flags::CodegenType::AssistsDocTests => assists_doc_tests::generate(self.check),
}
Ok(())
}
}

fn list_rust_files(dir: &Path) -> Vec<PathBuf> {
let mut res = list_files(dir);
res.retain(|it| {
it.file_name().unwrap_or_default().to_str().unwrap_or_default().ends_with(".rs")
});
res
}

fn list_files(dir: &Path) -> Vec<PathBuf> {
let mut res = Vec::new();
let mut work = vec![dir.to_path_buf()];
while let Some(dir) = work.pop() {
for entry in dir.read_dir().unwrap() {
let entry = entry.unwrap();
let file_type = entry.file_type().unwrap();
let path = entry.path();
let is_hidden =
path.file_name().unwrap_or_default().to_str().unwrap_or_default().starts_with('.');
if !is_hidden {
if file_type.is_dir() {
work.push(path);
} else if file_type.is_file() {
res.push(path);
}
}
}
}
res
}

#[derive(Clone)]
pub struct CommentBlock {

Check failure on line 55 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` item
pub id: String,

Check failure on line 56 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` field
pub line: usize,

Check failure on line 57 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` field
pub contents: Vec<String>,

Check failure on line 58 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` field
is_doc: bool,
}

impl CommentBlock {
fn extract(tag: &str, text: &str) -> Vec<CommentBlock> {
assert!(tag.starts_with(char::is_uppercase));

let tag = format!("{tag}:");
let mut blocks = CommentBlock::extract_untagged(text);
blocks.retain_mut(|block| {
let first = block.contents.remove(0);
let Some(id) = first.strip_prefix(&tag) else {
return false;
};

if block.is_doc {
panic!("Use plain (non-doc) comments with tags like {tag}:\n {first}");
}

block.id = id.trim().to_owned();
true
});
blocks
}

fn extract_untagged(text: &str) -> Vec<CommentBlock> {
let mut res = Vec::new();

let lines = text.lines().map(str::trim_start);

let dummy_block =
CommentBlock { id: String::new(), line: 0, contents: Vec::new(), is_doc: false };
let mut block = dummy_block.clone();
for (line_num, line) in lines.enumerate() {
match line.strip_prefix("//") {
Some(mut contents) => {
if let Some('/' | '!') = contents.chars().next() {
contents = &contents[1..];
block.is_doc = true;
}
if let Some(' ') = contents.chars().next() {
contents = &contents[1..];
}
block.contents.push(contents.to_owned());
}
None => {
if !block.contents.is_empty() {
let block = mem::replace(&mut block, dummy_block.clone());
res.push(block);
}
block.line = line_num + 2;
}
}
}
if !block.contents.is_empty() {
res.push(block);
}
res
}
}

#[derive(Debug)]
pub struct Location {

Check failure on line 121 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` item
pub file: PathBuf,

Check failure on line 122 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` field
pub line: usize,

Check failure on line 123 in xtask/src/codegen.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` field
}

impl fmt::Display for Location {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let path = self.file.strip_prefix(project_root()).unwrap().display().to_string();
let path = path.replace('\\', "/");
let name = self.file.file_name().unwrap();
write!(
f,
"https://github.com/rust-lang/rust-analyzer/blob/master/{}#L{}[{}]",
path,
self.line,
name.to_str().unwrap()
)
}
}

fn ensure_rustfmt(sh: &Shell) {
let version = cmd!(sh, "rustup run stable rustfmt --version").read().unwrap_or_default();
if !version.contains("stable") {
panic!(
"Failed to run rustfmt from toolchain 'stable'. \
Please run `rustup component add rustfmt --toolchain stable` to install it.",
);
}
}

fn reformat(text: String) -> String {
let sh = Shell::new().unwrap();
ensure_rustfmt(&sh);
let rustfmt_toml = project_root().join("rustfmt.toml");
let mut stdout = cmd!(
sh,
"rustup run stable rustfmt --config-path {rustfmt_toml} --config fn_single_line=true"
)
.stdin(text)
.read()
.unwrap();
if !stdout.ends_with('\n') {
stdout.push('\n');
}
stdout
}

fn add_preamble(generator: &'static str, mut text: String) -> String {
let preamble = format!("//! Generated by `{generator}`, do not edit by hand.\n\n");
text.insert_str(0, &preamble);
text
}

/// Checks that the `file` has the specified `contents`. If that is not the
/// case, updates the file and then fails the test.
#[allow(clippy::print_stderr)]
fn ensure_file_contents(file: &Path, contents: &str, check: bool) {
if let Ok(old_contents) = fs::read_to_string(file) {
if normalize_newlines(&old_contents) == normalize_newlines(contents) {
// File is already up to date.
return;
}
}

let display_path = file.strip_prefix(project_root()).unwrap_or(file);
if check {
panic!(
"{} was not up-to-date{}",
file.display(),
if std::env::var("CI").is_ok() {
"\n NOTE: run `cargo codegen` locally and commit the updated files\n"
} else {
""
}
);
} else {
eprintln!(
"\n\x1b[31;1merror\x1b[0m: {} was not up-to-date, updating\n",
display_path.display()
);

if let Some(parent) = file.parent() {
let _ = fs::create_dir_all(parent);
}
fs::write(file, contents).unwrap();
}
}

fn normalize_newlines(s: &str) -> String {
s.replace("\r\n", "\n")
}
Expand Up @@ -3,10 +3,15 @@
use std::{fmt, fs, path::Path};

use stdx::format_to_acc;
use test_utils::project_root;

#[test]
fn sourcegen_assists_docs() {
use crate::{
codegen::{
add_preamble, ensure_file_contents, list_rust_files, reformat, CommentBlock, Location,
},
project_root,
};

pub fn generate(check: bool) {

Check failure on line 14 in xtask/src/codegen/assists_doc_tests.rs

View workflow job for this annotation

GitHub Actions / Rust (ubuntu-latest)

unreachable `pub` item
let assists = Assist::collect();

{
Expand Down Expand Up @@ -40,10 +45,11 @@ r#####"
buf.push_str(&test)
}
}
let buf = sourcegen::add_preamble("sourcegen_assists_docs", sourcegen::reformat(buf));
sourcegen::ensure_file_contents(
let buf = add_preamble("sourcegen_assists_docs", reformat(buf));
ensure_file_contents(
&project_root().join("crates/ide-assists/src/tests/generated.rs"),
&buf,
check,
);
}

Expand All @@ -52,7 +58,7 @@ r#####"
// git repo. Instead, `cargo xtask release` runs this test before making
// a release.

let contents = sourcegen::add_preamble(
let contents = add_preamble(
"sourcegen_assists_docs",
assists.into_iter().map(|it| it.to_string()).collect::<Vec<_>>().join("\n\n"),
);
Expand All @@ -71,7 +77,7 @@ struct Section {
#[derive(Debug)]
struct Assist {
id: String,
location: sourcegen::Location,
location: Location,
sections: Vec<Section>,
}

Expand All @@ -80,15 +86,15 @@ impl Assist {
let handlers_dir = project_root().join("crates/ide-assists/src/handlers");

let mut res = Vec::new();
for path in sourcegen::list_rust_files(&handlers_dir) {
for path in list_rust_files(&handlers_dir) {
collect_file(&mut res, path.as_path());
}
res.sort_by(|lhs, rhs| lhs.id.cmp(&rhs.id));
return res;

fn collect_file(acc: &mut Vec<Assist>, path: &Path) {
let text = fs::read_to_string(path).unwrap();
let comment_blocks = sourcegen::CommentBlock::extract("Assist", &text);
let comment_blocks = CommentBlock::extract("Assist", &text);

for block in comment_blocks {
let id = block.id;
Expand All @@ -97,7 +103,7 @@ impl Assist {
"invalid assist id: {id:?}"
);
let mut lines = block.contents.iter().peekable();
let location = sourcegen::Location { file: path.to_path_buf(), line: block.line };
let location = Location { file: path.to_path_buf(), line: block.line };
let mut assist = Assist { id, location, sections: Vec::new() };

while lines.peek().is_some() {
Expand Down
29 changes: 29 additions & 0 deletions xtask/src/flags.rs
Expand Up @@ -52,6 +52,11 @@ xflags::xflags! {
cmd bb {
required suffix: String
}

cmd codegen {
optional codegen_type: CodegenType
optional --check
}
}
}

Expand All @@ -73,8 +78,32 @@ pub enum XtaskCmd {
PublishReleaseNotes(PublishReleaseNotes),
Metrics(Metrics),
Bb(Bb),
Codegen(Codegen),
}

#[derive(Debug)]
pub struct Codegen {
pub check: bool,
pub codegen_type: Option<CodegenType>,
}

#[derive(Debug, Default)]
pub enum CodegenType {
#[default]
All,
AssistsDocTests,
}

impl FromStr for CodegenType {
type Err = String;
fn from_str(s: &str) -> Result<Self, Self::Err> {
match s {
"all" => Ok(Self::All),
"assists-doc-tests" => Ok(Self::AssistsDocTests),
_ => Err("Invalid option".to_owned()),
}
}
}
#[derive(Debug)]
pub struct Install {
pub client: bool,
Expand Down

0 comments on commit 4411770

Please sign in to comment.