Repository navigation
feat(allowlist): add Jinja template support - #1056
Conversation
|
✅ OpenCodeReview: Review complete: 0 finding(s) across 2 selected item(s). |
Qiyuanqiii
left a comment
There was a problem hiding this comment.
The PR description has been flattened into a single Markdown line, so its headings, lists, and checkboxes do not render correctly. Please edit the PR description to restore the intended line breaks and blank lines.
|
@Qiyuanqiii Fixed — the PR description has been restored with its headings, lists, blank lines, and task checkboxes rendering correctly. The CLA item remains checked. Thanks for catching this! |
Qiyuanqiii
left a comment
There was a problem hiding this comment.
GitHub Linguist lists .jinja as Jinja’s primary extension. Since this PR is intentionally scoped to .jinja2 and .j2 per #1055, this does not need to block the PR, but it would be useful to track .jinja support in a follow-up issue.
46d669c to
7b7b2e9
Compare
|
@wu21-web Rebased onto the latest main ( |
wu21-web
left a comment
There was a problem hiding this comment.
Overall this is complete. I would approve this.
|
All review suggestions are addressed and checks are green — this is ready from my side whenever you'd like to merge. Thanks again for the thorough reviews! |
Co-authored-by: Tao Xin <[email protected]>
Co-authored-by: Tao Xin <[email protected]>
7054aa9 to
3736838
Compare
|
@dvd233 Please resolve the merge conflicts~ |
|
@dvd233 Please resolve the merge conflicts~ |
…mplate-support # Conflicts: # internal/config/allowlist/allowed_ext_test.go # internal/config/allowlist/supported_file_types.json # internal/config/rules/system_rules.json # internal/config/rules/system_rules_test.go # pages/src/content/docs/en/review-rules.md # pages/src/content/docs/ja/review-rules.md # pages/src/content/docs/ko/review-rules.md # pages/src/content/docs/ru/review-rules.md # pages/src/content/docs/zh/review-rules.md
lizhengfeng101
left a comment
There was a problem hiding this comment.
@dvd233 It seems that resolving the conflicts has caused some issues; please check it.
|
Git Status |
No text conflicts. The trial merge built, vetted and passed the full test suite; coverage stays at 90.9%. Checked for silent parity breaks: upstream left the filter sources (internal/agent/selection.go, preview.go, internal/diff) untouched. The only rule-data change is the Jinja allowlist (alibaba#1056, .jinja2 and .j2), which `ocr core diff` inherits through the shared allowlist package. The branch delta against v1.12.11 matches the pre-merge delta against v1.12.9, so no upstream-deleted code came back. Co-Authored-By: Claude Opus 5.5 <[email protected]>


Description
Add first-class review support for Jinja template files as the focused subtask tracked in #1055:
.jinja2and.j2files case-insensitively;Type of Change
How Has This Been Tested?
make testpasses locallyValidation performed on Windows/amd64 with Go 1.27.0, GNU Make 4.4.1, and GCC 16.2.0:
make checkmake test(all 23 Go packages with-race -count=1)make buildgo test -race -count=1 ./internal/config/allowlist ./internal/config/rulesThe repository-required
ocr review --audience agent --background "briefly summarize the background requirements"command was attempted, but this local environment has no configured LLM endpoint. I completed a separate standards/spec self-review; both axes reported no remaining findings.Checklist
go fmt,go vet)Related Issues
Closes #1055
Part of #470
Follow-up: conflict resolution repair (2026-09-29)
Restore the upstream allowlist and rule-mapping order, remove redundant legacy patterns introduced during conflict resolution, and put the Jinja row next to the other template rules in all five documentation locales. The intended Jinja extensions, rule document, and existing co-author attribution are preserved.
Validation on Windows/amd64 with Go 1.27.1:
make checkandmake buildpassed.GIT_CEILING_DIRECTORIESto the task's temporary root restored isolation; those three packages then passed without source or test changes.git diff --checkpassed.ocr review --audience agent --background ...was attempted again and exited because no valid LLM endpoint is configured; an automated OCR review result is unavailable.AI assistance
Codex (GPT-6) assisted with the conflict-resolution repair and its validation. The author's personal review is required before requesting further maintainer review.