Bump version to 0.0.236

This isn't super consistent with some other rules, but... if you have a lone body, with a `pass`, followed by a comment, it's probably surprising if it gets removed. Let's retain the comment.

Closes #2231.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,10 @@
+<!--
+Thank you for taking the time to report an issue! We're glad to have you involved with Ruff.
+
+If you're filing a bug report, please consider including the following information:
+
+- A minimal code snippet that reproduces the bug.
+- The command you invoked (e.g., `ruff /path/to/file.py --fix`), ideally including the `--isolated` flag.
+- The current Ruff settings (any relevant sections from your `pyproject.toml`).
+- The current Ruff version (`ruff --version`).
+-->

.github/workflows/ci.yaml

@@ -4,11 +4,16 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: true
 
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -22,26 +27,12 @@ jobs:
           profile: minimal
           toolchain: nightly-2022-11-01
           override: true
-          components: rustfmt
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - run: cargo build --all --release
-      - run: ./target/release/ruff_dev generate-all
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo build --all
+      - run: ./target/debug/ruff_dev generate-all
       - run: git diff --quiet README.md || echo "::error file=README.md::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet src/checks_gen.rs || echo "::error file=src/checks_gen.rs::This file is outdated. Run 'cargo +nightly dev generate-all'."
       - run: git diff --quiet ruff.schema.json || echo "::error file=ruff.schema.json::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --quiet playground/src/ruff_options.ts || echo "::error file=playground/src/ruff_options.ts::This file is outdated. Run 'cargo +nightly dev generate-all'."
-      - run: git diff --exit-code -- README.md src/checks_gen.rs ruff.schema.json playground/src/ruff_options.ts
+      - run: git diff --exit-code -- README.md ruff.schema.json
 
   cargo-fmt:
     name: "cargo fmt"
@@ -54,18 +45,6 @@ jobs:
           toolchain: nightly-2022-11-01
           override: true
           components: rustfmt
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
       - run: cargo fmt --all --check
 
   cargo_clippy:
@@ -80,46 +59,60 @@ jobs:
           override: true
           components: clippy
           target: wasm32-unknown-unknown
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
+      - uses: Swatinem/rust-cache@v1
       - run: cargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedantic
-      - run: cargo clippy --workspace --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
+      - run: cargo clippy -p ruff --target wasm32-unknown-unknown --all-features -- -D warnings -W clippy::pedantic
 
   cargo-test:
-    name: "cargo test"
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
+    name: "cargo test | ${{ matrix.os }}"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: 1.65.0
+          override: true
+      - uses: Swatinem/rust-cache@v1
+      - run: cargo install cargo-insta
+      - run: pip install black[d]==22.12.0
+      - name: Run tests (Ubuntu)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: |
+          cargo insta test --all --delete-unreferenced-snapshots
+          git diff --exit-code
+      - name: Run tests (Windows)
+        if: ${{ matrix.os == 'windows-latest' }}
+        shell: bash
+        run: |
+          cargo insta test --all
+          git diff --exit-code
+      - run: cargo test --package ruff_cli --test black_compatibility_test -- --ignored
+      # Check for broken links in the documentation.
+      - run: cargo doc --all --no-deps
+        env:
+          # Setting RUSTDOCFLAGS because `cargo doc --check` isn't yet implemented (https://github.com/rust-lang/cargo/issues/10025).
+          RUSTDOCFLAGS: "-D warnings"
+
+  scripts:
+    name: "test scripts"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-11-01
           override: true
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-      - run: pip install black[d]==22.12.0
-      - run: cargo test --all
-      - run: cargo test --package ruff --test black_compatibility_test -- --ignored
+      - uses: Swatinem/rust-cache@v1
+      - run: ./scripts/add_rule.py --name DoTheThing --code PLC999 --linter pylint
+      - run: cargo check
+      - run: |
+         ./scripts/add_plugin.py test --url https://pypi.org/project/-test/0.1.0/ --prefix TST
+         ./scripts/add_rule.py --name FirstRule --code TST001 --linter test
+      - run: cargo check
 
 # TODO(charlie): Re-enable the `wasm-pack` tests.
 # See: https://github.com/charliermarsh/ruff/issues/1425
@@ -159,22 +152,23 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: nightly-2022-11-01
+          toolchain: 1.65.0
           override: true
+      - uses: Swatinem/rust-cache@v1
       - uses: actions/setup-python@v4
         with:
           python-version: "3.11"
       - run: pip install maturin
-      - uses: actions/cache@v3
-        env:
-          cache-name: cache-cargo
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
       - run: maturin build -b bin
+
+  typos:
+    name: Spell Check with Typos
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Actions Repository
+      uses: actions/checkout@v3
+
+    - name: Check spelling of file.txt
+      uses: crate-ci/typos@master
+      with:
+        files: .

.github/workflows/flake8-to-ruff.yaml

@@ -12,6 +12,7 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -38,7 +39,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -64,7 +65,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*universal2.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -96,7 +97,7 @@ jobs:
         run: |
           python -m pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -123,7 +124,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -144,7 +145,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist -m ./${{ env.CRATE_NAME }}/Cargo.toml
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -158,7 +159,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -192,7 +193,7 @@ jobs:
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -228,7 +229,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -262,7 +263,7 @@ jobs:
         run: |
           pip install dist/${{ env.CRATE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -280,7 +281,7 @@ jobs:
       - musllinux-cross
       - pypy
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
       - uses: actions/setup-python@v4

.github/workflows/playground.yaml

@@ -8,6 +8,7 @@ on:
 env:
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -31,7 +32,7 @@ jobs:
       - uses: jetli/wasm-pack-action@v0.4.0
       - uses: jetli/wasm-bindgen-action@v0.2.0
       - name: "Run wasm-pack"
-        run: wasm-pack build --target web --out-dir playground/src/pkg
+        run: wasm-pack build --target web --out-dir playground/src/pkg . -- -p ruff
       - name: "Install Node dependencies"
         run: npm ci
         working-directory: playground

.github/workflows/ruff.yaml

@@ -1,6 +1,7 @@
 name: "[ruff] Release"
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -13,6 +14,7 @@ env:
   PYTHON_VERSION: "3.7" # to build abi3 wheels
   CARGO_INCREMENTAL: 0
   CARGO_NET_RETRY: 10
+  CARGO_TERM_COLOR: always
   RUSTUP_MAX_RETRIES: 10
 
 jobs:
@@ -39,7 +41,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -65,7 +67,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*universal2.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -97,7 +99,7 @@ jobs:
         run: |
           python -m pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -124,7 +126,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -145,7 +147,7 @@ jobs:
           target: ${{ matrix.target }}
           manylinux: auto
           args: --no-default-features --release --out dist
-      - uses: uraimo/run-on-arch-action@v2.0.5
+      - uses: uraimo/run-on-arch-action@v2.5.0
         if: matrix.target != 'ppc64'
         name: Install built wheel
         with:
@@ -159,7 +161,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -193,7 +195,7 @@ jobs:
             apk add py3-pip
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links /io/dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -229,7 +231,7 @@ jobs:
           run: |
             pip3 install ${{ env.PACKAGE_NAME }} --no-index --find-links dist/ --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -263,7 +265,7 @@ jobs:
         run: |
           pip install dist/${{ env.PACKAGE_NAME }}-*.whl --force-reinstall
       - name: Upload wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist
@@ -282,7 +284,7 @@ jobs:
       - pypy
     if: "startsWith(github.ref, 'refs/tags/')"
     steps:
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v3
         with:
           name: wheels
       - uses: actions/setup-python@v4
@@ -293,3 +295,6 @@ jobs:
         run: |
           pip install --upgrade twine
           twine upload --skip-existing *
+      - name: Update pre-commit mirror
+        run: |
+          curl -X POST -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.RUFF_PRE_COMMIT_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" https://api.github.com/repos/charliermarsh/ruff-pre-commit/dispatches --data '{"event_type": "pypi_release"}'

.gitignore

@@ -181,3 +181,4 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
+.vimspector.json

.pre-commit-config.yaml

@@ -1,10 +1,20 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.200
+    rev: v0.0.236
     hooks:
       - id: ruff
+        args: [--fix]
+        exclude: ^resources
 
   - repo: https://github.com/abravalheri/validate-pyproject
     rev: v0.10.1
     hooks:
       - id: validate-pyproject
+
+  - repo: local
+    hooks:
+      - id: cargo-fmt
+        name: cargo fmt
+        entry: cargo +nightly fmt --
+        language: rust
+        types: [rust]

BREAKING_CHANGES.md

@@ -1,5 +1,36 @@
 # Breaking Changes
 
+## 0.0.226
+
+### `misplaced-comparison-constant` (`PLC2201`) was deprecated in favor of `SIM300` ([#1980](https://github.com/charliermarsh/ruff/pull/1980))
+
+These two rules contain (nearly) identical logic. To deduplicate the rule set, we've upgraded
+`SIM300` to handle a few more cases, and deprecated `PLC2201` in favor of `SIM300`.
+
+## 0.0.225
+
+### `@functools.cache` rewrites have been moved to a standalone rule (`UP033`) ([#1938](https://github.com/charliermarsh/ruff/pull/1938))
+
+Previously, `UP011` handled both `@functools.lru_cache()`-to-`@functools.lru_cache` conversions,
+_and_ `@functools.lru_cache(maxsize=None)`-to-`@functools.cache` conversions. The latter has been
+moved out to its own rule (`UP033`). As such, some `# noqa: UP011` comments may need to be updated
+to reflect the change in rule code.
+
+## 0.0.222
+
+### `--max-complexity` has been removed from the CLI ([#1877](https://github.com/charliermarsh/ruff/pull/1877))
+
+The McCabe plugin's `--max-complexity` setting has been removed from the CLI, for consistency with
+the treatment of other, similar settings.
+
+To set the maximum complexity, use the `max-complexity` property in your `pyproject.toml` file,
+like so:
+
+```toml
+[tool.ruff.mccabe]
+max-complexity = 10
+```
+
 ## 0.0.181
 
 ### Files excluded by `.gitignore` are now ignored ([#1234](https://github.com/charliermarsh/ruff/pull/1234))

CONTRIBUTING.md

@@ -9,6 +9,16 @@ free to submit a PR. For larger changes (e.g., new lint rules, new functionality
 options), consider submitting an [Issue](https://github.com/charliermarsh/ruff/issues) outlining
 your proposed change.
 
+If you're looking for a place to start, we recommend implementing a new lint rule (see:
+[_Adding a new lint rule_](#example-adding-a-new-lint-rule), which will allow you to learn from and
+pattern-match against the examples in the existing codebase. Many lint rules are inspired by
+existing Python plugins, which can be used as a reference implementation.
+
+As a concrete example: consider taking on one of the rules from the [`tryceratops`](https://github.com/charliermarsh/ruff/issues/2056)
+plugin, and looking to the originating [Python source](https://github.com/guilatrova/tryceratops)
+for guidance. [`flake8-simplify`](https://github.com/charliermarsh/ruff/issues/998) has a few rules
+left too.
+
 ### Prerequisites
 
 Ruff is written in Rust. You'll need to install the
@@ -28,13 +38,16 @@ After cloning the repository, run Ruff locally with:
 cargo run resources/test/fixtures --no-cache
 ```
 
-Prior to opening a pull request, ensure that your code has been auto-formatted, and that it passes
-both the lint and test validation checks:
+Prior to opening a pull request, ensure that your code has been auto-formatted,
+and that it passes both the lint and test validation checks.
+
+For rustfmt and Clippy, we use [nightly Rust][nightly], as it is stricter than stable Rust.
+(However, tests and builds use stable Rust.)
 
 ```shell
 cargo +nightly fmt --all     # Auto-formatting...
-cargo +nightly clippy --all  # Linting...
-cargo +nightly test --all    # Testing...
+cargo +nightly clippy --fix --workspace --all-targets --all-features  # Linting...
+cargo test --all    # Testing...
 ```
 
 These checks will run on GitHub Actions when you open your Pull Request, but running them locally
@@ -45,59 +58,64 @@ prior to merging.
 
 ### Example: Adding a new lint rule
 
-There are four phases to adding a new lint rule:
+At a high level, the steps involved in adding a new lint rule are as follows:
 
-1. Define the rule in `src/checks.rs`.
-2. Define the _logic_ for triggering the rule in `src/checkers/ast.rs` (for AST-based checks),
-   `src/checkers/tokens.rs` (for token-based checks), or `src/checkers/lines.rs` (for text-based checks).
-3. Add a test fixture.
-4. Update the generated files (documentation and generated code).
+1. Create a file for your rule (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`).
+2. In that file, define a violation struct. You can grep for `define_violation!` to see examples.
+3. Map the violation struct to a rule code in `src/registry.rs` (e.g., `E402`).
+4. Define the logic for triggering the violation in `src/checkers/ast.rs` (for AST-based checks),
+   `src/checkers/tokens.rs` (for token-based checks), `src/checkers/lines.rs` (for text-based
+   checks), or `src/checkers/filesystem.rs` (for filesystem-based checks).
+5. Add a test fixture.
+6. Update the generated files (documentation and generated code).
 
-To define the rule, open up `src/checks.rs`. You'll need to define both a `CheckCode` and
-`CheckKind`. As an example, you can grep for `E402` and `ModuleImportNotAtTopOfFile`, and follow the
-pattern implemented therein.
+To define the violation, start by creating a dedicated file for your rule under the appropriate
+rule linter (e.g., `src/rules/flake8_bugbear/rules/abstract_base_class.rs`). That file should
+contain a struct defined via `define_violation!`, along with a function that creates the violation
+based on any required inputs. (Many of the existing examples live in `src/violations.rs`, but we're
+looking to place new rules in their own files.)
 
-To trigger the rule, you'll likely want to augment the logic in `src/check_ast.rs`, which defines
-the Python AST visitor, responsible for iterating over the abstract syntax tree and collecting
-lint-rule violations as it goes. If you need to inspect the AST, you can run
-`cargo +nightly dev print-ast` with a Python file. Grep for the `Check::new` invocations to
-understand how other, similar rules are implemented.
+To trigger the violation, you'll likely want to augment the logic in `src/checkers/ast.rs`, which
+defines the Python AST visitor, responsible for iterating over the abstract syntax tree and
+collecting diagnostics as it goes.
 
-To add a test fixture, create a file under `resources/test/fixtures`, named to match the `CheckCode`
-you defined earlier (e.g., `E402.py`). This file should contain a variety of violations and
-non-violations designed to evaluate and demonstrate the behavior of your lint rule. Run Ruff locally
-with (e.g.) `cargo run resources/test/fixtures/E402.py --no-cache`. Once you're satisfied with the
-output, codify the behavior as a snapshot test by adding a new `testcase` macro to the `mod tests`
-section of `src/linter.rs`, like so:
+If you need to inspect the AST, you can run `cargo +nightly dev print-ast` with a Python file. Grep
+for the `Check::new` invocations to understand how other, similar rules are implemented.
 
-```rust
-#[test_case(CheckCode::A001, Path::new("A001.py"); "A001")]
-...
-```
+To add a test fixture, create a file under `resources/test/fixtures/[linter]`, named to match
+the code you defined earlier (e.g., `resources/test/fixtures/pycodestyle/E402.py`). This file should
+contain a variety of violations and non-violations designed to evaluate and demonstrate the behavior
+of your lint rule.
 
-Then, run `cargo test`. Your test will fail, but you'll be prompted to follow-up with
-`cargo insta review`. Accept the generated snapshot, then commit the snapshot file alongside the
-rest of your changes.
+Run `cargo +nightly dev generate-all` to generate the code for your new fixture. Then run Ruff
+locally with (e.g.) `cargo run resources/test/fixtures/pycodestyle/E402.py --no-cache --select E402`.
+
+Once you're satisfied with the output, codify the behavior as a snapshot test by adding a new
+`test_case` macro in the relevant `src/[linter]/mod.rs` file. Then, run `cargo test --all`.
+Your test will fail, but you'll be prompted to follow-up with `cargo insta review`. Accept the
+generated snapshot, then commit the snapshot file alongside the rest of your changes.
 
 Finally, regenerate the documentation and generated code with `cargo +nightly dev generate-all`.
 
 ### Example: Adding a new configuration option
 
-Ruff's user-facing settings live in two places: first, the command-line options defined with
-[clap](https://docs.rs/clap/latest/clap/) via the `Cli` struct in `src/main.rs`; and second, the
-`Config` struct defined `src/pyproject.rs`, which is responsible for extracting user-defined
-settings from a `pyproject.toml` file.
+Ruff's user-facing settings live in a few different places.
 
-Ultimately, these two sources of configuration are merged into the `Settings` struct defined
-in `src/settings.rs`, which is then threaded through the codebase.
+First, the command-line options are defined via the `Cli` struct in `src/cli.rs`.
 
-To add a new configuration option, you'll likely want to _both_ add a CLI option to `src/main.rs`
-_and_ a `pyproject.toml` parameter to `src/pyproject.rs`. If you want to pattern-match against an
-existing example, grep for `dummy_variable_rgx`, which defines a regular expression to match against
-acceptable unused variables (e.g., `_`).
+Second, the `pyproject.toml` options are defined in `src/settings/options.rs` (via the `Options`
+struct), `src/settings/configuration.rs` (via the `Configuration` struct), and `src/settings/mod.rs`
+(via the `Settings` struct). These represent, respectively: the schema used to parse the
+`pyproject.toml` file; an internal, intermediate representation; and the final, internal
+representation used to power Ruff.
 
-If the new plugin's configuration should be cached between runs, you'll need to add it to the
-`Hash` implementation for `Settings` in `src/settings/mod.rs`.
+To add a new configuration option, you'll likely want to modify these latter few files (along with
+`cli.rs`, if appropriate). If you want to pattern-match against an existing example, grep for
+`dummy_variable_rgx`, which defines a regular expression to match against acceptable unused
+variables (e.g., `_`).
+
+Note that plugin-specific configuration options are defined in their own modules (e.g.,
+`src/flake8_unused_arguments/settings.rs`).
 
 You may also want to add the new configuration option to the `flake8-to-ruff` tool, which is
 responsible for converting `flake8` configuration files to Ruff's TOML format. This logic
@@ -113,3 +131,5 @@ them to [PyPI](https://pypi.org/project/ruff/).
 
 Ruff follows the [semver](https://semver.org/) versioning standard. However, as pre-1.0 software,
 even patch releases may contain [non-backwards-compatible changes](https://semver.org/#spec-item-4).
+
+[nightly]: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust

Cargo.toml

@@ -2,11 +2,13 @@
 members = [
   "flake8_to_ruff",
   "ruff_dev",
+  "ruff_cli",
 ]
+default-members = [".", "ruff_cli"]
 
 [package]
 name = "ruff"
-version = "0.0.200"
+version = "0.0.236"
 authors = ["Charlie Marsh <charlie.r.marsh@gmail.com>"]
 edition = "2021"
 rust-version = "1.65.0"
@@ -19,60 +21,47 @@ license = "MIT"
 [lib]
 name = "ruff"
 crate-type = ["cdylib", "rlib"]
+doctest = false
 
 [dependencies]
-annotate-snippets = { version = "0.9.1", features = ["color"] }
 anyhow = { version = "1.0.66" }
-atty = { version = "0.2.14" }
-bincode = { version = "1.3.3" }
 bitflags = { version = "1.3.2" }
-cachedir = { version = "0.3.0" }
 cfg-if = { version = "1.0.0" }
 chrono = { version = "0.4.21", default-features = false, features = ["clock"] }
-clap = { version = "4.0.1", features = ["derive"] }
-clap_complete_command = { version = "0.4.0" }
+clap = { version = "4.0.1", features = ["derive", "env"] }
 colored = { version = "2.0.0" }
-common-path = { version = "1.0.0" }
 dirs = { version = "4.0.0" }
 fern = { version = "0.6.1" }
-filetime = { version = "0.2.17" }
 glob = { version = "0.3.0" }
 globset = { version = "0.4.9" }
 ignore = { version = "0.4.18" }
+imperative = { version = "1.0.3" }
 itertools = { version = "0.10.5" }
 libcst = { git = "https://github.com/charliermarsh/LibCST", rev = "f2f0b7a487a8725d161fe8b3ed73a6758b21e177" }
 log = { version = "0.4.17" }
 natord = { version = "1.0.9" }
 nohash-hasher = { version = "0.2.0" }
-notify = { version = "5.0.0" }
 num-bigint = { version = "0.4.3" }
+num-traits = "0.2.15"
 once_cell = { version = "1.16.0" }
 path-absolutize = { version = "3.0.14", features = ["once_cell_cache", "use_unix_paths_on_wasm"] }
-quick-junit = { version = "0.3.2" }
 regex = { version = "1.6.0" }
-ropey = { version = "1.5.0", features = ["cr_lines", "simd"], default-features = false }
-ruff_macros = { version = "0.0.200", path = "ruff_macros" }
+ruff_macros = { version = "0.0.236", path = "ruff_macros" }
 rustc-hash = { version = "1.1.0" }
-rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
-rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "68d26955b3e24198a150315e7959719b03709dee" }
+rustpython-ast = { features = ["unparse"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-common = { git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
+rustpython-parser = { features = ["lalrpop"], git = "https://github.com/RustPython/RustPython.git", rev = "4f38cb68e4a97aeea9eb19673803a0bd5f655383" }
 schemars = { version = "0.8.11" }
 semver = { version = "1.0.16" }
 serde = { version = "1.0.147", features = ["derive"] }
-serde_json = { version = "1.0.87" }
 shellexpand = { version = "3.0.0" }
-similar = { version = "2.2.1" }
+smallvec = { version = "1.10.0" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
 textwrap = { version = "0.16.0" }
+thiserror = { version = "1.0" }
 titlecase = { version = "2.2.1" }
-toml = { version = "0.5.9" }
-walkdir = { version = "2.3.2" }
-
-[target.'cfg(not(target_family = "wasm"))'.dependencies]
-clearscreen = { version = "1.0.10" }
-rayon = { version = "1.5.3" }
-update-informer = { version = "0.5.0", default-features = false, features = ["pypi"], optional = true }
+toml = { version = "0.6.0" }
 
 # https://docs.rs/getrandom/0.2.7/getrandom/#webassembly-support
 # For (future) wasm-pack support
@@ -84,20 +73,17 @@ serde-wasm-bindgen = { version = "0.4" }
 js-sys = { version = "0.3.60" }
 wasm-bindgen = { version = "0.2.83" }
 
+[target.'cfg(not(target_family = "wasm"))'.dependencies]
+is_executable = "1.0.1"
+
 [dev-dependencies]
-insta = { version = "1.19.1", features = ["yaml"] }
+insta = { version = "1.19.1", features = ["yaml", "redactions"] }
 test-case = { version = "2.2.2" }
-ureq = { version = "2.5.0", features = [] }
 wasm-bindgen-test = { version = "0.3.33" }
 
 [target.'cfg(not(target_family = "wasm"))'.dev-dependencies]
-assert_cmd = { version = "2.0.4" }
 criterion = { version = "0.4.0" }
 
-[features]
-default = ["update-informer"]
-update-informer = ["dep:update-informer"]
-
 [profile.release]
 panic = "abort"
 lto = "thin"
@@ -114,7 +100,3 @@ opt-level = 3
 # https://github.com/bytecodealliance/wasm-tools/blob/b5c3d98e40590512a3b12470ef358d5c7b983b15/crates/wasmparser/src/limits.rs#L29
 [profile.dev.package.rustpython-parser]
 opt-level = 1
-
-[[bench]]
-name = "source_code_locator"
-harness = false

assets/badge/v0.json

@@ -0,0 +1,8 @@
+{
+  "label": "",
+  "message": "Ruff",
+  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"128\" height=\"128\"><path d=\"M115.36 61.84 70.22 50.49 114.45 2.4a1.222 1.222 0 0 0-1.54-1.87L12.3 61.98c-.41.25-.64.72-.57 1.2.06.48.4.87.87 1.01l45.07 13.25-44.29 48.16c-.42.46-.44 1.15-.04 1.61.24.29.58.44.94.44.22 0 .45-.06.65-.19l100.78-63.41c.42-.26.64-.75.56-1.22-.08-.49-.43-.88-.91-.99z\" style=\"fill:#fcc21b\"/></svg>",
+  "logoWidth": 10,
+  "labelColor": "grey",
+  "color": "#E15759"
+}

assets/badge/v1.json

@@ -0,0 +1,8 @@
+{
+  "label": "",
+  "message": "Ruff",
+  "logoSvg": "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"109\" height=\"132\" fill=\"none\"><g filter=\"url(#a)\"><path fill=\"#FCC21B\" d=\"m103.642 61.492-45.14-11.35 44.23-48.09a1.222 1.222 0 0 0-1.54-1.87L.582 61.632c-.41.25-.64.72-.57 1.2.06.48.4.87.87 1.01l45.07 13.25-44.29 48.16c-.42.46-.44 1.15-.04 1.61.24.29.58.44.94.44.22 0 .45-.06.65-.19l100.78-63.41c.42-.26.64-.75.56-1.22-.08-.49-.43-.88-.91-.99Z\"/></g><defs><filter id=\"a\" width=\"108.569\" height=\"131.302\" x=\"0\" y=\"0\" color-interpolation-filters=\"sRGB\" filterUnits=\"userSpaceOnUse\"><feFlood flood-opacity=\"0\" result=\"BackgroundImageFix\"/><feColorMatrix in=\"SourceAlpha\" result=\"hardAlpha\" values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0\"/><feOffset dx=\"4\" dy=\"4\"/><feComposite in2=\"hardAlpha\" operator=\"out\"/><feColorMatrix values=\"0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0\"/><feBlend in2=\"BackgroundImageFix\" result=\"effect1_dropShadow_7_4\"/><feBlend in=\"SourceGraphic\" in2=\"effect1_dropShadow_7_4\" result=\"shape\"/></filter></defs></svg>",
+  "logoWidth": 10,
+  "labelColor": "grey",
+  "color": "#E15759"
+}

benches/source_code_locator.rs

@@ -1,18 +0,0 @@
-use std::fs;
-use std::path::Path;
-
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-use ropey::Rope;
-
-fn criterion_benchmark(c: &mut Criterion) {
-    let contents = fs::read_to_string(Path::new("resources/test/fixtures/D.py")).unwrap();
-    c.bench_function("rope", |b| {
-        b.iter(|| {
-            let rope = Rope::from_str(black_box(&contents));
-            rope.line_to_char(black_box(4));
-        });
-    });
-}
-
-criterion_group!(benches, criterion_benchmark);
-criterion_main!(benches);

flake8_to_ruff/Cargo.lock

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

flake8_to_ruff/Cargo.toml

@@ -1,14 +1,12 @@
 [package]
 name = "flake8-to-ruff"
-version = "0.0.200-dev.0"
+version = "0.0.236"
 edition = "2021"
 
-[lib]
-name = "flake8_to_ruff"
-
 [dependencies]
 anyhow = { version = "1.0.66" }
 clap = { version = "4.0.1", features = ["derive"] }
+colored = { version = "2.0.0" }
 configparser = { version = "3.0.2" }
 once_cell = { version = "1.16.0" }
 regex = { version = "1.6.0" }
@@ -18,7 +16,7 @@ serde = { version = "1.0.147", features = ["derive"] }
 serde_json = { version = "1.0.87" }
 strum = { version = "0.24.1", features = ["strum_macros"] }
 strum_macros = { version = "0.24.3" }
-toml = { version = "0.5.9" }
+toml = { version = "0.6.0" }
 
 [dev-dependencies]
 

flake8_to_ruff/README.md

@@ -84,7 +84,7 @@ flake8-to-ruff path/to/.flake8 --plugin flake8-builtins --plugin flake8-quotes
 1. Ruff only supports a subset of the Flake configuration options. `flake8-to-ruff` will warn on and
    ignore unsupported options in the `.flake8` file (or equivalent). (Similarly, Ruff has a few
    configuration options that don't exist in Flake8.)
-2. Ruff will omit any error codes that are unimplemented or unsupported by Ruff, including error
+2. Ruff will omit any rule codes that are unimplemented or unsupported by Ruff, including rule
    codes from unsupported plugins. (See the [Ruff README](https://github.com/charliermarsh/ruff#user-content-how-does-ruff-compare-to-flake8)
    for the complete list of supported plugins.)
 

flake8_to_ruff/examples/jupyterhub.ini

@@ -0,0 +1,19 @@
+[flake8]
+# Ignore style and complexity
+# E: style errors
+# W: style warnings
+# C: complexity
+# D: docstring warnings (unused pydocstyle extension)
+# F841: local variable assigned but never used
+ignore = E, C, W, D, F841
+builtins = c, get_config
+exclude =
+    .cache,
+    .github,
+    docs,
+    jupyterhub/alembic*,
+    onbuild,
+    scripts,
+    share,
+    tools,
+    setup.py

flake8_to_ruff/examples/manim.ini

@@ -0,0 +1,43 @@
+[flake8]
+# Exclude the grpc generated code
+exclude = ./manim/grpc/gen/*
+max-complexity = 15
+max-line-length = 88
+statistics = True
+# Prevents some flake8-rst-docstrings errors
+rst-roles = attr,class,func,meth,mod,obj,ref,doc,exc
+rst-directives = manim, SEEALSO, seealso
+docstring-convention=numpy
+
+select = A,A00,B,B9,C4,C90,D,E,F,F,PT,RST,SIM,W
+
+                # General Compatibility
+extend-ignore = E203, W503, D202, D212, D213, D404
+
+                # Misc
+                F401, F403, F405, F841, E501, E731, E402, F811, F821,
+
+                # Plug-in: flake8-builtins
+                A001, A002, A003,
+
+                # Plug-in: flake8-bugbear
+                B006, B007, B008, B009, B010, B903, B950,
+
+                # Plug-in: flake8-simplify
+                SIM105, SIM106, SIM119,
+
+                # Plug-in: flake8-comprehensions
+                C901
+
+                # Plug-in: flake8-pytest-style
+                PT001, PT004, PT006, PT011, PT018, PT022, PT023,
+
+                # Plug-in: flake8-docstrings
+                D100, D101, D102, D103, D104, D105, D106, D107,
+                D200, D202, D204, D205, D209,
+                D301,
+                D400, D401, D402, D403, D405, D406, D407, D409, D411, D412, D414,
+
+                # Plug-in: flake8-rst-docstrings
+                RST201, RST203, RST210, RST212, RST213, RST215,
+                RST301, RST303,

flake8_to_ruff/src/black.rs

@@ -1,32 +0,0 @@
-//! Extract Black configuration settings from a pyproject.toml.
-
-use std::path::Path;
-
-use anyhow::Result;
-use ruff::settings::types::PythonVersion;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
-pub struct Black {
-    #[serde(alias = "line-length", alias = "line_length")]
-    pub line_length: Option<usize>,
-    #[serde(alias = "target-version", alias = "target_version")]
-    pub target_version: Option<Vec<PythonVersion>>,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct Tools {
-    black: Option<Black>,
-}
-
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
-struct Pyproject {
-    tool: Option<Tools>,
-}
-
-pub fn parse_black_options<P: AsRef<Path>>(path: P) -> Result<Option<Black>> {
-    let contents = std::fs::read_to_string(path)?;
-    Ok(toml::from_str::<Pyproject>(&contents)?
-        .tool
-        .and_then(|tool| tool.black))
-}

flake8_to_ruff/src/converter.rs

@@ -1,751 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-
-use anyhow::Result;
-use ruff::checks_gen::CheckCodePrefix;
-use ruff::flake8_quotes::settings::Quote;
-use ruff::flake8_tidy_imports::settings::Strictness;
-use ruff::pydocstyle::settings::Convention;
-use ruff::settings::options::Options;
-use ruff::settings::pyproject::Pyproject;
-use ruff::{
-    flake8_annotations, flake8_bugbear, flake8_errmsg, flake8_quotes, flake8_tidy_imports, mccabe,
-    pep8_naming, pydocstyle,
-};
-
-use crate::black::Black;
-use crate::plugin::Plugin;
-use crate::{parser, plugin};
-
-pub fn convert(
-    config: &HashMap<String, HashMap<String, Option<String>>>,
-    black: Option<&Black>,
-    plugins: Option<Vec<Plugin>>,
-) -> Result<Pyproject> {
-    // Extract the Flake8 section.
-    let flake8 = config
-        .get("flake8")
-        .expect("Unable to find flake8 section in INI file");
-
-    // Extract all referenced check code prefixes, to power plugin inference.
-    let mut referenced_codes: BTreeSet<CheckCodePrefix> = BTreeSet::default();
-    for (key, value) in flake8 {
-        if let Some(value) = value {
-            match key.as_str() {
-                "select" | "ignore" | "extend-select" | "extend_select" | "extend-ignore"
-                | "extend_ignore" => {
-                    referenced_codes.extend(parser::parse_prefix_codes(value.as_ref()));
-                }
-                "per-file-ignores" | "per_file_ignores" => {
-                    if let Ok(per_file_ignores) =
-                        parser::parse_files_to_codes_mapping(value.as_ref())
-                    {
-                        for (_, codes) in parser::collect_per_file_ignores(per_file_ignores) {
-                            referenced_codes.extend(codes);
-                        }
-                    }
-                }
-                _ => {}
-            }
-        }
-    }
-
-    // Check if the user has specified a `select`. If not, we'll add our own
-    // default `select`, and populate it based on user plugins.
-    let mut select = flake8
-        .get("select")
-        .and_then(|value| {
-            value
-                .as_ref()
-                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
-        })
-        .unwrap_or_else(|| {
-            plugin::resolve_select(
-                flake8,
-                &plugins.unwrap_or_else(|| {
-                    let from_options = plugin::infer_plugins_from_options(flake8);
-                    if !from_options.is_empty() {
-                        eprintln!("Inferred plugins from settings: {from_options:#?}");
-                    }
-                    let from_codes = plugin::infer_plugins_from_codes(&referenced_codes);
-                    if !from_codes.is_empty() {
-                        eprintln!("Inferred plugins from referenced check codes: {from_codes:#?}");
-                    }
-                    from_options.into_iter().chain(from_codes).collect()
-                }),
-            )
-        });
-    let mut ignore = flake8
-        .get("ignore")
-        .and_then(|value| {
-            value
-                .as_ref()
-                .map(|value| BTreeSet::from_iter(parser::parse_prefix_codes(value)))
-        })
-        .unwrap_or_default();
-
-    // Parse each supported option.
-    let mut options = Options::default();
-    let mut flake8_annotations = flake8_annotations::settings::Options::default();
-    let mut flake8_bugbear = flake8_bugbear::settings::Options::default();
-    let mut flake8_errmsg = flake8_errmsg::settings::Options::default();
-    let mut flake8_quotes = flake8_quotes::settings::Options::default();
-    let mut flake8_tidy_imports = flake8_tidy_imports::settings::Options::default();
-    let mut mccabe = mccabe::settings::Options::default();
-    let mut pep8_naming = pep8_naming::settings::Options::default();
-    let mut pydocstyle = pydocstyle::settings::Options::default();
-    for (key, value) in flake8 {
-        if let Some(value) = value {
-            match key.as_str() {
-                // flake8
-                "max-line-length" | "max_line_length" => match value.clone().parse::<usize>() {
-                    Ok(line_length) => options.line_length = Some(line_length),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                },
-                "select" => {
-                    // No-op (handled above).
-                    select.extend(parser::parse_prefix_codes(value.as_ref()));
-                }
-                "ignore" => {
-                    // No-op (handled above).
-                }
-                "extend-select" | "extend_select" => {
-                    // Unlike Flake8, use a single explicit `select`.
-                    select.extend(parser::parse_prefix_codes(value.as_ref()));
-                }
-                "extend-ignore" | "extend_ignore" => {
-                    // Unlike Flake8, use a single explicit `ignore`.
-                    ignore.extend(parser::parse_prefix_codes(value.as_ref()));
-                }
-                "exclude" => {
-                    options.exclude = Some(parser::parse_strings(value.as_ref()));
-                }
-                "extend-exclude" | "extend_exclude" => {
-                    options.extend_exclude = Some(parser::parse_strings(value.as_ref()));
-                }
-                "per-file-ignores" | "per_file_ignores" => {
-                    match parser::parse_files_to_codes_mapping(value.as_ref()) {
-                        Ok(per_file_ignores) => {
-                            options.per_file_ignores =
-                                Some(parser::collect_per_file_ignores(per_file_ignores));
-                        }
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                // flake8-bugbear
-                "extend-immutable-calls" | "extend_immutable_calls" => {
-                    flake8_bugbear.extend_immutable_calls =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
-                // flake8-annotations
-                "suppress-none-returning" | "suppress_none_returning" => {
-                    match parser::parse_bool(value.as_ref()) {
-                        Ok(bool) => flake8_annotations.suppress_none_returning = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                "suppress-dummy-args" | "suppress_dummy_args" => {
-                    match parser::parse_bool(value.as_ref()) {
-                        Ok(bool) => flake8_annotations.suppress_dummy_args = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                "mypy-init-return" | "mypy_init_return" => {
-                    match parser::parse_bool(value.as_ref()) {
-                        Ok(bool) => flake8_annotations.mypy_init_return = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                "allow-star-arg-any" | "allow_star_arg_any" => {
-                    match parser::parse_bool(value.as_ref()) {
-                        Ok(bool) => flake8_annotations.allow_star_arg_any = Some(bool),
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                // flake8-quotes
-                "quotes" | "inline-quotes" | "inline_quotes" => match value.trim() {
-                    "'" | "single" => flake8_quotes.inline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.inline_quotes = Some(Quote::Single),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
-                "multiline-quotes" | "multiline_quotes" => match value.trim() {
-                    "'" | "single" => flake8_quotes.multiline_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.multiline_quotes = Some(Quote::Single),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
-                "docstring-quotes" | "docstring_quotes" => match value.trim() {
-                    "'" | "single" => flake8_quotes.docstring_quotes = Some(Quote::Single),
-                    "\"" | "double" => flake8_quotes.docstring_quotes = Some(Quote::Single),
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
-                "avoid-escape" | "avoid_escape" => match parser::parse_bool(value.as_ref()) {
-                    Ok(bool) => flake8_quotes.avoid_escape = Some(bool),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                },
-                // pep8-naming
-                "ignore-names" | "ignore_names" => {
-                    pep8_naming.ignore_names = Some(parser::parse_strings(value.as_ref()));
-                }
-                "classmethod-decorators" | "classmethod_decorators" => {
-                    pep8_naming.classmethod_decorators =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
-                "staticmethod-decorators" | "staticmethod_decorators" => {
-                    pep8_naming.staticmethod_decorators =
-                        Some(parser::parse_strings(value.as_ref()));
-                }
-                // flake8-tidy-imports
-                "ban-relative-imports" | "ban_relative_imports" => match value.trim() {
-                    "true" => flake8_tidy_imports.ban_relative_imports = Some(Strictness::All),
-                    "parents" => {
-                        flake8_tidy_imports.ban_relative_imports = Some(Strictness::Parents);
-                    }
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
-                // flake8-docstrings
-                "docstring-convention" => match value.trim() {
-                    "google" => pydocstyle.convention = Some(Convention::Google),
-                    "numpy" => pydocstyle.convention = Some(Convention::Numpy),
-                    "pep257" | "all" => pydocstyle.convention = None,
-                    _ => eprintln!("Unexpected '{key}' value: {value}"),
-                },
-                // mccabe
-                "max-complexity" | "max_complexity" => match value.clone().parse::<usize>() {
-                    Ok(max_complexity) => mccabe.max_complexity = Some(max_complexity),
-                    Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                },
-                // flake8-errmsg
-                "errmsg-max-string-length" | "errmsg_max_string_length" => {
-                    match value.clone().parse::<usize>() {
-                        Ok(max_string_length) => {
-                            flake8_errmsg.max_string_length = Some(max_string_length);
-                        }
-                        Err(e) => eprintln!("Unable to parse '{key}' property: {e}"),
-                    }
-                }
-                // Unknown
-                _ => eprintln!("Skipping unsupported property: {key}"),
-            }
-        }
-    }
-
-    // Deduplicate and sort.
-    options.select = Some(Vec::from_iter(select));
-    options.ignore = Some(Vec::from_iter(ignore));
-    if flake8_annotations != flake8_annotations::settings::Options::default() {
-        options.flake8_annotations = Some(flake8_annotations);
-    }
-    if flake8_bugbear != flake8_bugbear::settings::Options::default() {
-        options.flake8_bugbear = Some(flake8_bugbear);
-    }
-    if flake8_errmsg != flake8_errmsg::settings::Options::default() {
-        options.flake8_errmsg = Some(flake8_errmsg);
-    }
-    if flake8_quotes != flake8_quotes::settings::Options::default() {
-        options.flake8_quotes = Some(flake8_quotes);
-    }
-    if flake8_tidy_imports != flake8_tidy_imports::settings::Options::default() {
-        options.flake8_tidy_imports = Some(flake8_tidy_imports);
-    }
-    if mccabe != mccabe::settings::Options::default() {
-        options.mccabe = Some(mccabe);
-    }
-    if pep8_naming != pep8_naming::settings::Options::default() {
-        options.pep8_naming = Some(pep8_naming);
-    }
-    if pydocstyle != pydocstyle::settings::Options::default() {
-        options.pydocstyle = Some(pydocstyle);
-    }
-
-    // Extract any settings from the existing `pyproject.toml`.
-    if let Some(black) = black {
-        if let Some(line_length) = &black.line_length {
-            options.line_length = Some(*line_length);
-        }
-
-        if let Some(target_version) = &black.target_version {
-            if let Some(target_version) = target_version.iter().min() {
-                options.target_version = Some(*target_version);
-            }
-        }
-    }
-
-    // Create the pyproject.toml.
-    Ok(Pyproject::new(options))
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use anyhow::Result;
-    use ruff::checks_gen::CheckCodePrefix;
-    use ruff::pydocstyle::settings::Convention;
-    use ruff::settings::options::Options;
-    use ruff::settings::pyproject::Pyproject;
-    use ruff::{flake8_quotes, pydocstyle};
-
-    use crate::converter::convert;
-    use crate::plugin::Plugin;
-
-    #[test]
-    fn it_converts_empty() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([("flake8".to_string(), HashMap::default())]),
-            None,
-            None,
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_converts_dashes() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max-line-length".to_string(), Some("100".to_string()))]),
-            )]),
-            None,
-            Some(vec![]),
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: Some(100),
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_converts_underscores() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max_line_length".to_string(), Some("100".to_string()))]),
-            )]),
-            None,
-            Some(vec![]),
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: Some(100),
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_ignores_parse_errors() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("max_line_length".to_string(), Some("abc".to_string()))]),
-            )]),
-            None,
-            Some(vec![]),
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_converts_plugin_options() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
-            )]),
-            None,
-            Some(vec![]),
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: Some(flake8_quotes::settings::Options {
-                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                multiline_quotes: None,
-                docstring_quotes: None,
-                avoid_escape: None,
-            }),
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_converts_docstring_conventions() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([(
-                    "docstring-convention".to_string(),
-                    Some("numpy".to_string()),
-                )]),
-            )]),
-            None,
-            Some(vec![Plugin::Flake8Docstrings]),
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                CheckCodePrefix::D214,
-                CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                CheckCodePrefix::D403,
-                CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                CheckCodePrefix::D406,
-                CheckCodePrefix::D407,
-                CheckCodePrefix::D408,
-                CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                CheckCodePrefix::D414,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: None,
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: Some(pydocstyle::settings::Options {
-                convention: Some(Convention::Numpy),
-            }),
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-
-    #[test]
-    fn it_infers_plugins_if_omitted() -> Result<()> {
-        let actual = convert(
-            &HashMap::from([(
-                "flake8".to_string(),
-                HashMap::from([("inline-quotes".to_string(), Some("single".to_string()))]),
-            )]),
-            None,
-            None,
-        )?;
-        let expected = Pyproject::new(Options {
-            allowed_confusables: None,
-            cache_dir: None,
-            dummy_variable_rgx: None,
-            exclude: None,
-            extend: None,
-            extend_exclude: None,
-            extend_ignore: None,
-            extend_select: None,
-            external: None,
-            fix: None,
-            fix_only: None,
-            fixable: None,
-            format: None,
-            force_exclude: None,
-            ignore: Some(vec![]),
-            ignore_init_module_imports: None,
-            line_length: None,
-            per_file_ignores: None,
-            required_version: None,
-            respect_gitignore: None,
-            select: Some(vec![
-                CheckCodePrefix::E,
-                CheckCodePrefix::F,
-                CheckCodePrefix::Q,
-                CheckCodePrefix::W,
-            ]),
-            show_source: None,
-            src: None,
-            target_version: None,
-            unfixable: None,
-            update_check: None,
-            flake8_annotations: None,
-            flake8_bugbear: None,
-            flake8_errmsg: None,
-            flake8_quotes: Some(flake8_quotes::settings::Options {
-                inline_quotes: Some(flake8_quotes::settings::Quote::Single),
-                multiline_quotes: None,
-                docstring_quotes: None,
-                avoid_escape: None,
-            }),
-            flake8_tidy_imports: None,
-            flake8_import_conventions: None,
-            flake8_unused_arguments: None,
-            isort: None,
-            mccabe: None,
-            pep8_naming: None,
-            pydocstyle: None,
-            pyupgrade: None,
-        });
-        assert_eq!(actual, expected);
-
-        Ok(())
-    }
-}

flake8_to_ruff/src/lib.rs

@@ -1,17 +0,0 @@
-#![allow(
-    clippy::collapsible_else_if,
-    clippy::collapsible_if,
-    clippy::implicit_hasher,
-    clippy::match_same_arms,
-    clippy::missing_errors_doc,
-    clippy::missing_panics_doc,
-    clippy::module_name_repetitions,
-    clippy::must_use_candidate,
-    clippy::similar_names,
-    clippy::too_many_lines
-)]
-
-pub mod black;
-pub mod converter;
-mod parser;
-pub mod plugin;

flake8_to_ruff/src/main.rs

@@ -1,4 +1,6 @@
-//! Utility to generate Ruff's pyproject.toml section from a Flake8 INI file.
+//! Utility to generate Ruff's `pyproject.toml` section from a Flake8 INI file.
+#![forbid(unsafe_code)]
+#![warn(clippy::pedantic)]
 #![allow(
     clippy::collapsible_else_if,
     clippy::collapsible_if,
@@ -17,16 +19,14 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 use configparser::ini::Ini;
-use flake8_to_ruff::black::parse_black_options;
-use flake8_to_ruff::converter;
-use flake8_to_ruff::plugin::Plugin;
+use ruff::flake8_to_ruff::{self, ExternalConfig};
 
 #[derive(Parser)]
 #[command(
     about = "Convert existing Flake8 configuration to Ruff.",
     long_about = None
 )]
-struct Cli {
+struct Args {
     /// Path to the Flake8 configuration file (e.g., `setup.cfg`, `tox.ini`, or
     /// `.flake8`).
     #[arg(required = true)]
@@ -37,26 +37,30 @@ struct Cli {
     pyproject: Option<PathBuf>,
     /// List of plugins to enable.
     #[arg(long, value_delimiter = ',')]
-    plugin: Option<Vec<Plugin>>,
+    plugin: Option<Vec<flake8_to_ruff::Plugin>>,
 }
 
 fn main() -> Result<()> {
-    let cli = Cli::parse();
+    let args = Args::parse();
 
     // Read the INI file.
     let mut ini = Ini::new_cs();
     ini.set_multiline(true);
-    let config = ini.load(cli.file).map_err(|msg| anyhow::anyhow!(msg))?;
+    let config = ini.load(args.file).map_err(|msg| anyhow::anyhow!(msg))?;
 
     // Read the pyproject.toml file.
-    let black = cli
-        .pyproject
-        .map(parse_black_options)
-        .transpose()?
-        .flatten();
+    let pyproject = args.pyproject.map(flake8_to_ruff::parse).transpose()?;
+    let external_config = pyproject
+        .as_ref()
+        .and_then(|pyproject| pyproject.tool.as_ref())
+        .map(|tool| ExternalConfig {
+            black: tool.black.as_ref(),
+            isort: tool.isort.as_ref(),
+        })
+        .unwrap_or_default();
 
     // Create Ruff's pyproject.toml section.
-    let pyproject = converter::convert(&config, black.as_ref(), cli.plugin)?;
+    let pyproject = flake8_to_ruff::convert(&config, &external_config, args.plugin)?;
     println!("{}", toml::to_string_pretty(&pyproject)?);
 
     Ok(())

flake8_to_ruff/src/plugin.rs

@@ -1,514 +0,0 @@
-use std::collections::{BTreeSet, HashMap};
-use std::fmt;
-use std::str::FromStr;
-
-use anyhow::anyhow;
-use ruff::checks_gen::CheckCodePrefix;
-
-#[derive(Clone, Ord, PartialOrd, Eq, PartialEq)]
-pub enum Plugin {
-    Flake8Annotations,
-    Flake8Bandit,
-    Flake8BlindExcept,
-    Flake8Bugbear,
-    Flake8Builtins,
-    Flake8Comprehensions,
-    Flake8Datetimez,
-    Flake8Debugger,
-    Flake8Docstrings,
-    Flake8ErrMsg,
-    Flake8Eradicate,
-    Flake8Print,
-    Flake8Quotes,
-    Flake8Return,
-    Flake8Simplify,
-    Flake8TidyImports,
-    McCabe,
-    PandasVet,
-    PEP8Naming,
-    Pyupgrade,
-}
-
-impl FromStr for Plugin {
-    type Err = anyhow::Error;
-
-    fn from_str(string: &str) -> Result<Self, Self::Err> {
-        match string {
-            "flake8-annotations" => Ok(Plugin::Flake8Annotations),
-            "flake8-bandit" => Ok(Plugin::Flake8Bandit),
-            "flake8-blind-except" => Ok(Plugin::Flake8BlindExcept),
-            "flake8-bugbear" => Ok(Plugin::Flake8Bugbear),
-            "flake8-builtins" => Ok(Plugin::Flake8Builtins),
-            "flake8-comprehensions" => Ok(Plugin::Flake8Comprehensions),
-            "flake8-datetimez" => Ok(Plugin::Flake8Datetimez),
-            "flake8-debugger" => Ok(Plugin::Flake8Debugger),
-            "flake8-docstrings" => Ok(Plugin::Flake8Docstrings),
-            "flake8-eradicate" => Ok(Plugin::Flake8Eradicate),
-            "flake8-errmsg" => Ok(Plugin::Flake8ErrMsg),
-            "flake8-print" => Ok(Plugin::Flake8Print),
-            "flake8-quotes" => Ok(Plugin::Flake8Quotes),
-            "flake8-return" => Ok(Plugin::Flake8Return),
-            "flake8-simplify" => Ok(Plugin::Flake8Simplify),
-            "flake8-tidy-imports" => Ok(Plugin::Flake8TidyImports),
-            "mccabe" => Ok(Plugin::McCabe),
-            "pandas-vet" => Ok(Plugin::PandasVet),
-            "pep8-naming" => Ok(Plugin::PEP8Naming),
-            "pyupgrade" => Ok(Plugin::Pyupgrade),
-            _ => Err(anyhow!("Unknown plugin: {string}")),
-        }
-    }
-}
-
-impl fmt::Debug for Plugin {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                Plugin::Flake8Annotations => "flake8-annotations",
-                Plugin::Flake8Bandit => "flake8-bandit",
-                Plugin::Flake8BlindExcept => "flake8-blind-except",
-                Plugin::Flake8Bugbear => "flake8-bugbear",
-                Plugin::Flake8Builtins => "flake8-builtins",
-                Plugin::Flake8Comprehensions => "flake8-comprehensions",
-                Plugin::Flake8Datetimez => "flake8-datetimez",
-                Plugin::Flake8Debugger => "flake8-debugger",
-                Plugin::Flake8Docstrings => "flake8-docstrings",
-                Plugin::Flake8Eradicate => "flake8-eradicate",
-                Plugin::Flake8ErrMsg => "flake8-errmsg",
-                Plugin::Flake8Print => "flake8-print",
-                Plugin::Flake8Quotes => "flake8-quotes",
-                Plugin::Flake8Return => "flake8-return",
-                Plugin::Flake8Simplify => "flake8-simplify",
-                Plugin::Flake8TidyImports => "flake8-tidy-imports",
-                Plugin::McCabe => "mccabe",
-                Plugin::PandasVet => "pandas-vet",
-                Plugin::PEP8Naming => "pep8-naming",
-                Plugin::Pyupgrade => "pyupgrade",
-            }
-        )
-    }
-}
-
-impl Plugin {
-    pub fn default(&self) -> CheckCodePrefix {
-        match self {
-            Plugin::Flake8Annotations => CheckCodePrefix::ANN,
-            Plugin::Flake8Bandit => CheckCodePrefix::S,
-            // TODO(charlie): Handle rename of `B` to `BLE`.
-            Plugin::Flake8BlindExcept => CheckCodePrefix::BLE,
-            Plugin::Flake8Bugbear => CheckCodePrefix::B,
-            Plugin::Flake8Builtins => CheckCodePrefix::A,
-            Plugin::Flake8Comprehensions => CheckCodePrefix::C4,
-            Plugin::Flake8Datetimez => CheckCodePrefix::DTZ,
-            Plugin::Flake8Debugger => CheckCodePrefix::T1,
-            Plugin::Flake8Docstrings => CheckCodePrefix::D,
-            // TODO(charlie): Handle rename of `E` to `ERA`.
-            Plugin::Flake8Eradicate => CheckCodePrefix::ERA,
-            Plugin::Flake8ErrMsg => CheckCodePrefix::EM,
-            Plugin::Flake8Print => CheckCodePrefix::T2,
-            Plugin::Flake8Quotes => CheckCodePrefix::Q,
-            Plugin::Flake8Return => CheckCodePrefix::RET,
-            Plugin::Flake8Simplify => CheckCodePrefix::SIM,
-            Plugin::Flake8TidyImports => CheckCodePrefix::TID25,
-            Plugin::McCabe => CheckCodePrefix::C9,
-            Plugin::PandasVet => CheckCodePrefix::PD,
-            Plugin::PEP8Naming => CheckCodePrefix::N,
-            Plugin::Pyupgrade => CheckCodePrefix::UP,
-        }
-    }
-
-    pub fn select(&self, flake8: &HashMap<String, Option<String>>) -> Vec<CheckCodePrefix> {
-        match self {
-            Plugin::Flake8Annotations => vec![CheckCodePrefix::ANN],
-            Plugin::Flake8Bandit => vec![CheckCodePrefix::S],
-            Plugin::Flake8BlindExcept => vec![CheckCodePrefix::BLE],
-            Plugin::Flake8Bugbear => vec![CheckCodePrefix::B],
-            Plugin::Flake8Builtins => vec![CheckCodePrefix::A],
-            Plugin::Flake8Comprehensions => vec![CheckCodePrefix::C4],
-            Plugin::Flake8Datetimez => vec![CheckCodePrefix::DTZ],
-            Plugin::Flake8Debugger => vec![CheckCodePrefix::T1],
-            Plugin::Flake8Docstrings => {
-                // Use the user-provided docstring.
-                for key in ["docstring-convention", "docstring_convention"] {
-                    if let Some(Some(value)) = flake8.get(key) {
-                        match DocstringConvention::from_str(value) {
-                            Ok(convention) => return convention.select(),
-                            Err(e) => {
-                                eprintln!("Unexpected '{key}' value: {value} ({e}");
-                                return vec![];
-                            }
-                        }
-                    }
-                }
-                // Default to PEP8.
-                DocstringConvention::PEP8.select()
-            }
-            Plugin::Flake8Eradicate => vec![CheckCodePrefix::ERA],
-            Plugin::Flake8ErrMsg => vec![CheckCodePrefix::EM],
-            Plugin::Flake8Print => vec![CheckCodePrefix::T2],
-            Plugin::Flake8Quotes => vec![CheckCodePrefix::Q],
-            Plugin::Flake8Return => vec![CheckCodePrefix::RET],
-            Plugin::Flake8Simplify => vec![CheckCodePrefix::SIM],
-            Plugin::Flake8TidyImports => vec![CheckCodePrefix::TID],
-            Plugin::McCabe => vec![CheckCodePrefix::C9],
-            Plugin::PandasVet => vec![CheckCodePrefix::PD],
-            Plugin::PEP8Naming => vec![CheckCodePrefix::N],
-            Plugin::Pyupgrade => vec![CheckCodePrefix::UP],
-        }
-    }
-}
-
-pub enum DocstringConvention {
-    All,
-    PEP8,
-    NumPy,
-    Google,
-}
-
-impl FromStr for DocstringConvention {
-    type Err = anyhow::Error;
-
-    fn from_str(string: &str) -> Result<Self, Self::Err> {
-        match string {
-            "all" => Ok(DocstringConvention::All),
-            "pep8" => Ok(DocstringConvention::PEP8),
-            "numpy" => Ok(DocstringConvention::NumPy),
-            "google" => Ok(DocstringConvention::Google),
-            _ => Err(anyhow!("Unknown docstring convention: {string}")),
-        }
-    }
-}
-
-impl DocstringConvention {
-    fn select(&self) -> Vec<CheckCodePrefix> {
-        match self {
-            DocstringConvention::All => vec![CheckCodePrefix::D],
-            DocstringConvention::PEP8 => vec![
-                // All errors except D203, D212, D213, D214, D215, D404, D405, D406, D407, D408,
-                // D409, D410, D411, D413, D415, D416 and D417.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                // CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                // CheckCodePrefix::D214,
-                // CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                // CheckCodePrefix::D404,
-                // CheckCodePrefix::D405,
-                // CheckCodePrefix::D406,
-                // CheckCodePrefix::D407,
-                // CheckCodePrefix::D408,
-                // CheckCodePrefix::D409,
-                // CheckCodePrefix::D410,
-                // CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                // CheckCodePrefix::D415,
-                // CheckCodePrefix::D416,
-                // CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
-            DocstringConvention::NumPy => vec![
-                // All errors except D107, D203, D212, D213, D402, D413, D415, D416, and D417.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                // CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                // CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                CheckCodePrefix::D214,
-                CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                CheckCodePrefix::D400,
-                // CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                CheckCodePrefix::D406,
-                CheckCodePrefix::D407,
-                CheckCodePrefix::D408,
-                CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                // CheckCodePrefix::D415,
-                // CheckCodePrefix::D416,
-                // CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
-            DocstringConvention::Google => vec![
-                // All errors except D203, D204, D213, D215, D400, D401, D404, D406, D407, D408,
-                // D409 and D413.
-                CheckCodePrefix::D100,
-                CheckCodePrefix::D101,
-                CheckCodePrefix::D102,
-                CheckCodePrefix::D103,
-                CheckCodePrefix::D104,
-                CheckCodePrefix::D105,
-                CheckCodePrefix::D106,
-                CheckCodePrefix::D107,
-                CheckCodePrefix::D200,
-                CheckCodePrefix::D201,
-                CheckCodePrefix::D202,
-                // CheckCodePrefix::D203,
-                // CheckCodePrefix::D204,
-                CheckCodePrefix::D205,
-                CheckCodePrefix::D206,
-                CheckCodePrefix::D207,
-                CheckCodePrefix::D208,
-                CheckCodePrefix::D209,
-                CheckCodePrefix::D210,
-                CheckCodePrefix::D211,
-                CheckCodePrefix::D212,
-                // CheckCodePrefix::D213,
-                CheckCodePrefix::D214,
-                // CheckCodePrefix::D215,
-                CheckCodePrefix::D300,
-                CheckCodePrefix::D301,
-                // CheckCodePrefix::D400,
-                CheckCodePrefix::D402,
-                CheckCodePrefix::D403,
-                // CheckCodePrefix::D404,
-                CheckCodePrefix::D405,
-                // CheckCodePrefix::D406,
-                // CheckCodePrefix::D407,
-                // CheckCodePrefix::D408,
-                // CheckCodePrefix::D409,
-                CheckCodePrefix::D410,
-                CheckCodePrefix::D411,
-                CheckCodePrefix::D412,
-                // CheckCodePrefix::D413,
-                CheckCodePrefix::D414,
-                CheckCodePrefix::D415,
-                CheckCodePrefix::D416,
-                CheckCodePrefix::D417,
-                CheckCodePrefix::D418,
-                CheckCodePrefix::D419,
-            ],
-        }
-    }
-}
-
-/// Infer the enabled plugins based on user-provided options.
-///
-/// For example, if the user specified a `mypy-init-return` setting, we should
-/// infer that `flake8-annotations` is active.
-pub fn infer_plugins_from_options(flake8: &HashMap<String, Option<String>>) -> Vec<Plugin> {
-    let mut plugins = BTreeSet::new();
-    for key in flake8.keys() {
-        match key.as_str() {
-            // flake8-annotations
-            "suppress-none-returning" | "suppress_none_returning" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "suppress-dummy-args" | "suppress_dummy_args" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "allow-untyped-defs" | "allow_untyped_defs" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "allow-untyped-nested" | "allow_untyped_nested" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "mypy-init-return" | "mypy_init_return" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "dispatch-decorators" | "dispatch_decorators" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "overload-decorators" | "overload_decorators" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            "allow-star-arg-any" | "allow_star_arg_any" => {
-                plugins.insert(Plugin::Flake8Annotations);
-            }
-            // flake8-bugbear
-            "extend-immutable-calls" | "extend_immutable_calls" => {
-                plugins.insert(Plugin::Flake8Bugbear);
-            }
-            // flake8-builtins
-            "builtins-ignorelist" | "builtins_ignorelist" => {
-                plugins.insert(Plugin::Flake8Builtins);
-            }
-            // flake8-docstrings
-            "docstring-convention" | "docstring_convention" => {
-                plugins.insert(Plugin::Flake8Docstrings);
-            }
-            // flake8-eradicate
-            "eradicate-aggressive" | "eradicate_aggressive" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            "eradicate-whitelist" | "eradicate_whitelist" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            "eradicate-whitelist-extend" | "eradicate_whitelist_extend" => {
-                plugins.insert(Plugin::Flake8Eradicate);
-            }
-            // flake8-quotes
-            "quotes" | "inline-quotes" | "inline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "multiline-quotes" | "multiline_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "docstring-quotes" | "docstring_quotes" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            "avoid-escape" | "avoid_escape" => {
-                plugins.insert(Plugin::Flake8Quotes);
-            }
-            // flake8-tidy-imports
-            "ban-relative-imports" | "ban_relative_imports" => {
-                plugins.insert(Plugin::Flake8TidyImports);
-            }
-            "banned-modules" | "banned_modules" => {
-                plugins.insert(Plugin::Flake8TidyImports);
-            }
-            // mccabe
-            "max-complexity" | "max_complexity" => {
-                plugins.insert(Plugin::McCabe);
-            }
-            // pep8-naming
-            "ignore-names" | "ignore_names" => {
-                plugins.insert(Plugin::PEP8Naming);
-            }
-            "classmethod-decorators" | "classmethod_decorators" => {
-                plugins.insert(Plugin::PEP8Naming);
-            }
-            "staticmethod-decorators" | "staticmethod_decorators" => {
-                plugins.insert(Plugin::PEP8Naming);
-            }
-            "max-string-length" | "max_string_length" => {
-                plugins.insert(Plugin::Flake8ErrMsg);
-            }
-            _ => {}
-        }
-    }
-    Vec::from_iter(plugins)
-}
-
-/// Infer the enabled plugins based on the referenced prefixes.
-///
-/// For example, if the user ignores `ANN101`, we should infer that
-/// `flake8-annotations` is active.
-pub fn infer_plugins_from_codes(codes: &BTreeSet<CheckCodePrefix>) -> Vec<Plugin> {
-    [
-        Plugin::Flake8Annotations,
-        Plugin::Flake8Bandit,
-        Plugin::Flake8BlindExcept,
-        Plugin::Flake8Bugbear,
-        Plugin::Flake8Builtins,
-        Plugin::Flake8Comprehensions,
-        Plugin::Flake8Datetimez,
-        Plugin::Flake8Debugger,
-        Plugin::Flake8Docstrings,
-        Plugin::Flake8Eradicate,
-        Plugin::Flake8ErrMsg,
-        Plugin::Flake8Print,
-        Plugin::Flake8Quotes,
-        Plugin::Flake8Return,
-        Plugin::Flake8Simplify,
-        Plugin::Flake8TidyImports,
-        Plugin::PandasVet,
-        Plugin::PEP8Naming,
-    ]
-    .into_iter()
-    .filter(|plugin| {
-        for prefix in codes {
-            if prefix
-                .codes()
-                .iter()
-                .any(|code| plugin.default().codes().contains(code))
-            {
-                return true;
-            }
-        }
-        false
-    })
-    .collect()
-}
-
-/// Resolve the set of enabled `CheckCodePrefix` values for the given plugins.
-pub fn resolve_select(
-    flake8: &HashMap<String, Option<String>>,
-    plugins: &[Plugin],
-) -> BTreeSet<CheckCodePrefix> {
-    // Include default Pyflakes and pycodestyle checks.
-    let mut select = BTreeSet::from([CheckCodePrefix::E, CheckCodePrefix::F, CheckCodePrefix::W]);
-
-    // Add prefix codes for every plugin.
-    for plugin in plugins {
-        select.extend(plugin.select(flake8));
-    }
-
-    select
-}
-
-#[cfg(test)]
-mod tests {
-    use std::collections::HashMap;
-
-    use crate::plugin::{infer_plugins_from_options, Plugin};
-
-    #[test]
-    fn it_infers_plugins() {
-        let actual = infer_plugins_from_options(&HashMap::from([(
-            "inline-quotes".to_string(),
-            Some("single".to_string()),
-        )]));
-        let expected = vec![Plugin::Flake8Quotes];
-        assert_eq!(actual, expected);
-
-        let actual = infer_plugins_from_options(&HashMap::from([(
-            "staticmethod-decorators".to_string(),
-            Some("[]".to_string()),
-        )]));
-        let expected = vec![Plugin::PEP8Naming];
-        assert_eq!(actual, expected);
-    }
-}

playground/.prettierignore

@@ -1 +0,0 @@
-src/ruff_options.ts

playground/.prettierrc.json

@@ -0,0 +1,3 @@
+{
+  "trailingComma": "all"
+}

playground/index.html

@@ -11,7 +11,7 @@
     <title>Ruff Playground</title>
     <link
       rel="icon"
-      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>🛠️</text></svg>"
+      href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 100 100%22><text y=%22.9em%22 font-size=%2290%22>⚡</text></svg>"
     />
     <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
   </head>

playground/src/Editor/Editor.tsx

@@ -1,12 +1,18 @@
 import { useCallback, useEffect, useState } from "react";
-import { persist, restore } from "./config";
-import { DEFAULT_CONFIG_SOURCE, DEFAULT_PYTHON_SOURCE } from "../constants";
+import { DEFAULT_PYTHON_SOURCE } from "../constants";
+import init, {
+  check,
+  Diagnostic,
+  currentVersion,
+  defaultSettings,
+} from "../pkg";
 import { ErrorMessage } from "./ErrorMessage";
 import Header from "./Header";
-import init, { check, current_version, Check } from "../pkg";
+import { useTheme } from "./theme";
+import { persist, restore, stringify } from "./settings";
 import SettingsEditor from "./SettingsEditor";
 import SourceEditor from "./SourceEditor";
-import Themes from "./Themes";
+import MonacoThemes from "./MonacoThemes";
 
 type Tab = "Source" | "Settings";
 
@@ -15,107 +21,120 @@ export default function Editor() {
   const [version, setVersion] = useState<string | null>(null);
   const [tab, setTab] = useState<Tab>("Source");
   const [edit, setEdit] = useState<number>(0);
-  const [configSource, setConfigSource] = useState<string | null>(null);
+  const [settingsSource, setSettingsSource] = useState<string | null>(null);
   const [pythonSource, setPythonSource] = useState<string | null>(null);
-  const [checks, setChecks] = useState<Check[]>([]);
+  const [diagnostics, setDiagnostics] = useState<Diagnostic[]>([]);
   const [error, setError] = useState<string | null>(null);
+  const [theme, setTheme] = useTheme();
 
   useEffect(() => {
     init().then(() => setInitialized(true));
   }, []);
 
   useEffect(() => {
-    if (!initialized || configSource == null || pythonSource == null) {
+    if (!initialized || settingsSource == null || pythonSource == null) {
       return;
     }
 
     let config: any;
-    let checks: Check[];
+    let diagnostics: Diagnostic[];
 
     try {
-      config = JSON.parse(configSource);
+      config = JSON.parse(settingsSource);
     } catch (e) {
-      setChecks([]);
+      setDiagnostics([]);
       setError((e as Error).message);
       return;
     }
 
     try {
-      checks = check(pythonSource, config);
+      diagnostics = check(pythonSource, config);
     } catch (e) {
       setError(e as string);
       return;
     }
 
     setError(null);
-    setChecks(checks);
-  }, [initialized, configSource, pythonSource]);
-
-  useEffect(() => {
-    if (configSource == null || pythonSource == null) {
-      const payload = restore();
-      if (payload) {
-        const [configSource, pythonSource] = payload;
-        setConfigSource(configSource);
-        setPythonSource(pythonSource);
-      } else {
-        setConfigSource(DEFAULT_CONFIG_SOURCE);
-        setPythonSource(DEFAULT_PYTHON_SOURCE);
-      }
-    }
-  }, [configSource, pythonSource]);
+    setDiagnostics(diagnostics);
+  }, [initialized, settingsSource, pythonSource]);
 
   useEffect(() => {
     if (!initialized) {
       return;
     }
 
-    setVersion(current_version());
-  }, [initialized]);
+    if (settingsSource == null || pythonSource == null) {
+      const payload = restore();
+      if (payload) {
+        const [settingsSource, pythonSource] = payload;
+        setSettingsSource(settingsSource);
+        setPythonSource(pythonSource);
+      } else {
+        setSettingsSource(stringify(defaultSettings()));
+        setPythonSource(DEFAULT_PYTHON_SOURCE);
+      }
+    }
+  }, [initialized, settingsSource, pythonSource]);
 
-  const handleShare = useCallback(() => {
-    if (!initialized || configSource == null || pythonSource == null) {
+  useEffect(() => {
+    if (!initialized) {
       return;
     }
 
-    persist(configSource, pythonSource);
-  }, [initialized, configSource, pythonSource]);
+    setVersion(currentVersion());
+  }, [initialized]);
+
+  const handleShare = useCallback(() => {
+    if (!initialized || settingsSource == null || pythonSource == null) {
+      return;
+    }
+
+    persist(settingsSource, pythonSource);
+  }, [initialized, settingsSource, pythonSource]);
 
   const handlePythonSourceChange = useCallback((pythonSource: string) => {
     setEdit((edit) => edit + 1);
     setPythonSource(pythonSource);
   }, []);
 
-  const handleConfigSourceChange = useCallback((configSource: string) => {
+  const handleSettingsSourceChange = useCallback((settingsSource: string) => {
     setEdit((edit) => edit + 1);
-    setConfigSource(configSource);
+    setSettingsSource(settingsSource);
   }, []);
 
   return (
-    <main className={"h-full w-full flex flex-auto"}>
+    <main
+      className={
+        "h-full w-full flex flex-auto bg-ayu-background dark:bg-ayu-background-dark"
+      }
+    >
       <Header
         edit={edit}
-        version={version}
         tab={tab}
-        onChange={setTab}
+        theme={theme}
+        version={version}
+        onChangeTab={setTab}
+        onChangeTheme={setTheme}
         onShare={initialized ? handleShare : undefined}
       />
 
-      <Themes />
+      <MonacoThemes />
 
       <div className={"mt-12 relative flex-auto"}>
-        {initialized && configSource != null && pythonSource != null ? (
+        {initialized && settingsSource != null && pythonSource != null ? (
           <>
             <SourceEditor
               visible={tab === "Source"}
               source={pythonSource}
-              checks={checks}
+              theme={theme}
+              diagnostics={diagnostics}
               onChange={handlePythonSourceChange}
             />
             <SettingsEditor
               visible={tab === "Settings"}
-              source={configSource}
-              onChange={handleConfigSourceChange}
+              source={settingsSource}
+              theme={theme}
+              onChange={handleSettingsSourceChange}
             />
           </>
         ) : null}

playground/src/Editor/ErrorMessage.tsx

@@ -18,7 +18,7 @@ export function ErrorMessage({ children }: { children: string }) {
           children.startsWith("Error: ")
             ? children.slice("Error: ".length)
             : children,
-          120
+          120,
         )}
       </p>
     </div>

playground/src/Editor/Header.tsx

@@ -1,26 +1,51 @@
 import classNames from "classnames";
+import RepoButton from "./RepoButton";
+import ThemeButton from "./ThemeButton";
 import ShareButton from "./ShareButton";
+import { Theme } from "./theme";
 import VersionTag from "./VersionTag";
 
 export type Tab = "Source" | "Settings";
 
 export default function Header({
   edit,
-  version,
   tab,
-  onChange,
+  theme,
+  version,
+  onChangeTab,
+  onChangeTheme,
   onShare,
 }: {
   edit: number;
-  version: string | null;
   tab: Tab;
-  onChange: (tab: Tab) => void;
+  theme: Theme;
+  version: string | null;
+  onChangeTab: (tab: Tab) => void;
+  onChangeTheme: (theme: Theme) => void;
   onShare?: () => void;
 }) {
   return (
     <div
-      className="w-full flex items-center justify-between flex-none pl-5 sm:pl-6 pr-4 lg:pr-6 absolute z-10 top-0 left-0 -mb-px antialiased border-b border-gray-200 dark:border-gray-800"
-      style={{ background: "#f8f9fa" }}
+      className={classNames(
+        "w-full",
+        "flex",
+        "items-center",
+        "justify-between",
+        "flex-none",
+        "pl-5",
+        "sm:pl-6",
+        "pr-4",
+        "lg:pr-6",
+        "absolute",
+        "z-10",
+        "top-0",
+        "left-0",
+        "-mb-px",
+        "antialiased",
+        "border-b",
+        "border-gray-200",
+        "dark:border-gray-800",
+      )}
     >
       <div className="flex space-x-5">
         <button
@@ -28,15 +53,15 @@ export default function Header({
           className={classNames(
             "relative flex py-3 text-sm leading-6 font-semibold focus:outline-none",
             tab === "Source"
-              ? "text-ayu"
-              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white"
+              ? "text-ayu-accent"
+              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white",
           )}
-          onClick={() => onChange("Source")}
+          onClick={() => onChangeTab("Source")}
         >
           <span
             className={classNames(
-              "absolute bottom-0 inset-x-0 bg-ayu h-0.5 rounded-full transition-opacity duration-150",
-              tab === "Source" ? "opacity-100" : "opacity-0"
+              "absolute bottom-0 inset-x-0 bg-ayu-accent h-0.5 rounded-full transition-opacity duration-150",
+              tab === "Source" ? "opacity-100" : "opacity-0",
             )}
           />
           Source
@@ -46,27 +71,34 @@ export default function Header({
           className={classNames(
             "relative flex py-3 text-sm leading-6 font-semibold focus:outline-none",
             tab === "Settings"
-              ? "text-ayu"
-              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white"
+              ? "text-ayu-accent"
+              : "text-gray-700 hover:text-gray-900 focus:text-gray-900 dark:text-gray-300 dark:hover:text-white",
           )}
-          onClick={() => onChange("Settings")}
+          onClick={() => onChangeTab("Settings")}
         >
           <span
             className={classNames(
-              "absolute bottom-0 inset-x-0 bg-ayu h-0.5 rounded-full transition-opacity duration-150",
-              tab === "Settings" ? "opacity-100" : "opacity-0"
+              "absolute bottom-0 inset-x-0 bg-ayu-accent h-0.5 rounded-full transition-opacity duration-150",
+              tab === "Settings" ? "opacity-100" : "opacity-0",
             )}
           />
           Settings
         </button>
+      </div>
+      <div className={"flex items-center min-w-0"}>
         {version ? (
-          <div className={"flex items-center"}>
+          <div className={"hidden sm:flex items-center"}>
             <VersionTag>v{version}</VersionTag>
           </div>
         ) : null}
-      </div>
-      <div className={"hidden sm:flex items-center min-w-0"}>
-        <ShareButton key={edit} onShare={onShare} />
+        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
+        <RepoButton />
+        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
+        <div className="hidden sm:block">
+          <ShareButton key={edit} onShare={onShare} />
+        </div>
+        <div className="hidden sm:block mx-6 lg:mx-4 w-px h-6 bg-gray-200 dark:bg-gray-700" />
+        <ThemeButton theme={theme} onChange={onChangeTheme} />
       </div>
     </div>
   );

playground/src/Editor/MonacoThemes.tsx

@@ -1,7 +1,11 @@
+/**
+ * Non-rendering component that loads the Monaco editor themes.
+ */
+
 import { useMonaco } from "@monaco-editor/react";
 import { useEffect } from "react";
 
-export default function Themes() {
+export default function MonacoThemes() {
   const monaco = useMonaco();
 
   useEffect(() => {
@@ -631,7 +635,642 @@ export default function Themes() {
           foreground: "#787b8099",
           token: "punctuation.definition.markdown",
         },
-        // Edits.
+        // Manual changes.
+        {
+          foreground: "#fa8d3e",
+          token: "number",
+        },
+      ],
+      encodedTokensColors: [],
+    });
+
+    // Generated via `monaco-vscode-textmate-theme-converter`.
+    // See: https://github.com/ayu-theme/vscode-ayu/blob/91839e8a9dfa78d61e58dbcf9b52272a01fee66a/ayu-dark.json.
+    monaco?.editor.defineTheme("Ayu-Dark", {
+      inherit: false,
+      base: "vs-dark",
+      colors: {
+        focusBorder: "#e6b450b3",
+        foreground: "#565b66",
+        "widget.shadow": "#00000080",
+        "selection.background": "#409fff4d",
+        "icon.foreground": "#565b66",
+        errorForeground: "#d95757",
+        descriptionForeground: "#565b66",
+        "textBlockQuote.background": "#0f131a",
+        "textLink.foreground": "#e6b450",
+        "textLink.activeForeground": "#e6b450",
+        "textPreformat.foreground": "#bfbdb6",
+        "button.background": "#e6b450",
+        "button.foreground": "#0b0e14",
+        "button.hoverBackground": "#e1af4b",
+        "button.secondaryBackground": "#565b6633",
+        "button.secondaryForeground": "#bfbdb6",
+        "button.secondaryHoverBackground": "#565b6680",
+        "dropdown.background": "#0d1017",
+        "dropdown.foreground": "#565b66",
+        "dropdown.border": "#565b6645",
+        "input.background": "#0d1017",
+        "input.border": "#565b6645",
+        "input.foreground": "#bfbdb6",
+        "input.placeholderForeground": "#565b6680",
+        "inputOption.activeBorder": "#e6b4504d",
+        "inputOption.activeBackground": "#e6b45033",
+        "inputOption.activeForeground": "#e6b450",
+        "inputValidation.errorBackground": "#0d1017",
+        "inputValidation.errorBorder": "#d95757",
+        "inputValidation.infoBackground": "#0b0e14",
+        "inputValidation.infoBorder": "#39bae6",
+        "inputValidation.warningBackground": "#0b0e14",
+        "inputValidation.warningBorder": "#ffb454",
+        "scrollbar.shadow": "#11151c00",
+        "scrollbarSlider.background": "#565b6666",
+        "scrollbarSlider.hoverBackground": "#565b6699",
+        "scrollbarSlider.activeBackground": "#565b66b3",
+        "badge.background": "#e6b45033",
+        "badge.foreground": "#e6b450",
+        "progressBar.background": "#e6b450",
+        "list.activeSelectionBackground": "#47526640",
+        "list.activeSelectionForeground": "#bfbdb6",
+        "list.focusBackground": "#47526640",
+        "list.focusForeground": "#bfbdb6",
+        "list.focusOutline": "#47526640",
+        "list.highlightForeground": "#e6b450",
+        "list.deemphasizedForeground": "#d95757",
+        "list.hoverBackground": "#47526640",
+        "list.inactiveSelectionBackground": "#47526633",
+        "list.inactiveSelectionForeground": "#565b66",
+        "list.invalidItemForeground": "#565b664d",
+        "list.errorForeground": "#d95757",
+        "tree.indentGuidesStroke": "#6c738080",
+        "listFilterWidget.background": "#0f131a",
+        "listFilterWidget.outline": "#e6b450",
+        "listFilterWidget.noMatchesOutline": "#d95757",
+        "list.filterMatchBackground": "#5f4c7266",
+        "list.filterMatchBorder": "#6c598066",
+        "activityBar.background": "#0b0e14",
+        "activityBar.foreground": "#565b66cc",
+        "activityBar.inactiveForeground": "#565b6699",
+        "activityBar.border": "#0b0e14",
+        "activityBar.activeBorder": "#e6b450b3",
+        "activityBarBadge.background": "#e6b450",
+        "activityBarBadge.foreground": "#0b0e14",
+        "sideBar.background": "#0b0e14",
+        "sideBar.border": "#0b0e14",
+        "sideBarTitle.foreground": "#565b66",
+        "sideBarSectionHeader.background": "#0b0e14",
+        "sideBarSectionHeader.foreground": "#565b66",
+        "sideBarSectionHeader.border": "#0b0e14",
+        "minimap.background": "#0b0e14",
+        "minimap.selectionHighlight": "#409fff4d",
+        "minimap.errorHighlight": "#d95757",
+        "minimap.findMatchHighlight": "#6c5980",
+        "minimapGutter.addedBackground": "#7fd962",
+        "minimapGutter.modifiedBackground": "#73b8ff",
+        "minimapGutter.deletedBackground": "#f26d78",
+        "editorGroup.border": "#11151c",
+        "editorGroup.background": "#0f131a",
+        "editorGroupHeader.noTabsBackground": "#0b0e14",
+        "editorGroupHeader.tabsBackground": "#0b0e14",
+        "editorGroupHeader.tabsBorder": "#0b0e14",
+        "tab.activeBackground": "#0b0e14",
+        "tab.activeForeground": "#bfbdb6",
+        "tab.border": "#0b0e14",
+        "tab.activeBorder": "#e6b450",
+        "tab.unfocusedActiveBorder": "#565b66",
+        "tab.inactiveBackground": "#0b0e14",
+        "tab.inactiveForeground": "#565b66",
+        "tab.unfocusedActiveForeground": "#565b66",
+        "tab.unfocusedInactiveForeground": "#565b66",
+        "editor.background": "#0b0e14",
+        "editor.foreground": "#bfbdb6",
+        "editorLineNumber.foreground": "#6c738099",
+        "editorLineNumber.activeForeground": "#6c7380e6",
+        "editorCursor.foreground": "#e6b450",
+        "editor.inactiveSelectionBackground": "#409fff21",
+        "editor.selectionBackground": "#409fff4d",
+        "editor.selectionHighlightBackground": "#7fd96226",
+        "editor.selectionHighlightBorder": "#7fd96200",
+        "editor.wordHighlightBackground": "#73b8ff14",
+        "editor.wordHighlightStrongBackground": "#7fd96214",
+        "editor.wordHighlightBorder": "#73b8ff80",
+        "editor.wordHighlightStrongBorder": "#7fd96280",
+        "editor.findMatchBackground": "#6c5980",
+        "editor.findMatchBorder": "#6c5980",
+        "editor.findMatchHighlightBackground": "#6c598066",
+        "editor.findMatchHighlightBorder": "#5f4c7266",
+        "editor.findRangeHighlightBackground": "#6c598040",
+        "editor.rangeHighlightBackground": "#6c598033",
+        "editor.lineHighlightBackground": "#131721",
+        "editorLink.activeForeground": "#e6b450",
+        "editorWhitespace.foreground": "#6c738099",
+        "editorIndentGuide.background": "#6c738033",
+        "editorIndentGuide.activeBackground": "#6c738080",
+        "editorRuler.foreground": "#6c738033",
+        "editorCodeLens.foreground": "#acb6bf8c",
+        "editorBracketMatch.background": "#6c73804d",
+        "editorBracketMatch.border": "#6c73804d",
+        "editor.snippetTabstopHighlightBackground": "#7fd96233",
+        "editorOverviewRuler.border": "#11151c",
+        "editorOverviewRuler.modifiedForeground": "#73b8ff",
+        "editorOverviewRuler.addedForeground": "#7fd962",
+        "editorOverviewRuler.deletedForeground": "#f26d78",
+        "editorOverviewRuler.errorForeground": "#d95757",
+        "editorOverviewRuler.warningForeground": "#e6b450",
+        "editorOverviewRuler.bracketMatchForeground": "#6c7380b3",
+        "editorOverviewRuler.wordHighlightForeground": "#73b8ff66",
+        "editorOverviewRuler.wordHighlightStrongForeground": "#7fd96266",
+        "editorOverviewRuler.findMatchForeground": "#6c5980",
+        "editorError.foreground": "#d95757",
+        "editorWarning.foreground": "#e6b450",
+        "editorGutter.modifiedBackground": "#73b8ffcc",
+        "editorGutter.addedBackground": "#7fd962cc",
+        "editorGutter.deletedBackground": "#f26d78cc",
+        "diffEditor.insertedTextBackground": "#7fd9621f",
+        "diffEditor.removedTextBackground": "#f26d781f",
+        "diffEditor.diagonalFill": "#11151c",
+        "editorWidget.background": "#0f131a",
+        "editorWidget.border": "#11151c",
+        "editorHoverWidget.background": "#0f131a",
+        "editorHoverWidget.border": "#11151c",
+        "editorSuggestWidget.background": "#0f131a",
+        "editorSuggestWidget.border": "#11151c",
+        "editorSuggestWidget.highlightForeground": "#e6b450",
+        "editorSuggestWidget.selectedBackground": "#47526640",
+        "debugExceptionWidget.border": "#11151c",
+        "debugExceptionWidget.background": "#0f131a",
+        "editorMarkerNavigation.background": "#0f131a",
+        "peekView.border": "#47526640",
+        "peekViewTitle.background": "#47526640",
+        "peekViewTitleDescription.foreground": "#565b66",
+        "peekViewTitleLabel.foreground": "#bfbdb6",
+        "peekViewEditor.background": "#0f131a",
+        "peekViewEditor.matchHighlightBackground": "#6c598066",
+        "peekViewEditor.matchHighlightBorder": "#5f4c7266",
+        "peekViewResult.background": "#0f131a",
+        "peekViewResult.fileForeground": "#bfbdb6",
+        "peekViewResult.lineForeground": "#565b66",
+        "peekViewResult.matchHighlightBackground": "#6c598066",
+        "peekViewResult.selectionBackground": "#47526640",
+        "panel.background": "#0b0e14",
+        "panel.border": "#11151c",
+        "panelTitle.activeBorder": "#e6b450",
+        "panelTitle.activeForeground": "#bfbdb6",
+        "panelTitle.inactiveForeground": "#565b66",
+        "statusBar.background": "#0b0e14",
+        "statusBar.foreground": "#565b66",
+        "statusBar.border": "#0b0e14",
+        "statusBar.debuggingBackground": "#f29668",
+        "statusBar.debuggingForeground": "#0d1017",
+        "statusBar.noFolderBackground": "#0f131a",
+        "statusBarItem.activeBackground": "#565b6633",
+        "statusBarItem.hoverBackground": "#565b6633",
+        "statusBarItem.prominentBackground": "#11151c",
+        "statusBarItem.prominentHoverBackground": "#00000030",
+        "statusBarItem.remoteBackground": "#e6b450",
+        "statusBarItem.remoteForeground": "#0d1017",
+        "titleBar.activeBackground": "#0b0e14",
+        "titleBar.activeForeground": "#bfbdb6",
+        "titleBar.inactiveBackground": "#0b0e14",
+        "titleBar.inactiveForeground": "#565b66",
+        "titleBar.border": "#0b0e14",
+        "extensionButton.prominentForeground": "#0d1017",
+        "extensionButton.prominentBackground": "#e6b450",
+        "extensionButton.prominentHoverBackground": "#e1af4b",
+        "pickerGroup.border": "#11151c",
+        "pickerGroup.foreground": "#565b6680",
+        "debugToolBar.background": "#0f131a",
+        "debugIcon.breakpointForeground": "#f29668",
+        "debugIcon.breakpointDisabledForeground": "#f2966880",
+        "debugConsoleInputIcon.foreground": "#e6b450",
+        "welcomePage.tileBackground": "#0b0e14",
+        "welcomePage.tileShadow": "#00000080",
+        "welcomePage.progress.background": "#131721",
+        "welcomePage.buttonBackground": "#e6b45066",
+        "walkThrough.embeddedEditorBackground": "#0f131a",
+        "gitDecoration.modifiedResourceForeground": "#73b8ffb3",
+        "gitDecoration.deletedResourceForeground": "#f26d78b3",
+        "gitDecoration.untrackedResourceForeground": "#7fd962b3",
+        "gitDecoration.ignoredResourceForeground": "#565b6680",
+        "gitDecoration.conflictingResourceForeground": "",
+        "gitDecoration.submoduleResourceForeground": "#d2a6ffb3",
+        "settings.headerForeground": "#bfbdb6",
+        "settings.modifiedItemIndicator": "#73b8ff",
+        "keybindingLabel.background": "#565b661a",
+        "keybindingLabel.foreground": "#bfbdb6",
+        "keybindingLabel.border": "#bfbdb61a",
+        "keybindingLabel.bottomBorder": "#bfbdb61a",
+        "terminal.background": "#0b0e14",
+        "terminal.foreground": "#bfbdb6",
+        "terminal.ansiBlack": "#11151c",
+        "terminal.ansiRed": "#ea6c73",
+        "terminal.ansiGreen": "#7fd962",
+        "terminal.ansiYellow": "#f9af4f",
+        "terminal.ansiBlue": "#53bdfa",
+        "terminal.ansiMagenta": "#cda1fa",
+        "terminal.ansiCyan": "#90e1c6",
+        "terminal.ansiWhite": "#c7c7c7",
+        "terminal.ansiBrightBlack": "#686868",
+        "terminal.ansiBrightRed": "#f07178",
+        "terminal.ansiBrightGreen": "#aad94c",
+        "terminal.ansiBrightYellow": "#ffb454",
+        "terminal.ansiBrightBlue": "#59c2ff",
+        "terminal.ansiBrightMagenta": "#d2a6ff",
+        "terminal.ansiBrightCyan": "#95e6cb",
+        "terminal.ansiBrightWhite": "#ffffff",
+      },
+      rules: [
+        {
+          fontStyle: "italic",
+          foreground: "#acb6bf8c",
+          token: "comment",
+        },
+        {
+          foreground: "#aad94c",
+          token: "string",
+        },
+        {
+          foreground: "#aad94c",
+          token: "constant.other.symbol",
+        },
+        {
+          foreground: "#95e6cb",
+          token: "string.regexp",
+        },
+        {
+          foreground: "#95e6cb",
+          token: "constant.character",
+        },
+        {
+          foreground: "#95e6cb",
+          token: "constant.other",
+        },
+        {
+          foreground: "#d2a6ff",
+          token: "constant.numeric",
+        },
+        {
+          foreground: "#d2a6ff",
+          token: "constant.language",
+        },
+        {
+          foreground: "#bfbdb6",
+          token: "variable",
+        },
+        {
+          foreground: "#bfbdb6",
+          token: "variable.parameter.function-call",
+        },
+        {
+          foreground: "#f07178",
+          token: "variable.member",
+        },
+        {
+          fontStyle: "italic",
+          foreground: "#39bae6",
+          token: "variable.language",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "storage",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "keyword",
+        },
+        {
+          foreground: "#f29668",
+          token: "keyword.operator",
+        },
+        {
+          foreground: "#bfbdb6b3",
+          token: "punctuation.separator",
+        },
+        {
+          foreground: "#bfbdb6b3",
+          token: "punctuation.terminator",
+        },
+        {
+          foreground: "#bfbdb6",
+          token: "punctuation.section",
+        },
+        {
+          foreground: "#f29668",
+          token: "punctuation.accessor",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "punctuation.definition.template-expression",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "punctuation.section.embedded",
+        },
+        {
+          foreground: "#bfbdb6",
+          token: "meta.embedded",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.java storage.type",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.haskell storage.type",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.c storage.type",
+        },
+        {
+          foreground: "#39bae6",
+          token: "entity.other.inherited-class",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "storage.type.function",
+        },
+        {
+          foreground: "#39bae6",
+          token: "source.java storage.type.primitive",
+        },
+        {
+          foreground: "#ffb454",
+          token: "entity.name.function",
+        },
+        {
+          foreground: "#d2a6ff",
+          token: "variable.parameter",
+        },
+        {
+          foreground: "#d2a6ff",
+          token: "meta.parameter",
+        },
+        {
+          foreground: "#ffb454",
+          token: "variable.function",
+        },
+        {
+          foreground: "#ffb454",
+          token: "variable.annotation",
+        },
+        {
+          foreground: "#ffb454",
+          token: "meta.function-call.generic",
+        },
+        {
+          foreground: "#ffb454",
+          token: "support.function.go",
+        },
+        {
+          foreground: "#f07178",
+          token: "support.function",
+        },
+        {
+          foreground: "#f07178",
+          token: "support.macro",
+        },
+        {
+          foreground: "#aad94c",
+          token: "entity.name.import",
+        },
+        {
+          foreground: "#aad94c",
+          token: "entity.name.package",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "entity.name",
+        },
+        {
+          foreground: "#39bae6",
+          token: "entity.name.tag",
+        },
+        {
+          foreground: "#39bae6",
+          token: "meta.tag.sgml",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "support.class.component",
+        },
+        {
+          foreground: "#39bae680",
+          token: "punctuation.definition.tag.end",
+        },
+        {
+          foreground: "#39bae680",
+          token: "punctuation.definition.tag.begin",
+        },
+        {
+          foreground: "#39bae680",
+          token: "punctuation.definition.tag",
+        },
+        {
+          foreground: "#ffb454",
+          token: "entity.other.attribute-name",
+        },
+        {
+          fontStyle: "italic",
+          foreground: "#f29668",
+          token: "support.constant",
+        },
+        {
+          foreground: "#39bae6",
+          token: "support.type",
+        },
+        {
+          foreground: "#39bae6",
+          token: "support.class",
+        },
+        {
+          foreground: "#39bae6",
+          token: "source.go storage.type",
+        },
+        {
+          foreground: "#e6b673",
+          token: "meta.decorator variable.other",
+        },
+        {
+          foreground: "#e6b673",
+          token: "meta.decorator punctuation.decorator",
+        },
+        {
+          foreground: "#e6b673",
+          token: "storage.type.annotation",
+        },
+        {
+          foreground: "#d95757",
+          token: "invalid",
+        },
+        {
+          foreground: "#c594c5",
+          token: "meta.diff",
+        },
+        {
+          foreground: "#c594c5",
+          token: "meta.diff.header",
+        },
+        {
+          foreground: "#ffb454",
+          token: "source.ruby variable.other.readwrite",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.css entity.name.tag",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.sass entity.name.tag",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.scss entity.name.tag",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.less entity.name.tag",
+        },
+        {
+          foreground: "#59c2ff",
+          token: "source.stylus entity.name.tag",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "source.css support.type",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "source.sass support.type",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "source.scss support.type",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "source.less support.type",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "source.stylus support.type",
+        },
+        {
+          fontStyle: "normal",
+          foreground: "#39bae6",
+          token: "support.type.property-name",
+        },
+        {
+          foreground: "#acb6bf8c",
+          token: "constant.numeric.line-number.find-in-files - match",
+        },
+        {
+          foreground: "#ff8f40",
+          token: "constant.numeric.line-number.match",
+        },
+        {
+          foreground: "#aad94c",
+          token: "entity.name.filename.find-in-files",
+        },
+        {
+          foreground: "#d95757",
+          token: "message.error",
+        },
+        {
+          fontStyle: "bold",
+          foreground: "#aad94c",
+          token: "markup.heading",
+        },
+        {
+          fontStyle: "bold",
+          foreground: "#aad94c",
+          token: "markup.heading entity.name",
+        },
+        {
+          foreground: "#39bae6",
+          token: "markup.underline.link",
+        },
+        {
+          foreground: "#39bae6",
+          token: "string.other.link",
+        },
+        {
+          fontStyle: "italic",
+          foreground: "#f07178",
+          token: "markup.italic",
+        },
+        {
+          fontStyle: "bold",
+          foreground: "#f07178",
+          token: "markup.bold",
+        },
+        {
+          fontStyle: "bold italic",
+          token: "markup.italic markup.bold",
+        },
+        {
+          fontStyle: "bold italic",
+          token: "markup.bold markup.italic",
+        },
+        {
+          background: "#bfbdb605",
+          token: "markup.raw",
+        },
+        {
+          background: "#bfbdb60f",
+          token: "markup.raw.inline",
+        },
+        {
+          fontStyle: "bold",
+          background: "#bfbdb60f",
+          foreground: "#acb6bf8c",
+          token: "meta.separator",
+        },
+        {
+          foreground: "#95e6cb",
+          fontStyle: "italic",
+          token: "markup.quote",
+        },
+        {
+          foreground: "#ffb454",
+          token: "markup.list punctuation.definition.list.begin",
+        },
+        {
+          foreground: "#7fd962",
+          token: "markup.inserted",
+        },
+        {
+          foreground: "#73b8ff",
+          token: "markup.changed",
+        },
+        {
+          foreground: "#f26d78",
+          token: "markup.deleted",
+        },
+        {
+          foreground: "#e6b673",
+          token: "markup.strike",
+        },
+        {
+          background: "#bfbdb60f",
+          foreground: "#39bae6",
+          token: "markup.table",
+        },
+        {
+          foreground: "#f29668",
+          token: "text.html.markdown markup.inline.raw",
+        },
+        {
+          background: "#acb6bf8c",
+          foreground: "#acb6bf8c",
+          token: "text.html.markdown meta.dummy.line-break",
+        },
+        {
+          background: "#bfbdb6",
+          foreground: "#acb6bf8c",
+          token: "punctuation.definition.markdown",
+        },
+        // Manual changes.
         {
           foreground: "#fa8d3e",
           token: "number",

playground/src/Editor/RepoButton.tsx

@@ -0,0 +1,27 @@
+export default function RepoButton() {
+  return (
+    <a
+      className={"hover:text-ayu-accent/70 text-ayu-accent"}
+      href={"https://github.com/charliermarsh/ruff"}
+      target={"_blank"}
+      rel={"noreferrer"}
+    >
+      <svg
+        xmlns={"http://www.w3.org/2000/svg"}
+        width={"24"}
+        height={"24"}
+        viewBox={"0 0 16 16"}
+        fill={"none"}
+      >
+        <path
+          fillRule={"evenodd"}
+          clipRule={"evenodd"}
+          d={
+            "M8 0C3.58 0 0 3.58 0 8C0 11.54 2.29 14.53 5.47 15.59C5.87 15.66 6.02 15.42 6.02 15.21C6.02 15.02 6.01 14.39 6.01 13.72C4 14.09 3.48 13.23 3.32 12.78C3.23 12.55 2.84 11.84 2.5 11.65C2.22 11.5 1.82 11.13 2.49 11.12C3.12 11.11 3.57 11.7 3.72 11.94C4.44 13.15 5.59 12.81 6.05 12.6C6.12 12.08 6.33 11.73 6.56 11.53C4.78 11.33 2.92 10.64 2.92 7.58C2.92 6.71 3.23 5.99 3.74 5.43C3.66 5.23 3.38 4.41 3.82 3.31C3.82 3.31 4.49 3.1 6.02 4.13C6.66 3.95 7.34 3.86 8.02 3.86C8.7 3.86 9.38 3.95 10.02 4.13C11.55 3.09 12.22 3.31 12.22 3.31C12.66 4.41 12.38 5.23 12.3 5.43C12.81 5.99 13.12 6.7 13.12 7.58C13.12 10.65 11.25 11.33 9.47 11.53C9.76 11.78 10.01 12.26 10.01 13.01C10.01 14.08 10 14.94 10 15.21C10 15.42 10.15 15.67 10.55 15.59C13.71 14.53 16 11.53 16 8C16 3.58 12.42 0 8 0Z"
+          }
+          fill={"currentColor"}
+        />
+      </svg>
+    </a>
+  );
+}

playground/src/Editor/SettingsEditor.tsx

@@ -5,14 +5,17 @@
 import Editor, { useMonaco } from "@monaco-editor/react";
 import { useCallback, useEffect } from "react";
 import schema from "../../../ruff.schema.json";
+import { Theme } from "./theme";
 
 export default function SettingsEditor({
   visible,
   source,
+  theme,
   onChange,
 }: {
   visible: boolean;
   source: string;
+  theme: Theme;
   onChange: (source: string) => void;
 }) {
   const monaco = useMonaco();
@@ -33,7 +36,7 @@ export default function SettingsEditor({
     (value: string | undefined) => {
       onChange(value ?? "");
     },
-    [onChange]
+    [onChange],
   );
   return (
     <Editor
@@ -47,7 +50,7 @@ export default function SettingsEditor({
       wrapperProps={visible ? {} : { style: { display: "none" } }}
       language={"json"}
       value={source}
-      theme={"Ayu-Light"}
+      theme={theme === "light" ? "Ayu-Light" : "Ayu-Dark"}
       onChange={handleChange}
     />
   );

playground/src/Editor/ShareButton.tsx

@@ -13,7 +13,7 @@ export default function ShareButton({ onShare }: { onShare?: () => void }) {
   return copied ? (
     <button
       type="button"
-      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 cursor-auto text-ayu shadow-copied dark:bg-ayu/10"
+      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 cursor-auto text-ayu-accent shadow-copied dark:bg-ayu-accent/10"
     >
       <span
         className="absolute inset-0 flex items-center justify-center invisible"
@@ -28,7 +28,7 @@ export default function ShareButton({ onShare }: { onShare?: () => void }) {
   ) : (
     <button
       type="button"
-      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 enabled:hover:bg-ayu/80 bg-ayu text-white shadow-sm dark:shadow-highlight/20 disabled:opacity-50"
+      className="relative flex-none rounded-md text-sm font-semibold leading-6 py-1.5 px-3 enabled:hover:bg-ayu-accent/70 bg-ayu-accent text-white shadow-sm dark:shadow-highlight/20 disabled:opacity-50"
       disabled={!onShare || copied}
       onClick={
         onShare

playground/src/Editor/SourceEditor.tsx

@@ -5,19 +5,20 @@
 import Editor, { useMonaco } from "@monaco-editor/react";
 import { MarkerSeverity, MarkerTag } from "monaco-editor";
 import { useCallback, useEffect } from "react";
-import { Check } from "../pkg";
-
-export type Mode = "JSON" | "Python";
+import { Diagnostic } from "../pkg";
+import { Theme } from "./theme";
 
 export default function SourceEditor({
   visible,
   source,
-  checks,
+  theme,
+  diagnostics,
   onChange,
 }: {
   visible: boolean;
   source: string;
-  checks: Check[];
+  diagnostics: Diagnostic[];
+  theme: Theme;
   onChange: (pythonSource: string) => void;
 }) {
   const monaco = useMonaco();
@@ -32,18 +33,18 @@ export default function SourceEditor({
     editor.setModelMarkers(
       model,
       "owner",
-      checks.map((check) => ({
-        startLineNumber: check.location.row,
-        startColumn: check.location.column + 1,
-        endLineNumber: check.end_location.row,
-        endColumn: check.end_location.column + 1,
-        message: `${check.code}: ${check.message}`,
+      diagnostics.map((diagnostic) => ({
+        startLineNumber: diagnostic.location.row,
+        startColumn: diagnostic.location.column + 1,
+        endLineNumber: diagnostic.end_location.row,
+        endColumn: diagnostic.end_location.column + 1,
+        message: `${diagnostic.code}: ${diagnostic.message}`,
         severity: MarkerSeverity.Error,
         tags:
-          check.code === "F401" || check.code === "F841"
+          diagnostic.code === "F401" || diagnostic.code === "F841"
             ? [MarkerTag.Unnecessary]
             : [],
-      }))
+      })),
     );
 
     const codeActionProvider = monaco?.languages.registerCodeActionProvider(
@@ -51,11 +52,13 @@ export default function SourceEditor({
       {
         // @ts-expect-error: The type definition is wrong.
         provideCodeActions: function (model, position) {
-          const actions = checks
+          const actions = diagnostics
             .filter((check) => position.startLineNumber === check.location.row)
             .filter((check) => check.fix)
             .map((check) => ({
-              title: `Fix ${check.code}`,
+              title: check.fix
+                ? `${check.code}: ${check.fix.message}` ?? `Fix ${check.code}`
+                : "Autofix",
               id: `fix-${check.code}`,
               kind: "quickfix",
               edit: check.fix
@@ -80,19 +83,19 @@ export default function SourceEditor({
             }));
           return { actions, dispose: () => {} };
         },
-      }
+      },
     );
 
     return () => {
       codeActionProvider?.dispose();
     };
-  }, [checks, monaco]);
+  }, [diagnostics, monaco]);
 
   const handleChange = useCallback(
     (value: string | undefined) => {
       onChange(value ?? "");
     },
-    [onChange]
+    [onChange],
   );
 
   return (
@@ -104,9 +107,9 @@ export default function SourceEditor({
         roundedSelection: false,
         scrollBeyondLastLine: false,
       }}
-      wrapperProps={visible ? {} : { style: { display: "none" } }}
-      theme={"Ayu-Light"}
       language={"python"}
+      wrapperProps={visible ? {} : { style: { display: "none" } }}
+      theme={theme === "light" ? "Ayu-Light" : "Ayu-Dark"}
       value={source}
       onChange={handleChange}
     />

playground/src/Editor/ThemeButton.tsx

@@ -0,0 +1,49 @@
+/**
+ * Button to toggle between light and dark mode themes.
+ */
+import { Theme } from "./theme";
+
+export default function ThemeButton({
+  theme,
+  onChange,
+}: {
+  theme: Theme;
+  onChange: (theme: Theme) => void;
+}) {
+  return (
+    <button
+      type="button"
+      className="ml-4 sm:ml-0 ring-1 ring-gray-900/5 shadow-sm hover:bg-gray-50 dark:ring-0 dark:bg-gray-800 dark:hover:bg-gray-700 dark:shadow-highlight/4 group focus:outline-none focus-visible:ring-2 rounded-md focus-visible:ring-ayu-accent dark:focus-visible:ring-2 dark:focus-visible:ring-gray-400"
+      onClick={() => onChange(theme === "light" ? "dark" : "light")}
+    >
+      <span className="sr-only">
+        <span className="dark:hidden">Switch to dark theme</span>
+        <span className="hidden dark:inline">Switch to light theme</span>
+      </span>
+      <svg
+        width="36"
+        height="36"
+        viewBox="-6 -6 36 36"
+        strokeWidth="2"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        className="stroke-ayu-accent fill-ayu-accent/10 group-hover:stroke-ayu-accent/80 dark:stroke-gray-400 dark:fill-gray-400/20 dark:group-hover:stroke-gray-300"
+      >
+        <g className="dark:opacity-0">
+          <path d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z"></path>
+          <path
+            d="M12 4v.01M17.66 6.345l-.007.007M20.005 12.005h-.01M17.66 17.665l-.007-.007M12 20.01V20M6.34 17.665l.007-.007M3.995 12.005h.01M6.34 6.344l.007.007"
+            fill="none"
+          />
+        </g>
+        <g className="opacity-0 dark:opacity-100">
+          <path d="M16 12a4 4 0 1 1-8 0 4 4 0 0 1 8 0Z" />
+          <path
+            d="M12 3v1M18.66 5.345l-.828.828M21.005 12.005h-1M18.66 18.665l-.828-.828M12 21.01V20M5.34 18.666l.835-.836M2.995 12.005h1.01M5.34 5.344l.835.836"
+            fill="none"
+          />
+        </g>
+      </svg>
+    </button>
+  );
+}

playground/src/Editor/VersionTag.tsx

@@ -17,7 +17,7 @@ export default function VersionTag({ children }: { children: ReactNode }) {
         "items-center",
         "dark:bg-gray-800",
         "dark:text-gray-400",
-        "dark:shadow-highlight/4"
+        "dark:shadow-highlight/4",
       )}
     >
       {children}

playground/src/Editor/config.ts

@@ -1,63 +0,0 @@
-import lzstring from "lz-string";
-import { OptionGroup } from "../ruff_options";
-
-export type Config = { [K: string]: any };
-
-/**
- * Parse an encoded value from the options export.
- *
- * TODO(charlie): Use JSON for the default values.
- */
-function parse(value: any): any {
-  if (value == "None") {
-    return null;
-  }
-  return JSON.parse(value);
-}
-
-/**
- * The default configuration for the playground.
- */
-export function defaultConfig(availableOptions: OptionGroup[]): Config {
-  const config: Config = {};
-  for (const group of availableOptions) {
-    if (group.name == "globals") {
-      for (const field of group.fields) {
-        config[field.name] = parse(field.default);
-      }
-    } else {
-      config[group.name] = {};
-      for (const field of group.fields) {
-        config[group.name][field.name] = parse(field.default);
-      }
-    }
-  }
-  return config;
-}
-
-/**
- * Persist the configuration to a URL.
- */
-export function persist(configSource: string, pythonSource: string) {
-  window.location.hash = lzstring.compressToEncodedURIComponent(
-    configSource + "$$$" + pythonSource
-  );
-}
-
-/**
- * Restore the configuration from a URL.
- */
-export function restore(): [string, string] | null {
-  const value = lzstring.decompressFromEncodedURIComponent(
-    window.location.hash.slice(1)
-  );
-
-  if (value) {
-    const parts = value.split("$$$");
-    const configSource = parts[0];
-    const pythonSource = parts[1];
-    return [configSource, pythonSource];
-  } else {
-    return null;
-  }
-}

playground/src/Editor/settings.ts

@@ -0,0 +1,50 @@
+import lzstring from "lz-string";
+
+export type Settings = { [K: string]: any };
+
+/**
+ * Stringify a settings object to JSON.
+ */
+export function stringify(settings: Settings): string {
+  return JSON.stringify(
+    settings,
+    (k, v) => {
+      if (v instanceof Map) {
+        return Object.fromEntries(v.entries());
+      } else {
+        return v;
+      }
+    },
+    2,
+  );
+}
+
+/**
+ * Persist the configuration to a URL.
+ */
+export async function persist(settingsSource: string, pythonSource: string) {
+  const hash = lzstring.compressToEncodedURIComponent(
+    settingsSource + "$$$" + pythonSource,
+  );
+  await navigator.clipboard.writeText(
+    window.location.href.split("#")[0] + "#" + hash,
+  );
+}
+
+/**
+ * Restore the configuration from a URL.
+ */
+export function restore(): [string, string] | null {
+  const value = lzstring.decompressFromEncodedURIComponent(
+    window.location.hash.slice(1),
+  );
+
+  if (value) {
+    const parts = value.split("$$$");
+    const settingsSource = parts[0];
+    const pythonSource = parts[1];
+    return [settingsSource, pythonSource];
+  } else {
+    return null;
+  }
+}

playground/src/Editor/theme.ts

@@ -0,0 +1,35 @@
+/**
+ * Light and dark mode theming.
+ */
+import { useEffect, useState } from "react";
+
+export type Theme = "dark" | "light";
+
+export function useTheme(): [Theme, (theme: Theme) => void] {
+  const [localTheme, setLocalTheme] = useState<Theme>("light");
+
+  const setTheme = (mode: Theme) => {
+    if (mode === "dark") {
+      document.body.classList.add("dark");
+    } else {
+      document.body.classList.remove("dark");
+    }
+    localStorage.setItem("theme", mode);
+    setLocalTheme(mode);
+  };
+
+  useEffect(() => {
+    const initialTheme = localStorage.getItem("theme");
+    if (initialTheme === "dark") {
+      setTheme("dark");
+    } else if (initialTheme === "light") {
+      setTheme("light");
+    } else if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
+      setTheme("dark");
+    } else {
+      setTheme("light");
+    }
+  }, []);
+
+  return [localTheme, setTheme];
+}

playground/src/Editor/utils.ts

@@ -0,0 +1,7 @@
+export async function copyTextToClipboard(text: string) {
+  if ("clipboard" in navigator) {
+    return await navigator.clipboard.writeText(text);
+  } else {
+    return document.execCommand("copy", true, text);
+  }
+}

playground/src/constants.ts

@@ -1,6 +1,3 @@
-import { defaultConfig } from "./Editor/config";
-import { AVAILABLE_OPTIONS } from "./ruff_options";
-
 export const DEFAULT_PYTHON_SOURCE =
   "import os\n" +
   "\n" +
@@ -32,9 +29,3 @@ export const DEFAULT_PYTHON_SOURCE =
   "# 13\n" +
   "# 21\n" +
   "# 34\n";
-
-export const DEFAULT_CONFIG_SOURCE = JSON.stringify(
-  defaultConfig(AVAILABLE_OPTIONS),
-  null,
-  2
-);

playground/src/main.tsx

@@ -6,5 +6,5 @@ import "./index.css";
 ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
   <React.StrictMode>
     <Editor />
-  </React.StrictMode>
+  </React.StrictMode>,
 );

playground/src/ruff_options.ts

@@ -1,244 +0,0 @@
-
-// This file is auto-generated by `cargo dev generate-playground-options`.
-export interface OptionGroup {
-    name: string;
-    fields: {
-        name: string;
-        default: string;
-        type: string;
-    }[];
-};
-
-export const AVAILABLE_OPTIONS: OptionGroup[] = [
-    {"name": "globals", "fields": [
-        {
-            "name": "allowed-confusables",
-            "default": '[]',
-            "type": 'Vec<char>',
-        },
-        {
-            "name": "dummy-variable-rgx",
-            "default": '"^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"',
-            "type": 'Regex',
-        },
-        {
-            "name": "extend-ignore",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "extend-select",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "external",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "fix-only",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "ignore",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "line-length",
-            "default": '88',
-            "type": 'usize',
-        },
-        {
-            "name": "required-version",
-            "default": 'None',
-            "type": 'String',
-        },
-        {
-            "name": "select",
-            "default": '["E", "F"]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "target-version",
-            "default": '"py310"',
-            "type": 'PythonVersion',
-        },
-        {
-            "name": "unfixable",
-            "default": '[]',
-            "type": 'Vec<CheckCodePrefix>',
-        },
-        {
-            "name": "update-check",
-            "default": 'true',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "flake8-annotations", "fields": [
-        {
-            "name": "allow-star-arg-any",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "mypy-init-return",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "suppress-dummy-args",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "suppress-none-returning",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "flake8-bugbear", "fields": [
-        {
-            "name": "extend-immutable-calls",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-    ]},
-    {"name": "flake8-errmsg", "fields": [
-        {
-            "name": "max-string-length",
-            "default": '0',
-            "type": 'usize',
-        },
-    ]},
-    {"name": "flake8-import-conventions", "fields": [
-        {
-            "name": "aliases",
-            "default": '{"altair": "alt", "matplotlib.pyplot": "plt", "numpy": "np", "pandas": "pd", "seaborn": "sns"}',
-            "type": 'FxHashMap<String, String>',
-        },
-        {
-            "name": "extend-aliases",
-            "default": '{}',
-            "type": 'FxHashMap<String, String>',
-        },
-    ]},
-    {"name": "flake8-quotes", "fields": [
-        {
-            "name": "avoid-escape",
-            "default": 'true',
-            "type": 'bool',
-        },
-        {
-            "name": "docstring-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-        {
-            "name": "inline-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-        {
-            "name": "multiline-quotes",
-            "default": '"double"',
-            "type": 'Quote',
-        },
-    ]},
-    {"name": "flake8-tidy-imports", "fields": [
-        {
-            "name": "ban-relative-imports",
-            "default": '"parents"',
-            "type": 'Strictness',
-        },
-    ]},
-    {"name": "flake8-unused-arguments", "fields": [
-        {
-            "name": "ignore-variadic-names",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "isort", "fields": [
-        {
-            "name": "combine-as-imports",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "extra-standard-library",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "force-single-line",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "force-wrap-aliases",
-            "default": 'false',
-            "type": 'bool',
-        },
-        {
-            "name": "known-first-party",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "known-third-party",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "single-line-exclusions",
-            "default": '[]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "split-on-trailing-comma",
-            "default": 'true',
-            "type": 'bool',
-        },
-    ]},
-    {"name": "mccabe", "fields": [
-        {
-            "name": "max-complexity",
-            "default": '10',
-            "type": 'usize',
-        },
-    ]},
-    {"name": "pep8-naming", "fields": [
-        {
-            "name": "classmethod-decorators",
-            "default": '["classmethod"]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "ignore-names",
-            "default": '["setUp", "tearDown", "setUpClass", "tearDownClass", "setUpModule", "tearDownModule", "asyncSetUp", "asyncTearDown", "setUpTestData", "failureException", "longMessage", "maxDiff"]',
-            "type": 'Vec<String>',
-        },
-        {
-            "name": "staticmethod-decorators",
-            "default": '["staticmethod"]',
-            "type": 'Vec<String>',
-        },
-    ]},
-    {"name": "pydocstyle", "fields": [
-        {
-            "name": "convention",
-            "default": 'None',
-            "type": 'Convention',
-        },
-    ]},
-    {"name": "pyupgrade", "fields": [
-        {
-            "name": "keep-runtime-typing",
-            "default": 'false',
-            "type": 'bool',
-        },
-    ]},
-];

playground/src/third-party.d.ts

@@ -1,6 +1,6 @@
 declare module "lz-string" {
   function decompressFromEncodedURIComponent(
-    input: string | null
+    input: string | null,
   ): string | null;
   function compressToEncodedURIComponent(input: string | null): string;
 }

playground/tailwind.config.cjs

@@ -2,11 +2,16 @@
 const defaultTheme = require("tailwindcss/defaultTheme");
 
 module.exports = {
+  darkMode: "class",
   content: ["./index.html", "./src/**/*.{js,ts,jsx,tsx}"],
   theme: {
     extend: {
       colors: {
-        ayu: "#f07171",
+        "ayu-accent": "#fa8d3e",
+        "ayu-background": {
+          DEFAULT: "#f8f9fa",
+          dark: "#0b0e14",
+        },
       },
       fontFamily: {
         sans: ["Inter var", ...defaultTheme.fontFamily.sans],

pyproject.toml

@@ -1,5 +1,22 @@
+[build-system]
+requires = ["maturin>=0.14.10,<0.15"]
+# We depend on >=0.14.10 because we specify name in
+# [package.metadata.maturin] in ruff_cli/Cargo.toml.
+
+build-backend = "maturin"
+
 [project]
 name = "ruff"
+version = "0.0.236"
+description = "An extremely fast Python linter, written in Rust."
+authors = [
+  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
+]
+maintainers = [
+  { name = "Charlie Marsh", email = "charlie.r.marsh@gmail.com" },
+]
+requires-python = ">=3.7"
+license = { file = "LICENSE" }
 keywords = ["automation", "flake8", "pycodestyle", "pyflakes", "pylint", "clippy"]
 classifiers = [
     "Development Status :: 3 - Alpha",
@@ -17,30 +34,10 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
     "Topic :: Software Development :: Quality Assurance",
 ]
-author = "Charlie Marsh"
-author_email = "charlie.r.marsh@gmail.com"
-description = "An extremely fast Python linter, written in Rust."
-requires-python = ">=3.7"
-
-[project.urls]
-repository = "https://github.com/charliermarsh/ruff"
-
-[build-system]
-requires = ["maturin>=0.14,<0.15"]
-build-backend = "maturin"
+urls = { repository = "https://github.com/charliermarsh/ruff" }
 
 [tool.maturin]
 bindings = "bin"
+manifest-path = "ruff_cli/Cargo.toml"
+python-source = "python"
 strip = true
-
-[tool.ruff]
-update-check = true
-
-[tool.ruff.isort]
-force-wrap-aliases = true
-combine-as-imports = true
-force-single-line = true
-single-line-exclusions = ["os", "logging.handlers"]
-
-[tool.ruff.pydocstyle]
-convention = "google"

resources/test/fixtures/flake8_annotations/allow_nested_overload.py

@@ -0,0 +1,9 @@
+class C:
+    from typing import overload
+
+    @overload
+    def f(self, x: int, y: int) -> None:
+        ...
+
+    def f(self, x, y):
+        pass

resources/test/fixtures/flake8_bandit/S103.py

@@ -0,0 +1,22 @@
+import os
+import stat
+
+keyfile = "foo"
+
+os.chmod("/etc/passwd", 0o227)  # Error
+os.chmod("/etc/passwd", 0o7)  # Error
+os.chmod("/etc/passwd", 0o664)  # OK
+os.chmod("/etc/passwd", 0o777)  # Error
+os.chmod("/etc/passwd", 0o770)  # Error
+os.chmod("/etc/passwd", 0o776)  # Error
+os.chmod("/etc/passwd", 0o760)  # OK
+os.chmod("~/.bashrc", 511)  # Error
+os.chmod("/etc/hosts", 0o777)  # Error
+os.chmod("/tmp/oh_hai", 0x1FF)  # Error
+os.chmod("/etc/passwd", stat.S_IRWXU)  # OK
+os.chmod(keyfile, 0o777)  # Error
+os.chmod(keyfile, 0o7 | 0o70 | 0o700)  # Error
+os.chmod(keyfile, stat.S_IRWXO | stat.S_IRWXG | stat.S_IRWXU)  # Error
+os.chmod("~/hidden_exec", stat.S_IXGRP)  # Error
+os.chmod("~/hidden_exec", stat.S_IXOTH)  # OK
+os.chmod("/etc/passwd", stat.S_IWOTH)  # Error

resources/test/fixtures/flake8_bandit/S105.py

@@ -51,3 +51,12 @@ secret == "s3cr3t"
 token == "s3cr3t"
 secrete == "s3cr3t"
 password == safe == "s3cr3t"
+
+if token == "1\n2":
+    pass
+
+if token == "3\t4":
+    pass
+
+if token == "5\r6":
+    pass

resources/test/fixtures/flake8_bandit/S108.py

@@ -0,0 +1,16 @@
+# ok
+with open("/abc/tmp", "w") as f:
+    f.write("def")
+
+with open("/tmp/abc", "w") as f:
+    f.write("def")
+
+with open("/var/tmp/123", "w") as f:
+    f.write("def")
+
+with open("/dev/shm/unit/test", "w") as f:
+    f.write("def")
+
+# not ok by config
+with open("/foo/bar", "w") as f:
+    f.write("def")

resources/test/fixtures/flake8_bandit/S113.py

@@ -0,0 +1,23 @@
+import requests
+
+requests.get('https://gmail.com')
+requests.get('https://gmail.com', timeout=None)
+requests.get('https://gmail.com', timeout=5)
+requests.post('https://gmail.com')
+requests.post('https://gmail.com', timeout=None)
+requests.post('https://gmail.com', timeout=5)
+requests.put('https://gmail.com')
+requests.put('https://gmail.com', timeout=None)
+requests.put('https://gmail.com', timeout=5)
+requests.delete('https://gmail.com')
+requests.delete('https://gmail.com', timeout=None)
+requests.delete('https://gmail.com', timeout=5)
+requests.patch('https://gmail.com')
+requests.patch('https://gmail.com', timeout=None)
+requests.patch('https://gmail.com', timeout=5)
+requests.options('https://gmail.com')
+requests.options('https://gmail.com', timeout=None)
+requests.options('https://gmail.com', timeout=5)
+requests.head('https://gmail.com')
+requests.head('https://gmail.com', timeout=None)
+requests.head('https://gmail.com', timeout=5)

resources/test/fixtures/flake8_bandit/S324.py

@@ -0,0 +1,52 @@
+import hashlib
+from hashlib import new as hashlib_new
+from hashlib import sha1 as hashlib_sha1
+
+# Invalid
+
+hashlib.new('md5')
+
+hashlib.new('md4', b'test')
+
+hashlib.new(name='md5', data=b'test')
+
+hashlib.new('MD4', data=b'test')
+
+hashlib.new('sha1')
+
+hashlib.new('sha1', data=b'test')
+
+hashlib.new('sha', data=b'test')
+
+hashlib.new(name='SHA', data=b'test')
+
+hashlib.sha(data=b'test')
+
+hashlib.md5()
+
+hashlib_new('sha1')
+
+hashlib_sha1('sha1')
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.new('sha1', usedforsecurity=True)
+
+# Valid
+
+hashlib.new('sha256')
+
+hashlib.new('SHA512')
+
+hashlib.sha256(data=b'test')
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib_new(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib_sha1(name='sha1', usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.md4(usedforsecurity=False)
+
+# usedforsecurity arg only available in Python 3.9+
+hashlib.new(name='sha256', usedforsecurity=False)

resources/test/fixtures/flake8_bandit/S501.py

@@ -0,0 +1,40 @@
+import httpx
+import requests
+
+requests.get('https://gmail.com', timeout=30, verify=True)
+requests.get('https://gmail.com', timeout=30, verify=False)
+requests.post('https://gmail.com', timeout=30, verify=True)
+requests.post('https://gmail.com', timeout=30, verify=False)
+requests.put('https://gmail.com', timeout=30, verify=True)
+requests.put('https://gmail.com', timeout=30, verify=False)
+requests.delete('https://gmail.com', timeout=30, verify=True)
+requests.delete('https://gmail.com', timeout=30, verify=False)
+requests.patch('https://gmail.com', timeout=30, verify=True)
+requests.patch('https://gmail.com', timeout=30, verify=False)
+requests.options('https://gmail.com', timeout=30, verify=True)
+requests.options('https://gmail.com', timeout=30, verify=False)
+requests.head('https://gmail.com', timeout=30, verify=True)
+requests.head('https://gmail.com', timeout=30, verify=False)
+
+httpx.request('GET', 'https://gmail.com', verify=True)
+httpx.request('GET', 'https://gmail.com', verify=False)
+httpx.get('https://gmail.com', verify=True)
+httpx.get('https://gmail.com', verify=False)
+httpx.options('https://gmail.com', verify=True)
+httpx.options('https://gmail.com', verify=False)
+httpx.head('https://gmail.com', verify=True)
+httpx.head('https://gmail.com', verify=False)
+httpx.post('https://gmail.com', verify=True)
+httpx.post('https://gmail.com', verify=False)
+httpx.put('https://gmail.com', verify=True)
+httpx.put('https://gmail.com', verify=False)
+httpx.patch('https://gmail.com', verify=True)
+httpx.patch('https://gmail.com', verify=False)
+httpx.delete('https://gmail.com', verify=True)
+httpx.delete('https://gmail.com', verify=False)
+httpx.stream('https://gmail.com', verify=True)
+httpx.stream('https://gmail.com', verify=False)
+httpx.Client()
+httpx.Client(verify=False)
+httpx.AsyncClient()
+httpx.AsyncClient(verify=False)

resources/test/fixtures/flake8_bandit/S506.py

@@ -0,0 +1,31 @@
+import json
+import yaml
+from yaml import CSafeLoader
+from yaml import SafeLoader
+from yaml import SafeLoader as NewSafeLoader
+
+
+def test_yaml_load():
+    ystr = yaml.dump({"a": 1, "b": 2, "c": 3})
+    y = yaml.load(ystr)
+    yaml.dump(y)
+    try:
+        y = yaml.load(ystr, Loader=yaml.CSafeLoader)
+    except AttributeError:
+        # CSafeLoader only exists if you build yaml with LibYAML
+        y = yaml.load(ystr, Loader=yaml.SafeLoader)
+
+
+def test_json_load():
+    # no issue should be found
+    j = json.load("{}")
+
+
+yaml.load("{}", Loader=yaml.Loader)
+
+# no issue should be found
+yaml.load("{}", SafeLoader)
+yaml.load("{}", yaml.SafeLoader)
+yaml.load("{}", CSafeLoader)
+yaml.load("{}", yaml.CSafeLoader)
+yaml.load("{}", NewSafeLoader)

resources/test/fixtures/flake8_bandit/S508.py

@@ -0,0 +1,6 @@
+from pysnmp.hlapi import CommunityData
+
+CommunityData("public", mpModel=0)  # S508
+CommunityData("public", mpModel=1)  # S508
+
+CommunityData("public", mpModel=2)  # OK

resources/test/fixtures/flake8_bandit/S509.py

@@ -0,0 +1,7 @@
+from pysnmp.hlapi import UsmUserData
+
+
+insecure = UsmUserData("securityName")  # S509
+auth_no_priv = UsmUserData("securityName", "authName")  # S509
+
+less_insecure = UsmUserData("securityName", "authName", "privName")  # OK

resources/test/fixtures/flake8_bandit/S612.py

@@ -0,0 +1,8 @@
+import logging.config
+
+t = logging.config.listen(9999)
+
+def verify_func():
+    pass
+
+l = logging.config.listen(9999, verify=verify_func)

resources/test/fixtures/flake8_bandit/S701.py

@@ -0,0 +1,29 @@
+import jinja2
+from jinja2 import Environment, select_autoescape
+templateLoader = jinja2.FileSystemLoader( searchpath="/" )
+something = ''
+
+Environment(loader=templateLoader, load=templateLoader, autoescape=True)
+templateEnv = jinja2.Environment(autoescape=True,
+        loader=templateLoader )
+Environment(loader=templateLoader, load=templateLoader, autoescape=something)  # S701
+templateEnv = jinja2.Environment(autoescape=False, loader=templateLoader )  # S701
+Environment(loader=templateLoader,
+            load=templateLoader,
+            autoescape=False)  # S701
+
+Environment(loader=templateLoader,  # S701
+            load=templateLoader)
+
+Environment(loader=templateLoader, autoescape=select_autoescape())
+
+Environment(loader=templateLoader,
+            autoescape=select_autoescape(['html', 'htm', 'xml']))
+
+Environment(loader=templateLoader,
+            autoescape=jinja2.select_autoescape(['html', 'htm', 'xml']))
+
+
+def fake_func():
+    return 'foobar'
+Environment(loader=templateLoader, autoescape=fake_func())  # S701

resources/test/fixtures/flake8_blind_except/BLE.py

@@ -61,3 +61,34 @@ except Exception as e:
     raise bad
 except BaseException:
     pass
+
+import logging
+
+try:
+    pass
+except Exception:
+    logging.error("...")
+
+
+try:
+    pass
+except Exception:
+    logging.error("...", exc_info=False)
+
+
+try:
+    pass
+except Exception:
+    logging.error("...", exc_info=None)
+
+
+try:
+    pass
+except Exception:
+    logging.exception("...")
+
+
+try:
+    pass
+except Exception:
+    logging.error("...", exc_info=True)

resources/test/fixtures/flake8_bugbear/B007.py

@@ -29,3 +29,19 @@ def strange_generator():
 
 for i, (j, (k, l)) in strange_generator():  # i, k not used
     print(j, l)
+
+FMT = "{foo} {bar}"
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**locals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**globals()))
+
+for foo, bar in [(1, 2)]:
+    if foo:
+        print(FMT.format(**vars()))
+
+for foo, bar in [(1, 2)]:
+    print(FMT.format(foo=foo, bar=eval('bar')))

resources/test/fixtures/flake8_bugbear/B009_B010.py

@@ -1,7 +1,7 @@
 """
 Should emit:
-B009 - Line 18, 19, 20, 21, 22
-B010 - Line 33, 34, 35, 36
+B009 - Line 19, 20, 21, 22, 23, 24
+B010 - Line 40, 41, 42, 43, 44, 45
 """
 
 # Valid getattr usage
@@ -13,10 +13,12 @@ getattr(foo, bar, None)
 getattr(foo, "123abc")
 getattr(foo, r"123\abc")
 getattr(foo, "except")
+getattr(foo, "__123abc")
 
 # Invalid usage
 getattr(foo, "bar")
 getattr(foo, "_123abc")
+getattr(foo, "__123abc__")
 getattr(foo, "abc123")
 getattr(foo, r"abc123")
 _ = lambda x: getattr(x, "bar")
@@ -27,6 +29,7 @@ if getattr(x, "bar"):
 setattr(foo, bar, None)
 setattr(foo, "bar{foo}".format(foo="a"), None)
 setattr(foo, "123abc", None)
+setattr(foo, "__123abc", None)
 setattr(foo, r"123\abc", None)
 setattr(foo, "except", None)
 _ = lambda x: setattr(x, "bar", 1)
@@ -36,6 +39,7 @@ if setattr(x, "bar", 1):
 # Invalid usage
 setattr(foo, "bar", None)
 setattr(foo, "_123abc", None)
+setattr(foo, "__123abc__", None)
 setattr(foo, "abc123", None)
 setattr(foo, r"abc123", None)
 setattr(foo.bar, r"baz", None)

resources/test/fixtures/flake8_bugbear/B023.py

@@ -25,10 +25,10 @@ for x in range(3):
 
 
 def check_inside_functions_too():
-    ls = [lambda: x for x in range(2)]
-    st = {lambda: x for x in range(2)}
-    gn = (lambda: x for x in range(2))
-    dt = {x: lambda: x for x in range(2)}
+    ls = [lambda: x for x in range(2)]  # error
+    st = {lambda: x for x in range(2)}  # error
+    gn = (lambda: x for x in range(2))  # error
+    dt = {x: lambda: x for x in range(2)}  # error
 
 
 async def pointless_async_iterable():
@@ -37,9 +37,9 @@ async def pointless_async_iterable():
 
 async def container_for_problems():
     async for x in pointless_async_iterable():
-        functions.append(lambda: x)
+        functions.append(lambda: x)  # error
 
-    [lambda: x async for x in pointless_async_iterable()]
+    [lambda: x async for x in pointless_async_iterable()]  # error
 
 
 a = 10
@@ -47,10 +47,10 @@ b = 0
 while True:
     a = a_ = a - 1
     b += 1
-    functions.append(lambda: a)
-    functions.append(lambda: a_)
-    functions.append(lambda: b)
-    functions.append(lambda: c)  # not a name error because of late binding!
+    functions.append(lambda: a)  # error
+    functions.append(lambda: a_)  # error
+    functions.append(lambda: b)  # error
+    functions.append(lambda: c)  # error, but not a name error due to late binding
     c: bool = a > 3
     if not c:
         break
@@ -58,7 +58,7 @@ while True:
 # Nested loops should not duplicate reports
 for j in range(2):
     for k in range(3):
-        lambda: j * k
+        lambda: j * k  # error
 
 
 for j, k, l in [(1, 2, 3)]:
@@ -80,3 +80,95 @@ for var in range(2):
 
 for i in range(3):
     lambda: f"{i}"
+
+
+# `query` is defined in the function, so also defining it in the loop should be OK.
+for name in ["a", "b"]:
+    query = name
+
+    def myfunc(x):
+        query = x
+        query_post = x
+        _ = query
+        _ = query_post
+
+    query_post = name  # in case iteration order matters
+
+
+# Bug here because two dict comprehensions reference `name`, one of which is inside
+# the lambda.  This should be totally fine, of course.
+_ = {
+    k: v
+    for k, v in reduce(
+        lambda data, event: merge_mappings(
+            [data, {name: f(caches, data, event) for name, f in xx}]
+        ),
+        events,
+        {name: getattr(group, name) for name in yy},
+    ).items()
+    if k in backfill_fields
+}
+
+
+# OK to define lambdas if they're immediately consumed, typically as the `key=`
+# argument or in a consumed `filter()` (even if a comprehension is better style)
+for x in range(2):
+    # It's not a complete get-out-of-linting-free construct - these should fail:
+    min([None, lambda: x], key=repr)
+    sorted([None, lambda: x], key=repr)
+    any(filter(bool, [None, lambda: x]))
+    list(filter(bool, [None, lambda: x]))
+    all(reduce(bool, [None, lambda: x]))
+
+    # But all these should be OK:
+    min(range(3), key=lambda y: x * y)
+    max(range(3), key=lambda y: x * y)
+    sorted(range(3), key=lambda y: x * y)
+
+    any(map(lambda y: x < y, range(3)))
+    all(map(lambda y: x < y, range(3)))
+    set(map(lambda y: x < y, range(3)))
+    list(map(lambda y: x < y, range(3)))
+    tuple(map(lambda y: x < y, range(3)))
+    sorted(map(lambda y: x < y, range(3)))
+    frozenset(map(lambda y: x < y, range(3)))
+
+    any(filter(lambda y: x < y, range(3)))
+    all(filter(lambda y: x < y, range(3)))
+    set(filter(lambda y: x < y, range(3)))
+    list(filter(lambda y: x < y, range(3)))
+    tuple(filter(lambda y: x < y, range(3)))
+    sorted(filter(lambda y: x < y, range(3)))
+    frozenset(filter(lambda y: x < y, range(3)))
+
+    any(reduce(lambda y: x | y, range(3)))
+    all(reduce(lambda y: x | y, range(3)))
+    set(reduce(lambda y: x | y, range(3)))
+    list(reduce(lambda y: x | y, range(3)))
+    tuple(reduce(lambda y: x | y, range(3)))
+    sorted(reduce(lambda y: x | y, range(3)))
+    frozenset(reduce(lambda y: x | y, range(3)))
+
+    import functools
+
+    any(functools.reduce(lambda y: x | y, range(3)))
+    all(functools.reduce(lambda y: x | y, range(3)))
+    set(functools.reduce(lambda y: x | y, range(3)))
+    list(functools.reduce(lambda y: x | y, range(3)))
+    tuple(functools.reduce(lambda y: x | y, range(3)))
+    sorted(functools.reduce(lambda y: x | y, range(3)))
+    frozenset(functools.reduce(lambda y: x | y, range(3)))
+
+# OK because the lambda which references a loop variable is defined in a `return`
+# statement, and after we return the loop variable can't be redefined.
+# In principle we could do something fancy with `break`, but it's not worth it.
+def iter_f(names):
+    for name in names:
+        if exists(name):
+            return lambda: name if exists(name) else None
+
+        if foo(name):
+            return [lambda: name]  # known false alarm
+
+        if False:
+            return [lambda: i for i in range(3)]  # error

resources/test/fixtures/flake8_bugbear/B024.py

@@ -1,15 +1,16 @@
 """
 Should emit:
-B024 - on lines 17, 34, 52, 58, 69, 74, 79, 84, 89
+B024 - on lines 18, 71, 82, 87, 92, 141
 """
 
 import abc
 import abc as notabc
 from abc import ABC, ABCMeta
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 from abc import abstractmethod as abstract
 from abc import abstractmethod as abstractaoeuaoeuaoeu
 from abc import abstractmethod as notabstract
+from abc import abstractproperty as notabstract_property
 
 import foo
 
@@ -49,12 +50,24 @@ class Base_6(ABC):
         foo()
 
 
-class Base_7(ABC):  # error
+class Base_7(ABC):
     @notabstract
     def method(self):
         foo()
 
 
+class Base_8(ABC):
+    @notabstract_property
+    def method(self):
+        foo()
+
+
+class Base_9(ABC):
+    @abstractproperty
+    def method(self):
+        foo()
+
+
 class MetaBase_1(metaclass=ABCMeta):  # error
     def method(self):
         foo()

resources/test/fixtures/flake8_bugbear/B027.py

@@ -1,11 +1,12 @@
 """
 Should emit:
-B027 - on lines 12, 15, 18, 22, 30
+B027 - on lines 13, 16, 19, 23
 """
 import abc
 from abc import ABC
-from abc import abstractmethod
+from abc import abstractmethod, abstractproperty
 from abc import abstractmethod as notabstract
+from abc import abstractproperty as notabstract_property
 
 
 class AbstractClass(ABC):
@@ -42,6 +43,18 @@ class AbstractClass(ABC):
     def abstract_3(self):
         ...
 
+    @abc.abstractproperty
+    def abstract_4(self):
+        ...
+
+    @abstractproperty
+    def abstract_5(self):
+        ...
+
+    @notabstract_property
+    def abstract_6(self):
+        ...
+
     def body_1(self):
         print("foo")
         ...

resources/test/fixtures/flake8_builtins/A001.py

@@ -1,5 +1,6 @@
 import some as sum
 from some import other as int
+from directory import new as dir
 
 print = 1
 copyright: 'annotation' = 2
@@ -7,6 +8,8 @@ copyright: 'annotation' = 2
 float = object = 4
 min, max = 5, 6
 
+id = 4
+
 def bytes():
     pass
 

resources/test/fixtures/flake8_builtins/A002.py

@@ -5,5 +5,7 @@ def func1(str, /, type, *complex, Exception, **getattr):
 async def func2(bytes):
     pass
 
+async def func3(id, dir):
+    pass
 
 map([], lambda float: ...)

resources/test/fixtures/flake8_builtins/A003.py

@@ -1,8 +1,12 @@
 class MyClass:
     ImportError = 4
+    id = 5
+    dir = "/"
 
     def __init__(self):
         self.float = 5  # is fine
+        self.id = 10
+        self.dir = "."
 
     def str(self):
         pass

resources/test/fixtures/flake8_commas/COM81.py

@@ -0,0 +1,628 @@
+# ==> bad_function_call.py <==
+bad_function_call(
+    param1='test',
+    param2='test'
+)
+# ==> bad_list.py <==
+bad_list = [
+    1,
+    2,
+    3
+]
+
+bad_list_with_comment = [
+    1,
+    2,
+    3
+    # still needs a comma!
+]
+
+bad_list_with_extra_empty = [
+    1,
+    2,
+    3
+
+
+
+]
+
+# ==> bare.py <==
+bar = 1, 2
+
+foo = 1
+
+foo = (1,)
+
+foo = 1,
+
+bar = 1; foo = bar,
+
+foo = (
+3,
+4,
+)
+
+foo = 3, 
+
+class A(object):
+ foo = 3
+ bar = 10,
+ foo_bar = 2
+
+a = ('a',)
+
+from foo import bar, baz
+
+group_by = function_call('arg'),
+
+group_by = ('foobar' * 3),
+
+def foo():
+    return False,
+
+==> callable_before_parenth_form.py <==
+def foo(
+    bar,
+):
+    pass
+
+{'foo': foo}['foo'](
+    bar
+)
+
+{'foo': foo}['foo'](
+    bar,
+)
+
+(foo)(
+    bar
+)
+
+(foo)[0](
+    bar,
+)
+
+[foo][0](
+    bar
+)
+
+[foo][0](
+    bar,
+)
+
+# ==> comment_good_dict.py <==
+multiline_good_dict = {
+    "good": 123,  # this is a good number
+}
+
+# ==> dict_comprehension.py <==
+not_a_dict = {
+    x: y
+    for x, y in ((1, 2), (3, 4))
+}
+
+# ==> good_empty_comma_context.py <==
+def func2(
+):
+    pass
+
+
+func2(
+
+)
+
+func2(
+)
+
+[
+]
+
+[
+
+]
+
+(
+)
+
+(
+
+)
+
+{
+
+}
+
+# ==> good_list.py <==
+stuff = [
+   'a',
+   'b',
+   # more stuff will go here
+]
+
+more_stuff = [
+    'a',
+    'b',
+
+
+
+]
+
+# ==> keyword_before_parenth_form/base_bad.py <==
+from x import (
+    y
+)
+
+assert(
+    SyntaxWarning,
+    ThrownHere,
+    Anyway
+)
+
+# async await is fine outside an async def
+# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
+
+# def await(
+#     foo
+# ):
+#     async(
+#         foo
+#     )
+
+# def async(
+#     foo
+# ):
+#     await(
+#         foo
+#     )
+
+# ==> keyword_before_parenth_form/base.py <==
+from x import (
+    y,
+)
+
+assert(
+    SyntaxWarning,
+    ThrownHere,
+    Anyway,
+)
+
+assert (
+    foo
+)
+
+assert (
+    foo and
+    bar
+)
+
+if(
+    foo and
+    bar
+):
+    pass
+elif(
+    foo and
+    bar
+):
+    pass
+
+for x in(
+    [1,2,3]
+):
+    print(x)
+
+
+(x for x in (
+    [1, 2, 3]
+))
+
+(
+    'foo'
+) is (
+    'foo'
+)
+
+if (
+    foo and
+    bar
+) or not (
+    foo
+) or (
+    spam
+):
+    pass
+
+def xyz():
+    raise(
+        Exception()
+    )
+
+def abc():
+    return(
+        3
+    )
+
+while(
+    False
+):
+    pass
+
+with(
+    loop
+):
+    pass
+
+def foo():
+    yield (
+        "foo"
+    )
+
+# async await is fine outside an async def
+# ruff: RustPython tokenizer treats async/await as keywords, not applicable.
+
+# def await(
+#     foo,
+# ):
+#     async(
+#         foo,
+#     )
+
+# def async(
+#     foo,
+# ):
+#     await(
+#         foo,
+#     )
+
+# ==> keyword_before_parenth_form/py3.py <==
+# Syntax error in Py2
+
+def foo():
+    yield from (
+        foo
+    )
+
+# ==> list_comprehension.py <==
+not_a_list = [
+    s.strip()
+    for s in 'foo, bar, baz'.split(',')
+]
+
+# ==> multiline_bad_dict.py <==
+multiline_bad_dict = {
+    "bad": 123
+}
+# ==> multiline_bad_function_def.py <==
+def func_good(
+        a = 3,
+        b = 2):
+    pass
+
+
+def func_bad(
+        a = 3,
+        b = 2
+    ):
+    pass
+
+# ==> multiline_bad_function_one_param.py <==
+def func(
+        a = 3
+    ):
+    pass
+
+
+func(
+    a = 3
+)
+
+# ==> multiline_bad_or_dict.py <==
+multiline_bad_or_dict = {
+    "good": True or False,
+    "bad": 123
+}
+
+# ==> multiline_good_dict.py <==
+multiline_good_dict = {
+    "good": 123,
+}
+# ==> multiline_good_single_keyed_for_dict.py <==
+good_dict = {
+    "good": x for x in y
+}
+
+# ==> multiline_if.py <==
+if (
+    foo
+    and bar
+):
+    print("Baz")
+
+# ==> multiline_index_access.py <==
+multiline_index_access[
+    "good"
+]
+
+multiline_index_access_after_function()[
+    "good"
+]
+
+multiline_index_access_after_inline_index_access['first'][
+    "good"
+]
+
+multiline_index_access[
+    "probably fine",
+]
+
+[0, 1, 2][
+    "good"
+]
+
+[0, 1, 2][
+    "probably fine",
+]
+
+multiline_index_access[
+    "probably fine",
+    "not good"
+]
+
+multiline_index_access[
+    "fine",
+    "fine",
+    :
+    "not good"
+]
+
+# ==> multiline_string.py <==
+s = (
+    'this' +
+    'is a string'
+)
+
+s2 = (
+    'this'
+    'is also a string'
+)
+
+t = (
+    'this' +
+    'is a tuple',
+)
+
+t2 = (
+    'this'
+    'is also a tuple',
+)
+
+# ==> multiline_subscript_slice.py <==
+multiline_index_access[
+    "fine",
+    "fine"
+    :
+    "not fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine"
+    :
+    "fine"
+    :
+    "fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine",
+    :
+    "fine",
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine"
+    :
+    "fine",
+    "not fine"
+]
+
+multiline_index_access[
+    "fine"
+    "fine",
+    :
+    "fine",
+    "fine"
+    :
+    "fine",
+]
+
+multiline_index_access[
+    lambda fine,
+    fine,
+    fine: (0,)
+    :
+    lambda fine,
+    fine,
+    fine: (0,),
+    "fine"
+    :
+    "fine",
+]
+
+# ==> one_line_dict.py <==
+one_line_dict = {"good": 123}
+# ==> parenth_form.py <==
+parenth_form = (
+    a +
+    b +
+    c
+)
+
+parenth_form_with_lambda = (
+    lambda x, y: 0
+)
+
+parenth_form_with_default_lambda = (
+    lambda x=(
+        lambda
+        x,
+        y,
+        :
+        0
+    ),
+    y = {a: b},
+    :
+    0
+)
+
+# ==> prohibited.py <==
+foo = ['a', 'b', 'c',]
+
+bar = { a: b,}
+
+def bah(ham, spam,):
+    pass
+
+(0,)
+
+(0, 1,)
+
+foo = ['a', 'b', 'c', ]
+
+bar = { a: b, }
+
+def bah(ham, spam, ):
+    pass
+
+(0, )
+
+(0, 1, )
+
+image[:, :, 0]
+
+image[:,]
+
+image[:,:,]
+
+lambda x, :
+
+# ==> unpack.py <==
+def function(
+    foo,
+    bar,
+    **kwargs
+):
+    pass
+
+def function(
+    foo,
+    bar,
+    *args
+):
+    pass
+
+def function(
+    foo,
+    bar,
+    *args,
+    extra_kwarg
+    ):
+    pass
+
+result = function(
+    foo,
+    bar,
+    **kwargs
+)
+
+result = function(
+    foo,
+    bar,
+    **not_called_kwargs
+)
+
+def foo(
+    ham,
+    spam,
+    *args,
+    kwarg_only
+    ):
+    pass
+
+# In python 3.5 if it's not a function def, commas are mandatory.
+
+foo(
+    **kwargs
+)
+
+{
+    **kwargs
+}
+
+(
+    *args
+)
+
+{
+    *args
+}
+
+[
+    *args
+]
+
+def foo(
+    ham,
+    spam,
+    *args
+    ):
+    pass
+
+def foo(
+    ham,
+    spam,
+    **kwargs
+    ):
+    pass
+
+def foo(
+    ham,
+    spam,
+    *args,
+    kwarg_only
+    ):
+    pass
+
+# In python 3.5 if it's not a function def, commas are mandatory.
+
+foo(
+    **kwargs,
+)
+
+{
+    **kwargs,
+}
+
+(
+    *args,
+)
+
+{
+    *args,
+}
+
+[
+    *args,
+]
+
+result = function(
+    foo,
+    bar,
+    **{'ham': spam}
+)

resources/test/fixtures/flake8_comprehensions/C400.py

@@ -2,3 +2,10 @@ x = list(x for x in range(3))
 x = list(
     x for x in range(3)
 )
+
+
+def list(*args, **kwargs):
+    return None
+
+
+list(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C401.py

@@ -2,3 +2,10 @@ x = set(x for x in range(3))
 x = set(
     x for x in range(3)
 )
+
+
+def set(*args, **kwargs):
+    return None
+
+
+set(x for x in range(3))

resources/test/fixtures/flake8_comprehensions/C405.py

@@ -1,5 +1,18 @@
-s1 = set([1, 2])
-s2 = set((1, 2))
-s3 = set([])
-s4 = set(())
-s5 = set()
+set([1, 2])
+set((1, 2))
+set([])
+set(())
+set()
+set((1,))
+set((
+    1,
+))
+set([
+    1,
+])
+set(
+    (1,)
+)
+set(
+    [1,]
+)

resources/test/fixtures/flake8_comprehensions/C408.py

@@ -3,3 +3,10 @@ l = list()
 d1 = dict()
 d2 = dict(a=1)
 d3 = dict(**d2)
+
+
+def list():
+    return [1, 2, 3]
+
+
+a = list()

resources/test/fixtures/flake8_comprehensions/C413.py

@@ -4,3 +4,10 @@ list(sorted(x))
 reversed(sorted(x))
 reversed(sorted(x, key=lambda e: e))
 reversed(sorted(x, reverse=True))
+
+
+def reversed(*args, **kwargs):
+    return None
+
+
+reversed(sorted(x, reverse=True))

resources/test/fixtures/flake8_executable/EXE001_1.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_2.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE001_3.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_1.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_2.py

@@ -0,0 +1,2 @@
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE002_3.py

@@ -0,0 +1,4 @@
+#!/usr/bin/python
+
+if __name__ == '__main__':
+    print('I should be executable.')

resources/test/fixtures/flake8_executable/EXE003.py

@@ -0,0 +1,2 @@
+#!/usr/bin/bash
+print("hello world")

resources/test/fixtures/flake8_executable/EXE004_1.py

@@ -0,0 +1 @@
+    #!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE004_2.py

@@ -0,0 +1,2 @@
+print("  #!/usr/bin/python")
+# shebang outside of comments should be ignored

resources/test/fixtures/flake8_executable/EXE004_3.py

@@ -0,0 +1,2 @@
+
+pass  #!/usr/bin/env python

resources/test/fixtures/flake8_executable/EXE005_1.py

@@ -0,0 +1,3 @@
+
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_2.py

@@ -0,0 +1,4 @@
+print("code prior to shebang")
+
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_executable/EXE005_3.py

@@ -0,0 +1,6 @@
+"""
+With a docstring
+print("commented out code")
+"""
+# A python comment
+#!/usr/bin/python

resources/test/fixtures/flake8_implicit_str_concat/ISC.py

@@ -0,0 +1,36 @@
+_ = "a" "b" "c"
+
+_ = "abc" + "def"
+
+_ = "abc" \
+    "def"
+
+_ = (
+  "abc" +
+  "def"
+)
+
+_ = (
+  f"abc" +
+  "def"
+)
+
+_ = (
+  b"abc" +
+  b"def"
+)
+
+_ = (
+  "abc"
+  "def"
+)
+
+_ = (
+  f"abc"
+  "def"
+)
+
+_ = (
+  b"abc"
+  b"def"
+)

resources/test/fixtures/flake8_import_conventions/from_imports.py

@@ -0,0 +1,21 @@
+# Test absolute imports
+# Violation cases
+import xml.dom.minidom
+import xml.dom.minidom as wrong
+from xml.dom import minidom as wrong
+from xml.dom import minidom
+from xml.dom.minidom import parseString as wrong  # Ensure ICN001 throws on function import.
+from xml.dom.minidom import parseString
+from xml.dom.minidom import parse, parseString
+from xml.dom.minidom import parse as ps, parseString as wrong
+
+# No ICN001 violations
+import xml.dom.minidom as md
+from xml.dom import minidom as md
+from xml.dom.minidom import parseString as pstr
+from xml.dom.minidom import parse, parseString as pstr
+from xml.dom.minidom import parse as ps, parseString as pstr
+
+
+# Test relative imports
+from ..xml.dom import minidom as okay  # Ensure config "xml.dom.minidom" doesn't catch relative imports

resources/test/fixtures/flake8_logging_format/G001.py

@@ -0,0 +1,3 @@
+import logging
+
+logging.info("Hello {}".format("World!"))

resources/test/fixtures/flake8_logging_format/G002.py

@@ -0,0 +1,3 @@
+import logging
+
+logging.info("Hello %s" % "World!")

resources/test/fixtures/flake8_logging_format/G003.py

@@ -0,0 +1,3 @@
+import logging
+
+logging.info("Hello" + " " + "World!")

resources/test/fixtures/flake8_logging_format/G004.py

@@ -0,0 +1,4 @@
+import logging
+
+name = "world"
+logging.info(f"Hello {name}")

resources/test/fixtures/flake8_logging_format/G010.py

@@ -0,0 +1,3 @@
+import logging
+
+logging.warn("Hello World!")

resources/test/fixtures/flake8_logging_format/G101_1.py

@@ -0,0 +1,8 @@
+import logging
+
+logging.info(
+    "Hello world!",
+    extra={
+        "name": "foobar",
+    },
+)

resources/test/fixtures/flake8_logging_format/G101_2.py

@@ -0,0 +1,8 @@
+import logging
+
+logging.info(
+    "Hello world!",
+    extra=dict(
+        name="foobar",
+    ),
+)