blockwatch-cli 0.11.1__tar.gz → 0.11.3__tar.gz

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/AGENTS.md

@@ -125,8 +125,9 @@ Source files here contain real `<block ...>` tags. Two runs check them:
   the code here.
 
 The hook and CI read `blockwatch.toml`. It skips `tests/testdata/`, where the fixtures break rules on purpose. It also
-turns off `check-lua`, because the `check-lua` block here needs the network. `.github/workflows/trusted-checks.yml`
-runs that block on a schedule.
+skips the `latest-model` block, because its `check-lua` script needs the network. `.github/workflows/trusted-checks.yml`
+runs that block on a schedule. The `[[block]]` entries in `blockwatch.toml` hold rules too, with no tag in the file
+they check, such as the version and the dependencies in `Cargo.toml`.
 
 No test checks these blocks, so `cargo test` can pass while the hook fails. `tests/general.rs` also runs the linter on
 the whole tree, but with an empty config, so the fixtures fail that run on purpose. To check the blocks before you

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/CHANGELOG.md

@@ -12,6 +12,26 @@ Releases up to and including v0.3.11 predate this file. Their notes live on the
 
 ## [Unreleased] - ReleaseDate
 
+## [0.11.3] - 2026-10-15
+
+### Fixed
+
+- A block with `keep-unique-pattern` now fails the run with ``unrecognized attribute `keep-unique-pattern` ``. Before,
+  blockwatch accepted the attribute and ignored it, so `keep-unique` compared whole lines. Put the regex in
+  `keep-unique` itself: `keep-unique="(?P<value>\w+)"`.
+
+## [0.11.2] - 2026-10-15
+
+### Added
+
+- blockwatch now supports Lean (`.lean`), OCaml (`.ml`, `.mli`) and MDX (`.mdx`) files. Before, it skipped them, so
+  their tags were never checked. In MDX, put tags in JavaScript comments, such as `{/* <block> */}`.
+
+### Fixed
+
+- In JSX and TSX, the braces around a `{/* <block> */}` tag are no longer block content. Before, the `}` after a start
+  tag and the `{` before an end tag were part of the block, so e.g. `keep-sorted` reported a correctly sorted list.
+
 ## [0.11.1] - 2026-10-14
 
 ### Added

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/CLAUDE.md

@@ -125,8 +125,9 @@ Source files here contain real `<block ...>` tags. Two runs check them:
   the code here.
 
 The hook and CI read `blockwatch.toml`. It skips `tests/testdata/`, where the fixtures break rules on purpose. It also
-turns off `check-lua`, because the `check-lua` block here needs the network. `.github/workflows/trusted-checks.yml`
-runs that block on a schedule.
+skips the `latest-model` block, because its `check-lua` script needs the network. `.github/workflows/trusted-checks.yml`
+runs that block on a schedule. The `[[block]]` entries in `blockwatch.toml` hold rules too, with no tag in the file
+they check, such as the version and the dependencies in `Cargo.toml`.
 
 No test checks these blocks, so `cargo test` can pass while the hook fails. `tests/general.rs` also runs the linter on
 the whole tree, but with an empty config, so the fixtures fail that run on purpose. To check the blocks before you

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/Cargo.lock

@@ -274,7 +274,7 @@ checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "blockwatch"
-version = "0.11.1"
+version = "0.11.3"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -289,6 +289,7 @@ dependencies = [
  "heck",
  "ignore",
  "libc",
+ "markdown",
  "mlua",
  "percent-encoding",
  "predicates",
@@ -328,6 +329,7 @@ dependencies = [
  "tree-sitter-make",
  "tree-sitter-md",
  "tree-sitter-nix",
+ "tree-sitter-ocaml",
  "tree-sitter-php",
  "tree-sitter-proto",
  "tree-sitter-python",
@@ -1268,6 +1270,15 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "markdown"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb"
+dependencies = [
+ "unicode-id",
+]
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -2646,6 +2657,16 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-ocaml"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43adb10fcccbcbbce0f4adc9dab7cd55f0a5eafc2d71bd4c03fcc5d6767066e0"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "tree-sitter-php"
 version = "0.25.1"
@@ -2788,6 +2809,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
+[[package]]
+name = "unicode-id"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65dd75ab2d9d379dbe86d4059e91d8b5a6e7054865eaba1ddbfc7a817ff96392"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/Cargo.toml

@@ -1,8 +1,6 @@
 [package]
 name = "blockwatch"
-# <block name="crate-version" same-as="docs/cli.md:sarif-example" same-as-mode="subset" same-as-pattern='version = "(?P<value>\d+\.\d+\.\d+)"'>
-version = "0.11.1"
-# </block>
+version = "0.11.3"
 edition = "2024"
 repository = "https://github.com/mennanov/blockwatch"
 description = "Language agnostic linter that keeps your code and documentation in sync and valid"
@@ -27,6 +25,7 @@ fnv = "1.0"
 globset = "0.4.18"
 heck = "0.5"
 ignore = "0.4"
+markdown = "1.0.0"
 mlua = { version = "0.12.0", features = ["lua54", "vendored", "async", "send"] }
 percent-encoding = "2.3"
 regex = "1.12"
@@ -42,7 +41,6 @@ strum_macros = "0.28"
 tokio = { version = "1.52", features = ["full"] }
 toml_edit = { version = "0.25", default-features = false, features = ["parse", "serde"] }
 # The grammar crates the language parsers are built from.
-# <block keep-sorted keep-unique>
 tree-sitter = "0.27.0"
 tree-sitter-bash = "0.25"
 tree-sitter-c = "0.24"
@@ -66,6 +64,7 @@ tree-sitter-lua = "0.5"
 tree-sitter-make = "1.1"
 tree-sitter-md = "0.5"
 tree-sitter-nix = "0.3.0"
+tree-sitter-ocaml = "0.26"
 tree-sitter-php = "0.25"
 tree-sitter-proto = "0.6.0"
 tree-sitter-python = "0.25"
@@ -79,7 +78,6 @@ tree-sitter-toml-ng = "0.7"
 tree-sitter-typescript = "0.23"
 tree-sitter-xml = "0.7"
 tree-sitter-yaml = "0.7"
-# </block>
 unidiff = "0.4.1"
 winnow = "1.0"
 

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockwatch-cli
-Version: 0.11.1
+Version: 0.11.3
 Summary: Language agnostic linter that keeps your code and documentation in sync and valid
 Keywords: linter,sync,drift,comments,agents
 Home-Page: https://github.com/mennanov/blockwatch

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/README.md

@@ -10,7 +10,7 @@ Some parts of a codebase have to change together: a function and its docs, or a
 blockwatch lets you write those rules in comments, right next to the code. If they fall out of sync, your pre-commit
 hook or CI run fails.
 
-Supports [34 languages](#supported-languages) and their common file names, such as `Gemfile` or `.mjs`.
+Supports [37 languages](#supported-languages) and their common file names, such as `Gemfile` or `.mjs`.
 
 [//]: # (</block>)
 
@@ -96,16 +96,16 @@ have to nitpick in code review.
      same-as="src/validators/mod.rs:validator-registry, docs/validators/README.md:validators-index"
      same-as-pattern='^\|\s*\[`(?P<value>[a-z-]+)`\]'> -->
 
-| Validator                                         | Description                                                                                  | Attributes                                                     |
-|---------------------------------------------------|----------------------------------------------------------------------------------------------|----------------------------------------------------------------|
-| [`affects`](docs/validators/affects.md)           | Forces linked blocks to be edited together (e.g. code and its docs); needs a diff            | `affects`                                                      |
-| [`same-as`](docs/validators/same-as.md)           | Asserts two or more blocks hold the same value, across languages and formats; no diff needed | `same-as`, `same-as-pattern`, `same-as-mode`, `same-as-format` |
-| [`keep-sorted`](docs/validators/keep-sorted.md)   | Enforces alphabetical or numerical ordering on list items                                    | `keep-sorted`, `keep-sorted-pattern`, `keep-sorted-format`     |
-| [`keep-unique`](docs/validators/keep-unique.md)   | Prevents duplicate lines within a block                                                      | `keep-unique`                                                  |
-| [`line-pattern`](docs/validators/line-pattern.md) | Enforces that every line matches a regex, or that no line matches a forbidden one            | `line-pattern`, `line-pattern-forbidden`                       |
-| [`line-count`](docs/validators/line-count.md)     | Enforces lower or upper bounds on the number of lines in a block                             | `line-count`                                                   |
-| [`check-ai`](docs/validators/check-ai.md)         | Validates content against natural language rules using an LLM                                | `check-ai`, `check-ai-pattern`                                 |
-| [`check-lua`](docs/validators/check-lua.md)       | Runs custom validation logic written in Lua                                                  | `check-lua`, `check-lua-pattern`, `check-lua-timeout`          |
+| Validator                                         | Description                                                                                  | Attributes                                                                      |
+|---------------------------------------------------|----------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------|
+| [`affects`](docs/validators/affects.md)           | Forces linked blocks to be edited together (e.g. code and its docs); needs a diff            | `affects`                                                                       |
+| [`same-as`](docs/validators/same-as.md)           | Asserts two or more blocks hold the same value, across languages and formats; no diff needed | `same-as`, `same-as-paths`, `same-as-pattern`, `same-as-mode`, `same-as-format` |
+| [`keep-sorted`](docs/validators/keep-sorted.md)   | Enforces alphabetical or numerical ordering on list items                                    | `keep-sorted`, `keep-sorted-pattern`, `keep-sorted-format`                      |
+| [`keep-unique`](docs/validators/keep-unique.md)   | Prevents duplicate lines within a block                                                      | `keep-unique`                                                                   |
+| [`line-pattern`](docs/validators/line-pattern.md) | Enforces that every line matches a regex, or that no line matches a forbidden one            | `line-pattern`, `line-pattern-forbidden`                                        |
+| [`line-count`](docs/validators/line-count.md)     | Enforces lower or upper bounds on the number of lines in a block                             | `line-count`                                                                    |
+| [`check-ai`](docs/validators/check-ai.md)         | Validates content against natural language rules using an LLM                                | `check-ai`, `check-ai-pattern`                                                  |
+| [`check-lua`](docs/validators/check-lua.md)       | Runs custom validation logic written in Lua                                                  | `check-lua`, `check-lua-pattern`, `check-lua-timeout`                           |
 
 <!-- </block> -->
 
@@ -210,12 +210,11 @@ exclusions, and custom extension mappings.
 
 **pre-commit** (`.pre-commit-config.yaml`):
 
-<!-- <block name="pre-commit-rev" same-as="Cargo.toml:crate-version" same-as-mode="subset"
-     same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
+<!-- <block name="pre-commit-rev" same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.3  # Use latest release
   hooks:
     - id: blockwatch
 ```
@@ -240,7 +239,8 @@ For plain git hooks, local pre-commit setups, and sandboxing untrusted Lua scrip
 
 ## Supported Languages
 
-<!-- <block name="supported-grammar" keep-sorted="asc" keep-sorted-pattern="^- (?P<value>.+)" affects=":pitch"> -->
+<!-- <block name="supported-grammar" keep-sorted="asc" keep-sorted-pattern="^- (?P<value>.+)" affects=":pitch"
+     check-lua="scripts/check_language_count.lua" check-lua-pattern="(?m)^- (?P<value>.+)"> -->
 
 - Bash (with `.zsh`, `.bashrc`, `.bash_profile`, `.zshrc` and `.envrc` support)
 - C#
@@ -259,10 +259,13 @@ For plain git hooks, local pre-commit setups, and sandboxing untrusted Lua scrip
 - Java
 - JavaScript (with `.mjs` and `.cjs` support)
 - Kotlin
+- Lean
 - Lua (with `.rockspec` support)
+- MDX
 - Makefile (with `GNUmakefile` and `.mak` support)
 - Markdown
 - Nix
+- OCaml (`.ml`, `.mli`)
 - PHP
 - Protocol Buffers (`.proto`)
 - Python (with `.pyi` and `.pyw` support)

blockwatch_cli-0.11.3/blockwatch.toml

@@ -0,0 +1,40 @@
+# The test fixtures break the rules on purpose.
+ignore = ['tests/testdata/**']
+
+# This block runs on a schedule in .github/workflows/trusted-checks.yml as it needs network access and ideally should
+# be avoided in a precommit hook.
+skip-blocks = ['src/validators/check_ai.rs:latest-model']
+
+# A block listed in `skip-blocks` is checked only by the scheduled run, so that run must list it too.
+[[block]]
+target = 'blockwatch.toml#/skip-blocks'
+same-as = '.github/workflows/trusted-checks.yml#/jobs/blockwatch/steps/0/with/only_blocks'
+same-as-pattern = '(?P<value>[\w./-]+\.\w+:[\w-]+)'
+
+# Users copy the version from the docs, and the pre-commit hooks install the PyPI package that setup.py pins. So each
+# copy must be the version being released. `cargo release` rewrites them with the replacements in release.toml.
+# The SARIF example also holds the version of the SARIF format, so the version only has to be one of its values.
+[[block]]
+target = 'Cargo.toml#/package/version'
+same-as = '''README.md:pre-commit-rev,
+    docs/ci.md:pre-commit-rev,
+    docs/ci.md:commit-msg-rev,
+    docs/cli.md:sarif-example,
+    setup.py:blockwatch-cli-version'''
+same-as-mode = 'subset'
+
+# The pattern skips the lines that are not a dependency, such as a comment or the items of a `features` list.
+[[block]]
+target = 'Cargo.toml#/dependencies'
+keep-sorted = true
+keep-sorted-pattern = '^(?P<value>[\w-]+) = '
+
+# Dependabot updates actions/checkout in the workflows, but not this pin, which dist copies into release.yml.
+# The pattern reads both the pin, `v7`, and each `actions/checkout@v7` in the workflows.
+[[block]]
+target = 'dist-workspace.toml#/dist/github-action-commits/actions~1checkout'
+same-as = '''.github/workflows/codeql.yml,
+    .github/workflows/markdownlint.yml,
+    .github/workflows/pypi.yml,
+    .github/workflows/rust.yml'''
+same-as-pattern = '(?:actions/checkout@|^)(?P<value>v\d+)$'

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/docs/ci.md

@@ -15,12 +15,11 @@ It stays fast, because a file without a block tag is not parsed. To check only t
 To use [pre-commit](https://pre-commit.com), add the hook to `.pre-commit-config.yaml`. pre-commit installs a prebuilt
 `blockwatch` from PyPI, so you don't need Rust:
 
-<!-- <block name="pre-commit-rev" same-as="Cargo.toml:crate-version" same-as-mode="subset"
-     same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
+<!-- <block name="pre-commit-rev" same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.3  # Use latest release
   hooks:
     - id: blockwatch
 ```
@@ -56,12 +55,11 @@ The `blockwatch` hook runs before the commit message exists, so it cannot see a
 `blockwatch-commit-msg` hook runs one stage later, at `commit-msg`, and hands the message Git is about to use to
 [`--suppress-from`](cli.md#suppressing-from-a-file):
 
-<!-- <block name="commit-msg-rev" same-as="Cargo.toml:crate-version" same-as-mode="subset"
-     same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
+<!-- <block name="commit-msg-rev" same-as-pattern='rev: v(?P<value>\d+\.\d+\.\d+)'> -->
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.3  # Use latest release
   hooks:
     - id: blockwatch-commit-msg
 ```

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/docs/cli.md

@@ -140,7 +140,7 @@ much — see [Checking Only Changed Blocks](ci.md#checking-only-changed-blocks).
 
 ### Supported Diff Input
 
-[//]: # (<block name="diff-input" affects="src/repo_path.rs:diff-target-resolution">)
+<!-- <block name="diff-input" same-as-pattern="`(?P<value>[a-z]/)`"> -->
 
 Each diff header points at a file, and `blockwatch` resolves that path against the repository:
 
@@ -165,7 +165,7 @@ A diff with a file that does not exist in the repository is an error too — but
 Entries whose extension maps to no language, such as binary assets or lockfiles, contribute no blocks and are passed
 over, so a diff carrying them alongside source changes still validates normally.
 
-[//]: # (</block>)
+<!-- </block> -->
 
 In each case `blockwatch` stops rather than check the wrong file, reporting the diff target at fault. The messages
 describe the input rather than the command that produced it, since a diff need not come from Git:
@@ -275,6 +275,8 @@ Write globs in single quotes. TOML then takes them as written, backslashes inclu
 
 Each key matches a flag:
 
+<!-- <block name="config-keys" same-as-pattern="^\|\s*`(?P<value>[a-z-]+)`"> -->
+
 | Key           | Flag           | When the flag is given too                        |
 |---------------|----------------|---------------------------------------------------|
 | `ignore`      | `--ignore`     | Both lists apply.                                 |
@@ -284,6 +286,8 @@ Each key matches a flag:
 | `only-blocks` | `--only-block` | The flags' selection replaces the config's.       |
 | `skip-blocks` | `--skip-block` | The flags' selection replaces the config's.       |
 
+<!-- </block> -->
+
 So `blockwatch -e keep-sorted` runs only `keep-sorted`, whatever the config enables or disables. An extra `--ignore`
 still skips the files the config skips.
 
@@ -293,6 +297,8 @@ unsupported language, a block address that is not `FILE:BLOCK_NAME`, or both `en
 cannot turn a setting off without anyone noticing. The error quotes the bad key or value. For an unknown key or a value
 of the wrong type, it also shows the line and column:
 
+<!-- <block name="config-key-error" same-as-pattern="`(?P<value>[a-z-]+)`"> -->
+
 ```text
 Error: invalid config file "blockwatch.toml"
 
@@ -301,9 +307,11 @@ Caused by:
       |
     1 | ignor = ['x']
       | ^^^^^
-    unknown field `ignor`, expected one of `ignore`, `extensions`, `enable`, `disable`, `block`
+    unknown field `ignor`, expected one of `ignore`, `extensions`, `enable`, `disable`, `only-blocks`, `skip-blocks`, `block`
 ```
 
+<!-- </block> -->
+
 Everything else stays out of the file:
 
 - **The paths and globs, `--diff`, `--only-changed`, `--suppress` and `--suppress-from`** describe one run, not the
@@ -546,15 +554,15 @@ Nothing else about the run changes: the same violations are found, and the exit
       "tool": {
         "driver": {
           "name": "blockwatch",
-          "version": "0.11.1",
-          "semanticVersion": "0.11.1",
+          "version": "0.11.3",
+          "semanticVersion": "0.11.3",
           "informationUri": "https://github.com/mennanov/blockwatch",
           "rules": [
             {
               "id": "keep-sorted",
               "name": "keep-sorted",
               "shortDescription": { "text": "Requires the lines of a block to stay in order." },
-              "helpUri": "https://github.com/mennanov/blockwatch/blob/v0.11.1/docs/validators/keep-sorted.md"
+              "helpUri": "https://github.com/mennanov/blockwatch/blob/v0.11.3/docs/validators/keep-sorted.md"
             }
           ]
         }

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/docs/validators/README.md

@@ -72,7 +72,7 @@ along with the rest of their file.
 Controls how a violation is reported. Mirrors
 [LSP diagnostic severities](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic).
 
-<!-- <block name="severity-levels" affects="src/blocks.rs:block-severity"> -->
+<!-- <block name="severity-levels" same-as-pattern="^\|\s*`(?P<value>[a-z]+)`"> -->
 
 | Value             | Reported | Exit code |
 |-------------------|----------|-----------|

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/release.toml

@@ -36,9 +36,9 @@ exactly = 1
 
 # The version is spelled out in the docs as well: the `rev:` of the pre-commit
 # snippets, and the `blockwatch` version and `helpUri` of the SARIF sample
-# output. The `crate-version` block in Cargo.toml lists them all and fails
-# a run once any of them goes stale, so they are rewritten here to keep that
-# check green. `exactly` aborts the release before publishing to crates.io if a
+# output. The `[[block]]` entry for `Cargo.toml#/package/version` in
+# blockwatch.toml lists them all and fails a run once any of them goes stale,
+# so they are rewritten here to keep that check green. `exactly` aborts the release before publishing to crates.io if a
 # snippet is ever reworded past these patterns.
 [[pre-release-replacements]]
 file = "README.md"

blockwatch_cli-0.11.3/scripts/check_language_count.lua

@@ -0,0 +1,19 @@
+-- Checks that the number of languages the README's pitch claims is the number of items in its list of supported
+-- languages. The list's block points at the pitch with `affects`, so the pitch arrives in `ctx.affects`, and the script
+-- needs no file access. `check-lua-pattern` passes one value for each item, so an item that wraps over two lines
+-- counts once.
+
+function validate(ctx, content)
+    local pitch = ctx.affects and ctx.affects[1]
+    if not pitch then
+        return "the block must point at the pitch with affects"
+    end
+    local claimed = pitch.content:match("(%d+) languages")
+    if not claimed then
+        return "the pitch does not say how many languages are supported"
+    end
+    if tonumber(claimed) ~= #content then
+        return string.format("the pitch claims %s languages, but the list has %d", claimed, #content)
+    end
+    return nil
+end

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/setup.py

@@ -5,8 +5,8 @@ from setuptools import setup
 setup(
     name='blockwatch-pre-commit-placeholder',
     version='0.0.0',
-    # <block same-as="Cargo.toml:crate-version" same-as-pattern="blockwatch-cli==(?P<value>\d+\.\d+\.\d+)">
-    install_requires=['blockwatch-cli==0.11.1'],
+    # <block name="blockwatch-cli-version" same-as-pattern="blockwatch-cli==(?P<value>\d+\.\d+\.\d+)">
+    install_requires=['blockwatch-cli==0.11.3'],
     # </block>
     # Without it, setuptools takes the directories under src/ for Python packages.
     packages=[],

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/block_parser.rs

@@ -32,7 +32,7 @@ impl<C: CommentsParser> BlocksFromCommentsParser<C> {
 }
 
 /// Assembles [`Block`]s out of a comment stream.
-struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
+pub(crate) struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
     partial_blocks: PartialBlocksIterator<'source, I>,
     /// Start tags still waiting for their end tag, outermost first.
     open_blocks: Vec<BlockStart>,
@@ -46,7 +46,7 @@ struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
 
 impl<'source, I: Iterator<Item = Comment>> BlocksIterator<'source, I> {
     /// Starts the block stream over the comments of `contents`, which must be in source order.
-    fn new(comments: I, contents: &'source str) -> Self {
+    pub(crate) fn new(comments: I, contents: &'source str) -> Self {
         Self {
             partial_blocks: PartialBlocksIterator::new(comments, contents),
             open_blocks: Vec::new(),

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/blocks.rs

@@ -294,7 +294,8 @@ impl Block {
 #[derive(Clone, Copy, Serialize_repr, EnumString, Debug, PartialEq)]
 #[strum(ascii_case_insensitive)]
 #[repr(u8)]
-// <block name="block-severity" affects="docs/validators/README.md:severity-levels">
+/* <block name="block-severity" same-as="docs/validators/README.md:severity-levels"
+same-as-format="identifier" same-as-pattern="^(?P<value>[A-Z][a-z]+) = \d"> */
 pub(crate) enum BlockSeverity {
     /// The default. A violation at this level makes the run exit non-zero, failing a hook or CI.
     Error = 1,
@@ -898,7 +899,8 @@ fn virtual_blocks_in_file(
 }
 
 const RECOGNIZED_ATTRIBUTES: &[&str] = &[
-    // <block keep-sorted>
+    /* <block keep-sorted same-as="src/skill.md:validator-reference"
+    same-as-pattern='"(?P<value>[a-z-]+)"'> */
     "affects",
     "check-ai",
     "check-ai-pattern",
@@ -909,7 +911,6 @@ const RECOGNIZED_ATTRIBUTES: &[&str] = &[
     "keep-sorted-format",
     "keep-sorted-pattern",
     "keep-unique",
-    "keep-unique-pattern",
     "line-count",
     "line-pattern",
     "line-pattern-forbidden",
@@ -2815,7 +2816,7 @@ mod supported_languages_tests {
                 "/* <block> */\nint main() { return 0; }\n/* </block> */".to_string(),
             ),
             (
-                "cc.cpp".to_string(),
+                "cc.cc".to_string(),
                 "// <block>\nint main() { return 0; }\n// </block>".to_string(),
             ),
             (
@@ -2982,6 +2983,10 @@ mod supported_languages_tests {
                 "kts.kts".to_string(),
                 "// <block>\nplugins { }\n// </block>".to_string(),
             ),
+            (
+                "lean.lean".to_string(),
+                "-- <block>\ndef x := 1\n-- </block>".to_string(),
+            ),
             (
                 "lua.lua".to_string(),
                 "-- <block>\nlocal x = 1\n-- </block>".to_string(),
@@ -3006,6 +3011,10 @@ mod supported_languages_tests {
                 "md.md".to_string(),
                 "<div>\n<!-- <block> -->\n## Heading\n<!-- </block> -->\n</div>".to_string(),
             ),
+            (
+                "mdx.mdx".to_string(),
+                "{/* <block> */}\n## Heading\n{/* </block> */}".to_string(),
+            ),
             (
                 "mk.mk".to_string(),
                 "# <block>\nall:\n\t@echo \"hello\"\n# </block>".to_string(),
@@ -3022,6 +3031,14 @@ mod supported_languages_tests {
                 "nix.nix".to_string(),
                 "# <block>\n{ pkgs = null; }\n# </block>".to_string(),
             ),
+            (
+                "ml.ml".to_string(),
+                "(* <block> *)\nlet x = 1\n(* </block> *)".to_string(),
+            ),
+            (
+                "mli.mli".to_string(),
+                "(* <block> *)\nval x : int\n(* </block> *)".to_string(),
+            ),
             (
                 "php.php".to_string(),
                 "<?php\n# <block>\necho 'hello';\n# </block>\n?>".to_string(),

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/cli.rs

@@ -376,7 +376,8 @@ fn write_sarif_violations(violations: &HashMap<RepoPath, Vec<Violation>>) -> any
 fn repository_root_path(current_path: PathBuf) -> anyhow::Result<PathBuf> {
     current_path
         .ancestors()
-        // <block affects="src/fs.rs:vcs-metadata-directories">
+        /* <block same-as="src/fs.rs:vcs-metadata-directories" same-as-mode="subset"
+        same-as-pattern='"(?P<value>\.[a-z]+)"'> */
         .find(|path| path.join(".git").exists() || path.join(".hg").exists())
         // </block>
         .map(|path| path.to_path_buf())

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/config.rs

@@ -37,6 +37,10 @@ pub(crate) struct Config {
 #[derive(Deserialize)]
 #[serde(deny_unknown_fields)]
 struct ConfigFile {
+    // The error example in the docs also shows `block` and a misspelled key, so the docs only have
+    // to hold each of these keys.
+    /* <block name="config-keys" same-as="docs/cli.md:config-keys, docs/cli.md:config-key-error"
+    same-as-mode="subset" same-as-format="identifier" same-as-pattern="^(?P<value>[a-z_]+):"> */
     #[serde(default)]
     ignore: Vec<String>,
     #[serde(default)]
@@ -49,6 +53,7 @@ struct ConfigFile {
     only_blocks: Vec<String>,
     #[serde(default, rename = "skip-blocks")]
     skip_blocks: Vec<String>,
+    // </block>
     /// The `[[block]]` entries, each with the byte range of its header.
     #[serde(default)]
     block: Vec<Spanned<BlockEntry>>,

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/fs.rs

@@ -7,7 +7,7 @@ use std::path::{Path, PathBuf};
 /// Directory names a version control system keeps its own state in.
 ///
 /// A superset of the markers that identify a repository root.
-// <block name="vcs-metadata-directories">
+// <block name="vcs-metadata-directories" same-as-pattern='"(?P<value>\.[a-z]+)"'>
 const VCS_METADATA_DIRECTORY_NAMES: [&str; 4] = [".git", ".hg", ".jj", ".svn"];
 // </block>
 

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.3}/src/language_parsers/javascript.rs

@@ -100,4 +100,50 @@ let between = 2;
 
         Ok(())
     }
+
+    #[test]
+    fn jsx_expression_holding_only_a_comment_covers_its_braces() -> anyhow::Result<()> {
+        let mut comments_parser = comments_parser()?;
+
+        let comments: Vec<Comment> = comments_parser
+            .parse(
+                r#"const list = (
+  <ul>
+    {/* lone */}
+    {/* with code */ items}
+    { /* first */ /* second */ }
+  </ul>
+);
+"#,
+            )
+            .collect();
+
+        assert_eq!(
+            comments,
+            vec![
+                Comment {
+                    position_range: Position::new(3, 5)..Position::new(3, 17),
+                    source_range: 26..38,
+                    comment_text: "    lone    ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(4, 6)..Position::new(4, 21),
+                    source_range: 44..59,
+                    comment_text: "   with code   ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(5, 7)..Position::new(5, 18),
+                    source_range: 73..84,
+                    comment_text: "   first   ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(5, 19)..Position::new(5, 31),
+                    source_range: 85..97,
+                    comment_text: "   second   ".to_string()
+                },
+            ]
+        );
+
+        Ok(())
+    }
 }