Formatter: Show preceding, following and enclosing of comments

**Summary** I used to always add `dbg!` for preceding, following and enclosing. With this change `--print-comments` can do this instead.
```python
import re  # import

def to_camel_case(node: str) -> str:
    """Converts PascalCase to camel_case"""
    return re.sub("([A-Z])", r"_\1", node).lower().lstrip("_")

# a
if True:
    pass  # b
else:
    print()
```
Debug output:
```
11..19 Some((StmtImport, 0..9)) Some((StmtFunctionDef, 22..165)) (ModModule, 0..213) "# import"
168..171 Some((StmtFunctionDef, 22..165)) Some((StmtIf, 172..212)) (ModModule, 0..213) "# a"
191..194 Some((StmtPass, 185..189)) Some((ElifElseClause, 195..212)) (StmtIf, 172..212) "# b"
```

**Test Plan** n/a

.github/workflows/ci.yaml

@@ -42,7 +42,7 @@ jobs:
               - "!crates/ruff_formatter/**"
               - "!crates/ruff_dev/**"
               - "!crates/ruff_shrinking/**"
-              - scripts/*
+              - scripts/check_ecosystem.py
 
             formatter:
               - Cargo.toml
@@ -56,7 +56,6 @@ jobs:
               - crates/ruff_text_size/**
               - crates/ruff_python_parser/**
               - crates/ruff_dev/**
-              - scripts/*
 
   cargo-fmt:
     name: "cargo fmt"
@@ -328,7 +327,7 @@ jobs:
     name: "Formatter ecosystem and progress checks"
     runs-on: ubuntu-latest
     needs: determine_changes
-    if: needs.determine_changes.outputs.formatter == 'true' || github.ref == 'refs/heads/main'
+    if: needs.determine_changes.outputs.formatter == 'true'
     steps:
       - uses: actions/checkout@v3
       - name: "Install Rust toolchain"
@@ -338,6 +337,9 @@ jobs:
       - name: "Formatter progress"
         run: scripts/formatter_ecosystem_checks.sh
       - name: "Github step summary"
-        run: cat target/progress_projects_stats.txt > $GITHUB_STEP_SUMMARY
-      - name: "Remove checkouts from cache"
-        run: rm -r target/progress_projects
+        run: grep "similarity index" target/progress_projects_log.txt | sort > $GITHUB_STEP_SUMMARY
+      # CPython is not black formatted, so we run only the stability check
+      - name: "Clone CPython 3.10"
+        run: git clone --branch 3.10 --depth 1 https://github.com/python/cpython.git crates/ruff/resources/test/cpython
+      - name: "Check CPython stability"
+        run: cargo run --bin ruff_dev -- format-dev --stability-check crates/ruff/resources/test/cpython

.github/workflows/docs.yaml

@@ -40,7 +40,7 @@ jobs:
         run: mkdocs build --strict -f mkdocs.generated.yml
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.0
+        uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

.github/workflows/playground.yaml

@@ -40,7 +40,7 @@ jobs:
         working-directory: playground
       - name: "Deploy to Cloudflare Pages"
         if: ${{ env.CF_API_TOKEN_EXISTS == 'true' }}
-        uses: cloudflare/wrangler-action@v3.1.0
+        uses: cloudflare/wrangler-action@2.0.0
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
           accountId: ${{ secrets.CF_ACCOUNT_ID }}

BREAKING_CHANGES.md

@@ -1,15 +1,5 @@
 # Breaking Changes
 
-## 0.0.283 / 0.284
-
-### The target Python version now defaults to 3.8 instead of 3.10 ([#6397](https://github.com/astral-sh/ruff/pull/6397))
-
-Previously, when a target Python version was not specified, Ruff would use a default of Python 3.10. However, it is safer to default to an _older_ Python version to avoid assuming the availability of new features. We now default to the oldest supported Python version which is currently Python 3.8.
-
-(We still support Python 3.7 but since [it has reached EOL](https://devguide.python.org/versions/#unsupported-versions) we've decided not to make it the default here.)
-
-Note this change was announced in 0.0.283 but not active until 0.0.284.
-
 ## 0.0.277
 
 ### `.ipynb_checkpoints`, `.pyenv`, `.pytest_cache`, and `.vscode` are now excluded by default ([#5513](https://github.com/astral-sh/ruff/pull/5513))

CONTRIBUTING.md

@@ -131,6 +131,7 @@ At time of writing, the repository includes the following crates:
 - `crates/ruff_macros`: proc macro crate containing macros used by Ruff.
 - `crates/ruff_python_ast`: library crate containing Python-specific AST types and utilities.
 - `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
+- `crates/ruff_python_codegen`: library crate containing utilities for generating Python source code.
 - `crates/ruff_python_formatter`: library crate implementing the Python formatter. Emits an
     intermediate representation for each node, which `ruff_formatter` prints based on the configured
     line length.
@@ -571,7 +572,7 @@ An alternative is to convert the perf data to `flamegraph.svg` using
 [flamegraph](https://github.com/flamegraph-rs/flamegraph) (`cargo install flamegraph`):
 
 ```shell
-flamegraph --perfdata perf.data --no-inline
+flamegraph --perfdata perf.data
 ```
 
 #### Mac

Cargo.lock

@@ -14,18 +14,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "ahash"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
-dependencies = [
- "cfg-if",
- "getrandom",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.20"
@@ -812,7 +800,7 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flake8-to-ruff"
-version = "0.0.285"
+version = "0.0.282"
 dependencies = [
  "anyhow",
  "clap",
@@ -1003,16 +991,6 @@ dependencies = [
  "winapi-util",
 ]
 
-[[package]]
-name = "imara-diff"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e98c1d0ad70fc91b8b9654b1f33db55e59579d3b3de2bffdced0fdb810570cb8"
-dependencies = [
- "ahash",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "imperative"
 version = "1.0.4"
@@ -2064,7 +2042,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.0.285"
+version = "0.0.282"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2141,7 +2119,6 @@ dependencies = [
  "ruff",
  "ruff_python_ast",
  "ruff_python_formatter",
- "ruff_python_index",
  "ruff_python_parser",
  "serde",
  "serde_json",
@@ -2164,7 +2141,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_cli"
-version = "0.0.285"
+version = "0.0.282"
 dependencies = [
  "annotate-snippets 0.9.1",
  "anyhow",
@@ -2220,7 +2197,6 @@ dependencies = [
  "anyhow",
  "clap",
  "ignore",
- "imara-diff",
  "indicatif",
  "indoc",
  "itertools",
@@ -2354,7 +2330,6 @@ dependencies = [
  "similar",
  "smallvec",
  "thiserror",
- "unicode-width",
 ]
 
 [[package]]
@@ -2378,6 +2353,7 @@ dependencies = [
  "is-macro",
  "itertools",
  "lexical-parse-float",
+ "num-bigint",
  "num-traits",
  "rand",
  "unic-ucd-category",
@@ -2399,7 +2375,6 @@ dependencies = [
  "ruff_text_size",
  "rustc-hash",
  "static_assertions",
- "test-case",
  "tiny-keccak",
  "unic-emoji-char",
  "unic-ucd-ident",
@@ -2425,7 +2400,6 @@ dependencies = [
  "num-traits",
  "ruff_index",
  "ruff_python_ast",
- "ruff_python_parser",
  "ruff_python_stdlib",
  "ruff_source_file",
  "ruff_text_size",

Cargo.toml

@@ -49,7 +49,6 @@ toml = { version = "0.7.2" }
 tracing = "0.1.37"
 tracing-indicatif = "0.3.4"
 tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-unicode-width = "0.1.10"
 wsl = { version = "0.1.0" }
 
 # v1.0.1

README.md

@@ -30,7 +30,7 @@ An extremely fast Python linter, written in Rust.
 - 🤝 Python 3.11 compatibility
 - 📦 Built-in caching, to avoid re-analyzing unchanged files
 - 🔧 Autofix support, for automatic error correction (e.g., automatically remove unused imports)
-- 📏 Over [600 built-in rules](https://beta.ruff.rs/docs/rules/)
+- 📏 Over [500 built-in rules](https://beta.ruff.rs/docs/rules/)
 - ⚖️ [Near-parity](https://beta.ruff.rs/docs/faq/#how-does-ruff-compare-to-flake8) with the
     built-in Flake8 rule set
 - 🔌 Native re-implementations of dozens of Flake8 plugins, like flake8-bugbear
@@ -140,7 +140,7 @@ Ruff can also be used as a [pre-commit](https://pre-commit.com) hook:
 ```yaml
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.0.285
+  rev: v0.0.282
   hooks:
     - id: ruff
 ```
@@ -211,8 +211,8 @@ line-length = 88
 # Allow unused variables when underscore-prefixed.
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
-# Assume Python 3.8
-target-version = "py38"
+# Assume Python 3.10.
+target-version = "py310"
 
 [tool.ruff.mccabe]
 # Unlike Flake8, default to a complexity level of 10.
@@ -233,7 +233,7 @@ linting command.
 
 <!-- Begin section: Rules -->
 
-**Ruff supports over 600 lint rules**, many of which are inspired by popular tools like Flake8,
+**Ruff supports over 500 lint rules**, many of which are inspired by popular tools like Flake8,
 isort, pyupgrade, and others. Regardless of the rule's origin, Ruff re-implements every rule in
 Rust as a first-party feature.
 

crates/flake8_to_ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.285"
+version = "0.0.282"
 description = """
 Convert Flake8 configuration files to Ruff configuration files.
 """

crates/ruff/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ruff"
-version = "0.0.285"
+version = "0.0.282"
 publish = false
 authors = { workspace = true }
 edition = { workspace = true }
@@ -62,6 +62,8 @@ quick-junit = { version = "0.3.2" }
 regex = { workspace = true }
 result-like = { version = "0.4.6" }
 rustc-hash = { workspace = true }
+
+
 schemars = { workspace = true, optional = true }
 semver = { version = "1.0.16" }
 serde = { workspace = true }
@@ -75,7 +77,7 @@ strum_macros = { workspace = true }
 thiserror = { version = "1.0.43" }
 toml = { workspace = true }
 typed-arena = { version = "2.0.2" }
-unicode-width = { workspace = true }
+unicode-width = { version = "0.1.10" }
 unicode_names2 = { version = "0.6.0", git = "https://github.com/youknowone/unicode_names2.git", rev = "4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" }
 wsl = { version = "0.1.0" }
 

crates/ruff/resources/test/fixtures/flake8_annotations/annotation_presence.py

@@ -152,9 +152,3 @@ def f(a: Union[str, bytes, Any]) -> None: ...
 def f(a: Optional[Any]) -> None: ...
 def f(a: Annotated[Any, ...]) -> None: ...
 def f(a: "Union[str, bytes, Any]") -> None: ...
-
-
-class Foo:
-    @decorator()
-    def __init__(self: "Foo", foo: int):
-       ...

crates/ruff/resources/test/fixtures/flake8_bandit/S108.py

@@ -14,19 +14,3 @@ with open("/dev/shm/unit/test", "w") as f:
 # not ok by config
 with open("/foo/bar", "w") as f:
     f.write("def")
-
-# Using `tempfile` module should be ok
-import tempfile
-from tempfile import TemporaryDirectory
-
-with tempfile.NamedTemporaryFile(dir="/tmp") as f:
-    f.write(b"def")
-
-with tempfile.NamedTemporaryFile(dir="/var/tmp") as f:
-    f.write(b"def")
-
-with tempfile.TemporaryDirectory(dir="/dev/shm") as d:
-    pass
-
-with TemporaryDirectory(dir="/tmp") as d:
-    pass

crates/ruff/resources/test/fixtures/flake8_boolean_trap/FBT.py

@@ -69,7 +69,6 @@ g_action.set_enabled(True)
 settings.set_enable_developer_extras(True)
 foo.is_(True)
 bar.is_not(False)
-next(iter([]), False)
 
 class Registry:
     def __init__(self) -> None:

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_B008.py

@@ -68,20 +68,6 @@ def this_is_also_wrong(value={}):
     ...
 
 
-class Foo:
-    @staticmethod
-    def this_is_also_wrong_and_more_indented(value={}):
-        pass
-
-
-def multiline_arg_wrong(value={
-
-}):
-    ...
-
-def single_line_func_wrong(value = {}): ...
-
-
 def and_this(value=set()):
     ...
 
@@ -254,16 +240,12 @@ def foo(f=lambda x: print(x)):
 
 from collections import abc
 from typing import Annotated, Dict, Optional, Sequence, Union, Set
-import typing_extensions
 
 
 def immutable_annotations(
     a: Sequence[int] | None = [],
     b: Optional[abc.Mapping[int, int]] = {},
     c: Annotated[Union[abc.Set[str], abc.Sized], "annotation"] = set(),
-    d: typing_extensions.Annotated[
-        Union[abc.Set[str], abc.Sized], "annotation"
-    ] = set(),
 ):
     pass
 
@@ -272,35 +254,5 @@ def mutable_annotations(
     a: list[int] | None = [],
     b: Optional[Dict[int, int]] = {},
     c: Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
-    d: typing_extensions.Annotated[Union[Set[str], abc.Sized], "annotation"] = set(),
 ):
     pass
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""
-    ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""; ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {}):
-    """Docstring"""; \
-        ...
-
-
-def single_line_func_wrong(value: dict[str, str] = {
-    # This is a comment
-}):
-    """Docstring"""
-
-
-def single_line_func_wrong(value: dict[str, str] = {}) \
-    : \
-    """Docstring"""

crates/ruff/resources/test/fixtures/flake8_bugbear/B006_extended.py

@@ -1,18 +0,0 @@
-import custom
-from custom import ImmutableTypeB
-
-
-def okay(foo: ImmutableTypeB = []):
-    ...
-
-
-def okay(foo: custom.ImmutableTypeA = []):
-    ...
-
-
-def okay(foo: custom.ImmutableTypeB = []):
-    ...
-
-
-def error_due_to_missing_import(foo: ImmutableTypeA = []):
-    ...

crates/ruff/resources/test/fixtures/flake8_bugbear/B014.py

@@ -74,10 +74,3 @@ try:
 except (ValueError, binascii.Error):
     # binascii.Error is a subclass of ValueError.
     pass
-
-
-# https://github.com/astral-sh/ruff/issues/6412
-try:
-    pass
-except (ValueError, ValueError, TypeError):
-    pass

crates/ruff/resources/test/fixtures/flake8_comprehensions/C414.py

@@ -22,10 +22,6 @@ tuple(
         "o"]
     )
 )
-set(set())
-set(list())
-set(tuple())
-sorted(reversed())
 
 # Nested sorts with differing keyword arguments. Not flagged.
 sorted(sorted(x, key=lambda y: y))

crates/ruff/resources/test/fixtures/flake8_comprehensions/C417.py

@@ -15,6 +15,11 @@ filter(func, map(lambda v: v, nums))
 _ = f"{set(map(lambda x: x % 2 == 0, nums))}"
 _ = f"{dict(map(lambda v: (v, v**2), nums))}"
 
+# Error, but unfixable.
+# For simple expressions, this could be: `(x if x else 1 for x in nums)`.
+# For more complex expressions, this would differ: `(x + 2 if x else 3 for x in nums)`.
+map(lambda x=1: x, nums)
+
 # False negatives.
 map(lambda x=2, y=1: x + y, nums, nums)
 set(map(lambda x, y: x, nums, nums))
@@ -32,8 +37,3 @@ map(lambda x: lambda: x, range(4))
 
 # Error: the `x` is overridden by the inner lambda.
 map(lambda x: lambda x: x, range(4))
-
-# Ok because of the default parameters, and variadic arguments.
-map(lambda x=1: x, nums)
-map(lambda *args: len(args), range(4))
-map(lambda **kwargs: len(kwargs), range(4))

crates/ruff/resources/test/fixtures/flake8_import_conventions/defaults.py

@@ -1,31 +1,22 @@
-def not_checked():
-    import math
+import math  # not checked
 
+import altair  # unconventional
+import matplotlib.pyplot  # unconventional
+import numpy  # unconventional
+import pandas  # unconventional
+import seaborn  # unconventional
+import tkinter  # unconventional
 
-def unconventional():
-    import altair
-    import matplotlib.pyplot
-    import numpy
-    import pandas
-    import seaborn
-    import tkinter
-    import networkx
+import altair as altr  # unconventional
+import matplotlib.pyplot as plot  # unconventional
+import numpy as nmp  # unconventional
+import pandas as pdas  # unconventional
+import seaborn as sbrn  # unconventional
+import tkinter as tkr  # unconventional
 
-
-def unconventional_aliases():
-    import altair as altr
-    import matplotlib.pyplot as plot
-    import numpy as nmp
-    import pandas as pdas
-    import seaborn as sbrn
-    import tkinter as tkr
-    import networkx as nxy
-
-def conventional_aliases():
-    import altair as alt
-    import matplotlib.pyplot as plt
-    import numpy as np
-    import pandas as pd
-    import seaborn as sns
-    import tkinter as tk
-    import networkx as nx
+import altair as alt  # conventional
+import matplotlib.pyplot as plt  # conventional
+import numpy as np  # conventional
+import pandas as pd  # conventional
+import seaborn as sns  # conventional
+import tkinter as tk  # conventional

crates/ruff/resources/test/fixtures/flake8_logging_format/G004.py

@@ -3,6 +3,3 @@ import logging
 name = "world"
 logging.info(f"Hello {name}")
 logging.log(logging.INFO, f"Hello {name}")
-
-_LOGGER = logging.getLogger()
-_LOGGER.info(f"{__name__}")

crates/ruff/resources/test/fixtures/flake8_pie/PIE808.py

@@ -1,13 +0,0 @@
-# PIE808
-range(0, 10)
-
-# OK
-range(x, 10)
-range(-15, 10)
-range(10)
-range(0)
-range(0, 10, x)
-range(0, 10, 1)
-range(0, 10, step=1)
-range(start=0, stop=10)
-range(0, stop=10)

crates/ruff/resources/test/fixtures/flake8_pyi/PYI016.py

@@ -1,19 +1,20 @@
-import typing
-
 # Shouldn't affect non-union field types.
 field1: str
 
 # Should emit for duplicate field types.
 field2: str | str  # PYI016: Duplicate union member `str`
 
+
 # Should emit for union types in arguments.
 def func1(arg1: int | int):  # PYI016: Duplicate union member `int`
     print(arg1)
 
+
 # Should emit for unions in return types.
 def func2() -> str | str:  # PYI016: Duplicate union member `str`
     return "my string"
 
+
 # Should emit in longer unions, even if not directly adjacent.
 field3: str | str | int  # PYI016: Duplicate union member `str`
 field4: int | int | str  # PYI016: Duplicate union member `int`
@@ -32,55 +33,3 @@ field10: (str | int) | str  # PYI016: Duplicate union member `str`
 
 # Should emit for nested unions.
 field11: dict[int | int, str]
-
-# Should emit for unions with more than two cases
-field12: int | int | int  # Error
-field13: int | int | int | int  # Error
-
-# Should emit for unions with more than two cases, even if not directly adjacent
-field14: int | int | str | int  # Error
-
-# Should emit for duplicate literal types; also covered by PYI030
-field15: typing.Literal[1] | typing.Literal[1]  # Error
-
-# Shouldn't emit if in new parent type
-field16: int | dict[int, str]  # OK
-
-# Shouldn't emit if not in a union parent
-field17: dict[int, int]  # OK
-
-# Should emit in cases with newlines
-field18: typing.Union[
-    set[
-        int  # foo
-    ],
-    set[
-        int  # bar
-    ],
-]  # Error, newline and comment will not be emitted in message
-
-# Should emit in cases with `typing.Union` instead of `|`
-field19: typing.Union[int, int]  # Error
-
-# Should emit in cases with nested `typing.Union`
-field20: typing.Union[int, typing.Union[int, str]]  # Error
-
-# Should emit in cases with mixed `typing.Union` and `|`
-field21: typing.Union[int, int | str]  # Error
-
-# Should emit only once in cases with multiple nested `typing.Union`
-field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
-
-# Should emit in cases with newlines
-field23: set[  # foo
-    int] | set[int]
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`

crates/ruff/resources/test/fixtures/flake8_pyi/PYI016.pyi

@@ -74,13 +74,3 @@ field22: typing.Union[int, typing.Union[int, typing.Union[int, int]]]  # Error
 # Should emit in cases with newlines
 field23: set[  # foo
     int] | set[int]
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field24: typing.Union[int, typing.Union[int, int]]  # PYI016: Duplicate union member `int`
-
-# Should emit twice (once for each `int` in the nested union, both of which are
-# duplicates of the outer `int`), but not three times (which would indicate that
-# we incorrectly re-checked the nested union).
-field25: typing.Union[int, int | int]  # PYI016: Duplicate union member `int`

crates/ruff/resources/test/fixtures/flake8_pyi/PYI019.py

@@ -14,10 +14,6 @@ class BadClass:
     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
 
 
-    @classmethod
-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-
-
     @classmethod
     def excluded_edge_case(cls: Type[_S], arg: int) -> _S: ...  # Ok
 

crates/ruff/resources/test/fixtures/flake8_pyi/PYI019.pyi

@@ -14,10 +14,6 @@ class BadClass:
     def bad_class_method(cls: type[_S], arg: int) -> _S: ...  # PYI019
 
 
-    @classmethod
-    def bad_posonly_class_method(cls: type[_S], /) -> _S: ...  # PYI019
-
-
     @classmethod
     def excluded_edge_case(cls: Type[_S], arg: int) -> _S: ...  # Ok
 

crates/ruff/resources/test/fixtures/flake8_pyi/PYI055.py

@@ -1,6 +1,7 @@
 import builtins
 from typing import Union
 
+
 w: builtins.type[int] | builtins.type[str] | builtins.type[complex]
 x: type[int] | type[str] | type[float]
 y: builtins.type[int] | type[str] | builtins.type[complex]
@@ -8,9 +9,7 @@ z: Union[type[float], type[complex]]
 z: Union[type[float, int], type[complex]]
 
 
-def func(arg: type[int] | str | type[float]) -> None:
-    ...
-
+def func(arg: type[int] | str | type[float]) -> None: ...
 
 # OK
 x: type[int, str, float]
@@ -18,14 +17,4 @@ y: builtins.type[int, str, complex]
 z: Union[float, complex]
 
 
-def func(arg: type[int, float] | str) -> None:
-    ...
-
-
-# OK
-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
-
-
-def func():
-    # PYI055
-    item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
+def func(arg: type[int, float] | str) -> None: ...

crates/ruff/resources/test/fixtures/flake8_pyi/PYI055.pyi

@@ -1,12 +1,14 @@
 import builtins
 from typing import Union
 
+
 w: builtins.type[int] | builtins.type[str] | builtins.type[complex]
 x: type[int] | type[str] | type[float]
 y: builtins.type[int] | type[str] | builtins.type[complex]
 z: Union[type[float], type[complex]]
 z: Union[type[float, int], type[complex]]
 
+
 def func(arg: type[int] | str | type[float]) -> None: ...
 
 # OK
@@ -14,11 +16,5 @@ x: type[int, str, float]
 y: builtins.type[int, str, complex]
 z: Union[float, complex]
 
+
 def func(arg: type[int, float] | str) -> None: ...
-
-# OK
-item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker
-
-def func():
-    # PYI055
-    item: type[requests_mock.Mocker] | type[httpretty] = requests_mock.Mocker

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT006.py

@@ -64,8 +64,3 @@ def test_implicit_str_concat_no_parens(param1, param2, param3):
 @pytest.mark.parametrize((("param1, " "param2, " "param3")), [(1, 2, 3), (4, 5, 6)])
 def test_implicit_str_concat_with_multi_parens(param1, param2, param3):
     ...
-
-
-@pytest.mark.parametrize(("param1,param2"), [(1, 2), (3, 4)])
-def test_csv_with_parens(param1, param2):
-    ...

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT009.py

@@ -80,15 +80,3 @@ class Test(unittest.TestCase):
 
     def test_assert_not_regexp_matches(self):
         self.assertNotRegex("abc", r"abc")  # Error
-
-    def test_fail_if(self):
-        self.failIf("abc")  # Error
-
-    def test_fail_unless(self):
-        self.failUnless("abc")  # Error
-
-    def test_fail_unless_equal(self):
-        self.failUnlessEqual(1, 2)  # Error
-
-    def test_fail_if_equal(self):
-        self.failIfEqual(1, 2)  # Error

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT011.py

@@ -1,4 +1,3 @@
-from pickle import PicklingError, UnpicklingError
 import socket
 
 import pytest
@@ -21,12 +20,6 @@ def test_error_no_argument_given():
     with pytest.raises(socket.error):
         raise ValueError("Can't divide 1 by 0")
 
-    with pytest.raises(PicklingError):
-        raise PicklingError("Can't pickle")
-
-    with pytest.raises(UnpicklingError):
-        raise UnpicklingError("Can't unpickle")
-
 
 def test_error_match_is_empty():
     with pytest.raises(ValueError, match=None):

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT014.py

@@ -1,53 +0,0 @@
-import pytest
-
-
-@pytest.mark.parametrize("x", [1, 1, 2])
-def test_error_literal(x):
-    ...
-
-
-a = 1
-b = 2
-c = 3
-
-
-@pytest.mark.parametrize("x", [a, a, b, b, b, c])
-def test_error_expr_simple(x):
-    ...
-
-
-@pytest.mark.parametrize(
-    "x",
-    [
-        (a, b),
-        # comment
-        (a, b),
-        (b, c),
-    ],
-)
-def test_error_expr_complex(x):
-    ...
-
-
-@pytest.mark.parametrize("x", [a, b, (a), c, ((a))])
-def test_error_parentheses(x):
-    ...
-
-
-@pytest.mark.parametrize(
-    "x",
-    [
-        a,
-        b,
-        (a),
-        c,
-        ((a)),
-    ],
-)
-def test_error_parentheses_trailing_comma(x):
-    ...
-
-
-@pytest.mark.parametrize("x", [1, 2])
-def test_ok(x):
-    ...

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT018.py

@@ -43,12 +43,3 @@ message
 assert something  # OK
 assert something and something_else  # Error
 assert something and something_else and something_third  # Error
-
-
-def test_multiline():
-    assert something and something_else; x = 1
-
-    x = 1; assert something and something_else
-
-    x = 1; \
-        assert something and something_else

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT027_0.py

@@ -1,48 +0,0 @@
-import unittest
-
-
-class Test(unittest.TestCase):
-    def test_errors(self):
-        with self.assertRaises(ValueError):
-            raise ValueError
-        with self.assertRaises(expected_exception=ValueError):
-            raise ValueError
-
-        with self.failUnlessRaises(ValueError):
-            raise ValueError
-
-        with self.assertRaisesRegex(ValueError, "test"):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(ValueError, expected_regex="test"):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(
-            expected_exception=ValueError, expected_regex="test"
-        ):
-            raise ValueError("test")
-
-        with self.assertRaisesRegex(
-            expected_regex="test", expected_exception=ValueError
-        ):
-            raise ValueError("test")
-
-        with self.assertRaisesRegexp(ValueError, "test"):
-            raise ValueError("test")
-
-    def test_unfixable_errors(self):
-        with self.assertRaises(ValueError, msg="msg"):
-            raise ValueError
-
-        with self.assertRaises(
-            # comment
-            ValueError
-        ):
-            raise ValueError
-
-        with (
-            self
-            # comment
-            .assertRaises(ValueError)
-        ):
-            raise ValueError

crates/ruff/resources/test/fixtures/flake8_pytest_style/PT027_1.py

@@ -1,12 +0,0 @@
-import unittest
-import pytest
-
-
-class Test(unittest.TestCase):
-    def test_pytest_raises(self):
-        with pytest.raises(ValueError):
-            raise ValueError
-
-    def test_errors(self):
-        with self.assertRaises(ValueError):
-            raise ValueError

crates/ruff/resources/test/fixtures/flake8_raise/RSE102.py

@@ -19,20 +19,11 @@ raise TypeError ()
 raise TypeError \
     ()
 
-# RSE102
-raise TypeError \
-    ();
-
 # RSE102
 raise TypeError(
 
 )
 
-# RSE102
-raise (TypeError) (
-
-)
-
 # RSE102
 raise TypeError(
     # Hello, world!
@@ -61,10 +52,3 @@ class Class:
 
 # OK
 raise Class.error()
-
-
-import ctypes
-
-
-# OK
-raise ctypes.WinError(1)

crates/ruff/resources/test/fixtures/flake8_return/RET503.py

@@ -320,9 +320,3 @@ def end_of_statement():
         if True:
             return "" \
                 ;  # type: ignore
-
-
-def end_of_file():
-    if False:
-        return 1
-    x = 2 \

crates/ruff/resources/test/fixtures/flake8_self/SLF001.py

@@ -73,7 +73,3 @@ print(foo.__dict__)
 print(foo.__str__())
 print(foo().__class__)
 print(foo._asdict())
-
-import os
-
-os._exit()

crates/ruff/resources/test/fixtures/flake8_simplify/SIM118.py

@@ -31,8 +31,6 @@ for key in list(obj.keys()):
 
 key in (obj or {}).keys()  # SIM118
 
-(key) in (obj or {}).keys()  # SIM118
-
 from typing import KeysView
 
 

crates/ruff/resources/test/fixtures/flake8_tidy_imports/TID253.py

@@ -1,31 +0,0 @@
-## Banned modules ##
-import torch
-
-from torch import *
-
-from tensorflow import a, b, c
-
-import torch as torch_wearing_a_trenchcoat
-
-# this should count as module level
-x = 1; import tensorflow
-
-# banning a module also bans any submodules
-import torch.foo.bar
-
-from tensorflow.foo import bar
-
-from torch.foo.bar import *
-
-# unlike TID251, inline imports are *not* banned
-def my_cool_function():
-    import tensorflow.foo.bar
-
-def another_cool_function():
-    from torch.foo import bar
-
-def import_alias():
-    from torch.foo import bar
-
-if TYPE_CHECKING:
-    import torch

crates/ruff/resources/test/fixtures/flake8_type_checking/runtime_evaluated_base_classes_4.py

@@ -1,12 +0,0 @@
-from __future__ import annotations
-
-from datetime import date
-
-from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
-
-
-class Birthday(DeclarativeBase):
-
-    __tablename__ = "birthday"
-    id: Mapped[int] = mapped_column(primary_key=True)
-    day: Mapped[date]

crates/ruff/resources/test/fixtures/flake8_unused_arguments/ARG.py

@@ -27,8 +27,6 @@ def f(cls, x):
 ###
 lambda x: print("Hello, world!")
 
-lambda: print("Hello, world!")
-
 
 class C:
     ###
@@ -204,14 +202,3 @@ class C:
 ###
 def f(x: None) -> None:
     _ = cast(Any, _identity)(x=x)
-
-###
-# Unused arguments with `locals`.
-###
-def f(bar: str):
-    print(locals())
-
-
-class C:
-    def __init__(self, x) -> None:
-        print(locals())

crates/ruff/resources/test/fixtures/isort/required_imports/comments_and_newlines.py

@@ -1,6 +0,0 @@
-#!/usr/bin/env python3
-# A copyright notice could go here
-
-# A linter directive could go here
-
-x = 1

crates/ruff/resources/test/fixtures/jupyter/cell/cell_magic.json

@@ -1,8 +0,0 @@
-{
-  "execution_count": null,
-  "cell_type": "code",
-  "id": "1",
-  "metadata": {},
-  "outputs": [],
-  "source": ["%%timeit\n", "print('hello world')"]
-}

crates/ruff/resources/test/fixtures/jupyter/ipy_escape_command.ipynb

@@ -1,52 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "eab4754a-d6df-4b41-8ee8-7e23aef440f9",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import math\n",
-    "\n",
-    "%matplotlib inline\n",
-    "\n",
-    "import os\n",
-    "\n",
-    "_ = math.pi"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "2b0e2986-1b87-4bb6-9b1d-c11ca1decd87",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%%timeit\n",
-    "import sys"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff)",
-   "language": "python",
-   "name": "ruff"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

crates/ruff/resources/test/fixtures/jupyter/ipy_escape_command_expected.ipynb

@@ -1,51 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "cad32845-44f9-4a53-8b8c-a6b1bb3f3378",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import math\n",
-    "\n",
-    "%matplotlib inline\n",
-    "\n",
-    "\n",
-    "_ = math.pi"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "d7b8e967-8b4a-493b-b6f7-d5cecfb3a5c3",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "%%timeit\n",
-    "import sys"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff)",
-   "language": "python",
-   "name": "ruff"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

crates/ruff/resources/test/fixtures/jupyter/isort.ipynb

@@ -25,23 +25,6 @@
     "def foo():\n",
     "    pass"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "16214f6f-bb32-4594-81be-79fb27c6ec92",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from pathlib import Path\n",
-    "import sys\n",
-    "\n",
-    "%matplotlib \\\n",
-    "    --inline\n",
-    "\n",
-    "import math\n",
-    "import abc"
-   ]
   }
  ],
  "metadata": {

crates/ruff/resources/test/fixtures/jupyter/isort_expected.ipynb

@@ -27,23 +27,6 @@
     "def foo():\n",
     "    pass"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6d6c55c6-4a34-4662-914b-4ee11c9c24a5",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "import sys\n",
-    "from pathlib import Path\n",
-    "\n",
-    "%matplotlib \\\n",
-    "    --inline\n",
-    "\n",
-    "import abc\n",
-    "import math"
-   ]
   }
  ],
  "metadata": {

crates/ruff/resources/test/fixtures/jupyter/unused_variable.ipynb

@@ -1,49 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "a0efffbc-85f1-4513-bf49-5387ec3a2a4e",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def f():\n",
-    "    foo1 = %matplotlib --list\n",
-    "    foo2: list[str] = %matplotlib --list"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "6e0b2b50-43f2-4f59-951d-9404dd560ae4",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def f():\n",
-    "    bar1 = !pwd\n",
-    "    bar2: str = !pwd"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff)",
-   "language": "python",
-   "name": "ruff"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

crates/ruff/resources/test/fixtures/jupyter/unused_variable_expected.ipynb

@@ -1,49 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "24426ef2-046c-453e-b809-05b56e7355e0",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def f():\n",
-    "    %matplotlib --list\n",
-    "    %matplotlib --list"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "3d98fdae-b86b-476e-b4db-9d3ce5562682",
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def f():\n",
-    "    !pwd\n",
-    "    !pwd"
-   ]
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Python (ruff)",
-   "language": "python",
-   "name": "ruff"
-  },
-  "language_info": {
-   "codemirror_mode": {
-    "name": "ipython",
-    "version": 3
-   },
-   "file_extension": ".py",
-   "mimetype": "text/x-python",
-   "name": "python",
-   "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
-   "version": "3.11.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 5
-}

crates/ruff/resources/test/fixtures/perflint/PERF203.py

@@ -21,29 +21,3 @@ while i < 10:
         print("error")
 
     i += 1
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        break
-    except:
-        print("error")
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        continue
-    except:
-        print("error")
-
-
-# OK - no other way to write this
-for i in range(10):
-    try:
-        print(f"{i}")
-        if i > 0:
-            break
-    except:
-        print("error")

crates/ruff/resources/test/fixtures/pycodestyle/E23.py

@@ -28,6 +28,3 @@ mdtypes_template = {
     'tag_full': [('mdtype', 'u4'), ('byte_count', 'u4')],
     'tag_smalldata':[('byte_count_mdtype', 'u4'), ('data', 'S4')],
 }
-
-#: Okay
-a = (1,

crates/ruff/resources/test/fixtures/pycodestyle/E402.py

@@ -30,10 +30,3 @@ def foo() -> None:
 
 if __name__ == "__main__":
     import g
-
-import h; import i
-
-
-if __name__ == "__main__":
-    import j; \
-import k

crates/ruff/resources/test/fixtures/pycodestyle/E501_2.py

@@ -1,16 +1,11 @@
-# aaaa
-# aaaaa
-    # a
-	# a
-	# aa
-	# aaa
-	# aaaa
-		# a
-		# aa
-		# aaa
+a = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+a	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
 
-if True: # noqa: E501
-	[12]
-	[12 ]
-	[1,2]
-	[1, 2]
+b = """ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+b	=	"""ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+c   =   """2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+c	=	"""2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+
+d       =       """💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""
+d	=	"""💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A67ß9💣2ℝ4A6"""

crates/ruff/resources/test/fixtures/pycodestyle/E712.py

@@ -25,12 +25,6 @@ if (True) == TrueElement or x == TrueElement:
 if res == True != False:
     pass
 
-if(True) == TrueElement or x == TrueElement:
-    pass
-
-if (yield i) == True:
-      print("even")
-
 #: Okay
 if x not in y:
     pass

crates/ruff/resources/test/fixtures/pycodestyle/E721.py

@@ -61,30 +61,3 @@ if x == types.X:
 
 #: E721
 assert type(res) is int
-
-
-class Foo:
-    def asdf(self, value: str | None):
-        #: E721
-        if type(value) is str:
-            ...
-
-
-class Foo:
-    def type(self):
-        pass
-
-    def asdf(self, value: str | None):
-        #: E721
-        if type(value) is str:
-            ...
-
-
-class Foo:
-    def asdf(self, value: str | None):
-        def type():
-            pass
-
-        # Okay
-        if type(value) is str:
-            ...

crates/ruff/resources/test/fixtures/pycodestyle/E731.py

@@ -133,8 +133,3 @@ def scope():
     from collections.abc import Callable
 
     f: Callable[[str, int, list[str]], list[str]] = lambda a, b, /, c: [*c, a * b]
-
-
-class TemperatureScales(Enum):
-    CELSIUS = (lambda deg_c: deg_c)
-    FAHRENHEIT = (lambda deg_c: deg_c * 9 / 5 + 32)

crates/ruff/resources/test/fixtures/pydocstyle/D.py

@@ -634,8 +634,3 @@ def starts_with_this():
 @expect('D404: First word of the docstring should not be "This"')
 def starts_with_space_then_this():
     """ This is a docstring that starts with a space."""  # noqa: D210
-
-
-class SameLine: """This is a docstring on the same line"""
-
-def same_line(): """This is a docstring on the same line"""

crates/ruff/resources/test/fixtures/pydocstyle/D200.py

@@ -1,13 +0,0 @@
-def func():
-    """\
-    """
-
-
-def func():
-    """\\
-    """
-
-
-def func():
-    """\ \
-    """

crates/ruff/resources/test/fixtures/pyflakes/F401_0.py

@@ -92,23 +92,3 @@ match *0, 1, *2:
     case 0,:
         import x
         import y
-
-
-# Test: access a sub-importation via an alias.
-import foo.bar as bop
-import foo.bar.baz
-
-print(bop.baz.read_csv("test.csv"))
-
-# Test: isolated deletions.
-if TYPE_CHECKING:
-    import a1
-
-    import a2
-
-
-match *0, 1, *2:
-    case 0,:
-        import b1
-
-        import b2

crates/ruff/resources/test/fixtures/pyflakes/F522.py

@@ -2,5 +2,6 @@
 "{bar}{}".format(1, bar=2, spam=3)  # F522
 "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+# Not fixable
 (''
- .format(x=2))  # F522
+ .format(x=2))

crates/ruff/resources/test/fixtures/pyflakes/F523.py

@@ -28,6 +28,6 @@
 "{1}{3}".format(1, 2, 3, 4)  # F523, # F524
 "{1} {8}".format(0, 1)  # F523, # F524
 
-# Multiline
+# Not fixable
 (''
 .format(2))

crates/ruff/resources/test/fixtures/pyflakes/F823.py

@@ -70,13 +70,3 @@ import requests_mock as rm
 
 def requests_mock(requests_mock: rm.Mocker):
     print(rm.ANY)
-
-
-import sklearn.base
-import mlflow.sklearn
-
-
-def f():
-    import sklearn
-
-    mlflow

crates/ruff/resources/test/fixtures/pyflakes/F841_0.py

@@ -145,9 +145,3 @@ def f() -> None:
     obj = Foo()
     obj.do_thing()
 
-
-def f():
-    try:
-        pass
-    except Exception as _:
-        pass

crates/ruff/resources/test/fixtures/pyflakes/F841_3.py

@@ -154,14 +154,3 @@ def f() -> None:
         print("hello")
     except A as e :
         print("oh no!")
-
-
-def f():
-    x = 1
-    y = 2
-
-
-def f():
-    x = 1
-
-    y = 2

crates/ruff/resources/test/fixtures/pylint/bad_dunder_method_name.py

@@ -1,46 +0,0 @@
-class Apples:
-    def _init_(self):  # [bad-dunder-name]
-        pass
-
-    def __hello__(self):  # [bad-dunder-name]
-        print("hello")
-
-    def __init_(self):  # [bad-dunder-name]
-        # author likely unintentionally misspelled the correct init dunder.
-        pass
-
-    def _init_(self):  # [bad-dunder-name]
-        # author likely unintentionally misspelled the correct init dunder.
-        pass
-
-    def ___neg__(self):  # [bad-dunder-name]
-        # author likely accidentally added an additional `_`
-        pass
-
-    def __inv__(self):  # [bad-dunder-name]
-        # author likely meant to call the invert dunder method
-        pass
-
-    def hello(self):
-        print("hello")
-
-    def __init__(self):
-        pass
-
-    def init(self):
-        # valid name even though someone could accidentally mean __init__
-        pass
-
-    def _protected_method(self):
-        print("Protected")
-
-    def __private_method(self):
-        print("Private")
-
-    @property
-    def __doc__(self):
-        return "Docstring"
-
-
-def __foo_bar__():  # this is not checked by the [bad-dunder-name] rule
-    ...

crates/ruff/resources/test/fixtures/pylint/bad_string_format_character.py

@@ -14,10 +14,7 @@
 
 "{:s} {:y}".format("hello", "world")  # [bad-format-character]
 
-"{:*^30s}".format("centered") # OK
-"{:{s}}".format("hello", s="s")  # OK (nested replacement value not checked)
-
-"{:{s:y}}".format("hello", s="s")  # [bad-format-character] (nested replacement format spec checked)
+"{:*^30s}".format("centered")
 
 ## f-strings
 

crates/ruff/resources/test/fixtures/pylint/bad_string_format_type.py

@@ -13,7 +13,6 @@ print("foo %(foo)d bar %(bar)d" % {"foo": "1", "bar": "2"})
 "%(key)d" % {"key": []}
 print("%d" % ("%s" % ("nested",),))
 "%d" % ((1, 2, 3),)
-"%d" % (1 if x > 0 else [])
 
 # False negatives
 WORD = "abc"
@@ -56,4 +55,3 @@ r'\%03o' % (ord(c),)
 "%d" % (len(foo),)
 '(%r, %r, %r, %r)' % (hostname, address, username, '$PASSWORD')
 '%r' % ({'server_school_roles': server_school_roles, 'is_school_multiserver_domain': is_school_multiserver_domain}, )
-"%d" % (1 if x > 0 else 2)

crates/ruff/resources/test/fixtures/pylint/comparison_with_itself.py

@@ -19,10 +19,6 @@ foo in foo
 
 foo not in foo
 
-id(foo) == id(foo)
-
-len(foo) == len(foo)
-
 # Non-errors.
 "foo" == "foo"  # This is flagged by `comparison-of-constant` instead.
 
@@ -47,11 +43,3 @@ foo is not bar
 foo in bar
 
 foo not in bar
-
-x(foo) == y(foo)
-
-id(foo) == id(bar)
-
-id(foo, bar) == id(foo, bar)
-
-id(foo, bar=1) == id(foo, bar=1)

crates/ruff/resources/test/fixtures/pylint/eq_without_hash.py

@@ -1,11 +1,10 @@
-class Person:  # [eq-without-hash]
+class Person:
     def __init__(self):
         self.name = "monty"
 
     def __eq__(self, other):
         return isinstance(other, Person) and other.name == self.name
 
-# OK
 class Language:
     def __init__(self):
         self.name = "python"
@@ -15,9 +14,3 @@ class Language:
 
     def __hash__(self):
         return hash(self.name)
-
-class MyClass:
-    def __eq__(self, other):
-        return True
-
-    __hash__ = None

crates/ruff/resources/test/fixtures/pylint/invalid_envvar_default.py

@@ -10,4 +10,3 @@ os.getenv("AA", "GOOD" + "BAD")
 os.getenv("AA", "GOOD" + 1)
 os.getenv("AA", "GOOD %s" % "BAD")
 os.getenv("B", Z)
-

crates/ruff/resources/test/fixtures/pylint/invalid_envvar_value.py

@@ -10,8 +10,6 @@ os.getenv(key="foo", default="bar")
 os.getenv(key=f"foo", default="bar")
 os.getenv(key="foo" + "bar", default=1)
 os.getenv(key=1 + "bar", default=1)  # [invalid-envvar-value]
-os.getenv("PATH_TEST" if using_clear_path else "PATH_ORIG")
-os.getenv(1 if using_clear_path else "PATH_ORIG")
 
 AA = "aa"
 os.getenv(AA)

crates/ruff/resources/test/fixtures/pylint/logging_too_few_args.py

@@ -19,10 +19,6 @@ logging.error("Example log %s, %s", "foo", "bar", "baz", **kwargs)
 # do not handle keyword arguments
 logging.error("%(objects)d modifications: %(modifications)d errors: %(errors)d")
 
-logging.info(msg="Hello %s")
-
-logging.info(msg="Hello %s %s")
-
 import warning
 
 warning.warning("Hello %s %s", "World!")

crates/ruff/resources/test/fixtures/pylint/logging_too_many_args.py

@@ -15,10 +15,6 @@ logging.error("Example log %s, %s", "foo", "bar", "baz", **kwargs)
 # do not handle keyword arguments
 logging.error("%(objects)d modifications: %(modifications)d errors: %(errors)d", {"objects": 1, "modifications": 1, "errors": 1})
 
-logging.info(msg="Hello")
-
-logging.info(msg="Hello", something="else")
-
 import warning
 
 warning.warning("Hello %s", "World!", "again")

crates/ruff/resources/test/fixtures/pylint/no_self_use.py

@@ -1,62 +0,0 @@
-import abc
-
-
-class Person:
-    def developer_greeting(self, name):  # [no-self-use]
-        print(f"Greetings {name}!")
-
-    def greeting_1(self):  # [no-self-use]
-        print("Hello!")
-
-    def greeting_2(self):  # [no-self-use]
-        print("Hi!")
-
-
-# OK
-def developer_greeting():
-    print("Greetings developer!")
-
-
-# OK
-class Person:
-    name = "Paris"
-
-    def __init__(self):
-        pass
-
-    def __cmp__(self, other):
-        print(24)
-
-    def __repr__(self):
-        return "Person"
-
-    def func(self):
-        ...
-
-    def greeting_1(self):
-        print(f"Hello from {self.name} !")
-
-    @staticmethod
-    def greeting_2():
-        print("Hi!")
-
-
-class Base(abc.ABC):
-    """abstract class"""
-
-    @abstractmethod
-    def abstract_method(self):
-        """abstract method could not be a function"""
-        raise NotImplementedError
-
-
-class Sub(Base):
-    @override
-    def abstract_method(self):
-        print("concret method")
-
-
-class Prop:
-    @property
-    def count(self):
-        return 24

crates/ruff/resources/test/fixtures/pylint/repeated_equality_comparison_target.py

@@ -9,22 +9,13 @@ foo != "a" and foo != "b" and foo != "c"
 
 foo == a or foo == "b" or foo == 3  # Mixed types.
 
+# False negatives (the current implementation doesn't support Yoda conditions).
 "a" == foo or "b" == foo or "c" == foo
 
 "a" != foo and "b" != foo and "c" != foo
 
 "a" == foo or foo == "b" or "c" == foo
 
-foo == bar or baz == foo or qux == foo
-
-foo == "a" or "b" == foo or foo == "c"
-
-foo != "a" and "b" != foo and foo != "c"
-
-foo == "a" or foo == "b" or "c" == bar or "d" == bar  # Multiple targets
-
-foo.bar == "a" or foo.bar == "b"  # Attributes.
-
 # OK
 foo == "a" and foo == "b" and foo == "c"  # `and` mixed with `==`.
 
@@ -41,13 +32,3 @@ foo not in {"a", "b", "c"}  # Uses membership test already.
 foo == "a"  # Single comparison.
 
 foo != "a"  # Single comparison.
-
-foo == "a" == "b" or foo == "c"  # Multiple comparisons.
-
-foo == bar == "b" or foo == "c"  # Multiple comparisons.
-
-foo == foo or foo == bar  # Self-comparison.
-
-foo[0] == "a" or foo[0] == "b"  # Subscripts.
-
-foo() == "a" or foo() == "b"  # Calls.

crates/ruff/resources/test/fixtures/pylint/subprocess_run_without_check.py

@@ -1,13 +0,0 @@
-import subprocess
-
-# Errors.
-subprocess.run("ls")
-subprocess.run("ls", shell=True)
-
-# Non-errors.
-subprocess.run("ls", check=True)
-subprocess.run("ls", check=False)
-subprocess.run("ls", shell=True, check=True)
-subprocess.run("ls", shell=True, check=False)
-foo.run("ls")  # Not a subprocess.run call.
-subprocess.bar("ls")  # Not a subprocess.run call.

crates/ruff/resources/test/fixtures/pylint/sys_exit_alias_11.py

@@ -1,3 +0,0 @@
-from sys import *
-
-exit(0)

crates/ruff/resources/test/fixtures/pyupgrade/UP009_10.py

@@ -1,7 +0,0 @@
-"""
-# coding=utf8""" # empty comment
-
-"""
-Invalid coding declaration since it is nested inside a docstring
-The following empty comment tests for false positives as our implementation visits comments
-"""

crates/ruff/resources/test/fixtures/pyupgrade/UP009_6.py

@@ -1,7 +0,0 @@
- # coding=utf8
-print("Hello world")
-
-"""
-Regression test for https://github.com/astral-sh/ruff/issues/6756
-The leading space must be removed to prevent invalid syntax.
-"""

crates/ruff/resources/test/fixtures/pyupgrade/UP009_7.py

@@ -1,7 +0,0 @@
-	# coding=utf8
-print("Hello world")
-
-"""
-Regression test for https://github.com/astral-sh/ruff/issues/6756
-The leading tab must be removed to prevent invalid syntax.
-"""

crates/ruff/resources/test/fixtures/pyupgrade/UP009_8.py

@@ -1,6 +0,0 @@
-print("foo") # coding=utf8
-print("Hello world")
-
-"""
-Invalid coding declaration due to a statement before the comment
-"""

crates/ruff/resources/test/fixtures/pyupgrade/UP009_9.py

@@ -1,7 +0,0 @@
-x = 1 \
-  # coding=utf8
-x = 2
-
-"""
-Invalid coding declaration due to continuation on preceding line
-"""

crates/ruff/resources/test/fixtures/pyupgrade/UP018.py

@@ -31,7 +31,6 @@ bool("foo")
 bool("")
 bool(b"")
 bool(1.0)
-int().denominator
 
 # These become string or byte literals
 str()
@@ -50,6 +49,3 @@ float(1.0)
 bool()
 bool(True)
 bool(False)
-
-# These become a literal but retain parentheses
-int(1).denominator

crates/ruff/resources/test/fixtures/pyupgrade/UP030_0.py

@@ -32,30 +32,3 @@ print(
 )
 
 '{' '0}'.format(1)
-
-args = list(range(10))
-kwargs = {x: x for x in range(10)}
-
-"{0}".format(*args)
-
-"{0}".format(**kwargs)
-
-"{0}_{1}".format(*args)
-
-"{0}_{1}".format(1, *args)
-
-"{0}_{1}".format(1, 2, *args)
-
-"{0}_{1}".format(*args, 1, 2)
-
-"{0}_{1}_{2}".format(1, **kwargs)
-
-"{0}_{1}_{2}".format(1, 2, **kwargs)
-
-"{0}_{1}_{2}".format(1, 2, 3, **kwargs)
-
-"{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)
-
-"{1}_{0}".format(1, 2, *args)
-
-"{1}_{0}".format(1, 2)

crates/ruff/resources/test/fixtures/pyupgrade/UP030_1.py

@@ -15,17 +15,3 @@ f"{0}".format(1)
 print(f"{0}".format(1))
 
 ''.format(1)
-
-'{1} {0}'.format(*args)
-
-"{1}_{0}".format(*args, 1)
-
-"{1}_{0}".format(*args, 1, 2)
-
-"{1}_{0}".format(1, **kwargs)
-
-"{1}_{0}".format(1, foo=2)
-
-"{1}_{0}".format(1, 2, **kwargs)
-
-"{1}_{0}".format(1, 2, foo=3, bar=4)

crates/ruff/resources/test/fixtures/pyupgrade/UP030_2.py

@@ -0,0 +1,28 @@
+# These SHOULD change
+
+args = list(range(10))
+kwargs = {x: x for x in range(10)}
+
+"{0}".format(*args)
+
+"{0}".format(**kwargs)
+
+"{0}_{1}".format(*args)
+
+"{0}_{1}".format(1, *args)
+
+"{1}_{0}".format(*args)
+
+"{1}_{0}".format(1, *args)
+
+"{0}_{1}".format(1, 2, *args)
+
+"{0}_{1}".format(*args, 1, 2)
+
+"{0}_{1}_{2}".format(1, **kwargs)
+
+"{0}_{1}_{2}".format(1, 2, **kwargs)
+
+"{0}_{1}_{2}".format(1, 2, 3, **kwargs)
+
+"{0}_{1}_{2}".format(1, 2, 3, *args, **kwargs)

crates/ruff/resources/test/fixtures/pyupgrade/UP031_0.py

@@ -106,7 +106,3 @@ print('Hello %(arg)s' % bar['bop'])
     """
     % (x,)
 )
-
-"%s" % (
-    x,  # comment
-)

crates/ruff/resources/test/fixtures/pyupgrade/UP032_0.py

@@ -198,7 +198,3 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 ).format(a=1)
 
 "{}".format(**c)
-
-"{}".format(
-    1  # comment
-)

crates/ruff/resources/test/fixtures/pyupgrade/UP035.py

@@ -46,35 +46,6 @@ from typing import Callable, Match, Pattern, List, OrderedDict, AbstractSet, Con
 if True: from collections import (
     Mapping, Counter)
 
-# Bad imports from PYI027 that are now handled by PYI022 (UP035)
-from typing import ContextManager
-from typing import OrderedDict
-from typing_extensions import OrderedDict
-from typing import Callable
-from typing import ByteString
-from typing import Container
-from typing import Hashable
-from typing import ItemsView
-from typing import Iterable
-from typing import Iterator
-from typing import KeysView
-from typing import Mapping
-from typing import MappingView
-from typing import MutableMapping
-from typing import MutableSequence
-from typing import MutableSet
-from typing import Sequence
-from typing import Sized
-from typing import ValuesView
-from typing import Awaitable
-from typing import AsyncIterator
-from typing import AsyncIterable
-from typing import Coroutine
-from typing import Collection
-from typing import AsyncGenerator
-from typing import Reversible
-from typing import Generator
-
 # OK
 from a import b
 

crates/ruff/resources/test/fixtures/pyupgrade/UP040.py

@@ -5,42 +5,11 @@ from typing import TypeAlias
 x: typing.TypeAlias = int
 x: TypeAlias = int
 
-# UP040 simple generic
+
+# UP040 with generics (todo)
 T = typing.TypeVar["T"]
 x: typing.TypeAlias = list[T]
 
-# UP040 call style generic
-T = typing.TypeVar("T")
-x: typing.TypeAlias = list[T]
-
-# UP040 bounded generic (todo)
-T = typing.TypeVar("T", bound=int)
-x: typing.TypeAlias = list[T]
-
-T = typing.TypeVar("T", int, str)
-x: typing.TypeAlias = list[T]
-
-# UP040 contravariant generic (todo)
-T = typing.TypeVar("T", contravariant=True)
-x: typing.TypeAlias = list[T]
-
-# UP040 covariant generic (todo)
-T = typing.TypeVar("T", covariant=True)
-x: typing.TypeAlias = list[T]
-
-# UP040 in class scope
-T = typing.TypeVar["T"]
-class Foo:
-    # reference to global variable
-    x: typing.TypeAlias = list[T]
-
-    # reference to class variable
-    TCLS = typing.TypeVar["TCLS"]
-    y: typing.TypeAlias = list[TCLS]
-
-# UP040 wont add generics in fix
-T = typing.TypeVar(*args)
-x: typing.TypeAlias = list[T]
 
 # OK
 x: TypeAlias

crates/ruff/resources/test/fixtures/ruff/RUF017.py

@@ -1,14 +0,0 @@
-x = [1, 2, 3]
-y = [4, 5, 6]
-
-# RUF017
-sum([x, y], start=[])
-sum([x, y], [])
-sum([[1, 2, 3], [4, 5, 6]], start=[])
-sum([[1, 2, 3], [4, 5, 6]], [])
-sum([[1, 2, 3], [4, 5, 6]],
-    [])
-
-# OK
-sum([x, y])
-sum([[1, 2, 3], [4, 5, 6]])

crates/ruff/resources/test/fixtures/ruff/RUF100_4.py

@@ -1,5 +0,0 @@
-# ruff: noqa: RUF100
-
-import os  # noqa: F401
-
-print(os.sep)

crates/ruff/resources/test/fixtures/tryceratops/TRY003.py

@@ -52,7 +52,3 @@ def good(a: int):
 def another_good(a):
     if a % 2 == 0:
         raise GoodArgCantBeEven(a)
-
-
-def another_good():
-    raise NotImplementedError("This is acceptable too")

crates/ruff/src/autofix/codemods.rs

@@ -33,7 +33,7 @@ impl<'a, T: Codegen<'a>> CodegenStylist<'a> for T {
 ///
 /// Returns `Ok(None)` if the statement is empty after removing the imports.
 pub(crate) fn remove_imports<'a>(
-    member_names: impl Iterator<Item = &'a str>,
+    imports: impl Iterator<Item = &'a str>,
     stmt: &Stmt,
     locator: &Locator,
     stylist: &Stylist,
@@ -45,20 +45,27 @@ pub(crate) fn remove_imports<'a>(
         bail!("Expected Statement::Simple");
     };
 
-    let aliases = match body.body.first_mut() {
-        Some(SmallStatement::Import(import_body)) => &mut import_body.names,
+    let (aliases, import_module) = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
         Some(SmallStatement::ImportFrom(import_body)) => {
             if let ImportNames::Aliases(names) = &mut import_body.names {
-                names
+                (
+                    names,
+                    Some((&import_body.relative, import_body.module.as_ref())),
+                )
             } else if let ImportNames::Star(..) = &import_body.names {
                 // Special-case: if the import is a `from ... import *`, then we delete the
                 // entire statement.
                 let mut found_star = false;
-                for member in member_names {
-                    if member == "*" {
+                for import in imports {
+                    let qualified_name = match import_body.module.as_ref() {
+                        Some(module_name) => format!("{}.*", compose_module_path(module_name)),
+                        None => "*".to_string(),
+                    };
+                    if import == qualified_name {
                         found_star = true;
                     } else {
-                        bail!("Expected \"*\" for unused import (got: \"{}\")", member);
+                        bail!("Expected \"*\" for unused import (got: \"{}\")", import);
                     }
                 }
                 if !found_star {
@@ -75,10 +82,30 @@ pub(crate) fn remove_imports<'a>(
     // Preserve the trailing comma (or not) from the last entry.
     let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
 
-    for member in member_names {
-        let alias_index = aliases
-            .iter()
-            .position(|alias| member == compose_module_path(&alias.name));
+    for import in imports {
+        let alias_index = aliases.iter().position(|alias| {
+            let qualified_name = match import_module {
+                Some((relative, module)) => {
+                    let module = module.map(compose_module_path);
+                    let member = compose_module_path(&alias.name);
+                    let mut qualified_name = String::with_capacity(
+                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
+                    );
+                    for _ in 0..relative.len() {
+                        qualified_name.push('.');
+                    }
+                    if let Some(module) = module {
+                        qualified_name.push_str(&module);
+                        qualified_name.push('.');
+                    }
+                    qualified_name.push_str(&member);
+                    qualified_name
+                }
+                None => compose_module_path(&alias.name),
+            };
+            qualified_name == import
+        });
+
         if let Some(index) = alias_index {
             aliases.remove(index);
         }
@@ -112,7 +139,7 @@ pub(crate) fn remove_imports<'a>(
 ///
 /// Returns the modified import statement.
 pub(crate) fn retain_imports(
-    member_names: &[&str],
+    imports: &[&str],
     stmt: &Stmt,
     locator: &Locator,
     stylist: &Stylist,
@@ -124,11 +151,14 @@ pub(crate) fn retain_imports(
         bail!("Expected Statement::Simple");
     };
 
-    let aliases = match body.body.first_mut() {
-        Some(SmallStatement::Import(import_body)) => &mut import_body.names,
+    let (aliases, import_module) = match body.body.first_mut() {
+        Some(SmallStatement::Import(import_body)) => (&mut import_body.names, None),
         Some(SmallStatement::ImportFrom(import_body)) => {
             if let ImportNames::Aliases(names) = &mut import_body.names {
-                names
+                (
+                    names,
+                    Some((&import_body.relative, import_body.module.as_ref())),
+                )
             } else {
                 bail!("Expected: ImportNames::Aliases");
             }
@@ -140,9 +170,28 @@ pub(crate) fn retain_imports(
     let trailing_comma = aliases.last().and_then(|alias| alias.comma.clone());
 
     aliases.retain(|alias| {
-        member_names
-            .iter()
-            .any(|member| *member == compose_module_path(&alias.name))
+        imports.iter().any(|import| {
+            let qualified_name = match import_module {
+                Some((relative, module)) => {
+                    let module = module.map(compose_module_path);
+                    let member = compose_module_path(&alias.name);
+                    let mut qualified_name = String::with_capacity(
+                        relative.len() + module.as_ref().map_or(0, String::len) + member.len() + 1,
+                    );
+                    for _ in 0..relative.len() {
+                        qualified_name.push('.');
+                    }
+                    if let Some(module) = module {
+                        qualified_name.push_str(&module);
+                        qualified_name.push('.');
+                    }
+                    qualified_name.push_str(&member);
+                    qualified_name
+                }
+                None => compose_module_path(&alias.name),
+            };
+            qualified_name == *import
+        })
     });
 
     // But avoid destroying any trailing comments.

crates/ruff/src/autofix/edits.rs

@@ -1,17 +1,15 @@
 //! Interface for generating autofix edits from higher-level actions (e.g., "remove an argument").
 
-use anyhow::{Context, Result};
+use anyhow::{bail, Result};
 
 use ruff_diagnostics::Edit;
 use ruff_python_ast::{self as ast, Arguments, ExceptHandler, Expr, Keyword, Ranged, Stmt};
 use ruff_python_codegen::Stylist;
 use ruff_python_index::Indexer;
-
-use ruff_python_trivia::{
-    has_leading_content, is_python_whitespace, PythonWhitespace, SimpleTokenKind, SimpleTokenizer,
-};
+use ruff_python_parser::{lexer, Mode};
+use ruff_python_trivia::{has_leading_content, is_python_whitespace, PythonWhitespace};
 use ruff_source_file::{Locator, NewlineWithTrailingNewline};
-use ruff_text_size::{TextLen, TextSize};
+use ruff_text_size::{TextLen, TextRange, TextSize};
 
 use crate::autofix::codemods;
 
@@ -48,7 +46,7 @@ pub(crate) fn delete_stmt(
         } else if has_leading_content(stmt.start(), locator) {
             Edit::range_deletion(stmt.range())
         } else if let Some(start) = indexer.preceded_by_continuations(stmt.start(), locator) {
-            Edit::deletion(start, stmt.end())
+            Edit::range_deletion(TextRange::new(start, stmt.end()))
         } else {
             let range = locator.full_lines_range(stmt.range());
             Edit::range_deletion(range)
@@ -58,14 +56,14 @@ pub(crate) fn delete_stmt(
 
 /// Generate a `Fix` to remove the specified imports from an `import` statement.
 pub(crate) fn remove_unused_imports<'a>(
-    member_names: impl Iterator<Item = &'a str>,
+    unused_imports: impl Iterator<Item = &'a str>,
     stmt: &Stmt,
     parent: Option<&Stmt>,
     locator: &Locator,
     stylist: &Stylist,
     indexer: &Indexer,
 ) -> Result<Edit> {
-    match codemods::remove_imports(member_names, stmt, locator, stylist)? {
+    match codemods::remove_imports(unused_imports, stmt, locator, stylist)? {
         None => Ok(delete_stmt(stmt, parent, locator, indexer)),
         Some(content) => Ok(Edit::range_replacement(content, stmt.range())),
     }
@@ -89,52 +87,82 @@ pub(crate) fn remove_argument<T: Ranged>(
     argument: &T,
     arguments: &Arguments,
     parentheses: Parentheses,
-    source: &str,
+    locator: &Locator,
 ) -> Result<Edit> {
-    // Partition into arguments before and after the argument to remove.
-    let (before, after): (Vec<_>, Vec<_>) = arguments
-        .args
-        .iter()
-        .map(Expr::range)
-        .chain(arguments.keywords.iter().map(Keyword::range))
-        .filter(|range| argument.range() != *range)
-        .partition(|range| range.start() < argument.start());
+    // TODO(sbrugman): Preserve trailing comments.
+    if arguments.keywords.len() + arguments.args.len() > 1 {
+        let mut fix_start = None;
+        let mut fix_end = None;
 
-    if !after.is_empty() {
-        // Case 1: argument or keyword is _not_ the last node, so delete from the start of the
-        // argument to the end of the subsequent comma.
-        let mut tokenizer = SimpleTokenizer::starts_at(argument.end(), source);
+        if arguments
+            .args
+            .iter()
+            .map(Expr::start)
+            .chain(arguments.keywords.iter().map(Keyword::start))
+            .any(|location| location > argument.start())
+        {
+            // Case 1: argument or keyword is _not_ the last node, so delete from the start of the
+            // argument to the end of the subsequent comma.
+            let mut seen_comma = false;
+            for (tok, range) in lexer::lex_starts_at(
+                locator.slice(arguments.range()),
+                Mode::Module,
+                arguments.start(),
+            )
+            .flatten()
+            {
+                if seen_comma {
+                    if tok.is_non_logical_newline() {
+                        // Also delete any non-logical newlines after the comma.
+                        continue;
+                    }
+                    fix_end = Some(if tok.is_newline() {
+                        range.end()
+                    } else {
+                        range.start()
+                    });
+                    break;
+                }
+                if range.start() == argument.start() {
+                    fix_start = Some(range.start());
+                }
+                if fix_start.is_some() && tok.is_comma() {
+                    seen_comma = true;
+                }
+            }
+        } else {
+            // Case 2: argument or keyword is the last node, so delete from the start of the
+            // previous comma to the end of the argument.
+            for (tok, range) in lexer::lex_starts_at(
+                locator.slice(arguments.range()),
+                Mode::Module,
+                arguments.start(),
+            )
+            .flatten()
+            {
+                if range.start() == argument.start() {
+                    fix_end = Some(argument.end());
+                    break;
+                }
+                if tok.is_comma() {
+                    fix_start = Some(range.start());
+                }
+            }
+        }
 
-        // Find the trailing comma.
-        tokenizer
-            .find(|token| token.kind == SimpleTokenKind::Comma)
-            .context("Unable to find trailing comma")?;
-
-        // Find the next non-whitespace token.
-        let next = tokenizer
-            .find(|token| {
-                token.kind != SimpleTokenKind::Whitespace && token.kind != SimpleTokenKind::Newline
-            })
-            .context("Unable to find next token")?;
-
-        Ok(Edit::deletion(argument.start(), next.start()))
-    } else if let Some(previous) = before.iter().map(Ranged::end).max() {
-        // Case 2: argument or keyword is the last node, so delete from the start of the
-        // previous comma to the end of the argument.
-        let mut tokenizer = SimpleTokenizer::starts_at(previous, source);
-
-        // Find the trailing comma.
-        let comma = tokenizer
-            .find(|token| token.kind == SimpleTokenKind::Comma)
-            .context("Unable to find trailing comma")?;
-
-        Ok(Edit::deletion(comma.start(), argument.end()))
+        match (fix_start, fix_end) {
+            (Some(start), Some(end)) => Ok(Edit::deletion(start, end)),
+            _ => {
+                bail!("No fix could be constructed")
+            }
+        }
     } else {
-        // Case 3: argument or keyword is the only node, so delete the arguments (but preserve
-        // parentheses, if needed).
+        // Only one argument; remove it (but preserve parentheses, if needed).
         Ok(match parentheses {
-            Parentheses::Remove => Edit::range_deletion(arguments.range()),
-            Parentheses::Preserve => Edit::range_replacement("()".to_string(), arguments.range()),
+            Parentheses::Remove => Edit::deletion(arguments.start(), arguments.end()),
+            Parentheses::Preserve => {
+                Edit::replacement("()".to_string(), arguments.start(), arguments.end())
+            }
         })
     }
 }
@@ -148,13 +176,16 @@ fn is_only<T: PartialEq>(vec: &[T], value: &T) -> bool {
 fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
     match parent {
         Stmt::FunctionDef(ast::StmtFunctionDef { body, .. })
+        | Stmt::AsyncFunctionDef(ast::StmtAsyncFunctionDef { body, .. })
         | Stmt::ClassDef(ast::StmtClassDef { body, .. })
-        | Stmt::With(ast::StmtWith { body, .. }) => {
+        | Stmt::With(ast::StmtWith { body, .. })
+        | Stmt::AsyncWith(ast::StmtAsyncWith { body, .. }) => {
             if is_only(body, child) {
                 return true;
             }
         }
         Stmt::For(ast::StmtFor { body, orelse, .. })
+        | Stmt::AsyncFor(ast::StmtAsyncFor { body, orelse, .. })
         | Stmt::While(ast::StmtWhile { body, orelse, .. }) => {
             if is_only(body, child) || is_only(orelse, child) {
                 return true;
@@ -178,7 +209,14 @@ fn is_lone_child(child: &Stmt, parent: &Stmt) -> bool {
             handlers,
             orelse,
             finalbody,
-            ..
+            range: _,
+        })
+        | Stmt::TryStar(ast::StmtTryStar {
+            body,
+            handlers,
+            orelse,
+            finalbody,
+            range: _,
         }) => {
             if is_only(body, child)
                 || is_only(orelse, child)
@@ -226,25 +264,25 @@ fn trailing_semicolon(offset: TextSize, locator: &Locator) -> Option<TextSize> {
 fn next_stmt_break(semicolon: TextSize, locator: &Locator) -> TextSize {
     let start_location = semicolon + TextSize::from(1);
 
-    for line in
-        NewlineWithTrailingNewline::with_offset(locator.after(start_location), start_location)
-    {
+    let contents = &locator.contents()[usize::from(start_location)..];
+    for line in NewlineWithTrailingNewline::from(contents) {
         let trimmed = line.trim_whitespace();
         // Skip past any continuations.
         if trimmed.starts_with('\\') {
             continue;
         }
 
-        return if trimmed.is_empty() {
-            // If the line is empty, then despite the previous statement ending in a
-            // semicolon, we know that it's not a multi-statement line.
-            line.start()
-        } else {
-            // Otherwise, find the start of the next statement. (Or, anything that isn't
-            // whitespace.)
-            let relative_offset = line.find(|c: char| !is_python_whitespace(c)).unwrap();
-            line.start() + TextSize::try_from(relative_offset).unwrap()
-        };
+        return start_location
+            + if trimmed.is_empty() {
+                // If the line is empty, then despite the previous statement ending in a
+                // semicolon, we know that it's not a multi-statement line.
+                line.start()
+            } else {
+                // Otherwise, find the start of the next statement. (Or, anything that isn't
+                // whitespace.)
+                let relative_offset = line.find(|c: char| !is_python_whitespace(c)).unwrap();
+                line.start() + TextSize::try_from(relative_offset).unwrap()
+            };
     }
 
     locator.line_end(start_location)

crates/ruff/src/autofix/mod.rs

@@ -13,7 +13,6 @@ use crate::registry::{AsRule, Rule};
 
 pub(crate) mod codemods;
 pub(crate) mod edits;
-pub(crate) mod snippet;
 pub(crate) mod source_map;
 
 pub(crate) struct FixResult {

crates/ruff/src/autofix/snippet.rs

@@ -1,36 +0,0 @@
-use unicode_width::UnicodeWidthStr;
-
-/// A snippet of source code for user-facing display, as in a diagnostic.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub(crate) struct SourceCodeSnippet(String);
-
-impl SourceCodeSnippet {
-    pub(crate) fn new(source_code: String) -> Self {
-        Self(source_code)
-    }
-
-    /// Return the full snippet for user-facing display, or `None` if the snippet should be
-    /// truncated.
-    pub(crate) fn full_display(&self) -> Option<&str> {
-        if Self::should_truncate(&self.0) {
-            None
-        } else {
-            Some(&self.0)
-        }
-    }
-
-    /// Return a truncated snippet for user-facing display.
-    pub(crate) fn truncated_display(&self) -> &str {
-        if Self::should_truncate(&self.0) {
-            "..."
-        } else {
-            &self.0
-        }
-    }
-
-    /// Returns `true` if the source code should be truncated when included in a user-facing
-    /// diagnostic.
-    fn should_truncate(source_code: &str) -> bool {
-        source_code.width() > 50 || source_code.contains(['\r', '\n'])
-    }
-}

crates/ruff/src/checkers/ast/analyze/bindings.rs

@@ -1,5 +1,4 @@
 use ruff_diagnostics::{Diagnostic, Fix};
-use ruff_python_ast::Ranged;
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
@@ -17,20 +16,14 @@ pub(crate) fn bindings(checker: &mut Checker) {
         return;
     }
 
-    for binding in &*checker.semantic.bindings {
+    for binding in checker.semantic.bindings.iter() {
         if checker.enabled(Rule::UnusedVariable) {
-            if binding.kind.is_bound_exception()
-                && !binding.is_used()
-                && !checker
-                    .settings
-                    .dummy_variable_rgx
-                    .is_match(binding.name(checker.locator))
-            {
+            if binding.kind.is_bound_exception() && !binding.is_used() {
                 let mut diagnostic = Diagnostic::new(
                     pyflakes::rules::UnusedVariable {
                         name: binding.name(checker.locator).to_string(),
                     },
-                    binding.range(),
+                    binding.range,
                 );
                 if checker.patch(Rule::UnusedVariable) {
                     diagnostic.try_set_fix(|| {

crates/ruff/src/checkers/ast/analyze/comprehension.rs

@@ -7,6 +7,10 @@ use crate::rules::flake8_simplify;
 /// Run lint rules over a [`Comprehension`] syntax nodes.
 pub(crate) fn comprehension(comprehension: &Comprehension, checker: &mut Checker) {
     if checker.enabled(Rule::InDictKeys) {
-        flake8_simplify::rules::key_in_dict_comprehension(checker, comprehension);
+        flake8_simplify::rules::key_in_dict_for(
+            checker,
+            &comprehension.target,
+            &comprehension.iter,
+        );
     }
 }

crates/ruff/src/checkers/ast/analyze/deferred_for_loops.rs

@@ -1,8 +1,8 @@
-use ruff_python_ast::Stmt;
+use ruff_python_ast::{self as ast, Stmt};
 
 use crate::checkers::ast::Checker;
 use crate::codes::Rule;
-use crate::rules::{flake8_bugbear, perflint, pyupgrade};
+use crate::rules::{flake8_bugbear, perflint};
 
 /// Run lint rules over all deferred for-loops in the [`SemanticModel`].
 pub(crate) fn deferred_for_loops(checker: &mut Checker) {
@@ -11,18 +11,21 @@ pub(crate) fn deferred_for_loops(checker: &mut Checker) {
         for snapshot in for_loops {
             checker.semantic.restore(snapshot);
 
-            let Stmt::For(stmt_for) = checker.semantic.current_statement() else {
-                unreachable!("Expected Stmt::For");
-            };
-
-            if checker.enabled(Rule::UnusedLoopControlVariable) {
-                flake8_bugbear::rules::unused_loop_control_variable(checker, stmt_for);
-            }
-            if checker.enabled(Rule::IncorrectDictIterator) {
-                perflint::rules::incorrect_dict_iterator(checker, stmt_for);
-            }
-            if checker.enabled(Rule::YieldInForLoop) {
-                pyupgrade::rules::yield_in_for_loop(checker, stmt_for);
+            if let Stmt::For(ast::StmtFor {
+                target, iter, body, ..
+            })
+            | Stmt::AsyncFor(ast::StmtAsyncFor {
+                target, iter, body, ..
+            }) = &checker.semantic.stmt()
+            {
+                if checker.enabled(Rule::UnusedLoopControlVariable) {
+                    flake8_bugbear::rules::unused_loop_control_variable(checker, target, body);
+                }
+                if checker.enabled(Rule::IncorrectDictIterator) {
+                    perflint::rules::incorrect_dict_iterator(checker, target, iter);
+                }
+            } else {
+                unreachable!("Expected Expr::For | Expr::AsyncFor");
             }
         }
     }