Bump version to 0.0.190

.pre-commit-config.yaml

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

Cargo.lock

@@ -724,7 +724,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.188-dev.0"
+version = "0.0.190-dev.0"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1845,7 +1845,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.188"
+version = "0.0.190"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -1901,7 +1901,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_dev"
-version = "0.0.188"
+version = "0.0.190"
 dependencies = [
  "anyhow",
  "clap 4.0.29",
@@ -1919,7 +1919,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_macros"
-version = "0.0.188"
+version = "0.0.190"
 dependencies = [
  "proc-macro2",
  "quote",

Cargo.toml

@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "ruff"
-version = "0.0.188"
+version = "0.0.190"
 edition = "2021"
 rust-version = "1.65.0"
 
@@ -43,7 +43,7 @@ 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.188", path = "ruff_macros" }
+ruff_macros = { version = "0.0.190", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
 rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" }
 rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "c01f014b1269eedcf4bdb45d5fbc62ae2beecf31" }

README.md

@@ -160,7 +160,7 @@ Ruff also works with [pre-commit](https://pre-commit.com):
 ```yaml
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.188
+    rev: v0.0.190
     hooks:
       - id: ruff
 ```
@@ -1765,6 +1765,30 @@ fixable = ["E", "F"]
 
 ---
 
+#### [`force-exclude`](#force-exclude)
+
+Whether to enforce `exclude` and `extend-exclude` patterns, even for paths that are
+passed to Ruff explicitly. Typically, Ruff will lint any paths passed in directly, even
+if they would typically be excluded. Setting `force-exclude = true` will cause Ruff to
+respect these exclusions unequivocally.
+
+This is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all
+changed files to the [`ruff-pre-commit`](https://github.com/charliermarsh/ruff-pre-commit)
+plugin, regardless of whether they're marked as excluded by Ruff's own settings.
+
+**Default value**: `false`
+
+**Type**: `bool`
+
+**Example usage**:
+
+```toml
+[tool.ruff]
+force-exclude = true
+```
+
+---
+
 #### [`format`](#format)
 
 The style in which violation messages should be formatted: `"text"` (default),

flake8_to_ruff/Cargo.lock

@@ -771,7 +771,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8_to_ruff"
-version = "0.0.188"
+version = "0.0.190"
 dependencies = [
  "anyhow",
  "clap",
@@ -1975,7 +1975,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.188"
+version = "0.0.190"
 dependencies = [
  "anyhow",
  "bincode",

flake8_to_ruff/Cargo.toml

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

flake8_to_ruff/src/converter.rs

@@ -268,6 +268,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
@@ -317,6 +318,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
@@ -366,6 +368,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: Some(100),
@@ -415,6 +418,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
@@ -464,6 +468,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
@@ -521,6 +526,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,
@@ -606,6 +612,7 @@ mod tests {
             fix: None,
             fixable: None,
             format: None,
+            force_exclude: None,
             ignore: Some(vec![]),
             ignore_init_module_imports: None,
             line_length: None,

pyproject.toml

@@ -32,6 +32,8 @@ build-backend = "maturin"
 bindings = "bin"
 strip = true
 
+[tool.ruff]
+
 [tool.ruff.isort]
 force-wrap-aliases = true
 combine-as-imports = true

resources/test/fixtures/flake8_datetimez/DTZ007.py

@@ -23,6 +23,12 @@ datetime.datetime.strptime("something", "something").astimezone()
 # OK
 datetime.datetime.strptime("something", "%H:%M:%S%z")
 
+# OK
+datetime.datetime.strptime("something", something).astimezone()
+
+# OK
+datetime.datetime.strptime("something", something).replace(tzinfo=datetime.timezone.utc)
+
 from datetime import datetime
 
 # no replace orastimezone unqualified

resources/test/fixtures/flake8_return/RET504.py

@@ -6,18 +6,6 @@ def x():
     return a  # error
 
 
-def x():
-    b, a = 1, 2
-    print(b)
-    return a  # error
-
-
-def x():
-    a = 1
-    print()
-    return a  # error
-
-
 def x():
     a = 1
     print(a)
@@ -53,7 +41,6 @@ def x():
 
 # https://github.com/afonasev/flake8-return/issues/47#issue-641117366
 def user_agent_username(username=None):
-
     if not username:
         return ""
 
@@ -136,6 +123,20 @@ def x():
     return a
 
 
+# Considered OK, since functions can have side effects.
+def x():
+    b, a = 1, 2
+    print(b)
+    return a
+
+
+# Considered OK, since functions can have side effects.
+def x():
+    a = 1
+    print()
+    return a
+
+
 # Test cases for using value for assignment then returning it
 # See:https://github.com/afonasev/flake8-return/issues/47
 def resolve_from_url(self, url: str) -> dict:

resources/test/fixtures/pyflakes/F821_7.py

@@ -0,0 +1,13 @@
+"""Test: Mypy extensions."""
+
+from mypy_extensions import DefaultNamedArg
+
+# OK
+_ = DefaultNamedArg(bool | None, name="some_prop_name")
+_ = DefaultNamedArg(type=bool | None, name="some_prop_name")
+_ = DefaultNamedArg(bool | None, "some_prop_name")
+
+# Not OK
+_ = DefaultNamedArg("Undefined", name="some_prop_name")
+_ = DefaultNamedArg(type="Undefined", name="some_prop_name")
+_ = DefaultNamedArg("Undefined", "some_prop_name")

resources/test/fixtures/pylint/used_prior_global_declaration.py

@@ -109,6 +109,11 @@ def f():
     del x
 
 
+def f():
+    print(f"{x=}")
+    global x
+
+
 ###
 # Non-errors.
 ###
@@ -146,3 +151,8 @@ def f():
     global x, y
 
     del x
+
+
+def f():
+    global x
+    print(f"{x=}")

resources/test/fixtures/ruff/RUF100.py

@@ -79,3 +79,10 @@ _ = """Here's a source: https://github.com/ethereum/web3.py/blob/ffe59daf10edc19
 May raise:
 - DeserializationError if the abi string is invalid or abi or log topics/data do not match
 """  # noqa: E501
+
+import collections  # noqa
+import os  # noqa: F401, RUF100
+import shelve  # noqa: RUF100
+import sys  # noqa: F401, RUF100
+
+print(sys.path)

ruff_dev/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff_dev"
-version = "0.0.188"
+version = "0.0.190"
 edition = "2021"
 
 [dependencies]

ruff_macros/Cargo.toml

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

src/cache.rs

@@ -8,6 +8,7 @@ use std::path::Path;
 use anyhow::Result;
 use filetime::FileTime;
 use log::error;
+use once_cell::sync::Lazy;
 use path_absolutize::Absolutize;
 use serde::{Deserialize, Serialize};
 
@@ -15,6 +16,7 @@ use crate::autofix::fixer;
 use crate::message::Message;
 use crate::settings::{flags, Settings};
 
+static CACHE_DIR: Lazy<Option<String>> = Lazy::new(|| std::env::var("RUFF_CACHE_DIR").ok());
 const CARGO_PKG_VERSION: &str = env!("CARGO_PKG_VERSION");
 
 #[derive(Serialize, Deserialize)]
@@ -34,12 +36,12 @@ struct CheckResult {
     messages: Vec<Message>,
 }
 
-fn cache_dir() -> &'static str {
-    "./.ruff_cache"
+fn cache_dir() -> &'static Path {
+    Path::new(CACHE_DIR.as_ref().map_or(".ruff_cache", String::as_str))
 }
 
-fn content_dir() -> &'static str {
-    "content"
+fn content_dir() -> &'static Path {
+    Path::new("content")
 }
 
 fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: fixer::Mode) -> u64 {
@@ -53,7 +55,7 @@ fn cache_key<P: AsRef<Path>>(path: P, settings: &Settings, autofix: fixer::Mode)
 
 /// Initialize the cache directory.
 pub fn init() -> Result<()> {
-    let path = Path::new(cache_dir());
+    let path = cache_dir();
 
     // Create the cache directories.
     create_dir_all(path.join(content_dir()))?;
@@ -75,19 +77,13 @@ pub fn init() -> Result<()> {
 
 fn write_sync(key: u64, value: &[u8]) -> Result<(), std::io::Error> {
     fs::write(
-        Path::new(cache_dir())
-            .join(content_dir())
-            .join(format!("{key:x}")),
+        cache_dir().join(content_dir()).join(format!("{key:x}")),
         value,
     )
 }
 
 fn read_sync(key: u64) -> Result<Vec<u8>, std::io::Error> {
-    fs::read(
-        Path::new(cache_dir())
-            .join(content_dir())
-            .join(format!("{key:x}")),
-    )
+    fs::read(cache_dir().join(content_dir()).join(format!("{key:x}")))
 }
 
 /// Get a value from the cache.

src/checkers/ast.rs

@@ -156,19 +156,14 @@ impl<'a> Checker<'a> {
     }
 
     /// Add a `Check` to the `Checker`.
-    pub(crate) fn add_check(&mut self, check: Check) {
+    pub(crate) fn add_check(&mut self, mut check: Check) {
         // If we're in an f-string, override the location. RustPython doesn't produce
         // reliable locations for expressions within f-strings, so we use the
         // span of the f-string itself as a best-effort default.
-        let check = if let Some(range) = self.in_f_string {
-            Check {
-                location: range.location,
-                end_location: range.end_location,
-                ..check
-            }
-        } else {
-            check
-        };
+        if let Some(range) = self.in_f_string {
+            check.location = range.location;
+            check.end_location = range.end_location;
+        }
         self.checks.push(check);
     }
 
@@ -189,6 +184,13 @@ impl<'a> Checker<'a> {
             && self.settings.fixable.contains(code)
     }
 
+    /// Return the amended `Range` from a `Located`.
+    pub fn range_for<T>(&self, located: &Located<T>) -> Range {
+        // If we're in an f-string, override the location.
+        self.in_f_string
+            .unwrap_or_else(|| Range::from_located(located))
+    }
+
     /// Return `true` if the `Expr` is a reference to `typing.${target}`.
     pub fn match_typing_expr(&self, expr: &Expr, target: &str) -> bool {
         let call_path = dealias_call_path(collect_call_paths(expr), &self.import_aliases);
@@ -2507,6 +2509,29 @@ where
                         self.visit_expr(value);
                         self.in_type_definition = prev_in_type_definition;
                     }
+                } else if ["Arg", "DefaultArg", "NamedArg", "DefaultNamedArg"]
+                    .iter()
+                    .any(|target| {
+                        match_call_path(&call_path, "mypy_extensions", target, &self.from_imports)
+                    })
+                {
+                    self.visit_expr(func);
+
+                    // Ex) DefaultNamedArg(bool | None, name="some_prop_name")
+                    let mut arguments = args.iter().chain(keywords.iter().map(|keyword| {
+                        let KeywordData { value, .. } = &keyword.node;
+                        value
+                    }));
+                    if let Some(expr) = arguments.next() {
+                        self.in_type_definition = true;
+                        self.visit_expr(expr);
+                        self.in_type_definition = prev_in_type_definition;
+                    }
+                    for expr in arguments {
+                        self.in_type_definition = false;
+                        self.visit_expr(expr);
+                        self.in_type_definition = prev_in_type_definition;
+                    }
                 } else {
                     visitor::walk_expr(self, expr);
                 }

src/checkers/noqa.rs

@@ -100,18 +100,32 @@ pub fn check_noqa(
                 Directive::Codes(spaces, start, end, codes) => {
                     let mut invalid_codes = vec![];
                     let mut valid_codes = vec![];
+                    let mut self_ignore = false;
                     for code in codes {
                         let code = CODE_REDIRECTS.get(code).map_or(code, AsRef::as_ref);
-                        if matches.contains(&code) || settings.external.contains(code) {
-                            valid_codes.push(code.to_string());
+                        if code == CheckCode::RUF100.as_ref() {
+                            self_ignore = true;
                         } else {
-                            invalid_codes.push(code.to_string());
+                            if matches.contains(&code) || settings.external.contains(code) {
+                                valid_codes.push(code);
+                            } else {
+                                invalid_codes.push(code);
+                            }
                         }
                     }
 
+                    if self_ignore {
+                        continue;
+                    }
+
                     if !invalid_codes.is_empty() {
                         let mut check = Check::new(
-                            CheckKind::UnusedNOQA(Some(invalid_codes)),
+                            CheckKind::UnusedNOQA(Some(
+                                invalid_codes
+                                    .iter()
+                                    .map(|code| (*code).to_string())
+                                    .collect(),
+                            )),
                             Range {
                                 location: Location::new(row + 1, start),
                                 end_location: Location::new(row + 1, end),

src/cli.rs

@@ -92,6 +92,12 @@ pub struct Cli {
     respect_gitignore: bool,
     #[clap(long, overrides_with("respect_gitignore"), hide = true)]
     no_respect_gitignore: bool,
+    /// Enforce exclusions, even for paths passed to Ruff directly on the
+    /// command-line.
+    #[arg(long, overrides_with("no_show_source"))]
+    force_exclude: bool,
+    #[clap(long, overrides_with("force_exclude"), hide = true)]
+    no_force_exclude: bool,
     /// See the files Ruff will be run against with the current settings.
     #[arg(long)]
     pub show_files: bool,
@@ -173,6 +179,7 @@ impl Cli {
                 // TODO(charlie): Included in `pyproject.toml`, but not inherited.
                 fix: resolve_bool_arg(self.fix, self.no_fix),
                 format: self.format,
+                force_exclude: resolve_bool_arg(self.force_exclude, self.no_force_exclude),
             },
         )
     }
@@ -230,6 +237,7 @@ pub struct Overrides {
     // TODO(charlie): Captured in pyproject.toml as a default, but not part of `Settings`.
     pub fix: Option<bool>,
     pub format: Option<SerializationFormat>,
+    pub force_exclude: Option<bool>,
 }
 
 /// Map the CLI settings to a `LogLevel`.

src/flake8_datetimez/plugins.rs

@@ -177,22 +177,17 @@ pub fn call_datetime_strptime_without_zone(
         return;
     }
 
-    let Some(ExprKind::Constant {
+    // Does the `strptime` call contain a format string with a timezone specifier?
+    if let Some(ExprKind::Constant {
         value: Constant::Str(format),
         kind: None,
-    }) = args.get(1).as_ref().map(|arg| &arg.node) else {
-                checker.add_check(Check::new(
-            CheckKind::CallDatetimeStrptimeWithoutZone,
-            location,
-        ));
-        return;
+    }) = args.get(1).as_ref().map(|arg| &arg.node)
+    {
+        if format.contains("%z") {
+            return;
+        }
     };
 
-    // Does the `strptime` call contain a format string with a timezone specifier?
-    if format.contains("%z") {
-        return;
-    }
-
     let (Some(grandparent), Some(parent)) = (checker.current_expr_grandparent(), checker.current_expr_parent()) else {
         checker.add_check(Check::new(
             CheckKind::CallDatetimeStrptimeWithoutZone,

src/flake8_datetimez/snapshots/ruff__flake8_datetimez__tests__DTZ007_DTZ007.py.snap

@@ -36,10 +36,10 @@ expression: checks
   fix: ~
 - kind: CallDatetimeStrptimeWithoutZone
   location:
-    row: 29
+    row: 35
     column: 0
   end_location:
-    row: 29
+    row: 35
     column: 43
   fix: ~
 

src/flake8_return/snapshots/ruff__flake8_return__tests__RET504_RET504.py.snap

@@ -12,50 +12,34 @@ expression: checks
   fix: ~
 - kind: UnnecessaryAssign
   location:
-    row: 12
+    row: 13
     column: 11
   end_location:
-    row: 12
+    row: 13
     column: 12
   fix: ~
 - kind: UnnecessaryAssign
   location:
-    row: 18
-    column: 11
-  end_location:
-    row: 18
-    column: 12
-  fix: ~
-- kind: UnnecessaryAssign
-  location:
-    row: 25
-    column: 11
-  end_location:
-    row: 25
-    column: 12
-  fix: ~
-- kind: UnnecessaryAssign
-  location:
-    row: 31
+    row: 19
     column: 15
   end_location:
-    row: 31
+    row: 19
     column: 16
   fix: ~
 - kind: UnnecessaryAssign
   location:
-    row: 43
+    row: 31
     column: 11
   end_location:
-    row: 43
+    row: 31
     column: 17
   fix: ~
 - kind: UnnecessaryAssign
   location:
-    row: 51
+    row: 39
     column: 11
   end_location:
-    row: 51
+    row: 39
     column: 20
   fix: ~
 

src/flake8_return/visitor.rs

@@ -100,6 +100,7 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
                     .push((stmt.location, stmt.end_location.unwrap()));
                 visitor::walk_stmt(self, stmt);
             }
+
             _ => {
                 visitor::walk_stmt(self, stmt);
             }
@@ -108,6 +109,17 @@ impl<'a> Visitor<'a> for ReturnVisitor<'a> {
 
     fn visit_expr(&mut self, expr: &'a Expr) {
         match &expr.node {
+            ExprKind::Call { .. } => {
+                // Arbitrary function calls can have side effects, so we conservatively treat
+                // every function call as a reference to every known variable.
+                for name in self.stack.assigns.keys() {
+                    self.stack
+                        .refs
+                        .entry(name)
+                        .or_insert_with(Vec::new)
+                        .push(self.in_f_string.unwrap_or(expr.location));
+                }
+            }
             ExprKind::Name { id, .. } => {
                 self.stack
                     .refs

src/main.rs

@@ -103,6 +103,10 @@ fn inner_main() -> Result<ExitCode> {
     // Extract options that are included in `Settings`, but only apply at the top
     // level.
     let file_strategy = FileDiscovery {
+        force_exclude: match &pyproject_strategy {
+            PyprojectDiscovery::Fixed(settings) => settings.force_exclude,
+            PyprojectDiscovery::Hierarchical(settings) => settings.force_exclude,
+        },
         respect_gitignore: match &pyproject_strategy {
             PyprojectDiscovery::Fixed(settings) => settings.respect_gitignore,
             PyprojectDiscovery::Hierarchical(settings) => settings.respect_gitignore,

src/pydocstyle/plugins.rs

@@ -1349,39 +1349,22 @@ fn missing_args(checker: &mut Checker, docstring: &Docstring, docstrings_args: &
 
 // See: `GOOGLE_ARGS_REGEX` in `pydocstyle/checker.py`.
 static GOOGLE_ARGS_REGEX: Lazy<Regex> =
-    Lazy::new(|| Regex::new(r"^\s*(\w+)\s*(\(.*?\))?\s*:\n?\s*.+").unwrap());
+    Lazy::new(|| Regex::new(r"^\s*(\w+)\s*(\(.*?\))?\s*:.+").unwrap());
 
 fn args_section(checker: &mut Checker, docstring: &Docstring, context: &SectionContext) {
-    let mut args_sections: Vec<String> = vec![];
-    for line in textwrap::dedent(&context.following_lines.join("\n"))
-        .trim()
-        .lines()
-    {
-        if line.chars().next().map_or(true, char::is_whitespace) {
-            // This is a continuation of documentation for the last
-            // parameter because it does start with whitespace.
-            if let Some(current) = args_sections.last_mut() {
-                current.push_str(line);
-            }
-        } else {
-            // This line is the start of documentation for the next
-            // parameter because it doesn't start with any whitespace.
-            args_sections.push(line.to_string());
+    let mut matches = Vec::new();
+    for line in context.following_lines {
+        if let Some(captures) = GOOGLE_ARGS_REGEX.captures(line) {
+            matches.push(captures);
         }
     }
 
     missing_args(
         checker,
         docstring,
-        // Collect the list of arguments documented in the docstring.
-        &args_sections
+        &matches
             .iter()
-            .filter_map(
-                |section| match GOOGLE_ARGS_REGEX.captures(section.as_str()) {
-                    Some(caps) => caps.get(1).map(|arg_name| arg_name.as_str()),
-                    None => None,
-                },
-            )
+            .filter_map(|captures| captures.get(1).map(|arg_name| arg_name.as_str()))
             .collect(),
     );
 }

src/pydocstyle/snapshots/ruff__pydocstyle__tests__D417_sections.py.snap

@@ -69,6 +69,17 @@ expression: checks
     row: 367
     column: 11
   fix: ~
+- kind:
+    DocumentAllArguments:
+      - skip
+      - verbose
+  location:
+    row: 370
+    column: 4
+  end_location:
+    row: 382
+    column: 11
+  fix: ~
 - kind:
     DocumentAllArguments:
       - y

src/pyflakes/mod.rs

@@ -96,6 +96,7 @@ mod tests {
     #[test_case(CheckCode::F821, Path::new("F821_4.py"); "F821_4")]
     #[test_case(CheckCode::F821, Path::new("F821_5.py"); "F821_5")]
     #[test_case(CheckCode::F821, Path::new("F821_6.py"); "F821_6")]
+    #[test_case(CheckCode::F821, Path::new("F821_7.py"); "F821_7")]
     #[test_case(CheckCode::F822, Path::new("F822.py"); "F822")]
     #[test_case(CheckCode::F823, Path::new("F823.py"); "F823")]
     #[test_case(CheckCode::F831, Path::new("F831.py"); "F831")]

src/pyflakes/snapshots/ruff__pyflakes__tests__F821_F821_7.py.snap

@@ -0,0 +1,32 @@
+---
+source: src/pyflakes/mod.rs
+expression: checks
+---
+- kind:
+    UndefinedName: Undefined
+  location:
+    row: 11
+    column: 20
+  end_location:
+    row: 11
+    column: 31
+  fix: ~
+- kind:
+    UndefinedName: Undefined
+  location:
+    row: 12
+    column: 25
+  end_location:
+    row: 12
+    column: 36
+  fix: ~
+- kind:
+    UndefinedName: Undefined
+  location:
+    row: 13
+    column: 20
+  end_location:
+    row: 13
+    column: 31
+  fix: ~
+

src/pylint/plugins/used_prior_global_declaration.rs

@@ -13,7 +13,7 @@ pub fn used_prior_global_declaration(checker: &mut Checker, name: &str, expr: &E
         _ => return,
     };
     if let Some(stmt) = globals.get(name) {
-        if expr.location < stmt.location {
+        if checker.range_for(expr).location < stmt.location {
             checker.add_check(Check::new(
                 CheckKind::UsedPriorGlobalDeclaration(name.to_string(), stmt.location.row()),
                 Range::from_located(expr),

src/pylint/snapshots/ruff__pylint__tests__PLE0118_used_prior_global_declaration.py.snap

@@ -134,4 +134,15 @@ expression: checks
     row: 105
     column: 9
   fix: ~
+- kind:
+    UsedPriorGlobalDeclaration:
+      - x
+      - 114
+  location:
+    row: 113
+    column: 10
+  end_location:
+    row: 113
+    column: 17
+  fix: ~
 

src/resolver.rs

@@ -20,6 +20,7 @@ use crate::settings::{pyproject, Settings};
 /// The strategy used to discover Python files in the filesystem..
 #[derive(Debug)]
 pub struct FileDiscovery {
+    pub force_exclude: bool,
     pub respect_gitignore: bool,
 }
 
@@ -263,7 +264,7 @@ pub fn python_files_in_path(
 
             // Respect our own exclusion behavior.
             if let Ok(entry) = &result {
-                if entry.depth() > 0 {
+                if file_strategy.force_exclude || entry.depth() > 0 {
                     let path = entry.path();
                     let resolver = resolver.read().unwrap();
                     let settings = resolver.resolve(path, pyproject_strategy);

src/ruff/mod.rs

@@ -38,6 +38,7 @@ mod tests {
             &settings::Settings::for_rules(vec![
                 CheckCode::RUF100,
                 CheckCode::E501,
+                CheckCode::F401,
                 CheckCode::F841,
             ]),
         )?;

src/ruff/snapshots/ruff__ruff__tests__ruf100.snap

@@ -182,4 +182,22 @@ expression: checks
     end_location:
       row: 71
       column: 11
+- kind:
+    UnusedImport:
+      - shelve
+      - false
+  location:
+    row: 85
+    column: 7
+  end_location:
+    row: 85
+    column: 13
+  fix:
+    content: ""
+    location:
+      row: 85
+      column: 0
+    end_location:
+      row: 86
+      column: 0
 

src/settings/configuration.rs

@@ -31,6 +31,7 @@ pub struct Configuration {
     pub fix: Option<bool>,
     pub fixable: Option<Vec<CheckCodePrefix>>,
     pub format: Option<SerializationFormat>,
+    pub force_exclude: Option<bool>,
     pub ignore: Option<Vec<CheckCodePrefix>>,
     pub ignore_init_module_imports: Option<bool>,
     pub line_length: Option<usize>,
@@ -96,6 +97,7 @@ impl Configuration {
             fix: options.fix,
             fixable: options.fixable,
             format: options.format,
+            force_exclude: options.force_exclude,
             ignore: options.ignore,
             ignore_init_module_imports: options.ignore_init_module_imports,
             line_length: options.line_length,
@@ -159,6 +161,7 @@ impl Configuration {
             fix: self.fix.or(config.fix),
             fixable: self.fixable.or(config.fixable),
             format: self.format.or(config.format),
+            force_exclude: self.force_exclude.or(config.force_exclude),
             ignore: self.ignore.or(config.ignore),
             ignore_init_module_imports: self
                 .ignore_init_module_imports
@@ -208,6 +211,9 @@ impl Configuration {
         if let Some(format) = overrides.format {
             self.format = Some(format);
         }
+        if let Some(force_exclude) = overrides.force_exclude {
+            self.force_exclude = Some(force_exclude);
+        }
         if let Some(ignore) = overrides.ignore {
             self.ignore = Some(ignore);
         }

src/settings/mod.rs

@@ -41,6 +41,7 @@ pub struct Settings {
     pub fix: bool,
     pub fixable: FxHashSet<CheckCode>,
     pub format: SerializationFormat,
+    pub force_exclude: bool,
     pub ignore_init_module_imports: bool,
     pub line_length: usize,
     pub per_file_ignores: Vec<(GlobMatcher, GlobMatcher, FxHashSet<CheckCode>)>,
@@ -127,6 +128,7 @@ impl Settings {
                 .into_iter(),
             ),
             format: config.format.unwrap_or(SerializationFormat::Text),
+            force_exclude: config.force_exclude.unwrap_or(false),
             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(
@@ -199,6 +201,7 @@ impl Settings {
             fix: false,
             fixable: FxHashSet::from_iter([check_code]),
             format: SerializationFormat::Text,
+            force_exclude: false,
             ignore_init_module_imports: false,
             line_length: 88,
             per_file_ignores: vec![],
@@ -231,6 +234,7 @@ impl Settings {
             fix: false,
             fixable: FxHashSet::from_iter(check_codes),
             format: SerializationFormat::Text,
+            force_exclude: false,
             ignore_init_module_imports: false,
             line_length: 88,
             per_file_ignores: vec![],

src/settings/options.rs

@@ -165,6 +165,24 @@ pub struct Options {
         "#
     )]
     pub format: Option<SerializationFormat>,
+    #[option(
+        doc = r#"
+            Whether to enforce `exclude` and `extend-exclude` patterns, even for paths that are
+            passed to Ruff explicitly. Typically, Ruff will lint any paths passed in directly, even
+            if they would typically be excluded. Setting `force-exclude = true` will cause Ruff to
+            respect these exclusions unequivocally.
+
+            This is useful for [`pre-commit`](https://pre-commit.com/), which explicitly passes all
+            changed files to the [`ruff-pre-commit`](https://github.com/charliermarsh/ruff-pre-commit)
+            plugin, regardless of whether they're marked as excluded by Ruff's own settings.
+        "#,
+        default = r#"false"#,
+        value_type = "bool",
+        example = r#"
+            force-exclude = true
+        "#
+    )]
+    pub force_exclude: Option<bool>,
     #[option(
         doc = r"
             A list of check code prefixes to ignore. Prefixes can specify exact checks (like

src/settings/pyproject.rs

@@ -129,6 +129,8 @@ mod tests {
                     external: None,
                     fix: None,
                     fixable: None,
+                    format: None,
+                    force_exclude: None,
                     ignore: None,
                     ignore_init_module_imports: None,
                     line_length: None,
@@ -138,7 +140,6 @@ mod tests {
                     show_source: None,
                     src: None,
                     target_version: None,
-                    format: None,
                     unfixable: None,
                     flake8_annotations: None,
                     flake8_bugbear: None,
@@ -176,6 +177,8 @@ line-length = 79
                     external: None,
                     fix: None,
                     fixable: None,
+                    force_exclude: None,
+                    format: None,
                     ignore: None,
                     ignore_init_module_imports: None,
                     line_length: Some(79),
@@ -185,7 +188,6 @@ line-length = 79
                     show_source: None,
                     src: None,
                     target_version: None,
-                    format: None,
                     unfixable: None,
                     flake8_annotations: None,
                     flake8_bugbear: None,
@@ -214,26 +216,27 @@ exclude = ["foo.py"]
             Some(Tools {
                 ruff: Some(Options {
                     allowed_confusables: None,
-                    line_length: None,
-                    fix: None,
-                    extend: None,
+                    dummy_variable_rgx: None,
                     exclude: Some(vec!["foo.py".to_string()]),
+                    extend: None,
                     extend_exclude: None,
-                    select: None,
+                    extend_ignore: None,
                     extend_select: None,
                     external: None,
+                    fix: None,
+                    fixable: None,
+                    force_exclude: None,
+                    format: None,
                     ignore: None,
                     ignore_init_module_imports: None,
-                    extend_ignore: None,
-                    fixable: None,
-                    format: None,
-                    unfixable: None,
+                    line_length: None,
                     per_file_ignores: None,
                     respect_gitignore: None,
-                    dummy_variable_rgx: None,
+                    select: None,
+                    show_source: None,
                     src: None,
                     target_version: None,
-                    show_source: None,
+                    unfixable: None,
                     flake8_annotations: None,
                     flake8_errmsg: None,
                     flake8_bugbear: None,
@@ -270,6 +273,8 @@ select = ["E501"]
                     external: None,
                     fix: None,
                     fixable: None,
+                    force_exclude: None,
+                    format: None,
                     ignore: None,
                     ignore_init_module_imports: None,
                     line_length: None,
@@ -279,7 +284,6 @@ select = ["E501"]
                     show_source: None,
                     src: None,
                     target_version: None,
-                    format: None,
                     unfixable: None,
                     flake8_annotations: None,
                     flake8_bugbear: None,
@@ -318,6 +322,8 @@ ignore = ["E501"]
                     external: None,
                     fix: None,
                     fixable: None,
+                    force_exclude: None,
+                    format: None,
                     ignore: Some(vec![CheckCodePrefix::E501]),
                     ignore_init_module_imports: None,
                     line_length: None,
@@ -327,7 +333,6 @@ ignore = ["E501"]
                     show_source: None,
                     src: None,
                     target_version: None,
-                    format: None,
                     unfixable: None,
                     flake8_annotations: None,
                     flake8_bugbear: None,
@@ -408,6 +413,7 @@ other-attribute = 1
                 extend_ignore: None,
                 fixable: None,
                 format: None,
+                force_exclude: None,
                 unfixable: None,
                 per_file_ignores: Some(FxHashMap::from_iter([(
                     "__init__.py".to_string(),

tests/integration_test.rs

@@ -55,12 +55,33 @@ fn test_stdin_json() -> Result<()> {
         .failure();
     assert_eq!(
         str::from_utf8(&output.get_output().stdout)?,
-        "[\n  {\n    \"code\": \"F401\",\n    \"message\": \"`os` imported but unused\",\n    \
-         \"fix\": {\n      \"content\": \"\",\n      \"location\": {\n        \"row\": 1,\n        \
-         \"column\": 0\n      },\n      \"end_location\": {\n        \"row\": 2,\n        \
-         \"column\": 0\n      }\n    },\n    \"location\": {\n      \"row\": 1,\n      \
-         \"column\": 8\n    },\n    \"end_location\": {\n      \"row\": 1,\n      \"column\": \
-         10\n    },\n    \"filename\": \"F401.py\"\n  }\n]\n"
+        r#"[
+  {
+    "code": "F401",
+    "message": "`os` imported but unused",
+    "fix": {
+      "content": "",
+      "location": {
+        "row": 1,
+        "column": 0
+      },
+      "end_location": {
+        "row": 2,
+        "column": 0
+      }
+    },
+    "location": {
+      "row": 1,
+      "column": 8
+    },
+    "end_location": {
+      "row": 1,
+      "column": 10
+    },
+    "filename": "F401.py"
+  }
+]
+"#
     );
     Ok(())
 }