Bump version to 0.0.179

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.176
+    rev: v0.0.179
     hooks:
       - id: ruff
 

BREAKING_CHANGES.md

@@ -0,0 +1,10 @@
+# Breaking Changes
+
+## 0.0.178
+
+### Configuration files are now resolved hierarchically ([#1190](https://github.com/charliermarsh/ruff/pull/1190))
+
+`pyproject.toml` files are now resolved hierarchically, such that for each Python file, we find
+the first `pyproject.toml` file in its path, and use that to determine its lint settings.
+
+See the [README](https://github.com/charliermarsh/ruff#pyprojecttoml-discovery) for more.

Cargo.lock

@@ -724,7 +724,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.176-dev.0"
+version = "0.0.179-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -796,6 +796,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "glob"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
+
 [[package]]
 name = "globset"
 version = "0.4.9"
@@ -1821,7 +1827,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.176"
+version = "0.0.179"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1841,6 +1847,7 @@ dependencies = [
  "fern",
  "filetime",
  "getrandom 0.2.8",
+ "glob",
  "globset",
  "insta",
  "itertools",
@@ -1874,7 +1881,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.176"
+version = "0.0.179"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1892,7 +1899,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.176"
+version = "0.0.179"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1935,7 +1942,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -1945,7 +1952,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -1968,7 +1975,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "bincode",
  "bitflags",
@@ -1985,7 +1992,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ahash",
  "anyhow",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.176"
+version = "0.0.179"
 edition = "2021"
 rust-version = "1.65.0"
 
@@ -28,6 +28,7 @@ common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
 filetime = { version = "0.2.17" }
+glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
@@ -41,11 +42,11 @@ quick-junit = { version = "0.3.2" }
 rayon = { version = "1.5.3" }
 regex = { version = "1.6.0" }
 ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.176", path = "ruff_macros" }
+ruff_macros = { version = "0.0.179", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
 serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }

README.md

@@ -155,7 +155,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.176
+    rev: v0.0.179
     hooks:
       - id: ruff
 ```
@@ -331,6 +331,40 @@ Options:
           Print version information
 ```
 
+### `pyproject.toml` discovery
+
+Similar to [ESLint](https://eslint.org/docs/latest/user-guide/configuring/configuration-files#cascading-and-hierarchy),
+Ruff supports hierarchical configuration, such that the "closest" `pyproject.toml` file in the
+directory hierarchy is used for every individual file, with all paths in the `pyproject.toml` file
+(e.g., `exclude` globs, `src` paths) being resolved relative to the directory containing the
+`pyproject.toml` file.
+
+There are a few exceptions to these rules:
+
+1. If a configuration file is passed directly via `--config`, those settings are used for across
+   files. Any relative paths in that configuration file (like `exclude` globs or `src` paths) are
+   resolved relative to the _current working directory_.
+2. If no `pyproject.toml` file is found in the filesystem hierarchy, Ruff will fall back to using
+   a default configuration. If a user-specific configuration file exists at `${config_dir}/ruff/pyproject.toml`,
+   that file will be used instead of the default configuration, with `${config_dir}` being determined
+   via the [`dirs](https://docs.rs/dirs/4.0.0/dirs/fn.config_dir.html) crate, and all relative paths
+   being again resolved relative to the _current working directory_.
+3. Any `pyproject.toml`-supported settings that are provided on the command-line (e.g., via
+   `--select`) will override the settings in _every_ resolved configuration file.
+
+Unlike [ESLint](https://eslint.org/docs/latest/user-guide/configuring/configuration-files#cascading-and-hierarchy),
+Ruff does not merge settings across configuration files; instead, the "closest" configuration file
+is used, and any parent configuration files are ignored. In lieu of this implicit cascade, Ruff
+supports an [`extend`](#extend) field, which allows you to inherit the settings from another
+`pyproject.toml` file, like so:
+
+```toml
+# Extend the `pyproject.toml` file in the parent directory.
+extend = "../pyproject.toml"
+# But use a different line length.
+line-length = 100
+```
+
 ### Ignoring errors
 
 To omit a lint check entirely, add it to the "ignore" list via [`ignore`](#ignore) or
@@ -778,7 +812,7 @@ For more, see [flake8-simplify](https://pypi.org/project/flake8-simplify/0.19.3/
 
 | Code | Name | Message | Fix |
 | ---- | ---- | ------- | --- |
-| SIM118 | KeyInDict | Use 'key in dict' instead of 'key in dict.keys() | 🛠 |
+| SIM118 | KeyInDict | Use `key in dict` instead of `key in dict.keys()` | 🛠 |
 
 ### flake8-tidy-imports (TID)
 
@@ -852,6 +886,37 @@ For more, see [Pylint](https://pypi.org/project/pylint/2.15.7/) on PyPI.
 
 Download the [Ruff VS Code extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff).
 
+### Language Server Protocol
+
+Ruff is available as a [Language Server Protocol (LSP)](https://microsoft.github.io/language-server-protocol/)
+server, distributed as the [`python-lsp-ruff`](https://github.com/python-lsp/python-lsp-ruff) plugin
+for [`python-lsp-server`](https://github.com/python-lsp/python-lsp-server), both of which are
+installable via [PyPI](https://pypi.org/project/python-lsp-ruff/):
+
+```shell
+pip install python-lsp-server python-lsp-ruff
+```
+
+The LSP server can be used with any editor that supports the Language Server Protocol. For example,
+to use it with Neovim, you would add something like the following to your `init.lua`:
+
+```lua
+require'lspconfig'.pylsp.setup {
+  settings = {
+    pylsp = {
+      plugins = {
+        ruff = {
+          enabled = true
+        }
+      }
+    }
+  },
+}
+```
+
+[`ruffd`](https://github.com/Seamooo/ruffd) is another implementation of the Language Server
+Protocol (LSP) for Ruff, written in Rust.
+
 ### PyCharm
 
 Ruff can be installed as an [External Tool](https://www.jetbrains.com/help/pycharm/configuring-third-party-tools.html)
@@ -864,10 +929,13 @@ Ruff should then appear as a runnable action:
 
 ![Ruff as a runnable action](https://user-images.githubusercontent.com/1309177/193156026-732b0aaf-3dd9-4549-9b4d-2de6d2168a33.png)
 
-### Vim & Neovim (Unofficial)
+### Vim & Neovim
 
-Ruff is available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright) extension
-for coc.nvim.
+Ruff can be integrated into any editor that supports the Language Server Protocol (LSP) (see:
+[Language Server Protocol](#language-server-protocol)).
+
+Ruff is also available as part of the [coc-pyright](https://github.com/fannheyward/coc-pyright)
+extension for `coc.nvim`.
 
 <details>
 <summary>Ruff can also be integrated via <a href="https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#efm"><code>efm</code></a> in just a <a href="https://github.com/JafarAbdi/myconfigs/blob/6f0b6b2450e92ec8fc50422928cd22005b919110/efm-langserver/config.yaml#L14-L20">few lines</a>.</summary>
@@ -923,11 +991,6 @@ null_ls.setup({
 
 </details>
 
-### Language Server Protocol (Unofficial)
-
-[`ruffd`](https://github.com/Seamooo/ruffd) is a Rust-based language server for Ruff that implements
-the Language Server Protocol (LSP).
-
 ### GitHub Actions
 
 GitHub Actions has everything you need to run Ruff out-of-the-box:
@@ -975,9 +1038,8 @@ Under those conditions, Ruff implements every rule in Flake8.
 Ruff also re-implements some of the most popular Flake8 plugins and related code quality tools
 natively, including:
 
-- [`isort`](https://pypi.org/project/isort/)
-- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
-- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`autoflake`](https://pypi.org/project/autoflake/) (1/7)
+- [`eradicate`](https://pypi.org/project/eradicate/)
 - [`flake8-2020`](https://pypi.org/project/flake8-2020/)
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
@@ -995,12 +1057,13 @@ natively, including:
 - [`flake8-return`](https://pypi.org/project/flake8-return/)
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
+- [`isort`](https://pypi.org/project/isort/)
 - [`mccabe`](https://pypi.org/project/mccabe/)
-- [`yesqa`](https://github.com/asottile/yesqa)
-- [`eradicate`](https://pypi.org/project/eradicate/)
-- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (16/33)
+- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 - [`pygrep-hooks`](https://github.com/pre-commit/pygrep-hooks) (1/10)
-- [`autoflake`](https://pypi.org/project/autoflake/) (1/7)
+- [`pyupgrade`](https://pypi.org/project/pyupgrade/) (16/33)
+- [`yesqa`](https://github.com/asottile/yesqa)
 
 Note that, in some cases, Ruff uses different error code prefixes than would be found in the
 originating Flake8 plugins. For example, Ruff uses `TID252` to represent the `I252` rule from
@@ -1010,8 +1073,7 @@ conflicts with the `isort` rules, like `I001`).
 
 Beyond the rule set, Ruff suffers from the following limitations vis-à-vis Flake8:
 
-1. Ruff does not yet support a few Python 3.9 and 3.10 language features, including structural
-   pattern matching and parenthesized context managers.
+1. Ruff does not yet support structural pattern matching.
 2. Flake8 has a plugin architecture and supports writing custom lint rules. (Instead, popular Flake8
    plugins are re-implemented in Rust as part of Ruff itself.)
 
@@ -1031,8 +1093,6 @@ Pylint parity is being tracked in [#689](https://github.com/charliermarsh/ruff/i
 
 Today, Ruff can be used to replace Flake8 when used with any of the following plugins:
 
-- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
-- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
 - [`flake8-2020`](https://pypi.org/project/flake8-2020/)
 - [`flake8-annotations`](https://pypi.org/project/flake8-annotations/)
 - [`flake8-bandit`](https://pypi.org/project/flake8-bandit/) (6/40)
@@ -1051,6 +1111,8 @@ Today, Ruff can be used to replace Flake8 when used with any of the following pl
 - [`flake8-super`](https://pypi.org/project/flake8-super/)
 - [`flake8-tidy-imports`](https://pypi.org/project/flake8-tidy-imports/) (1/3)
 - [`mccabe`](https://pypi.org/project/mccabe/)
+- [`pep8-naming`](https://pypi.org/project/pep8-naming/)
+- [`pydocstyle`](https://pypi.org/project/pydocstyle/)
 
 Ruff can also replace [`isort`](https://pypi.org/project/isort/),
 [`yesqa`](https://github.com/asottile/yesqa), [`eradicate`](https://pypi.org/project/eradicate/),
@@ -1393,7 +1455,7 @@ Exclusions are based on globs, and can be either:
   (to exclude any Python files in `directory`). Note that these paths are relative to the
   project root (e.g., the directory containing your `pyproject.toml`).
 
-Note that you'll typically want to use [`extend_exclude`](#extend_exclude) to modify
+Note that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify
 the excluded paths.
 
 **Default value**: `[".bzr", ".direnv", ".eggs", ".git", ".hg", ".mypy_cache", ".nox", ".pants.d", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "buck-out", "build", "dist", "node_modules", "venv"]`
@@ -1409,6 +1471,30 @@ exclude = [".venv"]
 
 ---
 
+#### [`extend`](#extend)
+
+A path to a local `pyproject.toml` file to merge into this configuration.
+
+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.
+
+**Default value**: `None`
+
+**Type**: `Path`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+# Extend the `pyproject.toml` file in the parent directory.
+extend = "../pyproject.toml"
+# But use a different line length.
+line-length = 100
+```
+
+---
+
 #### [`extend-exclude`](#extend-exclude)
 
 A list of file patterns to omit from linting, in addition to those specified by `exclude`.
@@ -1666,6 +1752,25 @@ show-source = true
 
 The source code paths to consider, e.g., when resolving first- vs. third-party imports.
 
+As an example: given a Python package structure like:
+
+```text
+my_package/
+  pyproject.toml
+  src/
+    my_package/
+      __init__.py
+      foo.py
+      bar.py
+```
+
+The `src` directory should be included in `source` (e.g., `source = ["src"]`), such that
+when resolving imports, `my_package.foo` is considered a first-party import.
+
+This field supports globs. For example, if you have a series of Python packages in
+a `python_modules` directory, `src = ["python_modules/*"]` would expand to incorporate
+all of the packages in that directory.
+
 **Default value**: `["."]`
 
 **Type**: `Vec<PathBuf>`

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.176"
+version = "0.0.179"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.176"
+version = "0.0.179"
 dependencies = [
  "anyhow",
  "bincode",
@@ -2028,7 +2028,7 @@ dependencies = [
 [[package]]
 name = "rustpython-ast"
 version = "0.1.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "num-bigint",
  "rustpython-common",
@@ -2038,7 +2038,7 @@ dependencies = [
 [[package]]
 name = "rustpython-common"
 version = "0.0.0"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ascii",
  "cfg-if 1.0.0",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "rustpython-compiler-core"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "bincode",
  "bitflags",
@@ -2078,7 +2078,7 @@ dependencies = [
 [[package]]
 name = "rustpython-parser"
 version = "0.1.2"
-source = "git+https://github.com/RustPython/RustPython.git?rev=2edd0d264c50c7807bcff03a52a6509e8b7f187f#2edd0d264c50c7807bcff03a52a6509e8b7f187f"
+source = "git+https://github.com/RustPython/RustPython.git?rev=8d879a53197f9c73062f6160410bdba796a71cbf#8d879a53197f9c73062f6160410bdba796a71cbf"
 dependencies = [
  "ahash",
  "anyhow",

flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.176-dev.0"
+version = "0.0.179-dev.0"
 edition = "2021"
 
 [lib]

flake8_to_ruff/src/converter.rs

@@ -246,6 +246,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -291,6 +292,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -336,6 +338,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -381,6 +384,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -426,6 +430,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -479,6 +484,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,
@@ -560,6 +566,7 @@ mod tests {
             allowed_confusables: None,
             dummy_variable_rgx: None,
             exclude: None,
+            extend: None,
             extend_exclude: None,
             extend_ignore: None,
             extend_select: None,

resources/test/fixtures/README.md

@@ -0,0 +1,3 @@
+# fixtures
+
+Fixture files used for snapshot testing.

resources/test/fixtures/isort/insert_empty_lines.py

@@ -39,3 +39,27 @@ if True:
     import collections
     import typing
     def f(): pass
+
+
+import os
+
+# Comment goes here.
+
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+
+# And another.
+def f():
+    pass

resources/test/fixtures/isort/insert_empty_lines.pyi

@@ -39,3 +39,27 @@ if True:
     import collections
     import typing
     def f(): pass
+
+
+import os
+
+# Comment goes here.
+
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+def f():
+    pass
+
+
+import os
+
+# Comment goes here.
+
+# And another.
+def f():
+    pass

resources/test/fixtures/pyflakes/F841_0.py

@@ -10,13 +10,13 @@ except ValueError as e:
     print(e)
 
 
-def f1():
+def f():
     x = 1
     y = 2
     z = x + y
 
 
-def f2():
+def f():
     foo = (1, 2)
     (a, b) = (1, 2)
 
@@ -26,12 +26,12 @@ def f2():
     (x, y) = baz = bar
 
 
-def f3():
+def f():
     locals()
     x = 1
 
 
-def f4():
+def f():
     _ = 1
     __ = 1
     _discarded = 1
@@ -40,26 +40,26 @@ def f4():
 a = 1
 
 
-def f5():
+def f():
     global a
 
-    # Used in `f7` via `nonlocal`.
+    # Used in `c` via `nonlocal`.
     b = 1
 
-    def f6():
+    def c():
         # F841
         b = 1
 
-    def f7():
+    def d():
         nonlocal b
 
 
-def f6():
+def f():
     annotations = []
     assert len([annotations for annotations in annotations])
 
 
-def f7():
+def f():
     def connect():
         return None, None
 
@@ -67,6 +67,22 @@ def f7():
         cursor.execute("SELECT * FROM users")
 
 
-def f8():
-    with open("file") as f, open("") as ((a, b)):
+def f():
+    def connect():
+        return None, None
+
+    with (connect() as (connection, cursor)):
+        cursor.execute("SELECT * FROM users")
+
+
+def f():
+    with open("file") as my_file, open("") as ((this, that)):
+        print("hello")
+
+
+def f():
+    with (
+        open("file") as my_file,
+        open("") as ((this, that)),
+    ):
         print("hello")

resources/test/project/README.md

@@ -0,0 +1,73 @@
+# project
+
+An example multi-package Python project used to test setting resolution and other complex
+behaviors.
+
+## Expected behavior
+
+Running from the repo root should pick up and enforce the appropriate settings for each package:
+
+```
+∴ cargo run resources/test/project/
+Found 5 error(s).
+resources/test/project/examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/src/file.py:1:8: F401 `os` imported but unused
+resources/test/project/src/file.py:5:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+3 potentially fixable with the --fix option.
+```
+
+Running from the project directory itself should exhibit the same behavior:
+
+```
+∴ cd resources/test/project/ && cargo run .
+Found 5 error(s).
+examples/docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+src/file.py:1:8: F401 `os` imported but unused
+src/file.py:5:5: F841 Local variable `x` is assigned to but never used
+src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+3 potentially fixable with the --fix option.
+```
+
+Running from the sub-package directory should exhibit the same behavior, but omit the top-level
+files:
+
+```
+∴ cd resources/test/project/examples/docs && cargo run .
+Found 2 error(s).
+docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+1 potentially fixable with the --fix option.
+```
+
+`--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
+file paths from the current working directory:
+
+```
+∴ cargo run -- --config=resources/test/project/pyproject.toml resources/test/project/
+Found 9 error(s).
+resources/test/project/examples/docs/docs/concepts/file.py:1:8: F401 `os` imported but unused
+resources/test/project/examples/docs/docs/concepts/file.py:5:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/examples/docs/docs/file.py:1:8: F401 `os` imported but unused
+resources/test/project/examples/docs/docs/file.py:3:8: F401 `numpy` imported but unused
+resources/test/project/examples/docs/docs/file.py:4:27: F401 `docs.concepts.file` imported but unused
+resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/src/file.py:1:8: F401 `os` imported but unused
+resources/test/project/src/file.py:5:5: F841 Local variable `x` is assigned to but never used
+resources/test/project/src/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
+6 potentially fixable with the --fix option.
+```
+
+Running from a parent directory should this "ignore" the `exclude` (hence, `concepts/file.py` gets
+included in the output):
+
+```
+∴ cd resources/test/project/examples && cargo run -- --config=docs/pyproject.toml .
+Found 3 error(s).
+docs/docs/concepts/file.py:5:5: F841 Local variable `x` is assigned to but never used
+docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
+docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
+1 potentially fixable with the --fix option.
+```

resources/test/project/examples/docs/docs/concepts/file.py

@@ -0,0 +1,5 @@
+import os
+
+
+def f():
+    x = 1

resources/test/project/examples/docs/docs/file.py

@@ -0,0 +1,8 @@
+import os
+
+import numpy as np
+from docs.concepts import file
+
+
+def f():
+    x = 1

resources/test/project/examples/docs/pyproject.toml

@@ -0,0 +1,6 @@
+[tool.ruff]
+extend = "../../pyproject.toml"
+src = ["."]
+extend-select = ["I001"]
+extend-ignore = ["F401"]
+extend-exclude = ["./docs/concepts/file.py"]

resources/test/project/pyproject.toml

@@ -0,0 +1,3 @@
+[tool.ruff]
+src = [".", "python_modules/*"]
+extend-select = ["I001"]

resources/test/project/src/file.py

@@ -0,0 +1,5 @@
+import os
+
+
+def f():
+    x = 1

resources/test/project/src/import_file.py

@@ -0,0 +1,7 @@
+import numpy as np
+from app import app_file
+from core import core_file
+
+np.array([1, 2, 3])
+app_file()
+core_file()

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.176"
+version = "0.0.179"
 edition = "2021"
 
 [dependencies]
@@ -11,8 +11,8 @@ itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 once_cell = { version = "1.16.0" }
 ruff = { path = ".." }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "2edd0d264c50c7807bcff03a52a6509e8b7f187f" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "8d879a53197f9c73062f6160410bdba796a71cbf" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }

ruff_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_macros"
-version = "0.0.176"
+version = "0.0.179"
 edition = "2021"
 
 [lib]

src/autofix/fixer.rs

@@ -10,7 +10,7 @@ use crate::autofix::Fix;
 use crate::checks::Check;
 use crate::source_code_locator::SourceCodeLocator;
 
-#[derive(Hash)]
+#[derive(Debug, Hash)]
 pub enum Mode {
     Generate,
     Apply,

src/check_imports.rs

@@ -37,7 +37,7 @@ pub fn check_imports(
     autofix: bool,
     path: &Path,
 ) -> Vec<Check> {
-    let mut tracker = ImportTracker::new(directives, path);
+    let mut tracker = ImportTracker::new(locator, directives, path);
     for stmt in python_ast {
         tracker.visit_stmt(stmt);
     }

src/checks.rs

@@ -2334,7 +2334,7 @@ impl CheckKind {
             }
             // flake8-simplify
             CheckKind::KeyInDict(key, dict) => {
-                format!("Use '{key} in {dict}' instead of '{key} in {dict}.keys()")
+                format!("Use `{key} in {dict}` instead of `{key} in {dict}.keys()`")
             }
             // pyupgrade
             CheckKind::TypeOfPrimitive(primitive) => {

src/cli.rs

@@ -1,4 +1,4 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 use clap::{command, Parser};
 use regex::Regex;
@@ -6,6 +6,7 @@ use rustc_hash::FxHashMap;
 
 use crate::checks::CheckCode;
 use crate::checks_gen::CheckCodePrefix;
+use crate::fs;
 use crate::logging::LogLevel;
 use crate::settings::types::{
     FilePattern, PatternPrefixPair, PerFileIgnore, PythonVersion, SerializationFormat,
@@ -88,7 +89,7 @@ pub struct Cli {
     /// See the files Ruff will be run against with the current settings.
     #[arg(long)]
     pub show_files: bool,
-    /// See Ruff's settings.
+    /// See the settings Ruff used for the first matching file.
     #[arg(long)]
     pub show_settings: bool,
     /// Enable automatic additions of noqa directives to failing lines.
@@ -198,6 +199,7 @@ pub struct Arguments {
 }
 
 /// CLI settings that function as configuration overrides.
+#[derive(Clone)]
 #[allow(clippy::struct_excessive_bools)]
 pub struct Overrides {
     pub dummy_variable_rgx: Option<Regex>,
@@ -243,6 +245,9 @@ pub fn collect_per_file_ignores(pairs: Vec<PatternPrefixPair>) -> Vec<PerFileIgn
     }
     per_file_ignores
         .into_iter()
-        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes))
+        .map(|(pattern, prefixes)| {
+            let absolute = fs::normalize_path(Path::new(&pattern));
+            PerFileIgnore::new(pattern, absolute, &prefixes)
+        })
         .collect()
 }

src/commands.rs

@@ -1,36 +1,207 @@
-use std::path::PathBuf;
+use std::io::{self, Read};
+use std::path::{Path, PathBuf};
+use std::time::Instant;
 
 use anyhow::{bail, Result};
+use itertools::Itertools;
+use log::{debug, error};
+#[cfg(not(target_family = "wasm"))]
+use rayon::prelude::*;
+use rustpython_ast::Location;
 use serde::Serialize;
-use walkdir::DirEntry;
 
-use crate::checks::CheckCode;
-use crate::fs::iter_python_files;
+use crate::autofix::fixer;
+use crate::checks::{CheckCode, CheckKind};
+use crate::cli::Overrides;
+use crate::iterators::par_iter;
+use crate::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin, Diagnostics};
+use crate::message::Message;
+use crate::resolver;
+use crate::resolver::Strategy;
 use crate::settings::types::SerializationFormat;
-use crate::{Configuration, Settings};
+
+/// Run the linter over a collection of files.
+pub fn run(
+    files: &[PathBuf],
+    strategy: &Strategy,
+    overrides: &Overrides,
+    cache: bool,
+    autofix: &fixer::Mode,
+) -> Result<Diagnostics> {
+    // Collect all the files to check.
+    let start = Instant::now();
+    let (paths, resolver) = resolver::resolve_python_files(files, strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let mut diagnostics: Diagnostics = par_iter(&paths)
+        .map(|entry| {
+            match entry {
+                Ok(entry) => {
+                    let path = entry.path();
+                    let settings = resolver.resolve(path, strategy);
+                    lint_path(path, settings, &cache.into(), autofix)
+                        .map_err(|e| (Some(path.to_owned()), e.to_string()))
+                }
+                Err(e) => Err((
+                    e.path().map(Path::to_owned),
+                    e.io_error()
+                        .map_or_else(|| e.to_string(), io::Error::to_string),
+                )),
+            }
+            .unwrap_or_else(|(path, message)| {
+                if let Some(path) = &path {
+                    let settings = resolver.resolve(path, strategy);
+                    if settings.enabled.contains(&CheckCode::E902) {
+                        Diagnostics::new(vec![Message {
+                            kind: CheckKind::IOError(message),
+                            location: Location::default(),
+                            end_location: Location::default(),
+                            fix: None,
+                            filename: path.to_string_lossy().to_string(),
+                            source: None,
+                        }])
+                    } else {
+                        error!("Failed to check {}: {message}", path.to_string_lossy());
+                        Diagnostics::default()
+                    }
+                } else {
+                    error!("{message}");
+                    Diagnostics::default()
+                }
+            })
+        })
+        .reduce(Diagnostics::default, |mut acc, item| {
+            acc += item;
+            acc
+        });
+
+    diagnostics.messages.sort_unstable();
+    let duration = start.elapsed();
+    debug!("Checked files in: {:?}", duration);
+
+    Ok(diagnostics)
+}
+
+/// Read a `String` from `stdin`.
+fn read_from_stdin() -> Result<String> {
+    let mut buffer = String::new();
+    io::stdin().lock().read_to_string(&mut buffer)?;
+    Ok(buffer)
+}
+
+/// Run the linter over a single file, read from `stdin`.
+pub fn run_stdin(
+    strategy: &Strategy,
+    filename: &Path,
+    autofix: &fixer::Mode,
+) -> Result<Diagnostics> {
+    let stdin = read_from_stdin()?;
+    let settings = match strategy {
+        Strategy::Fixed(settings) => settings,
+        Strategy::Hierarchical(settings) => settings,
+    };
+    let mut diagnostics = lint_stdin(filename, &stdin, settings, autofix)?;
+    diagnostics.messages.sort_unstable();
+    Ok(diagnostics)
+}
+
+/// Add `noqa` directives to a collection of files.
+pub fn add_noqa(files: &[PathBuf], strategy: &Strategy, overrides: &Overrides) -> Result<usize> {
+    // Collect all the files to check.
+    let start = Instant::now();
+    let (paths, resolver) = resolver::resolve_python_files(files, strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let modifications: usize = par_iter(&paths)
+        .flatten()
+        .filter_map(|entry| {
+            let path = entry.path();
+            let settings = resolver.resolve(path, strategy);
+            match add_noqa_to_path(path, settings) {
+                Ok(count) => Some(count),
+                Err(e) => {
+                    error!("Failed to add noqa to {}: {e}", path.to_string_lossy());
+                    None
+                }
+            }
+        })
+        .sum();
+
+    let duration = start.elapsed();
+    debug!("Added noqa to files in: {:?}", duration);
+
+    Ok(modifications)
+}
+
+/// Automatically format a collection of files.
+pub fn autoformat(files: &[PathBuf], strategy: &Strategy, overrides: &Overrides) -> Result<usize> {
+    // Collect all the files to format.
+    let start = Instant::now();
+    let (paths, resolver) = resolver::resolve_python_files(files, strategy, overrides)?;
+    let duration = start.elapsed();
+    debug!("Identified files to lint in: {:?}", duration);
+
+    let start = Instant::now();
+    let modifications = par_iter(&paths)
+        .flatten()
+        .filter_map(|entry| {
+            let path = entry.path();
+            let settings = resolver.resolve(path, strategy);
+            match autoformat_path(path, settings) {
+                Ok(()) => Some(()),
+                Err(e) => {
+                    error!("Failed to autoformat {}: {e}", path.to_string_lossy());
+                    None
+                }
+            }
+        })
+        .count();
+
+    let duration = start.elapsed();
+    debug!("Auto-formatted files in: {:?}", duration);
+
+    Ok(modifications)
+}
 
 /// Print the user-facing configuration settings.
-pub fn show_settings(
-    configuration: &Configuration,
-    project_root: Option<&PathBuf>,
-    pyproject: Option<&PathBuf>,
-) {
-    println!("Resolved configuration: {configuration:#?}");
-    println!("Found project root at: {project_root:?}");
-    println!("Found pyproject.toml at: {pyproject:?}");
+pub fn show_settings(files: &[PathBuf], strategy: &Strategy, overrides: &Overrides) -> Result<()> {
+    // Collect all files in the hierarchy.
+    let (paths, resolver) = resolver::resolve_python_files(files, strategy, overrides)?;
+
+    // Print the list of files.
+    let Some(entry) = paths
+        .iter()
+        .flatten()
+        .sorted_by(|a, b| a.path().cmp(b.path())).next() else {
+        bail!("No files found under the given path");
+    };
+    let path = entry.path();
+    let settings = resolver.resolve(path, strategy);
+    println!("Resolved settings for: {path:?}");
+    println!("{settings:#?}");
+
+    Ok(())
 }
 
 /// Show the list of files to be checked based on current settings.
-pub fn show_files(files: &[PathBuf], settings: &Settings) {
-    let mut entries: Vec<DirEntry> = files
+pub fn show_files(files: &[PathBuf], strategy: &Strategy, overrides: &Overrides) -> Result<()> {
+    // Collect all files in the hierarchy.
+    let (paths, _resolver) = resolver::resolve_python_files(files, strategy, overrides)?;
+
+    // Print the list of files.
+    for entry in paths
         .iter()
-        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
         .flatten()
-        .collect();
-    entries.sort_by(|a, b| a.path().cmp(b.path()));
-    for entry in entries {
+        .sorted_by(|a, b| a.path().cmp(b.path()))
+    {
         println!("{}", entry.path().to_string_lossy());
     }
+
+    Ok(())
 }
 
 #[derive(Serialize)]
@@ -41,7 +212,7 @@ struct Explanation<'a> {
 }
 
 /// Explain a `CheckCode` to the user.
-pub fn explain(code: &CheckCode, format: SerializationFormat) -> Result<()> {
+pub fn explain(code: &CheckCode, format: &SerializationFormat) -> Result<()> {
     match format {
         SerializationFormat::Text | SerializationFormat::Grouped => {
             println!(

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__allow_overload.snap

@@ -8,7 +8,7 @@ expression: checks
     row: 29
     column: 4
   end_location:
-    row: 35
-    column: 0
+    row: 30
+    column: 16
   fix: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__defaults.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 4
     column: 0
   end_location:
-    row: 9
-    column: 0
+    row: 5
+    column: 8
   fix: ~
 - kind:
     MissingTypeFunctionArgument: a
@@ -35,8 +35,8 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 14
-    column: 0
+    row: 10
+    column: 8
   fix: ~
 - kind:
     MissingTypeFunctionArgument: b
@@ -62,8 +62,8 @@ expression: checks
     row: 19
     column: 0
   end_location:
-    row: 24
-    column: 0
+    row: 20
+    column: 8
   fix: ~
 - kind:
     MissingReturnTypePublicFunction: foo
@@ -71,8 +71,8 @@ expression: checks
     row: 24
     column: 0
   end_location:
-    row: 29
-    column: 0
+    row: 25
+    column: 8
   fix: ~
 - kind:
     DynamicallyTypedExpression: a

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__mypy_init_return.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 10
-    column: 0
+    row: 6
+    column: 11
   fix: ~
 - kind:
     MissingReturnTypeMagicMethod: __init__
@@ -17,8 +17,8 @@ expression: checks
     row: 11
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 12
+    column: 11
   fix: ~
 - kind:
     MissingReturnTypePrivateFunction: __init__
@@ -26,7 +26,7 @@ expression: checks
     row: 40
     column: 0
   end_location:
-    row: 42
-    column: 0
+    row: 41
+    column: 7
   fix: ~
 

src/flake8_annotations/snapshots/ruff__flake8_annotations__tests__suppress_none_returning.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 45
     column: 0
   end_location:
-    row: 50
-    column: 0
+    row: 46
+    column: 15
   fix: ~
 - kind:
     MissingReturnTypePublicFunction: foo
@@ -17,7 +17,7 @@ expression: checks
     row: 50
     column: 0
   end_location:
-    row: 56
-    column: 0
+    row: 55
+    column: 14
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B017_B017.py.snap

@@ -7,7 +7,7 @@ expression: checks
     row: 22
     column: 8
   end_location:
-    row: 25
-    column: 4
+    row: 23
+    column: 42
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B024_B024.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 17
     column: 0
   end_location:
-    row: 22
-    column: 0
+    row: 19
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: MetaBase_1
@@ -17,8 +17,8 @@ expression: checks
     row: 58
     column: 0
   end_location:
-    row: 63
-    column: 0
+    row: 60
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_Base_1
@@ -26,8 +26,8 @@ expression: checks
     row: 69
     column: 0
   end_location:
-    row: 74
-    column: 0
+    row: 71
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_Base_2
@@ -35,8 +35,8 @@ expression: checks
     row: 74
     column: 0
   end_location:
-    row: 79
-    column: 0
+    row: 76
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: notabc_Base_1
@@ -44,8 +44,8 @@ expression: checks
     row: 79
     column: 0
   end_location:
-    row: 84
-    column: 0
+    row: 81
+    column: 13
   fix: ~
 - kind:
     AbstractBaseClassWithoutAbstractMethod: abc_set_class_variable_4
@@ -53,7 +53,7 @@ expression: checks
     row: 128
     column: 0
   end_location:
-    row: 130
-    column: 0
+    row: 129
+    column: 7
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B025_B025.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 15
     column: 0
   end_location:
-    row: 22
-    column: 0
+    row: 20
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: pickle.PickleError
@@ -17,8 +17,8 @@ expression: checks
     row: 22
     column: 0
   end_location:
-    row: 31
-    column: 0
+    row: 29
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: TypeError
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 0
   end_location:
-    row: 39
-    column: 0
+    row: 38
+    column: 9
   fix: ~
 - kind:
     DuplicateTryBlockException: ValueError
@@ -35,7 +35,7 @@ expression: checks
     row: 31
     column: 0
   end_location:
-    row: 39
-    column: 0
+    row: 38
+    column: 9
   fix: ~
 

src/flake8_bugbear/snapshots/ruff__flake8_bugbear__tests__B027_B027.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 12
     column: 4
   end_location:
-    row: 15
-    column: 4
+    row: 13
+    column: 11
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -17,8 +17,8 @@ expression: checks
     row: 15
     column: 4
   end_location:
-    row: 18
-    column: 4
+    row: 16
+    column: 12
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -26,8 +26,8 @@ expression: checks
     row: 18
     column: 4
   end_location:
-    row: 22
-    column: 4
+    row: 20
+    column: 11
   fix: ~
 - kind:
     EmptyMethodWithoutAbstractDecorator: AbstractClass
@@ -35,7 +35,7 @@ expression: checks
     row: 22
     column: 4
   end_location:
-    row: 29
-    column: 4
+    row: 27
+    column: 12
   fix: ~
 

src/flake8_builtins/snapshots/ruff__flake8_builtins__tests__A001_A001.py.snap

@@ -89,8 +89,8 @@ expression: checks
     row: 10
     column: 0
   end_location:
-    row: 13
-    column: 0
+    row: 11
+    column: 8
   fix: ~
 - kind:
     BuiltinVariableShadowing: slice
@@ -98,8 +98,8 @@ expression: checks
     row: 13
     column: 0
   end_location:
-    row: 16
-    column: 0
+    row: 14
+    column: 8
   fix: ~
 - kind:
     BuiltinVariableShadowing: ValueError
@@ -107,8 +107,8 @@ expression: checks
     row: 18
     column: 0
   end_location:
-    row: 21
-    column: 0
+    row: 19
+    column: 7
   fix: ~
 - kind:
     BuiltinVariableShadowing: memoryview

src/flake8_builtins/snapshots/ruff__flake8_builtins__tests__A003_A003.py.snap

@@ -17,7 +17,7 @@ expression: checks
     row: 7
     column: 4
   end_location:
-    row: 9
-    column: 0
+    row: 8
+    column: 12
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET503_RET503.py.snap

@@ -7,8 +7,8 @@ expression: checks
     row: 7
     column: 4
   end_location:
-    row: 12
-    column: 0
+    row: 8
+    column: 16
   fix: ~
 - kind: ImplicitReturn
   location:
@@ -45,8 +45,8 @@ expression: checks
     row: 29
     column: 8
   end_location:
-    row: 34
-    column: 0
+    row: 30
+    column: 20
   fix: ~
 - kind: ImplicitReturn
   location:

src/flake8_return/snapshots/ruff__flake8_return__tests__RET505_RET505.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 13
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 17
     column: 4
   end_location:
-    row: 27
-    column: 4
+    row: 26
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseReturn: Elif
@@ -26,8 +26,8 @@ expression: checks
     row: 38
     column: 4
   end_location:
-    row: 49
-    column: 0
+    row: 46
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 50
     column: 4
   end_location:
-    row: 58
-    column: 0
+    row: 55
+    column: 16
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 61
     column: 8
   end_location:
-    row: 67
-    column: 4
+    row: 66
+    column: 20
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 73
     column: 4
   end_location:
-    row: 81
-    column: 4
+    row: 80
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -62,8 +62,8 @@ expression: checks
     row: 86
     column: 8
   end_location:
-    row: 91
-    column: 4
+    row: 90
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseReturn: Else
@@ -71,7 +71,7 @@ expression: checks
     row: 97
     column: 4
   end_location:
-    row: 109
-    column: 0
+    row: 103
+    column: 23
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET506_RET506.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 5
     column: 4
   end_location:
-    row: 16
-    column: 0
+    row: 13
+    column: 26
   fix: ~
 - kind:
     SuperfluousElseRaise: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 17
     column: 4
   end_location:
-    row: 27
-    column: 4
+    row: 26
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 4
   end_location:
-    row: 39
-    column: 0
+    row: 36
+    column: 26
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 42
     column: 8
   end_location:
-    row: 48
-    column: 4
+    row: 47
+    column: 30
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 54
     column: 4
   end_location:
-    row: 62
-    column: 4
+    row: 61
+    column: 13
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 67
     column: 8
   end_location:
-    row: 72
-    column: 4
+    row: 71
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseRaise: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 78
     column: 4
   end_location:
-    row: 90
-    column: 0
+    row: 84
+    column: 33
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET507_RET507.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 6
     column: 8
   end_location:
-    row: 14
-    column: 0
+    row: 11
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 16
     column: 8
   end_location:
-    row: 26
-    column: 8
+    row: 25
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 34
     column: 8
   end_location:
-    row: 40
-    column: 0
+    row: 37
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 44
     column: 12
   end_location:
-    row: 50
-    column: 8
+    row: 49
+    column: 24
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 57
     column: 8
   end_location:
-    row: 65
-    column: 8
+    row: 64
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 71
     column: 12
   end_location:
-    row: 76
-    column: 8
+    row: 75
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseContinue: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 83
     column: 8
   end_location:
-    row: 92
-    column: 0
+    row: 89
+    column: 24
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET508_RET508.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 6
     column: 8
   end_location:
-    row: 14
-    column: 0
+    row: 11
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Elif
@@ -17,8 +17,8 @@ expression: checks
     row: 16
     column: 8
   end_location:
-    row: 26
-    column: 8
+    row: 25
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -26,8 +26,8 @@ expression: checks
     row: 31
     column: 8
   end_location:
-    row: 37
-    column: 0
+    row: 34
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -35,8 +35,8 @@ expression: checks
     row: 41
     column: 12
   end_location:
-    row: 47
-    column: 8
+    row: 46
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -44,8 +44,8 @@ expression: checks
     row: 54
     column: 8
   end_location:
-    row: 62
-    column: 8
+    row: 61
+    column: 17
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -53,8 +53,8 @@ expression: checks
     row: 68
     column: 12
   end_location:
-    row: 73
-    column: 8
+    row: 72
+    column: 21
   fix: ~
 - kind:
     SuperfluousElseBreak: Else
@@ -62,7 +62,7 @@ expression: checks
     row: 80
     column: 8
   end_location:
-    row: 92
-    column: 0
+    row: 86
+    column: 21
   fix: ~
 

src/fs.rs

@@ -5,15 +5,13 @@ use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Result};
 use globset::GlobMatcher;
-use log::debug;
 use path_absolutize::{path_dedot, Absolutize};
 use rustc_hash::FxHashSet;
-use walkdir::{DirEntry, WalkDir};
 
 use crate::checks::CheckCode;
 
 /// Extract the absolute path and basename (as strings) from a Path.
-fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
+pub fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
     let file_path = path
         .to_str()
         .ok_or_else(|| anyhow!("Unable to parse filename: {:?}", path))?;
@@ -25,62 +23,7 @@ fn extract_path_names(path: &Path) -> Result<(&str, &str)> {
     Ok((file_path, file_basename))
 }
 
-fn is_excluded(file_path: &str, file_basename: &str, exclude: &globset::GlobSet) -> bool {
-    exclude.is_match(file_path) || exclude.is_match(file_basename)
-}
-
-fn is_included(path: &Path) -> bool {
-    let file_name = path.to_string_lossy();
-    file_name.ends_with(".py") || file_name.ends_with(".pyi")
-}
-
-pub fn iter_python_files<'a>(
-    path: &'a Path,
-    exclude: &'a globset::GlobSet,
-    extend_exclude: &'a globset::GlobSet,
-) -> impl Iterator<Item = Result<DirEntry, walkdir::Error>> + 'a {
-    // Run some checks over the provided patterns, to enable optimizations below.
-    let has_exclude = !exclude.is_empty();
-    let has_extend_exclude = !extend_exclude.is_empty();
-
-    WalkDir::new(normalize_path(path))
-        .into_iter()
-        .filter_entry(move |entry| {
-            if !has_exclude && !has_extend_exclude {
-                return true;
-            }
-
-            let path = entry.path();
-            match extract_path_names(path) {
-                Ok((file_path, file_basename)) => {
-                    if has_exclude && is_excluded(file_path, file_basename, exclude) {
-                        debug!("Ignored path via `exclude`: {:?}", path);
-                        false
-                    } else if has_extend_exclude
-                        && is_excluded(file_path, file_basename, extend_exclude)
-                    {
-                        debug!("Ignored path via `extend-exclude`: {:?}", path);
-                        false
-                    } else {
-                        true
-                    }
-                }
-                Err(e) => {
-                    debug!("Ignored path due to error in parsing: {:?}: {}", path, e);
-                    true
-                }
-            }
-        })
-        .filter(|entry| {
-            entry.as_ref().map_or(true, |entry| {
-                (entry.depth() == 0 || is_included(entry.path()))
-                    && !entry.file_type().is_dir()
-                    && !(entry.file_type().is_symlink() && entry.path().is_dir())
-            })
-        })
-}
-
-/// Create tree set with codes matching the pattern/code pairs.
+/// Create a set with codes matching the pattern/code pairs.
 pub(crate) fn ignores_from_path<'a>(
     path: &Path,
     pattern_code_pairs: &'a [(GlobMatcher, GlobMatcher, FxHashSet<CheckCode>)],
@@ -128,114 +71,3 @@ pub(crate) fn read_file(path: &Path) -> Result<String> {
     buf_reader.read_to_string(&mut contents)?;
     Ok(contents)
 }
-
-#[cfg(test)]
-mod tests {
-    use std::path::{Path, PathBuf};
-
-    use anyhow::Result;
-    use globset::GlobSet;
-    use path_absolutize::Absolutize;
-
-    use crate::fs::{extract_path_names, is_excluded, is_included};
-    use crate::settings::types::FilePattern;
-
-    #[test]
-    fn inclusions() {
-        let path = Path::new("foo/bar/baz.py").absolutize().unwrap();
-        assert!(is_included(&path));
-
-        let path = Path::new("foo/bar/baz.pyi").absolutize().unwrap();
-        assert!(is_included(&path));
-
-        let path = Path::new("foo/bar/baz.js").absolutize().unwrap();
-        assert!(!is_included(&path));
-
-        let path = Path::new("foo/bar/baz").absolutize().unwrap();
-        assert!(!is_included(&path));
-    }
-
-    fn make_exclusion(file_pattern: FilePattern, project_root: Option<&PathBuf>) -> GlobSet {
-        let mut builder = globset::GlobSetBuilder::new();
-        file_pattern.add_to(&mut builder, project_root).unwrap();
-        builder.build().unwrap()
-    }
-
-    #[test]
-    fn exclusions() -> Result<()> {
-        let project_root = Path::new("/tmp/");
-
-        let path = Path::new("foo").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("foo".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("bar".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("baz.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
-        let exclude = FilePattern::User("foo/bar".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("foo/bar/baz.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("foo/bar/*.py".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        let path = Path::new("foo/bar/baz.py")
-            .absolutize_from(project_root)
-            .unwrap();
-        let exclude = FilePattern::User("baz".to_string());
-        let (file_path, file_basename) = extract_path_names(&path)?;
-        assert!(!is_excluded(
-            file_path,
-            file_basename,
-            &make_exclusion(exclude, Some(&project_root.to_path_buf()))
-        ));
-
-        Ok(())
-    }
-}

src/isort/helpers.rs

@@ -0,0 +1,55 @@
+use rustpython_ast::Stmt;
+
+use crate::source_code_locator::SourceCodeLocator;
+
+/// Return `true` if a `Stmt` is preceded by a "comment break"
+pub fn has_comment_break(stmt: &Stmt, locator: &SourceCodeLocator) -> bool {
+    // Starting from the `Stmt` (`def f(): pass`), we want to detect patterns like
+    // this:
+    //
+    //   import os
+    //
+    //   # Detached comment.
+    //
+    //   def f(): pass
+
+    // This should also be detected:
+    //
+    //   import os
+    //
+    //   # Detached comment.
+    //
+    //   # Direct comment.
+    //   def f(): pass
+
+    // But this should not:
+    //
+    //   import os
+    //
+    //   # Direct comment.
+    //   def f(): pass
+    let mut seen_blank = false;
+    for line in locator
+        .slice_source_code_until(&stmt.location)
+        .lines()
+        .rev()
+    {
+        let line = line.trim();
+        if seen_blank {
+            if line.starts_with('#') {
+                return true;
+            } else if !line.is_empty() {
+                break;
+            }
+        } else {
+            if line.is_empty() {
+                seen_blank = true;
+            } else if line.starts_with('#') || line.starts_with('@') {
+                continue;
+            } else {
+                break;
+            }
+        }
+    }
+    false
+}

src/isort/mod.rs

@@ -18,6 +18,7 @@ use crate::isort::types::{
 mod categorize;
 mod comments;
 pub mod format;
+mod helpers;
 pub mod plugins;
 pub mod settings;
 mod sorting;

src/isort/snapshots/ruff__isort__tests__insert_empty_lines.py.snap

@@ -49,32 +49,17 @@ expression: checks
       column: 0
 - kind: UnsortedImports
   location:
-    row: 33
+    row: 52
     column: 0
   end_location:
-    row: 35
+    row: 54
     column: 0
   fix:
-    content: "    import collections\n    import typing\n\n"
+    content: "import os\n\n\n"
     location:
-      row: 33
+      row: 52
       column: 0
     end_location:
-      row: 35
-      column: 0
-- kind: UnsortedImports
-  location:
-    row: 39
-    column: 0
-  end_location:
-    row: 41
-    column: 0
-  fix:
-    content: "    import collections\n    import typing\n\n"
-    location:
-      row: 39
-      column: 0
-    end_location:
-      row: 41
+      row: 54
       column: 0
 

src/isort/snapshots/ruff__isort__tests__insert_empty_lines.pyi.snap

@@ -47,19 +47,4 @@ expression: checks
     end_location:
       row: 16
       column: 0
-- kind: UnsortedImports
-  location:
-    row: 33
-    column: 0
-  end_location:
-    row: 35
-    column: 0
-  fix:
-    content: "    import collections\n    import typing\n\n"
-    location:
-      row: 33
-      column: 0
-    end_location:
-      row: 35
-      column: 0
 

src/isort/snapshots/ruff__isort__tests__trailing_suffix.py.snap

@@ -25,7 +25,7 @@ expression: checks
     row: 6
     column: 13
   fix:
-    content: "    import os\n    import sys\n\n"
+    content: "    import os\n    import sys\n"
     location:
       row: 5
       column: 0

src/isort/track.rs

@@ -8,20 +8,24 @@ use rustpython_ast::{
 
 use crate::ast::visitor::Visitor;
 use crate::directives::IsortDirectives;
+use crate::isort::helpers;
+use crate::source_code_locator::SourceCodeLocator;
 
+#[derive(Debug)]
 pub enum Trailer {
     Sibling,
     ClassDef,
     FunctionDef,
 }
 
-#[derive(Default)]
+#[derive(Debug, Default)]
 pub struct Block<'a> {
     pub imports: Vec<&'a Stmt>,
     pub trailer: Option<Trailer>,
 }
 
 pub struct ImportTracker<'a> {
+    locator: &'a SourceCodeLocator<'a>,
     directives: &'a IsortDirectives,
     pyi: bool,
     blocks: Vec<Block<'a>>,
@@ -30,8 +34,13 @@ pub struct ImportTracker<'a> {
 }
 
 impl<'a> ImportTracker<'a> {
-    pub fn new(directives: &'a IsortDirectives, path: &'a Path) -> Self {
+    pub fn new(
+        locator: &'a SourceCodeLocator<'a>,
+        directives: &'a IsortDirectives,
+        path: &'a Path,
+    ) -> Self {
         Self {
+            locator,
             directives,
             pyi: path.extension().map_or(false, |ext| ext == "pyi"),
             blocks: vec![Block::default()],
@@ -46,31 +55,46 @@ impl<'a> ImportTracker<'a> {
     }
 
     fn trailer_for(&self, stmt: &'a Stmt) -> Option<Trailer> {
-        if self.pyi {
-            // Black treats interface files differently, limiting to one newline
-            // (`Trailing::Sibling`), and avoiding inserting any newlines in nested function
-            // blocks.
-            if self.nested
-                && matches!(
-                    stmt.node,
-                    StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. }
-                )
-            {
-                None
-            } else {
-                Some(Trailer::Sibling)
-            }
-        } else if self.nested {
-            Some(Trailer::Sibling)
-        } else {
-            Some(match &stmt.node {
-                StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
-                    Trailer::FunctionDef
-                }
-                StmtKind::ClassDef { .. } => Trailer::ClassDef,
-                _ => Trailer::Sibling,
-            })
+        // No need to compute trailers if we won't be finalizing anything.
+        let index = self.blocks.len() - 1;
+        if self.blocks[index].imports.is_empty() {
+            return None;
         }
+
+        // Similar to isort, avoid enforcing any newline behaviors in nested blocks.
+        if self.nested {
+            return None;
+        }
+
+        Some(if self.pyi {
+            // Black treats interface files differently, limiting to one newline
+            // (`Trailing::Sibling`).
+            Trailer::Sibling
+        } else {
+            // If the import block is followed by a class or function, we want to enforce
+            // two blank lines. The exception: if, between the import and the class or
+            // function, we have at least one commented line, followed by at
+            // least one blank line. In that case, we treat it as a regular
+            // sibling (i.e., as if the comment is the next statement, as
+            // opposed to the class or function).
+            match &stmt.node {
+                StmtKind::FunctionDef { .. } | StmtKind::AsyncFunctionDef { .. } => {
+                    if helpers::has_comment_break(stmt, self.locator) {
+                        Trailer::Sibling
+                    } else {
+                        Trailer::FunctionDef
+                    }
+                }
+                StmtKind::ClassDef { .. } => {
+                    if helpers::has_comment_break(stmt, self.locator) {
+                        Trailer::Sibling
+                    } else {
+                        Trailer::ClassDef
+                    }
+                }
+                _ => Trailer::Sibling,
+            }
+        })
     }
 
     fn finalize(&mut self, trailer: Option<Trailer>) {

src/iterators.rs

@@ -0,0 +1,16 @@
+#[cfg(not(target_family = "wasm"))]
+use rayon::prelude::*;
+
+/// Shim that calls `par_iter` except for wasm because there's no wasm support
+/// in rayon yet (there is a shim to be used for the web, but it requires js
+/// cooperation) Unfortunately, `ParallelIterator` does not implement `Iterator`
+/// so the signatures diverge
+#[cfg(not(target_family = "wasm"))]
+pub fn par_iter<T: Sync>(iterable: &[T]) -> impl ParallelIterator<Item = &T> {
+    iterable.par_iter()
+}
+
+#[cfg(target_family = "wasm")]
+pub fn par_iter<T: Sync>(iterable: &[T]) -> impl Iterator<Item = &T> {
+    iterable.iter()
+}

src/lib.rs

@@ -14,13 +14,14 @@
 use std::path::Path;
 
 use anyhow::Result;
-use log::debug;
+use path_absolutize::path_dedot;
 use rustpython_helpers::tokenize;
 use rustpython_parser::lexer::LexResult;
 use settings::{pyproject, Settings};
 
 use crate::checks::Check;
 use crate::linter::check_path;
+use crate::resolver::Relativity;
 use crate::settings::configuration::Configuration;
 use crate::source_code_locator::SourceCodeLocator;
 
@@ -58,6 +59,7 @@ pub mod flake8_tidy_imports;
 mod flake8_unused_arguments;
 pub mod fs;
 mod isort;
+pub mod iterators;
 mod lex;
 pub mod linter;
 pub mod logging;
@@ -73,6 +75,7 @@ mod pygrep_hooks;
 mod pylint;
 mod python;
 mod pyupgrade;
+pub mod resolver;
 mod ruff;
 mod rustpython_helpers;
 pub mod settings;
@@ -82,24 +85,24 @@ pub mod updates;
 mod vendored;
 pub mod visibility;
 
+/// Load the relevant `Settings` for a given `Path`.
+fn resolve(path: &Path) -> Result<Settings> {
+    if let Some(pyproject) = pyproject::find_pyproject_toml(path) {
+        // First priority: `pyproject.toml` in the current `Path`.
+        resolver::resolve_settings(&pyproject, &Relativity::Parent, None)
+    } else if let Some(pyproject) = pyproject::find_user_pyproject_toml() {
+        // Second priority: user-specific `pyproject.toml`.
+        resolver::resolve_settings(&pyproject, &Relativity::Cwd, None)
+    } else {
+        // Fallback: default settings.
+        Settings::from_configuration(Configuration::default(), &path_dedot::CWD)
+    }
+}
+
 /// Run Ruff over Python source code directly.
 pub fn check(path: &Path, contents: &str, autofix: bool) -> Result<Vec<Check>> {
-    // Find the project root and pyproject.toml.
-    let project_root = pyproject::find_project_root(&[path.to_path_buf()]);
-    match &project_root {
-        Some(path) => debug!("Found project root at: {:?}", path),
-        None => debug!("Unable to identify project root; assuming current directory..."),
-    };
-    let pyproject = pyproject::find_pyproject_toml(project_root.as_ref());
-    match &pyproject {
-        Some(path) => debug!("Found pyproject.toml at: {:?}", path),
-        None => debug!("Unable to find pyproject.toml; using default settings..."),
-    };
-
-    let settings = Settings::from_configuration(
-        Configuration::from_pyproject(pyproject.as_ref(), project_root.as_ref())?,
-        project_root.as_ref(),
-    )?;
+    // Load the relevant `Settings` for the given `Path`.
+    let settings = resolve(path)?;
 
     // Tokenize once.
     let tokens: Vec<LexResult> = tokenize(contents);

src/linter.rs

@@ -211,7 +211,7 @@ pub fn add_noqa_to_path(path: &Path, settings: &Settings) -> Result<usize> {
 }
 
 /// Apply autoformatting to the source code at the given `Path`.
-pub fn autoformat_path(path: &Path) -> Result<()> {
+pub fn autoformat_path(path: &Path, _settings: &Settings) -> Result<()> {
     // Read the file from disk.
     let contents = fs::read_file(path)?;
 

src/main.rs

@@ -11,190 +11,61 @@
     clippy::too_many_lines
 )]
 
-use std::io::{self, Read};
+use std::io::{self};
 use std::path::{Path, PathBuf};
 use std::process::ExitCode;
 use std::sync::mpsc::channel;
-use std::time::Instant;
 
 use ::ruff::autofix::fixer;
-use ::ruff::checks::{CheckCode, CheckKind};
 use ::ruff::cli::{extract_log_level, Cli};
-use ::ruff::fs::iter_python_files;
-use ::ruff::linter::{add_noqa_to_path, autoformat_path, lint_path, lint_stdin, Diagnostics};
 use ::ruff::logging::{set_up_logging, LogLevel};
-use ::ruff::message::Message;
 use ::ruff::printer::Printer;
+use ::ruff::resolver::Strategy;
 use ::ruff::settings::configuration::Configuration;
 use ::ruff::settings::types::SerializationFormat;
 use ::ruff::settings::{pyproject, Settings};
 #[cfg(feature = "update-informer")]
 use ::ruff::updates;
-use ::ruff::{cache, commands, fs};
+use ::ruff::{cache, commands};
 use anyhow::Result;
 use clap::{CommandFactory, Parser};
 use colored::Colorize;
-use log::{debug, error};
 use notify::{recommended_watcher, RecursiveMode, Watcher};
-#[cfg(not(target_family = "wasm"))]
-use rayon::prelude::*;
-use rustpython_ast::Location;
-use walkdir::DirEntry;
+use path_absolutize::path_dedot;
+use ruff::cli::Overrides;
+use ruff::resolver::{resolve_settings, Relativity};
 
-/// Shim that calls `par_iter` except for wasm because there's no wasm support
-/// in rayon yet (there is a shim to be used for the web, but it requires js
-/// cooperation) Unfortunately, `ParallelIterator` does not implement `Iterator`
-/// so the signatures diverge
-#[cfg(not(target_family = "wasm"))]
-fn par_iter<T: Sync>(iterable: &Vec<T>) -> impl ParallelIterator<Item = &T> {
-    iterable.par_iter()
-}
-
-#[cfg(target_family = "wasm")]
-fn par_iter<T: Sync>(iterable: &Vec<T>) -> impl Iterator<Item = &T> {
-    iterable.iter()
-}
-
-fn read_from_stdin() -> Result<String> {
-    let mut buffer = String::new();
-    io::stdin().lock().read_to_string(&mut buffer)?;
-    Ok(buffer)
-}
-
-fn run_once_stdin(
-    settings: &Settings,
-    filename: &Path,
-    autofix: &fixer::Mode,
-) -> Result<Diagnostics> {
-    let stdin = read_from_stdin()?;
-    let mut diagnostics = lint_stdin(filename, &stdin, settings, autofix)?;
-    diagnostics.messages.sort_unstable();
-    Ok(diagnostics)
-}
-
-fn run_once(
-    files: &[PathBuf],
-    settings: &Settings,
-    cache: bool,
-    autofix: &fixer::Mode,
-) -> Diagnostics {
-    // Collect all the files to check.
-    let start = Instant::now();
-    let paths: Vec<Result<DirEntry, walkdir::Error>> = files
-        .iter()
-        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
-        .collect();
-    let duration = start.elapsed();
-    debug!("Identified files to lint in: {:?}", duration);
-
-    let start = Instant::now();
-    let mut diagnostics: Diagnostics = par_iter(&paths)
-        .map(|entry| {
-            match entry {
-                Ok(entry) => {
-                    let path = entry.path();
-                    lint_path(path, settings, &cache.into(), autofix)
-                        .map_err(|e| (Some(path.to_owned()), e.to_string()))
-                }
-                Err(e) => Err((
-                    e.path().map(Path::to_owned),
-                    e.io_error()
-                        .map_or_else(|| e.to_string(), io::Error::to_string),
-                )),
-            }
-            .unwrap_or_else(|(path, message)| {
-                if let Some(path) = path {
-                    if settings.enabled.contains(&CheckCode::E902) {
-                        Diagnostics::new(vec![Message {
-                            kind: CheckKind::IOError(message),
-                            location: Location::default(),
-                            end_location: Location::default(),
-                            fix: None,
-                            filename: path.to_string_lossy().to_string(),
-                            source: None,
-                        }])
-                    } else {
-                        error!("Failed to check {}: {message}", path.to_string_lossy());
-                        Diagnostics::default()
-                    }
-                } else {
-                    error!("{message}");
-                    Diagnostics::default()
-                }
-            })
-        })
-        .reduce(Diagnostics::default, |mut acc, item| {
-            acc += item;
-            acc
-        });
-
-    diagnostics.messages.sort_unstable();
-    let duration = start.elapsed();
-    debug!("Checked files in: {:?}", duration);
-
-    diagnostics
-}
-
-fn add_noqa(files: &[PathBuf], settings: &Settings) -> usize {
-    // Collect all the files to check.
-    let start = Instant::now();
-    let paths: Vec<DirEntry> = files
-        .iter()
-        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
-        .flatten()
-        .collect();
-    let duration = start.elapsed();
-    debug!("Identified files to lint in: {:?}", duration);
-
-    let start = Instant::now();
-    let modifications: usize = par_iter(&paths)
-        .filter_map(|entry| {
-            let path = entry.path();
-            match add_noqa_to_path(path, settings) {
-                Ok(count) => Some(count),
-                Err(e) => {
-                    error!("Failed to add noqa to {}: {e}", path.to_string_lossy());
-                    None
-                }
-            }
-        })
-        .sum();
-
-    let duration = start.elapsed();
-    debug!("Added noqa to files in: {:?}", duration);
-
-    modifications
-}
-
-fn autoformat(files: &[PathBuf], settings: &Settings) -> usize {
-    // Collect all the files to format.
-    let start = Instant::now();
-    let paths: Vec<DirEntry> = files
-        .iter()
-        .flat_map(|path| iter_python_files(path, &settings.exclude, &settings.extend_exclude))
-        .flatten()
-        .collect();
-    let duration = start.elapsed();
-    debug!("Identified files to lint in: {:?}", duration);
-
-    let start = Instant::now();
-    let modifications = par_iter(&paths)
-        .filter_map(|entry| {
-            let path = entry.path();
-            match autoformat_path(path) {
-                Ok(()) => Some(()),
-                Err(e) => {
-                    error!("Failed to autoformat {}: {e}", path.to_string_lossy());
-                    None
-                }
-            }
-        })
-        .count();
-
-    let duration = start.elapsed();
-    debug!("Auto-formatted files in: {:?}", duration);
-
-    modifications
+/// Resolve the relevant settings strategy and defaults for the current
+/// invocation.
+fn resolve(config: Option<PathBuf>, overrides: &Overrides) -> Result<Strategy> {
+    if let Some(pyproject) = config {
+        // First priority: the user specified a `pyproject.toml` file. Use that
+        // `pyproject.toml` for _all_ configuration, and resolve paths relative to the
+        // current working directory. (This matches ESLint's behavior.)
+        let settings = resolve_settings(&pyproject, &Relativity::Cwd, Some(overrides))?;
+        Ok(Strategy::Fixed(settings))
+    } else if let Some(pyproject) = pyproject::find_pyproject_toml(path_dedot::CWD.as_path()) {
+        // Second priority: find a `pyproject.toml` file in the current working path,
+        // and resolve all paths relative to that directory. (With
+        // `Strategy::Hierarchical`, we'll end up finding the "closest" `pyproject.toml`
+        // file for every Python file later on, so these act as the "default" settings.)
+        let settings = resolve_settings(&pyproject, &Relativity::Parent, Some(overrides))?;
+        Ok(Strategy::Hierarchical(settings))
+    } else if let Some(pyproject) = pyproject::find_user_pyproject_toml() {
+        // Third priority: find a user-specific `pyproject.toml`, but resolve all paths
+        // relative the current working directory. (With `Strategy::Hierarchical`, we'll
+        // end up the "closest" `pyproject.toml` file for every Python file later on, so
+        // these act as the "default" settings.)
+        let settings = resolve_settings(&pyproject, &Relativity::Cwd, Some(overrides))?;
+        Ok(Strategy::Hierarchical(settings))
+    } else {
+        // Fallback: load Ruff's default settings, and resolve all paths relative to the
+        // current working directory. (With `Strategy::Hierarchical`, we'll end up the
+        // "closest" `pyproject.toml` file for every Python file later on, so these act
+        // as the "default" settings.)
+        let settings = Settings::from_configuration(Configuration::default(), &path_dedot::CWD)?;
+        Ok(Strategy::Hierarchical(settings))
+    }
 }
 
 fn inner_main() -> Result<ExitCode> {
@@ -203,63 +74,42 @@ fn inner_main() -> Result<ExitCode> {
     let log_level = extract_log_level(&cli);
     set_up_logging(&log_level)?;
 
-    if let Some(shell) = cli.generate_shell_completion {
-        shell.generate(&mut Cli::command(), &mut std::io::stdout());
-        return Ok(ExitCode::SUCCESS);
-    }
-
-    // Find the project root and pyproject.toml.
-    let config: Option<PathBuf> = cli.config;
-    let project_root = config.as_ref().map_or_else(
-        || pyproject::find_project_root(&cli.files),
-        |config| config.parent().map(fs::normalize_path),
-    );
-    let pyproject = config.or_else(|| pyproject::find_pyproject_toml(project_root.as_ref()));
-
-    // Reconcile configuration from pyproject.toml and command-line arguments.
-    let mut configuration =
-        Configuration::from_pyproject(pyproject.as_ref(), project_root.as_ref())?;
-    configuration.merge(overrides);
-
     if cli.show_settings && cli.show_files {
-        eprintln!("Error: specify --show-settings or show-files (not both).");
-        return Ok(ExitCode::FAILURE);
+        anyhow::bail!("specify --show-settings or show-files (not both)")
     }
-    if cli.show_settings {
-        commands::show_settings(&configuration, project_root.as_ref(), pyproject.as_ref());
+    if let Some(shell) = cli.generate_shell_completion {
+        shell.generate(&mut Cli::command(), &mut io::stdout());
         return Ok(ExitCode::SUCCESS);
     }
 
-    // TODO(charlie): Included in `pyproject.toml`, but not inherited.
-    let fix = if configuration.fix {
+    // Construct the "default" settings. These are used when no `pyproject.toml`
+    // files are present, or files are injected from outside of the hierarchy.
+    let strategy = resolve(cli.config, &overrides)?;
+
+    // Extract options that are included in `Settings`, but only apply at the top
+    // level.
+    let (fix, format) = match &strategy {
+        Strategy::Fixed(settings) => (settings.fix, settings.format),
+        Strategy::Hierarchical(settings) => (settings.fix, settings.format),
+    };
+    let autofix = if fix {
         fixer::Mode::Apply
-    } else if matches!(configuration.format, SerializationFormat::Json) {
+    } else if matches!(format, SerializationFormat::Json) {
         fixer::Mode::Generate
     } else {
         fixer::Mode::None
     };
-    let format = configuration.format;
-
-    let settings = Settings::from_configuration(configuration, project_root.as_ref())?;
-
-    // Now that we've inferred the appropriate log level, add some debug
-    // information.
-    match &project_root {
-        Some(path) => debug!("Found project root at: {:?}", path),
-        None => debug!("Unable to identify project root; assuming current directory..."),
-    };
-    match &pyproject {
-        Some(path) => debug!("Found pyproject.toml at: {:?}", path),
-        None => debug!("Unable to find pyproject.toml; using default settings..."),
-    };
 
     if let Some(code) = cli.explain {
-        commands::explain(&code, format)?;
+        commands::explain(&code, &format)?;
+        return Ok(ExitCode::SUCCESS);
+    }
+    if cli.show_settings {
+        commands::show_settings(&cli.files, &strategy, &overrides)?;
         return Ok(ExitCode::SUCCESS);
     }
-
     if cli.show_files {
-        commands::show_files(&cli.files, &settings);
+        commands::show_files(&cli.files, &strategy, &overrides)?;
         return Ok(ExitCode::SUCCESS);
     }
 
@@ -272,7 +122,7 @@ fn inner_main() -> Result<ExitCode> {
 
     let printer = Printer::new(&format, &log_level);
     if cli.watch {
-        if matches!(fix, fixer::Mode::Generate | fixer::Mode::Apply) {
+        if matches!(autofix, fixer::Mode::Generate | fixer::Mode::Apply) {
             eprintln!("Warning: --fix is not enabled in watch mode.");
         }
         if cli.add_noqa {
@@ -289,7 +139,13 @@ fn inner_main() -> Result<ExitCode> {
         printer.clear_screen()?;
         printer.write_to_user("Starting linter in watch mode...\n");
 
-        let messages = run_once(&cli.files, &settings, cache_enabled, &fixer::Mode::None);
+        let messages = commands::run(
+            &cli.files,
+            &strategy,
+            &overrides,
+            cache_enabled,
+            &fixer::Mode::None,
+        )?;
         printer.write_continuously(&messages)?;
 
         // Configure the file watcher.
@@ -301,32 +157,37 @@ fn inner_main() -> Result<ExitCode> {
 
         loop {
             match rx.recv() {
-                Ok(e) => {
-                    let paths = e?.paths;
-                    let py_changed = paths.iter().any(|p| {
-                        p.extension()
-                            .map(|ext| ext.eq_ignore_ascii_case("py"))
+                Ok(event) => {
+                    let paths = event?.paths;
+                    let py_changed = paths.iter().any(|path| {
+                        path.extension()
+                            .map(|ext| ext == "py" || ext == "pyi")
                             .unwrap_or_default()
                     });
                     if py_changed {
                         printer.clear_screen()?;
                         printer.write_to_user("File change detected...\n");
 
-                        let messages =
-                            run_once(&cli.files, &settings, cache_enabled, &fixer::Mode::None);
+                        let messages = commands::run(
+                            &cli.files,
+                            &strategy,
+                            &overrides,
+                            cache_enabled,
+                            &fixer::Mode::None,
+                        )?;
                         printer.write_continuously(&messages)?;
                     }
                 }
-                Err(e) => return Err(e.into()),
+                Err(err) => return Err(err.into()),
             }
         }
     } else if cli.add_noqa {
-        let modifications = add_noqa(&cli.files, &settings);
+        let modifications = commands::add_noqa(&cli.files, &strategy, &overrides)?;
         if modifications > 0 && log_level >= LogLevel::Default {
             println!("Added {modifications} noqa directives.");
         }
     } else if cli.autoformat {
-        let modifications = autoformat(&cli.files, &settings);
+        let modifications = commands::autoformat(&cli.files, &strategy, &overrides)?;
         if modifications > 0 && log_level >= LogLevel::Default {
             println!("Formatted {modifications} files.");
         }
@@ -337,16 +198,16 @@ fn inner_main() -> Result<ExitCode> {
         let diagnostics = if is_stdin {
             let filename = cli.stdin_filename.unwrap_or_else(|| "-".to_string());
             let path = Path::new(&filename);
-            run_once_stdin(&settings, path, &fix)?
+            commands::run_stdin(&strategy, path, &autofix)?
         } else {
-            run_once(&cli.files, &settings, cache_enabled, &fix)
+            commands::run(&cli.files, &strategy, &overrides, cache_enabled, &autofix)?
         };
 
         // Always try to print violations (the printer itself may suppress output),
         // unless we're writing fixes via stdin (in which case, the transformed
         // source code goes to stdout).
-        if !(is_stdin && matches!(fix, fixer::Mode::Apply)) {
-            printer.write_once(&diagnostics, &fix)?;
+        if !(is_stdin && matches!(autofix, fixer::Mode::Apply)) {
+            printer.write_once(&diagnostics, &autofix)?;
         }
 
         // Check for updates if we're in a non-silent log level.

src/mccabe/snapshots/ruff__mccabe__tests__max_complexity_0.snap

@@ -10,8 +10,8 @@ expression: checks
     row: 2
     column: 0
   end_location:
-    row: 7
-    column: 0
+    row: 3
+    column: 8
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -21,8 +21,8 @@ expression: checks
     row: 7
     column: 0
   end_location:
-    row: 12
-    column: 0
+    row: 8
+    column: 10
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -32,8 +32,8 @@ expression: checks
     row: 12
     column: 0
   end_location:
-    row: 19
-    column: 0
+    row: 15
+    column: 12
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -43,8 +43,8 @@ expression: checks
     row: 19
     column: 0
   end_location:
-    row: 29
-    column: 0
+    row: 25
+    column: 47
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -54,8 +54,8 @@ expression: checks
     row: 29
     column: 0
   end_location:
-    row: 40
-    column: 0
+    row: 36
+    column: 47
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -65,8 +65,8 @@ expression: checks
     row: 40
     column: 0
   end_location:
-    row: 46
-    column: 0
+    row: 42
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -76,8 +76,8 @@ expression: checks
     row: 46
     column: 0
   end_location:
-    row: 54
-    column: 0
+    row: 50
+    column: 19
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -87,8 +87,8 @@ expression: checks
     row: 54
     column: 0
   end_location:
-    row: 62
-    column: 0
+    row: 58
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -98,8 +98,8 @@ expression: checks
     row: 62
     column: 0
   end_location:
-    row: 73
-    column: 0
+    row: 69
+    column: 7
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -109,8 +109,8 @@ expression: checks
     row: 63
     column: 4
   end_location:
-    row: 69
-    column: 4
+    row: 67
+    column: 11
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -120,8 +120,8 @@ expression: checks
     row: 64
     column: 8
   end_location:
-    row: 67
-    column: 8
+    row: 65
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -131,8 +131,8 @@ expression: checks
     row: 73
     column: 0
   end_location:
-    row: 85
-    column: 0
+    row: 81
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -142,8 +142,8 @@ expression: checks
     row: 85
     column: 0
   end_location:
-    row: 96
-    column: 0
+    row: 92
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -153,8 +153,8 @@ expression: checks
     row: 96
     column: 0
   end_location:
-    row: 107
-    column: 0
+    row: 103
+    column: 12
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -164,8 +164,8 @@ expression: checks
     row: 107
     column: 0
   end_location:
-    row: 112
-    column: 0
+    row: 108
+    column: 17
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -175,8 +175,8 @@ expression: checks
     row: 113
     column: 4
   end_location:
-    row: 139
-    column: 0
+    row: 138
+    column: 40
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -186,8 +186,8 @@ expression: checks
     row: 118
     column: 12
   end_location:
-    row: 121
-    column: 12
+    row: 119
+    column: 20
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -197,8 +197,8 @@ expression: checks
     row: 121
     column: 12
   end_location:
-    row: 125
-    column: 8
+    row: 123
+    column: 24
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -208,8 +208,8 @@ expression: checks
     row: 126
     column: 12
   end_location:
-    row: 129
-    column: 12
+    row: 127
+    column: 20
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -219,8 +219,8 @@ expression: checks
     row: 129
     column: 12
   end_location:
-    row: 132
-    column: 12
+    row: 130
+    column: 20
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -230,8 +230,8 @@ expression: checks
     row: 132
     column: 12
   end_location:
-    row: 135
-    column: 12
+    row: 133
+    column: 20
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -241,7 +241,7 @@ expression: checks
     row: 135
     column: 12
   end_location:
-    row: 138
-    column: 8
+    row: 136
+    column: 20
   fix: ~
 

src/mccabe/snapshots/ruff__mccabe__tests__max_complexity_3.snap

@@ -10,8 +10,8 @@ expression: checks
     row: 73
     column: 0
   end_location:
-    row: 85
-    column: 0
+    row: 81
+    column: 16
   fix: ~
 - kind:
     FunctionIsTooComplex:
@@ -21,7 +21,7 @@ expression: checks
     row: 113
     column: 4
   end_location:
-    row: 139
-    column: 0
+    row: 138
+    column: 40
   fix: ~
 

src/pep8_naming/snapshots/ruff__pep8_naming__tests__N801_N801.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 1
     column: 0
   end_location:
-    row: 5
-    column: 0
+    row: 2
+    column: 8
   fix: ~
 - kind:
     InvalidClassName: _bad
@@ -17,8 +17,8 @@ expression: checks
     row: 5
     column: 0
   end_location:
-    row: 9
-    column: 0
+    row: 6
+    column: 8
   fix: ~
 - kind:
     InvalidClassName: bad_class
@@ -26,8 +26,8 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 13
-    column: 0
+    row: 10
+    column: 8
   fix: ~
 - kind:
     InvalidClassName: Bad_Class
@@ -35,8 +35,8 @@ expression: checks
     row: 13
     column: 0
   end_location:
-    row: 17
-    column: 0
+    row: 14
+    column: 8
   fix: ~
 - kind:
     InvalidClassName: BAD_CLASS
@@ -44,7 +44,7 @@ expression: checks
     row: 17
     column: 0
   end_location:
-    row: 21
-    column: 0
+    row: 18
+    column: 8
   fix: ~
 

src/pep8_naming/snapshots/ruff__pep8_naming__tests__N802_N802.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 4
     column: 0
   end_location:
-    row: 8
-    column: 0
+    row: 5
+    column: 8
   fix: ~
 - kind:
     InvalidFunctionName: _Bad
@@ -17,8 +17,8 @@ expression: checks
     row: 8
     column: 0
   end_location:
-    row: 12
-    column: 0
+    row: 9
+    column: 8
   fix: ~
 - kind:
     InvalidFunctionName: BAD
@@ -26,8 +26,8 @@ expression: checks
     row: 12
     column: 0
   end_location:
-    row: 16
-    column: 0
+    row: 13
+    column: 8
   fix: ~
 - kind:
     InvalidFunctionName: BAD_FUNC
@@ -35,8 +35,8 @@ expression: checks
     row: 16
     column: 0
   end_location:
-    row: 20
-    column: 0
+    row: 17
+    column: 8
   fix: ~
 - kind:
     InvalidFunctionName: testTest
@@ -44,7 +44,7 @@ expression: checks
     row: 40
     column: 4
   end_location:
-    row: 42
-    column: 0
+    row: 41
+    column: 19
   fix: ~
 

src/pep8_naming/snapshots/ruff__pep8_naming__tests__N807_N807.py.snap

@@ -7,15 +7,15 @@ expression: checks
     row: 1
     column: 0
   end_location:
-    row: 5
-    column: 0
+    row: 2
+    column: 8
   fix: ~
 - kind: DunderFunctionName
   location:
     row: 14
     column: 4
   end_location:
-    row: 17
-    column: 4
+    row: 15
+    column: 12
   fix: ~
 

src/pep8_naming/snapshots/ruff__pep8_naming__tests__N818_N818.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 13
-    column: 0
+    row: 10
+    column: 8
   fix: ~
 - kind:
     ErrorSuffixOnExceptionName: E
@@ -17,7 +17,7 @@ expression: checks
     row: 17
     column: 0
   end_location:
-    row: 19
-    column: 0
+    row: 18
+    column: 8
   fix: ~
 

src/pycodestyle/snapshots/ruff__pycodestyle__tests__E722_E722.py.snap

@@ -7,23 +7,23 @@ expression: checks
     row: 4
     column: 0
   end_location:
-    row: 7
-    column: 0
+    row: 5
+    column: 8
   fix: ~
 - kind: DoNotUseBareExcept
   location:
     row: 11
     column: 0
   end_location:
-    row: 14
-    column: 0
+    row: 12
+    column: 8
   fix: ~
 - kind: DoNotUseBareExcept
   location:
     row: 16
     column: 0
   end_location:
-    row: 19
-    column: 0
+    row: 17
+    column: 8
   fix: ~
 

src/pycodestyle/snapshots/ruff__pycodestyle__tests__E741_E741.py.snap

@@ -215,8 +215,8 @@ expression: checks
     row: 71
     column: 0
   end_location:
-    row: 74
-    column: 0
+    row: 72
+    column: 8
   fix: ~
 - kind:
     AmbiguousVariableName: l

src/pycodestyle/snapshots/ruff__pycodestyle__tests__E742_E742.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 1
     column: 0
   end_location:
-    row: 5
-    column: 0
+    row: 2
+    column: 8
   fix: ~
 - kind:
     AmbiguousClassName: I
@@ -17,8 +17,8 @@ expression: checks
     row: 5
     column: 0
   end_location:
-    row: 9
-    column: 0
+    row: 6
+    column: 8
   fix: ~
 - kind:
     AmbiguousClassName: O
@@ -26,7 +26,7 @@ expression: checks
     row: 9
     column: 0
   end_location:
-    row: 13
-    column: 0
+    row: 10
+    column: 8
   fix: ~
 

src/pycodestyle/snapshots/ruff__pycodestyle__tests__E743_E743.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 1
     column: 0
   end_location:
-    row: 5
-    column: 0
+    row: 2
+    column: 8
   fix: ~
 - kind:
     AmbiguousFunctionName: I
@@ -17,8 +17,8 @@ expression: checks
     row: 5
     column: 0
   end_location:
-    row: 9
-    column: 0
+    row: 6
+    column: 8
   fix: ~
 - kind:
     AmbiguousFunctionName: O
@@ -26,7 +26,7 @@ expression: checks
     row: 10
     column: 4
   end_location:
-    row: 14
-    column: 0
+    row: 11
+    column: 12
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D101_D.py.snap

@@ -7,7 +7,7 @@ expression: checks
     row: 15
     column: 0
   end_location:
-    row: 72
-    column: 0
+    row: 69
+    column: 12
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D102_D.py.snap

@@ -7,23 +7,23 @@ expression: checks
     row: 23
     column: 4
   end_location:
-    row: 26
-    column: 4
+    row: 24
+    column: 12
   fix: ~
 - kind: PublicMethod
   location:
     row: 56
     column: 4
   end_location:
-    row: 59
-    column: 4
+    row: 57
+    column: 12
   fix: ~
 - kind: PublicMethod
   location:
     row: 68
     column: 4
   end_location:
-    row: 72
-    column: 0
+    row: 69
+    column: 12
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D103_D.py.snap

@@ -7,7 +7,7 @@ expression: checks
     row: 400
     column: 0
   end_location:
-    row: 401
-    column: 0
+    row: 400
+    column: 27
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D105_D.py.snap

@@ -7,7 +7,7 @@ expression: checks
     row: 64
     column: 4
   end_location:
-    row: 67
-    column: 4
+    row: 65
+    column: 12
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D107_D.py.snap

@@ -7,15 +7,15 @@ expression: checks
     row: 60
     column: 4
   end_location:
-    row: 63
-    column: 4
+    row: 61
+    column: 12
   fix: ~
 - kind: PublicInit
   location:
     row: 534
     column: 4
   end_location:
-    row: 538
-    column: 0
+    row: 535
+    column: 12
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D417_sections.py.snap

@@ -9,8 +9,8 @@ expression: checks
     row: 283
     column: 4
   end_location:
-    row: 296
-    column: 0
+    row: 293
+    column: 16
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -19,8 +19,8 @@ expression: checks
     row: 300
     column: 0
   end_location:
-    row: 309
-    column: 0
+    row: 306
+    column: 7
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -31,8 +31,8 @@ expression: checks
     row: 324
     column: 4
   end_location:
-    row: 332
-    column: 4
+    row: 330
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -43,8 +43,8 @@ expression: checks
     row: 336
     column: 4
   end_location:
-    row: 345
-    column: 4
+    row: 343
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -55,8 +55,8 @@ expression: checks
     row: 349
     column: 4
   end_location:
-    row: 357
-    column: 4
+    row: 355
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -66,8 +66,8 @@ expression: checks
     row: 361
     column: 4
   end_location:
-    row: 369
-    column: 4
+    row: 367
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -76,8 +76,8 @@ expression: checks
     row: 389
     column: 0
   end_location:
-    row: 401
-    column: 0
+    row: 398
+    column: 7
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -88,8 +88,8 @@ expression: checks
     row: 425
     column: 4
   end_location:
-    row: 436
-    column: 4
+    row: 434
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -100,8 +100,8 @@ expression: checks
     row: 440
     column: 4
   end_location:
-    row: 455
-    column: 4
+    row: 453
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -111,8 +111,8 @@ expression: checks
     row: 459
     column: 4
   end_location:
-    row: 471
-    column: 4
+    row: 469
+    column: 11
   fix: ~
 - kind:
     DocumentAllArguments:
@@ -121,7 +121,7 @@ expression: checks
     row: 489
     column: 4
   end_location:
-    row: 498
-    column: 0
+    row: 497
+    column: 11
   fix: ~
 

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D418_D.py.snap

@@ -7,23 +7,23 @@ expression: checks
     row: 34
     column: 4
   end_location:
-    row: 38
-    column: 4
+    row: 36
+    column: 11
   fix: ~
 - kind: SkipDocstring
   location:
     row: 90
     column: 4
   end_location:
-    row: 94
-    column: 4
+    row: 92
+    column: 11
   fix: ~
 - kind: SkipDocstring
   location:
     row: 110
     column: 0
   end_location:
-    row: 115
-    column: 0
+    row: 112
+    column: 7
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F634_F634.py.snap

@@ -7,15 +7,15 @@ expression: checks
     row: 1
     column: 0
   end_location:
-    row: 4
-    column: 0
+    row: 2
+    column: 8
   fix: ~
 - kind: IfTuple
   location:
     row: 7
     column: 4
   end_location:
-    row: 9
-    column: 4
+    row: 8
+    column: 12
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F707_F707.py.snap

@@ -7,23 +7,23 @@ expression: checks
     row: 3
     column: 0
   end_location:
-    row: 5
-    column: 0
+    row: 4
+    column: 8
   fix: ~
 - kind: DefaultExceptNotLast
   location:
     row: 10
     column: 0
   end_location:
-    row: 12
-    column: 0
+    row: 11
+    column: 8
   fix: ~
 - kind: DefaultExceptNotLast
   location:
     row: 19
     column: 0
   end_location:
-    row: 21
-    column: 0
+    row: 20
+    column: 8
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F811_F811_0.py.snap

@@ -10,7 +10,7 @@ expression: checks
     row: 10
     column: 0
   end_location:
-    row: 12
-    column: 0
+    row: 11
+    column: 8
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F811_F811_15.py.snap

@@ -10,7 +10,7 @@ expression: checks
     row: 4
     column: 0
   end_location:
-    row: 6
-    column: 0
+    row: 5
+    column: 8
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F811_F811_16.py.snap

@@ -10,7 +10,7 @@ expression: checks
     row: 8
     column: 8
   end_location:
-    row: 10
-    column: 0
+    row: 9
+    column: 16
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F811_F811_17.py.snap

@@ -21,7 +21,7 @@ expression: checks
     row: 9
     column: 8
   end_location:
-    row: 11
-    column: 0
+    row: 10
+    column: 16
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__F841_F841_0.py.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 3
     column: 0
   end_location:
-    row: 7
-    column: 0
+    row: 4
+    column: 8
   fix: ~
 - kind:
     UnusedVariable: z
@@ -66,12 +66,21 @@ expression: checks
     column: 9
   fix: ~
 - kind:
-    UnusedVariable: f
+    UnusedVariable: my_file
   location:
-    row: 71
+    row: 79
     column: 25
   end_location:
-    row: 71
-    column: 26
+    row: 79
+    column: 32
+  fix: ~
+- kind:
+    UnusedVariable: my_file
+  location:
+    row: 85
+    column: 24
+  end_location:
+    row: 85
+    column: 31
   fix: ~
 

src/pyflakes/snapshots/ruff__pyflakes__tests__f841_dummy_variable_rgx.snap

@@ -8,8 +8,8 @@ expression: checks
     row: 3
     column: 0
   end_location:
-    row: 7
-    column: 0
+    row: 4
+    column: 8
   fix: ~
 - kind:
     UnusedVariable: foo
@@ -84,12 +84,21 @@ expression: checks
     column: 9
   fix: ~
 - kind:
-    UnusedVariable: f
+    UnusedVariable: my_file
   location:
-    row: 71
+    row: 79
     column: 25
   end_location:
-    row: 71
-    column: 26
+    row: 79
+    column: 32
+  fix: ~
+- kind:
+    UnusedVariable: my_file
+  location:
+    row: 85
+    column: 24
+  end_location:
+    row: 85
+    column: 31
   fix: ~
 

src/pylint/snapshots/ruff__pylint__tests__PLR0206_property_with_parameters.py.snap

@@ -7,23 +7,23 @@ expression: checks
     row: 7
     column: 4
   end_location:
-    row: 10
-    column: 4
+    row: 8
+    column: 29
   fix: ~
 - kind: PropertyWithParameters
   location:
     row: 11
     column: 4
   end_location:
-    row: 14
-    column: 4
+    row: 12
+    column: 29
   fix: ~
 - kind: PropertyWithParameters
   location:
     row: 15
     column: 4
   end_location:
-    row: 19
-    column: 0
+    row: 16
+    column: 29
   fix: ~
 

src/pylint/snapshots/ruff__pylint__tests__PLW0120_useless_else_on_loop.py.snap

@@ -7,55 +7,55 @@ expression: checks
     row: 6
     column: 4
   end_location:
-    row: 11
-    column: 4
+    row: 10
+    column: 31
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 16
     column: 4
   end_location:
-    row: 20
-    column: 4
+    row: 19
+    column: 31
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 23
     column: 0
   end_location:
-    row: 34
-    column: 0
+    row: 31
+    column: 21
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 34
     column: 0
   end_location:
-    row: 40
-    column: 0
+    row: 38
+    column: 21
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 40
     column: 0
   end_location:
-    row: 48
-    column: 0
+    row: 45
+    column: 13
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 81
     column: 4
   end_location:
-    row: 90
-    column: 4
+    row: 89
+    column: 19
   fix: ~
 - kind: UselessElseOnLoop
   location:
     row: 96
     column: 8
   end_location:
-    row: 101
-    column: 4
+    row: 100
+    column: 21
   fix: ~
 

src/resolver.rs

@@ -0,0 +1,414 @@
+//! Discover Python files, and their corresponding `Settings`, from the
+//! filesystem.
+
+use std::collections::BTreeMap;
+use std::path::{Path, PathBuf};
+
+use anyhow::{bail, Result};
+use log::debug;
+use path_absolutize::path_dedot;
+use rustc_hash::FxHashSet;
+use walkdir::{DirEntry, WalkDir};
+
+use crate::cli::Overrides;
+use crate::fs;
+use crate::settings::configuration::Configuration;
+use crate::settings::{pyproject, Settings};
+
+/// The strategy for discovering a `pyproject.toml` file for each Python file.
+#[derive(Debug)]
+pub enum Strategy {
+    /// Use a fixed `pyproject.toml` file for all Python files (i.e., one
+    /// provided on the command-line).
+    Fixed(Settings),
+    /// Use the closest `pyproject.toml` file in the filesystem hierarchy, or
+    /// the default settings.
+    Hierarchical(Settings),
+}
+
+/// The strategy for resolving file paths in a `pyproject.toml`.
+pub enum Relativity {
+    /// Resolve file paths relative to the current working directory.
+    Cwd,
+    /// Resolve file paths relative to the directory containing the
+    /// `pyproject.toml`.
+    Parent,
+}
+
+impl Relativity {
+    pub fn resolve(&self, path: &Path) -> PathBuf {
+        match self {
+            Relativity::Parent => path
+                .parent()
+                .expect("Expected pyproject.toml file to be in parent directory")
+                .to_path_buf(),
+            Relativity::Cwd => path_dedot::CWD.clone(),
+        }
+    }
+}
+
+#[derive(Default)]
+pub struct Resolver {
+    settings: BTreeMap<PathBuf, Settings>,
+}
+
+impl Resolver {
+    /// Merge a `Resolver` into the current `Resolver`.
+    pub fn merge(&mut self, resolver: Resolver) {
+        self.settings.extend(resolver.settings);
+    }
+
+    /// Add a resolved `Settings` under a given `PathBuf` scope.
+    pub fn add(&mut self, path: PathBuf, settings: Settings) {
+        self.settings.insert(path, settings);
+    }
+
+    /// Return the appropriate `Settings` for a given `Path`.
+    pub fn resolve<'a>(&'a self, path: &Path, strategy: &'a Strategy) -> &'a Settings {
+        match strategy {
+            Strategy::Fixed(settings) => settings,
+            Strategy::Hierarchical(default) => self
+                .settings
+                .iter()
+                .rev()
+                .find_map(|(root, settings)| {
+                    if path.starts_with(root) {
+                        Some(settings)
+                    } else {
+                        None
+                    }
+                })
+                .unwrap_or(default),
+        }
+    }
+}
+
+/// Recursively resolve a `Configuration` from a `pyproject.toml` file at the
+/// specified `Path`.
+// TODO(charlie): This whole system could do with some caching. Right now, if a
+// configuration file extends another in the same path, we'll re-parse the same
+// file at least twice (possibly more than twice, since we'll also parse it when
+// resolving the "default" configuration).
+pub fn resolve_configuration(
+    pyproject: &Path,
+    relativity: &Relativity,
+    overrides: Option<&Overrides>,
+) -> Result<Configuration> {
+    let mut seen = FxHashSet::default();
+    let mut stack = vec![];
+    let mut next = Some(fs::normalize_path(pyproject));
+    while let Some(path) = next {
+        if seen.contains(&path) {
+            bail!("Circular dependency detected in pyproject.toml");
+        }
+
+        // Resolve the current path.
+        let options = pyproject::load_options(&path)?;
+        let project_root = relativity.resolve(&path);
+        let configuration = Configuration::from_options(options, &project_root)?;
+
+        // If extending, continue to collect.
+        next = configuration.extend.as_ref().map(|extend| {
+            fs::normalize_path_to(
+                extend,
+                path.parent()
+                    .expect("Expected pyproject.toml file to be in parent directory"),
+            )
+        });
+
+        // Keep track of (1) the paths we've already resolved (to avoid cycles), and (2)
+        // the base configuration for every path.
+        seen.insert(path);
+        stack.push(configuration);
+    }
+
+    // Merge the configurations, in order.
+    stack.reverse();
+    let mut configuration = stack.pop().unwrap();
+    while let Some(extend) = stack.pop() {
+        configuration = configuration.combine(extend);
+    }
+    if let Some(overrides) = overrides {
+        configuration.apply(overrides.clone());
+    }
+    Ok(configuration)
+}
+
+/// Extract the project root (scope) and `Settings` from a given
+/// `pyproject.toml`.
+pub fn resolve_scoped_settings(
+    pyproject: &Path,
+    relativity: &Relativity,
+    overrides: Option<&Overrides>,
+) -> Result<(PathBuf, Settings)> {
+    let project_root = relativity.resolve(pyproject);
+    let configuration = resolve_configuration(pyproject, relativity, overrides)?;
+    let settings = Settings::from_configuration(configuration, &project_root)?;
+    Ok((project_root, settings))
+}
+
+/// Extract the `Settings` from a given `pyproject.toml`.
+pub fn resolve_settings(
+    pyproject: &Path,
+    relativity: &Relativity,
+    overrides: Option<&Overrides>,
+) -> Result<Settings> {
+    let (_project_root, settings) = resolve_scoped_settings(pyproject, relativity, overrides)?;
+    Ok(settings)
+}
+
+/// Return `true` if the given file should be ignored based on the exclusion
+/// criteria.
+fn is_excluded(file_path: &str, file_basename: &str, exclude: &globset::GlobSet) -> bool {
+    exclude.is_match(file_path) || exclude.is_match(file_basename)
+}
+
+/// Return `true` if the `Path` appears to be that of a Python file.
+fn is_python_file(path: &Path) -> bool {
+    path.extension()
+        .map_or(false, |ext| ext == "py" || ext == "pyi")
+}
+
+/// Find all Python (`.py` and `.pyi` files) in a set of `PathBuf`s.
+pub fn resolve_python_files(
+    paths: &[PathBuf],
+    strategy: &Strategy,
+    overrides: &Overrides,
+) -> Result<(Vec<Result<DirEntry, walkdir::Error>>, Resolver)> {
+    let mut files = Vec::new();
+    let mut resolver = Resolver::default();
+    for path in paths {
+        let (files_in_path, file_resolver) = python_files_in_path(path, strategy, overrides)?;
+        files.extend(files_in_path);
+        resolver.merge(file_resolver);
+    }
+    Ok((files, resolver))
+}
+
+/// Find all Python (`.py` and `.pyi` files) in a given `Path`.
+fn python_files_in_path(
+    path: &Path,
+    strategy: &Strategy,
+    overrides: &Overrides,
+) -> Result<(Vec<Result<DirEntry, walkdir::Error>>, Resolver)> {
+    let path = fs::normalize_path(path);
+
+    // Search for `pyproject.toml` files in all parent directories.
+    let mut resolver = Resolver::default();
+    for path in path.ancestors() {
+        if path.is_dir() {
+            let pyproject = path.join("pyproject.toml");
+            if pyproject.is_file() {
+                let (root, settings) =
+                    resolve_scoped_settings(&pyproject, &Relativity::Parent, Some(overrides))?;
+                resolver.add(root, settings);
+            }
+        }
+    }
+
+    // Collect all Python files.
+    let files: Vec<Result<DirEntry, walkdir::Error>> = WalkDir::new(path)
+        .into_iter()
+        .filter_entry(|entry| {
+            // Search for the `pyproject.toml` file in this directory, before we visit any
+            // of its contents.
+            if entry.file_type().is_dir() {
+                let pyproject = entry.path().join("pyproject.toml");
+                if pyproject.is_file() {
+                    // TODO(charlie): Return a `Result` here.
+                    let (root, settings) =
+                        resolve_scoped_settings(&pyproject, &Relativity::Parent, Some(overrides))
+                            .unwrap();
+                    resolver.add(root, settings);
+                }
+            }
+
+            let path = entry.path();
+            let settings = resolver.resolve(path, strategy);
+            match fs::extract_path_names(path) {
+                Ok((file_path, file_basename)) => {
+                    if !settings.exclude.is_empty()
+                        && is_excluded(file_path, file_basename, &settings.exclude)
+                    {
+                        debug!("Ignored path via `exclude`: {:?}", path);
+                        false
+                    } else if !settings.extend_exclude.is_empty()
+                        && is_excluded(file_path, file_basename, &settings.extend_exclude)
+                    {
+                        debug!("Ignored path via `extend-exclude`: {:?}", path);
+                        false
+                    } else {
+                        true
+                    }
+                }
+                Err(e) => {
+                    debug!("Ignored path due to error in parsing: {:?}: {}", path, e);
+                    true
+                }
+            }
+        })
+        .filter(|entry| {
+            entry.as_ref().map_or(true, |entry| {
+                (entry.depth() == 0 || is_python_file(entry.path()))
+                    && !entry.file_type().is_dir()
+                    && !(entry.file_type().is_symlink() && entry.path().is_dir())
+            })
+        })
+        .collect::<Vec<_>>();
+
+    Ok((files, resolver))
+}
+
+#[cfg(test)]
+mod tests {
+    use std::path::Path;
+
+    use anyhow::Result;
+    use globset::GlobSet;
+    use path_absolutize::Absolutize;
+
+    use crate::fs;
+    use crate::resolver::{is_excluded, is_python_file};
+    use crate::settings::types::FilePattern;
+
+    #[test]
+    fn inclusions() {
+        let path = Path::new("foo/bar/baz.py").absolutize().unwrap();
+        assert!(is_python_file(&path));
+
+        let path = Path::new("foo/bar/baz.pyi").absolutize().unwrap();
+        assert!(is_python_file(&path));
+
+        let path = Path::new("foo/bar/baz.js").absolutize().unwrap();
+        assert!(!is_python_file(&path));
+
+        let path = Path::new("foo/bar/baz").absolutize().unwrap();
+        assert!(!is_python_file(&path));
+    }
+
+    fn make_exclusion(file_pattern: FilePattern) -> GlobSet {
+        let mut builder = globset::GlobSetBuilder::new();
+        file_pattern.add_to(&mut builder).unwrap();
+        builder.build().unwrap()
+    }
+
+    #[test]
+    fn exclusions() -> Result<()> {
+        let project_root = Path::new("/tmp/");
+
+        let path = Path::new("foo").absolutize_from(project_root).unwrap();
+        let exclude = FilePattern::User(
+            "foo".to_string(),
+            Path::new("foo")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
+        let exclude = FilePattern::User(
+            "bar".to_string(),
+            Path::new("bar")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar/baz.py")
+            .absolutize_from(project_root)
+            .unwrap();
+        let exclude = FilePattern::User(
+            "baz.py".to_string(),
+            Path::new("baz.py")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar").absolutize_from(project_root).unwrap();
+        let exclude = FilePattern::User(
+            "foo/bar".to_string(),
+            Path::new("foo/bar")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar/baz.py")
+            .absolutize_from(project_root)
+            .unwrap();
+        let exclude = FilePattern::User(
+            "foo/bar/baz.py".to_string(),
+            Path::new("foo/bar/baz.py")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar/baz.py")
+            .absolutize_from(project_root)
+            .unwrap();
+        let exclude = FilePattern::User(
+            "foo/bar/*.py".to_string(),
+            Path::new("foo/bar/*.py")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        let path = Path::new("foo/bar/baz.py")
+            .absolutize_from(project_root)
+            .unwrap();
+        let exclude = FilePattern::User(
+            "baz".to_string(),
+            Path::new("baz")
+                .absolutize_from(project_root)
+                .unwrap()
+                .to_path_buf(),
+        );
+        let (file_path, file_basename) = fs::extract_path_names(&path)?;
+        assert!(!is_excluded(
+            file_path,
+            file_basename,
+            &make_exclusion(exclude,)
+        ));
+
+        Ok(())
+    }
+}

src/settings/configuration.rs

@@ -5,13 +5,12 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Result};
-use once_cell::sync::Lazy;
-use path_absolutize::path_dedot;
+use glob::{glob, GlobError, Paths, PatternError};
 use regex::Regex;
-use rustc_hash::FxHashSet;
 
-use crate::checks_gen::{CheckCodePrefix, CATEGORIES};
+use crate::checks_gen::CheckCodePrefix;
 use crate::cli::{collect_per_file_ignores, Overrides};
+use crate::settings::options::Options;
 use crate::settings::pyproject::load_options;
 use crate::settings::types::{FilePattern, PerFileIgnore, PythonVersion, SerializationFormat};
 use crate::{
@@ -19,222 +18,217 @@ use crate::{
     flake8_tidy_imports, fs, isort, mccabe, pep8_naming, pyupgrade,
 };
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Configuration {
-    pub allowed_confusables: FxHashSet<char>,
-    pub dummy_variable_rgx: Regex,
-    pub exclude: Vec<FilePattern>,
-    pub extend_exclude: Vec<FilePattern>,
-    pub extend_ignore: Vec<CheckCodePrefix>,
-    pub extend_select: Vec<CheckCodePrefix>,
-    pub external: Vec<String>,
-    pub fix: bool,
-    pub fixable: Vec<CheckCodePrefix>,
-    pub format: SerializationFormat,
-    pub ignore: Vec<CheckCodePrefix>,
-    pub ignore_init_module_imports: bool,
-    pub line_length: usize,
-    pub per_file_ignores: Vec<PerFileIgnore>,
-    pub select: Vec<CheckCodePrefix>,
-    pub show_source: bool,
-    pub src: Vec<PathBuf>,
-    pub target_version: PythonVersion,
-    pub unfixable: Vec<CheckCodePrefix>,
+    pub allowed_confusables: Option<Vec<char>>,
+    pub dummy_variable_rgx: Option<Regex>,
+    pub exclude: Option<Vec<FilePattern>>,
+    pub extend: Option<PathBuf>,
+    pub extend_exclude: Option<Vec<FilePattern>>,
+    pub extend_ignore: Option<Vec<CheckCodePrefix>>,
+    pub extend_select: Option<Vec<CheckCodePrefix>>,
+    pub external: Option<Vec<String>>,
+    pub fix: Option<bool>,
+    pub fixable: Option<Vec<CheckCodePrefix>>,
+    pub format: Option<SerializationFormat>,
+    pub ignore: Option<Vec<CheckCodePrefix>>,
+    pub ignore_init_module_imports: Option<bool>,
+    pub line_length: Option<usize>,
+    pub per_file_ignores: Option<Vec<PerFileIgnore>>,
+    pub select: Option<Vec<CheckCodePrefix>>,
+    pub show_source: Option<bool>,
+    pub src: Option<Vec<PathBuf>>,
+    pub target_version: Option<PythonVersion>,
+    pub unfixable: Option<Vec<CheckCodePrefix>>,
     // Plugins
-    pub flake8_annotations: flake8_annotations::settings::Settings,
-    pub flake8_bugbear: flake8_bugbear::settings::Settings,
-    pub flake8_import_conventions: flake8_import_conventions::settings::Settings,
-    pub flake8_quotes: flake8_quotes::settings::Settings,
-    pub flake8_tidy_imports: flake8_tidy_imports::settings::Settings,
-    pub isort: isort::settings::Settings,
-    pub mccabe: mccabe::settings::Settings,
-    pub pep8_naming: pep8_naming::settings::Settings,
-    pub pyupgrade: pyupgrade::settings::Settings,
+    pub flake8_annotations: Option<flake8_annotations::settings::Options>,
+    pub flake8_bugbear: Option<flake8_bugbear::settings::Options>,
+    pub flake8_import_conventions: Option<flake8_import_conventions::settings::Options>,
+    pub flake8_quotes: Option<flake8_quotes::settings::Options>,
+    pub flake8_tidy_imports: Option<flake8_tidy_imports::settings::Options>,
+    pub isort: Option<isort::settings::Options>,
+    pub mccabe: Option<mccabe::settings::Options>,
+    pub pep8_naming: Option<pep8_naming::settings::Options>,
+    pub pyupgrade: Option<pyupgrade::settings::Options>,
 }
 
-static DEFAULT_EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
-    vec![
-        FilePattern::Builtin(".bzr"),
-        FilePattern::Builtin(".direnv"),
-        FilePattern::Builtin(".eggs"),
-        FilePattern::Builtin(".git"),
-        FilePattern::Builtin(".hg"),
-        FilePattern::Builtin(".mypy_cache"),
-        FilePattern::Builtin(".nox"),
-        FilePattern::Builtin(".pants.d"),
-        FilePattern::Builtin(".ruff_cache"),
-        FilePattern::Builtin(".svn"),
-        FilePattern::Builtin(".tox"),
-        FilePattern::Builtin(".venv"),
-        FilePattern::Builtin("__pypackages__"),
-        FilePattern::Builtin("_build"),
-        FilePattern::Builtin("buck-out"),
-        FilePattern::Builtin("build"),
-        FilePattern::Builtin("dist"),
-        FilePattern::Builtin("node_modules"),
-        FilePattern::Builtin("venv"),
-    ]
-});
-
-static DEFAULT_DUMMY_VARIABLE_RGX: Lazy<Regex> =
-    Lazy::new(|| Regex::new("^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$").unwrap());
-
 impl Configuration {
-    pub fn from_pyproject(
-        pyproject: Option<&PathBuf>,
-        project_root: Option<&PathBuf>,
-    ) -> Result<Self> {
-        let options = load_options(pyproject)?;
+    pub fn from_pyproject(pyproject: &Path, project_root: &Path) -> Result<Self> {
+        Self::from_options(load_options(pyproject)?, project_root)
+    }
+
+    pub fn from_options(options: Options, project_root: &Path) -> Result<Self> {
         Ok(Configuration {
-            allowed_confusables: FxHashSet::from_iter(
-                options.allowed_confusables.unwrap_or_default(),
-            ),
-            dummy_variable_rgx: match options.dummy_variable_rgx {
-                Some(pattern) => Regex::new(&pattern)
-                    .map_err(|e| anyhow!("Invalid `dummy-variable-rgx` value: {e}"))?,
-                None => DEFAULT_DUMMY_VARIABLE_RGX.clone(),
-            },
-            src: options.src.map_or_else(
-                || {
-                    vec![match project_root {
-                        Some(project_root) => project_root.clone(),
-                        None => path_dedot::CWD.clone(),
-                    }]
-                },
-                |src| {
-                    src.iter()
-                        .map(|path| {
-                            let path = Path::new(path);
-                            match project_root {
-                                Some(project_root) => fs::normalize_path_to(path, project_root),
-                                None => fs::normalize_path(path),
-                            }
-                        })
-                        .collect()
-                },
-            ),
-            target_version: options.target_version.unwrap_or(PythonVersion::Py310),
-            exclude: options.exclude.map_or_else(
-                || DEFAULT_EXCLUDE.clone(),
-                |paths| paths.into_iter().map(FilePattern::User).collect(),
-            ),
-            extend_exclude: options
-                .extend_exclude
-                .map(|paths| paths.into_iter().map(FilePattern::User).collect())
-                .unwrap_or_default(),
-            extend_ignore: options.extend_ignore.unwrap_or_default(),
-            select: options
-                .select
-                .unwrap_or_else(|| vec![CheckCodePrefix::E, CheckCodePrefix::F]),
-            extend_select: options.extend_select.unwrap_or_default(),
-            external: options.external.unwrap_or_default(),
-            fix: options.fix.unwrap_or_default(),
-            fixable: options.fixable.unwrap_or_else(|| CATEGORIES.to_vec()),
-            unfixable: options.unfixable.unwrap_or_default(),
-            format: options.format.unwrap_or_default(),
-            ignore: options.ignore.unwrap_or_default(),
-            ignore_init_module_imports: options.ignore_init_module_imports.unwrap_or_default(),
-            line_length: options.line_length.unwrap_or(88),
-            per_file_ignores: options
-                .per_file_ignores
-                .map(|per_file_ignores| {
-                    per_file_ignores
-                        .into_iter()
-                        .map(|(pattern, prefixes)| PerFileIgnore::new(pattern, &prefixes))
-                        .collect()
-                })
-                .unwrap_or_default(),
-            show_source: options.show_source.unwrap_or_default(),
+            extend: options.extend.map(PathBuf::from),
+            allowed_confusables: options.allowed_confusables,
+            dummy_variable_rgx: options
+                .dummy_variable_rgx
+                .map(|pattern| Regex::new(&pattern))
+                .transpose()
+                .map_err(|e| anyhow!("Invalid `dummy-variable-rgx` value: {e}"))?,
+            src: options
+                .src
+                .map(|src| resolve_src(&src, project_root))
+                .transpose()?,
+            target_version: options.target_version,
+            exclude: options.exclude.map(|paths| {
+                paths
+                    .into_iter()
+                    .map(|pattern| {
+                        let absolute = fs::normalize_path_to(Path::new(&pattern), project_root);
+                        FilePattern::User(pattern, absolute)
+                    })
+                    .collect()
+            }),
+            extend_exclude: options.extend_exclude.map(|paths| {
+                paths
+                    .into_iter()
+                    .map(|pattern| {
+                        let absolute = fs::normalize_path_to(Path::new(&pattern), project_root);
+                        FilePattern::User(pattern, absolute)
+                    })
+                    .collect()
+            }),
+            extend_ignore: options.extend_ignore,
+            select: options.select,
+            extend_select: options.extend_select,
+            external: options.external,
+            fix: options.fix,
+            fixable: options.fixable,
+            unfixable: options.unfixable,
+            format: options.format,
+            ignore: options.ignore,
+            ignore_init_module_imports: options.ignore_init_module_imports,
+            line_length: options.line_length,
+            per_file_ignores: options.per_file_ignores.map(|per_file_ignores| {
+                per_file_ignores
+                    .into_iter()
+                    .map(|(pattern, prefixes)| {
+                        let absolute = fs::normalize_path_to(Path::new(&pattern), project_root);
+                        PerFileIgnore::new(pattern, absolute, &prefixes)
+                    })
+                    .collect()
+            }),
+            show_source: options.show_source,
             // Plugins
-            flake8_annotations: options
-                .flake8_annotations
-                .map(flake8_annotations::settings::Settings::from_options)
-                .unwrap_or_default(),
-            flake8_bugbear: options
-                .flake8_bugbear
-                .map(flake8_bugbear::settings::Settings::from_options)
-                .unwrap_or_default(),
-            flake8_import_conventions: options
-                .flake8_import_conventions
-                .map(flake8_import_conventions::settings::Settings::from_options)
-                .unwrap_or_default(),
-            flake8_quotes: options
-                .flake8_quotes
-                .map(flake8_quotes::settings::Settings::from_options)
-                .unwrap_or_default(),
-            flake8_tidy_imports: options
-                .flake8_tidy_imports
-                .map(flake8_tidy_imports::settings::Settings::from_options)
-                .unwrap_or_default(),
-            isort: options
-                .isort
-                .map(isort::settings::Settings::from_options)
-                .unwrap_or_default(),
-            mccabe: options
-                .mccabe
-                .as_ref()
-                .map(mccabe::settings::Settings::from_options)
-                .unwrap_or_default(),
-            pep8_naming: options
-                .pep8_naming
-                .map(pep8_naming::settings::Settings::from_options)
-                .unwrap_or_default(),
-            pyupgrade: options
-                .pyupgrade
-                .as_ref()
-                .map(pyupgrade::settings::Settings::from_options)
-                .unwrap_or_default(),
+            flake8_annotations: options.flake8_annotations,
+            flake8_bugbear: options.flake8_bugbear,
+            flake8_import_conventions: options.flake8_import_conventions,
+            flake8_quotes: options.flake8_quotes,
+            flake8_tidy_imports: options.flake8_tidy_imports,
+            isort: options.isort,
+            mccabe: options.mccabe,
+            pep8_naming: options.pep8_naming,
+            pyupgrade: options.pyupgrade,
         })
     }
 
-    pub fn merge(&mut self, overrides: Overrides) {
+    #[must_use]
+    pub fn combine(self, config: Configuration) -> Self {
+        Self {
+            allowed_confusables: self.allowed_confusables.or(config.allowed_confusables),
+            dummy_variable_rgx: self.dummy_variable_rgx.or(config.dummy_variable_rgx),
+            exclude: self.exclude.or(config.exclude),
+            extend: self.extend.or(config.extend),
+            extend_exclude: self.extend_exclude.or(config.extend_exclude),
+            extend_ignore: self.extend_ignore.or(config.extend_ignore),
+            extend_select: self.extend_select.or(config.extend_select),
+            external: self.external.or(config.external),
+            fix: self.fix.or(config.fix),
+            fixable: self.fixable.or(config.fixable),
+            format: self.format.or(config.format),
+            ignore: self.ignore.or(config.ignore),
+            ignore_init_module_imports: self
+                .ignore_init_module_imports
+                .or(config.ignore_init_module_imports),
+            line_length: self.line_length.or(config.line_length),
+            per_file_ignores: self.per_file_ignores.or(config.per_file_ignores),
+            select: self.select.or(config.select),
+            show_source: self.show_source.or(config.show_source),
+            src: self.src.or(config.src),
+            target_version: self.target_version.or(config.target_version),
+            unfixable: self.unfixable.or(config.unfixable),
+            // Plugins
+            flake8_annotations: self.flake8_annotations.or(config.flake8_annotations),
+            flake8_bugbear: self.flake8_bugbear.or(config.flake8_bugbear),
+            flake8_import_conventions: self
+                .flake8_import_conventions
+                .or(config.flake8_import_conventions),
+            flake8_quotes: self.flake8_quotes.or(config.flake8_quotes),
+            flake8_tidy_imports: self.flake8_tidy_imports.or(config.flake8_tidy_imports),
+            isort: self.isort.or(config.isort),
+            mccabe: self.mccabe.or(config.mccabe),
+            pep8_naming: self.pep8_naming.or(config.pep8_naming),
+            pyupgrade: self.pyupgrade.or(config.pyupgrade),
+        }
+    }
+
+    pub fn apply(&mut self, overrides: Overrides) {
         if let Some(dummy_variable_rgx) = overrides.dummy_variable_rgx {
-            self.dummy_variable_rgx = dummy_variable_rgx;
+            self.dummy_variable_rgx = Some(dummy_variable_rgx);
         }
         if let Some(exclude) = overrides.exclude {
-            self.exclude = exclude;
+            self.exclude = Some(exclude);
         }
         if let Some(extend_exclude) = overrides.extend_exclude {
-            self.extend_exclude = extend_exclude;
+            self.extend_exclude = Some(extend_exclude);
         }
         if let Some(extend_ignore) = overrides.extend_ignore {
-            self.extend_ignore = extend_ignore;
+            self.extend_ignore = Some(extend_ignore);
         }
         if let Some(extend_select) = overrides.extend_select {
-            self.extend_select = extend_select;
+            self.extend_select = Some(extend_select);
         }
         if let Some(fix) = overrides.fix {
-            self.fix = fix;
+            self.fix = Some(fix);
         }
         if let Some(fixable) = overrides.fixable {
-            self.fixable = fixable;
+            self.fixable = Some(fixable);
         }
         if let Some(format) = overrides.format {
-            self.format = format;
+            self.format = Some(format);
         }
         if let Some(ignore) = overrides.ignore {
-            self.ignore = ignore;
+            self.ignore = Some(ignore);
         }
         if let Some(line_length) = overrides.line_length {
-            self.line_length = line_length;
+            self.line_length = Some(line_length);
         }
         if let Some(max_complexity) = overrides.max_complexity {
-            self.mccabe.max_complexity = max_complexity;
+            self.mccabe = Some(mccabe::settings::Options {
+                max_complexity: Some(max_complexity),
+            });
         }
         if let Some(per_file_ignores) = overrides.per_file_ignores {
-            self.per_file_ignores = collect_per_file_ignores(per_file_ignores);
+            self.per_file_ignores = Some(collect_per_file_ignores(per_file_ignores));
         }
         if let Some(select) = overrides.select {
-            self.select = select;
+            self.select = Some(select);
         }
         if let Some(show_source) = overrides.show_source {
-            self.show_source = show_source;
+            self.show_source = Some(show_source);
         }
         if let Some(target_version) = overrides.target_version {
-            self.target_version = target_version;
+            self.target_version = Some(target_version);
         }
         if let Some(unfixable) = overrides.unfixable {
-            self.unfixable = unfixable;
+            self.unfixable = Some(unfixable);
         }
     }
 }
+
+/// Given a list of source paths, which could include glob patterns, resolve the
+/// matching paths.
+pub fn resolve_src(src: &[String], project_root: &Path) -> Result<Vec<PathBuf>> {
+    let globs = src
+        .iter()
+        .map(Path::new)
+        .map(|path| fs::normalize_path_to(path, project_root))
+        .map(|path| glob(&path.to_string_lossy()))
+        .collect::<Result<Vec<Paths>, PatternError>>()?;
+    let paths: Vec<PathBuf> = globs
+        .into_iter()
+        .flatten()
+        .collect::<Result<Vec<PathBuf>, GlobError>>()?;
+    Ok(paths)
+}

src/settings/mod.rs

@@ -8,17 +8,18 @@ use std::path::{Path, PathBuf};
 use anyhow::Result;
 use globset::{Glob, GlobMatcher, GlobSet};
 use itertools::Itertools;
+use once_cell::sync::Lazy;
 use path_absolutize::path_dedot;
 use regex::Regex;
 use rustc_hash::FxHashSet;
 
 use crate::checks::CheckCode;
-use crate::checks_gen::{CheckCodePrefix, SuffixLength};
+use crate::checks_gen::{CheckCodePrefix, SuffixLength, CATEGORIES};
 use crate::settings::configuration::Configuration;
-use crate::settings::types::{FilePattern, PerFileIgnore, PythonVersion};
+use crate::settings::types::{FilePattern, PerFileIgnore, PythonVersion, SerializationFormat};
 use crate::{
     flake8_annotations, flake8_bugbear, flake8_import_conventions, flake8_quotes,
-    flake8_tidy_imports, fs, isort, mccabe, pep8_naming, pyupgrade,
+    flake8_tidy_imports, isort, mccabe, pep8_naming, pyupgrade,
 };
 
 pub mod configuration;
@@ -35,7 +36,9 @@ pub struct Settings {
     pub exclude: GlobSet,
     pub extend_exclude: GlobSet,
     pub external: FxHashSet<String>,
+    pub fix: bool,
     pub fixable: FxHashSet<CheckCode>,
+    pub format: SerializationFormat,
     pub ignore_init_module_imports: bool,
     pub line_length: usize,
     pub per_file_ignores: Vec<(GlobMatcher, GlobMatcher, FxHashSet<CheckCode>)>,
@@ -54,45 +57,115 @@ pub struct Settings {
     pub pyupgrade: pyupgrade::settings::Settings,
 }
 
+static DEFAULT_EXCLUDE: Lazy<Vec<FilePattern>> = Lazy::new(|| {
+    vec![
+        FilePattern::Builtin(".bzr"),
+        FilePattern::Builtin(".direnv"),
+        FilePattern::Builtin(".eggs"),
+        FilePattern::Builtin(".git"),
+        FilePattern::Builtin(".hg"),
+        FilePattern::Builtin(".mypy_cache"),
+        FilePattern::Builtin(".nox"),
+        FilePattern::Builtin(".pants.d"),
+        FilePattern::Builtin(".ruff_cache"),
+        FilePattern::Builtin(".svn"),
+        FilePattern::Builtin(".tox"),
+        FilePattern::Builtin(".venv"),
+        FilePattern::Builtin("__pypackages__"),
+        FilePattern::Builtin("_build"),
+        FilePattern::Builtin("buck-out"),
+        FilePattern::Builtin("build"),
+        FilePattern::Builtin("dist"),
+        FilePattern::Builtin("node_modules"),
+        FilePattern::Builtin("venv"),
+    ]
+});
+
+static DEFAULT_DUMMY_VARIABLE_RGX: Lazy<Regex> =
+    Lazy::new(|| Regex::new("^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$").unwrap());
+
 impl Settings {
-    pub fn from_configuration(
-        config: Configuration,
-        project_root: Option<&PathBuf>,
-    ) -> Result<Self> {
+    pub fn from_configuration(config: Configuration, project_root: &Path) -> Result<Self> {
         Ok(Self {
-            allowed_confusables: config.allowed_confusables,
-            dummy_variable_rgx: config.dummy_variable_rgx,
+            allowed_confusables: config
+                .allowed_confusables
+                .map(FxHashSet::from_iter)
+                .unwrap_or_default(),
+            dummy_variable_rgx: config
+                .dummy_variable_rgx
+                .unwrap_or_else(|| DEFAULT_DUMMY_VARIABLE_RGX.clone()),
             enabled: resolve_codes(
                 &config
                     .select
+                    .unwrap_or_else(|| vec![CheckCodePrefix::E, CheckCodePrefix::F])
                     .into_iter()
-                    .chain(config.extend_select.into_iter())
+                    .chain(config.extend_select.unwrap_or_default().into_iter())
                     .collect::<Vec<_>>(),
                 &config
                     .ignore
+                    .unwrap_or_default()
                     .into_iter()
-                    .chain(config.extend_ignore.into_iter())
+                    .chain(config.extend_ignore.unwrap_or_default().into_iter())
                     .collect::<Vec<_>>(),
             ),
-            exclude: resolve_globset(config.exclude, project_root)?,
-            extend_exclude: resolve_globset(config.extend_exclude, project_root)?,
-            external: FxHashSet::from_iter(config.external),
-            fixable: resolve_codes(&config.fixable, &config.unfixable),
-            flake8_annotations: config.flake8_annotations,
-            flake8_bugbear: config.flake8_bugbear,
-            flake8_import_conventions: config.flake8_import_conventions,
-            flake8_quotes: config.flake8_quotes,
-            flake8_tidy_imports: config.flake8_tidy_imports,
-            ignore_init_module_imports: config.ignore_init_module_imports,
-            isort: config.isort,
-            mccabe: config.mccabe,
-            line_length: config.line_length,
-            pep8_naming: config.pep8_naming,
-            pyupgrade: config.pyupgrade,
-            per_file_ignores: resolve_per_file_ignores(config.per_file_ignores, project_root)?,
-            src: config.src,
-            target_version: config.target_version,
-            show_source: config.show_source,
+            exclude: resolve_globset(config.exclude.unwrap_or_else(|| DEFAULT_EXCLUDE.clone()))?,
+            extend_exclude: resolve_globset(config.extend_exclude.unwrap_or_default())?,
+            external: FxHashSet::from_iter(config.external.unwrap_or_default()),
+            fix: config.fix.unwrap_or(false),
+            fixable: resolve_codes(
+                &config.fixable.unwrap_or_else(|| CATEGORIES.to_vec()),
+                &config.unfixable.unwrap_or_default(),
+            ),
+            format: config.format.unwrap_or(SerializationFormat::Text),
+            ignore_init_module_imports: config.ignore_init_module_imports.unwrap_or_default(),
+            line_length: config.line_length.unwrap_or(88),
+            per_file_ignores: resolve_per_file_ignores(
+                config.per_file_ignores.unwrap_or_default(),
+            )?,
+            src: config
+                .src
+                .unwrap_or_else(|| vec![project_root.to_path_buf()]),
+            target_version: config.target_version.unwrap_or(PythonVersion::Py310),
+            show_source: config.show_source.unwrap_or_default(),
+            // Plugins
+            flake8_annotations: config
+                .flake8_annotations
+                .map(flake8_annotations::settings::Settings::from_options)
+                .unwrap_or_default(),
+            flake8_bugbear: config
+                .flake8_bugbear
+                .map(flake8_bugbear::settings::Settings::from_options)
+                .unwrap_or_default(),
+            flake8_import_conventions: config
+                .flake8_import_conventions
+                .map(flake8_import_conventions::settings::Settings::from_options)
+                .unwrap_or_default(),
+            flake8_quotes: config
+                .flake8_quotes
+                .map(flake8_quotes::settings::Settings::from_options)
+                .unwrap_or_default(),
+            flake8_tidy_imports: config
+                .flake8_tidy_imports
+                .map(flake8_tidy_imports::settings::Settings::from_options)
+                .unwrap_or_default(),
+            isort: config
+                .isort
+                .map(isort::settings::Settings::from_options)
+                .unwrap_or_default(),
+            mccabe: config
+                .mccabe
+                .as_ref()
+                .map(mccabe::settings::Settings::from_options)
+                .unwrap_or_default(),
+            pep8_naming: config
+                .pep8_naming
+                .map(pep8_naming::settings::Settings::from_options)
+                .unwrap_or_default(),
+            pyupgrade: config
+                .pyupgrade
+                .as_ref()
+                .map(pyupgrade::settings::Settings::from_options)
+                .unwrap_or_default(),
         })
     }
 
@@ -104,7 +177,9 @@ impl Settings {
             exclude: GlobSet::empty(),
             extend_exclude: GlobSet::empty(),
             external: FxHashSet::default(),
+            fix: false,
             fixable: FxHashSet::from_iter([check_code]),
+            format: SerializationFormat::Text,
             ignore_init_module_imports: false,
             line_length: 88,
             per_file_ignores: vec![],
@@ -131,7 +206,9 @@ impl Settings {
             exclude: GlobSet::empty(),
             extend_exclude: GlobSet::empty(),
             external: FxHashSet::default(),
+            fix: false,
             fixable: FxHashSet::from_iter(check_codes),
+            format: SerializationFormat::Text,
             ignore_init_module_imports: false,
             line_length: 88,
             per_file_ignores: vec![],
@@ -192,13 +269,10 @@ impl Hash for Settings {
 }
 
 /// Given a list of patterns, create a `GlobSet`.
-pub fn resolve_globset(
-    patterns: Vec<FilePattern>,
-    project_root: Option<&PathBuf>,
-) -> Result<GlobSet> {
+pub fn resolve_globset(patterns: Vec<FilePattern>) -> Result<GlobSet> {
     let mut builder = globset::GlobSetBuilder::new();
     for pattern in patterns {
-        pattern.add_to(&mut builder, project_root)?;
+        pattern.add_to(&mut builder)?;
     }
     builder.build().map_err(std::convert::Into::into)
 }
@@ -206,21 +280,16 @@ pub fn resolve_globset(
 /// Given a list of patterns, create a `GlobSet`.
 pub fn resolve_per_file_ignores(
     per_file_ignores: Vec<PerFileIgnore>,
-    project_root: Option<&PathBuf>,
 ) -> Result<Vec<(GlobMatcher, GlobMatcher, FxHashSet<CheckCode>)>> {
     per_file_ignores
         .into_iter()
         .map(|per_file_ignore| {
             // Construct absolute path matcher.
-            let path = Path::new(&per_file_ignore.pattern);
-            let absolute_path = match project_root {
-                Some(project_root) => fs::normalize_path_to(path, project_root),
-                None => fs::normalize_path(path),
-            };
-            let absolute = Glob::new(&absolute_path.to_string_lossy())?.compile_matcher();
+            let absolute =
+                Glob::new(&per_file_ignore.absolute.to_string_lossy())?.compile_matcher();
 
             // Construct basename matcher.
-            let basename = Glob::new(&per_file_ignore.pattern)?.compile_matcher();
+            let basename = Glob::new(&per_file_ignore.basename)?.compile_matcher();
 
             Ok((absolute, basename, per_file_ignore.codes))
         })

src/settings/options.rs

@@ -20,7 +20,7 @@ pub struct Options {
             `RUF002`, and `RUF003`.
         "#,
         default = r#"[]"#,
-        value_type = "Vec<a test>",
+        value_type = "Vec<char>",
         example = r#"
             # Allow minus-sign (U+2212), greek-small-letter-rho (U+03C1), and the asterisk-operator (U+2217),
             # which could be confused for "-", "p", and "*", respectively.
@@ -55,7 +55,7 @@ pub struct Options {
               (to exclude any Python files in `directory`). Note that these paths are relative to the
               project root (e.g., the directory containing your `pyproject.toml`).
 
-            Note that you'll typically want to use [`extend_exclude`](#extend_exclude) to modify
+            Note that you'll typically want to use [`extend-exclude`](#extend-exclude) to modify
             the excluded paths.
         "#,
         default = r#"[".bzr", ".direnv", ".eggs", ".git", ".hg", ".mypy_cache", ".nox", ".pants.d", ".ruff_cache", ".svn", ".tox", ".venv", "__pypackages__", "_build", "buck-out", "build", "dist", "node_modules", "venv"]"#,
@@ -65,6 +65,24 @@ pub struct Options {
         "#
     )]
     pub exclude: Option<Vec<String>>,
+    #[option(
+        doc = r#"
+            A path to a local `pyproject.toml` file to merge into this configuration.
+
+            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.
+        "#,
+        default = r#"None"#,
+        value_type = "Path",
+        example = r#"
+            # Extend the `pyproject.toml` file in the parent directory.
+            extend = "../pyproject.toml"
+            # But use a different line length.
+            line-length = 100
+        "#
+    )]
+    pub extend: Option<String>,
     #[option(
         doc = "A list of file patterns to omit from linting, in addition to those specified by \
                `exclude`.",
@@ -217,8 +235,28 @@ pub struct Options {
     )]
     pub show_source: Option<bool>,
     #[option(
-        doc = "The source code paths to consider, e.g., when resolving first- vs. third-party \
-               imports.",
+        doc = r#"
+            The source code paths to consider, e.g., when resolving first- vs. third-party imports.
+
+            As an example: given a Python package structure like:
+
+            ```text
+            my_package/
+              pyproject.toml
+              src/
+                my_package/
+                  __init__.py
+                  foo.py
+                  bar.py
+            ```
+
+            The `src` directory should be included in `source` (e.g., `source = ["src"]`), such that
+            when resolving imports, `my_package.foo` is considered a first-party import.
+
+            This field supports globs. For example, if you have a series of Python packages in
+            a `python_modules` directory, `src = ["python_modules/*"]` would expand to incorporate
+            all of the packages in that directory.
+            "#,
         default = r#"["."]"#,
         value_type = "Vec<PathBuf>",
         example = r#"

src/settings/pyproject.rs

@@ -3,9 +3,6 @@
 use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, Result};
-use common_path::common_path_all;
-use log::debug;
-use path_absolutize::Absolutize;
 use serde::{Deserialize, Serialize};
 
 use crate::fs;
@@ -33,21 +30,21 @@ impl Pyproject {
 
 fn parse_pyproject_toml(path: &Path) -> Result<Pyproject> {
     let contents = fs::read_file(path)?;
-    Ok(toml::from_str(&contents)?)
+    toml::from_str(&contents).map_err(std::convert::Into::into)
 }
 
-pub fn find_pyproject_toml(path: Option<&PathBuf>) -> Option<PathBuf> {
-    if let Some(path) = path {
-        let path_pyproject_toml = path.join("pyproject.toml");
-        if path_pyproject_toml.is_file() {
-            return Some(path_pyproject_toml);
+/// Find the nearest `pyproject.toml` file.
+pub fn find_pyproject_toml(path: &Path) -> Option<PathBuf> {
+    for directory in path.ancestors() {
+        let pyproject = directory.join("pyproject.toml");
+        if pyproject.is_file() {
+            return Some(pyproject);
         }
     }
-
-    find_user_pyproject_toml()
+    None
 }
 
-fn find_user_pyproject_toml() -> Option<PathBuf> {
+pub fn find_user_pyproject_toml() -> Option<PathBuf> {
     let mut path = dirs::config_dir()?;
     path.push("ruff");
     path.push("pyproject.toml");
@@ -58,46 +55,17 @@ fn find_user_pyproject_toml() -> Option<PathBuf> {
     }
 }
 
-pub fn find_project_root(sources: &[PathBuf]) -> Option<PathBuf> {
-    let absolute_sources: Vec<PathBuf> = sources
-        .iter()
-        .flat_map(|source| source.absolutize().map(|path| path.to_path_buf()))
-        .collect();
-    if let Some(prefix) = common_path_all(absolute_sources.iter().map(PathBuf::as_path)) {
-        for directory in prefix.ancestors() {
-            if directory.join(".git").is_dir() {
-                return Some(directory.to_path_buf());
-            }
-            if directory.join(".hg").is_dir() {
-                return Some(directory.to_path_buf());
-            }
-            if directory.join("pyproject.toml").is_file() {
-                return Some(directory.to_path_buf());
-            }
-        }
-    }
-
-    None
-}
-
-pub fn load_options(pyproject: Option<&PathBuf>) -> Result<Options> {
-    if let Some(pyproject) = pyproject {
-        Ok(parse_pyproject_toml(pyproject)
-            .map_err(|err| anyhow!("Failed to parse `{}`: {}", pyproject.to_string_lossy(), err))?
-            .tool
-            .and_then(|tool| tool.ruff)
-            .unwrap_or_default())
-    } else {
-        debug!("No pyproject.toml found.");
-        debug!("Falling back to default configuration...");
-        Ok(Options::default())
-    }
+pub fn load_options(pyproject: &Path) -> Result<Options> {
+    Ok(parse_pyproject_toml(pyproject)
+        .map_err(|err| anyhow!("Failed to parse `{}`: {}", pyproject.to_string_lossy(), err))?
+        .tool
+        .and_then(|tool| tool.ruff)
+        .unwrap_or_default())
 }
 
 #[cfg(test)]
 mod tests {
     use std::env::current_dir;
-    use std::path::PathBuf;
     use std::str::FromStr;
 
     use anyhow::Result;
@@ -107,7 +75,7 @@ mod tests {
     use crate::flake8_quotes::settings::Quote;
     use crate::flake8_tidy_imports::settings::Strictness;
     use crate::settings::pyproject::{
-        find_project_root, find_pyproject_toml, parse_pyproject_toml, Options, Pyproject, Tools,
+        find_pyproject_toml, parse_pyproject_toml, Options, Pyproject, Tools,
     };
     use crate::settings::types::PatternPrefixPair;
     use crate::{
@@ -140,6 +108,7 @@ mod tests {
                     allowed_confusables: None,
                     dummy_variable_rgx: None,
                     exclude: None,
+                    extend: None,
                     extend_exclude: None,
                     extend_ignore: None,
                     extend_select: None,
@@ -183,6 +152,7 @@ line-length = 79
                     allowed_confusables: None,
                     dummy_variable_rgx: None,
                     exclude: None,
+                    extend: None,
                     extend_exclude: None,
                     extend_ignore: None,
                     extend_select: None,
@@ -226,6 +196,7 @@ exclude = ["foo.py"]
                     allowed_confusables: None,
                     line_length: None,
                     fix: None,
+                    extend: None,
                     exclude: Some(vec!["foo.py".to_string()]),
                     extend_exclude: None,
                     select: None,
@@ -269,6 +240,7 @@ select = ["E501"]
                     allowed_confusables: None,
                     dummy_variable_rgx: None,
                     exclude: None,
+                    extend: None,
                     extend_exclude: None,
                     extend_ignore: None,
                     extend_select: None,
@@ -313,6 +285,7 @@ ignore = ["E501"]
                     allowed_confusables: None,
                     dummy_variable_rgx: None,
                     exclude: None,
+                    extend: None,
                     extend_exclude: None,
                     extend_ignore: None,
                     extend_select: Some(vec![CheckCodePrefix::RUF100]),
@@ -376,14 +349,14 @@ other-attribute = 1
     #[test]
     fn find_and_parse_pyproject_toml() -> Result<()> {
         let cwd = current_dir()?;
-        let project_root =
-            find_project_root(&[PathBuf::from("resources/test/fixtures/__init__.py")]).unwrap();
-        assert_eq!(project_root, cwd.join("resources/test/fixtures"));
+        let pyproject =
+            find_pyproject_toml(&cwd.join("resources/test/fixtures/__init__.py")).unwrap();
+        assert_eq!(
+            pyproject,
+            cwd.join("resources/test/fixtures/pyproject.toml")
+        );
 
-        let path = find_pyproject_toml(Some(&project_root)).unwrap();
-        assert_eq!(path, cwd.join("resources/test/fixtures/pyproject.toml"));
-
-        let pyproject = parse_pyproject_toml(&path)?;
+        let pyproject = parse_pyproject_toml(&pyproject)?;
         let config = pyproject.tool.and_then(|tool| tool.ruff).unwrap();
         assert_eq!(
             config,
@@ -392,6 +365,7 @@ other-attribute = 1
                 line_length: Some(88),
                 fix: None,
                 exclude: None,
+                extend: None,
                 extend_exclude: Some(vec![
                     "excluded_file.py".to_string(),
                     "migrations".to_string(),

src/settings/types.rs

@@ -49,27 +49,18 @@ impl FromStr for PythonVersion {
 #[derive(Debug, Clone)]
 pub enum FilePattern {
     Builtin(&'static str),
-    User(String),
+    User(String, PathBuf),
 }
 
 impl FilePattern {
-    pub fn add_to(
-        self,
-        builder: &mut GlobSetBuilder,
-        project_root: Option<&PathBuf>,
-    ) -> Result<()> {
+    pub fn add_to(self, builder: &mut GlobSetBuilder) -> Result<()> {
         match self {
             FilePattern::Builtin(pattern) => {
                 builder.add(Glob::from_str(pattern)?);
             }
-            FilePattern::User(pattern) => {
-                // Add absolute path.
-                let path = Path::new(&pattern);
-                let absolute_path = match project_root {
-                    Some(project_root) => fs::normalize_path_to(path, project_root),
-                    None => fs::normalize_path(path),
-                };
-                builder.add(Glob::new(&absolute_path.to_string_lossy())?);
+            FilePattern::User(pattern, absolute) => {
+                // Add the absolute path.
+                builder.add(Glob::new(&absolute.to_string_lossy())?);
 
                 // Add basename path.
                 if !pattern.contains(std::path::MAIN_SEPARATOR) {
@@ -85,20 +76,27 @@ impl FromStr for FilePattern {
     type Err = anyhow::Error;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        Ok(Self::User(s.into()))
+        let pattern = s.to_string();
+        let absolute = fs::normalize_path(Path::new(&pattern));
+        Ok(Self::User(pattern, absolute))
     }
 }
 
 #[derive(Debug, Clone)]
 pub struct PerFileIgnore {
-    pub pattern: String,
+    pub basename: String,
+    pub absolute: PathBuf,
     pub codes: FxHashSet<CheckCode>,
 }
 
 impl PerFileIgnore {
-    pub fn new(pattern: String, prefixes: &[CheckCodePrefix]) -> Self {
+    pub fn new(basename: String, absolute: PathBuf, prefixes: &[CheckCodePrefix]) -> Self {
         let codes = prefixes.iter().flat_map(CheckCodePrefix::codes).collect();
-        Self { pattern, codes }
+        Self {
+            basename,
+            absolute,
+            codes,
+        }
     }
 }
 

src/source_code_locator.rs

@@ -31,6 +31,12 @@ impl<'a> SourceCodeLocator<'a> {
         Cow::from(rope.slice(offset..))
     }
 
+    pub fn slice_source_code_until(&self, location: &Location) -> Cow<'_, str> {
+        let rope = self.get_or_init_rope();
+        let offset = rope.line_to_char(location.row() - 1) + location.column();
+        Cow::from(rope.slice(..offset))
+    }
+
     pub fn slice_source_code_range(&self, range: &Range) -> Cow<'_, str> {
         let rope = self.get_or_init_rope();
         let start = rope.line_to_char(range.location.row() - 1) + range.location.column();