Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions crates/ruff_workspace/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,20 @@ pub struct Options {
)]
pub cache_dir: Option<String>,

/// A path to a local `pyproject.toml` file to merge into this
/// A path to a local `pyproject.toml` or `ruff.toml` file to merge into this
/// configuration. User home directory and environment variables will be
/// expanded.
///
/// To resolve the current `pyproject.toml` file, Ruff will first resolve
/// this base configuration file, then merge in any properties defined
/// in the current configuration file.
/// To resolve the current configuration file, Ruff will first load
/// this base configuration file, then merge in properties defined
/// in the current configuration file. Most settings follow simple override
/// behavior where the child value replaces the parent value. However,
/// rule selection (`lint.select` and `lint.ignore`) has special merging
/// behavior: if the child configuration specifies `lint.select`, it
/// establishes a new baseline rule set and the parent's `lint.ignore`
/// rules are discarded; if the child configuration omits `lint.select`,
/// the parent's rule selection is inherited and both parent and child
/// `lint.ignore` rules are accumulated together.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed the priority part as it is somewhat unrelated to extend itself.

#[option(
default = r#"null"#,
value_type = "str",
Expand Down
2 changes: 1 addition & 1 deletion ruff.schema.json

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