creator/cc-1c-skills
1
0
Fork 0
mirror of https://github.com/Nikolay-Shirokov/cc-1c-skills.git synced 2026-07-22 04:31:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

feat(cfe-patch-method): прозрачность пустых строк и комментариев при ресинке (v2.5)

Browse Source 
Косметика вендора (пустые строки, строки-комментарии) больше не ломает классификацию:
- пустая строка между якорем и уже-перенесённым кодом → раньше ДУБЛЬ, теперь ПЕРЕНЕСЕНО;
- пустая/комментарий у якоря → раньше ложный конфликт, теперь переякоривание.

Три шага разведены:
- размещение якоря — сначала точно (комментарии/пустые включены, держит позицию
  вставки относительно стабильного комментария), затем fallback по значимым строкам;
- поглощение — по значимым строкам (пустые/комментарии перешагиваем); вставку из
  одних комментариев/пустых не поглощаем;
- вывод тела — всегда v2 дословно, все комментарии/пустые нового оригинала сохраняются.

Пограничный случай (комментарий разработчика у поглощённого кода): значимый код
поглощаем, осиротевший комментарий — строкой ⚠ в отчёте, не роняя в конфликт.

Новые helper: Test-Significant/Get-SignificantProjection (+ py). Верхняя сверка
АКТУАЛЕН остаётся точной (любой diff → перепись тела в v2). Зеркально ps1↔py,
+3 кейса (blankskew/comment-stable/orphan-comment), 22/22 на обоих рантаймах.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Nick Shirokov
2026-07-19 14:35:56 +03:00
co-authored by Claude Opus 4.8
parent 912128d24f
commit 6318018bc1
35 changed files with 1563 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/cfe-patch-method/scripts/cfe-patch-method.ps1
+59 -14
View File
@@ -1,4 +1,4 @@
# cfe-patch-method v2.4 — Source-aware method interceptor for 1C extension (CFE)
# cfe-patch-method v2.5 — Source-aware method interceptor for 1C extension (CFE)
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
param(
[Parameter(Mandatory)]
@@ -421,6 +421,23 @@ function Find-UniqueRun {
return $found
}
# A "significant" line carries code: non-empty and not a whole-line comment (//).
# Blank lines and comment-only lines are cosmetic — transparent to anchor/absorption matching.
function Test-Significant {
param([string]$normLine)
return ($normLine -ne '' -and -not $normLine.StartsWith('//'))
}
# Project normalized lines to significant-only. Returns @{ Sig = @(values); Map = @(orig indices) }.
function Get-SignificantProjection {
param($norm)
$sig = @(); $map = @()
for ($i = 0; $i -lt $norm.Count; $i++) {
if (Test-Significant $norm[$i]) { $sig += $norm[$i]; $map += $i }
}
return @{ Sig = $sig; Map = $map }
}
# True if the normalized run `keys` sits in `hay` starting exactly at index `at` (contiguous, in-bounds).
# Used to detect an insert whose payload the vendor already placed at the anchor (pereneseno v osnovnuyu).
function Test-RunAt {
@@ -446,9 +463,9 @@ function Test-DeleteAbsorbed {
return $false
}
# Resolve where an insertion lands in v2 using two-sided context.
# Exact two-sided resolution over the given array.
# Returns index to "insert after" (-1 = top of body), or $null if ambiguous/conflict.
function Resolve-InsertionPoint {
function Resolve-InsertionPointExact {
param($v2norm, $beforeLines, $afterLines)
$nb = $beforeLines.Count; $na = $afterLines.Count
@@ -494,6 +511,22 @@ function Resolve-InsertionPoint {
return $null
}
# Resolve where an insertion lands in v2. Exact first (comments/blanks included — keeps the insert's
# position relative to a stable comment); on failure, retry on significant lines only (transparent to
# vendor-added blanks/comments) and map back to a full-v2 index. Returns "insert after" idx or $null.
function Resolve-InsertionPoint {
param($v2norm, $beforeLines, $afterLines)
$k = Resolve-InsertionPointExact $v2norm $beforeLines $afterLines
if ($null -ne $k) { return $k }
$proj = Get-SignificantProjection $v2norm
$bs = @($beforeLines | Where-Object { Test-Significant $_ })
$as = @($afterLines | Where-Object { Test-Significant $_ })
$ksig = Resolve-InsertionPointExact $proj.Sig $bs $as
if ($null -eq $ksig) { return $null }
if ($ksig -lt 0) { return -1 }
return $proj.Map[$ksig]
}
# Truncate a line for compact summary output
function Get-Truncated {
param([string]$s, [int]$n = 60)
@@ -621,7 +654,8 @@ function Invoke-Resync {
return @{ Id = $methodId; Status = 'АКТУАЛЕН'; ExtBsl = $extBsl }
}
$insertTop = @(); $insertAfter = @{}; $delStart = @{}; $delEnd = @{}; $disputed = @(); $transferred = @(); $absorbed = @()
$insertTop = @(); $insertAfter = @{}; $delStart = @{}; $delEnd = @{}; $disputed = @(); $transferred = @(); $absorbed = @(); $absorbedNotes = @()
$v2proj = Get-SignificantProjection $v2norm
foreach ($op in $ops) {
if ($op.Kind -eq 'insert') {
$beforeLines = @()
@@ -630,10 +664,18 @@ function Invoke-Resync {
$ae = [Math]::Min($v1norm.Count - 1, $op.After + 3)
for ($m = $op.After + 1; $m -le $ae; $m++) { $afterLines += $v1norm[$m] }
$k = Resolve-InsertionPoint $v2norm $beforeLines $afterLines
$payloadNorm = @($op.Lines | ForEach-Object { Get-Normalized $_ })
# Payload already in the new original -> the change was carried into the main config.
$isAbsorbed = if ($null -eq $k) { (Find-UniqueRun $v2norm $payloadNorm) -ge 0 } else { Test-RunAt $v2norm $payloadNorm ($(if ($k -lt 0) { 0 } else { $k + 1 })) }
if ($isAbsorbed) { $absorbed += @{ Kind = 'insert' } }
# Payload already in the new original -> change carried into the main config.
# Match on significant lines only, so vendor-added blanks/comments don't hide it.
$payloadSig = @(($op.Lines | ForEach-Object { Get-Normalized $_ }) | Where-Object { Test-Significant $_ })
$isAbsorbed = $false
if ($payloadSig.Count -gt 0) {
if ($null -eq $k) { $isAbsorbed = (Find-UniqueRun $v2proj.Sig $payloadSig) -ge 0 }
else { $sigStart = @($v2proj.Map | Where-Object { $_ -le $k }).Count; $isAbsorbed = Test-RunAt $v2proj.Sig $payloadSig $sigStart }
}
if ($isAbsorbed) {
$absorbed += @{ Kind = 'insert' }
foreach ($pl in $op.Lines) { if ((Get-Normalized $pl).StartsWith('//')) { $absorbedNotes += $pl.Trim() } }
}
elseif ($null -eq $k) {
$dbefore = @(); if ($op.After -ge 0) { $bz = [Math]::Max(0, $op.After - 2); for ($z = $bz; $z -le $op.After; $z++) { $dbefore += $v1[$z] } }
$dafter = @(); $az = [Math]::Min($v1.Count - 1, $op.After + 3); for ($z = $op.After + 1; $z -le $az; $z++) { $dafter += $v1[$z] }
@@ -646,10 +688,11 @@ function Invoke-Resync {
$p = Find-UniqueRun $v2norm $keys
if ($p -ge 0) { $delStart[$p] = $true; $delEnd[$p + $keys.Count - 1] = $true; $transferred += @{ Kind = 'delete' } }
else {
$delBeforeCtx = if ($op.Start -gt 0) { $v1norm[$op.Start - 1] } else { $null }
$delAfterCtx = if ($op.End -lt ($v1norm.Count - 1)) { $v1norm[$op.End + 1] } else { $null }
# Block already cut from the new original -> deletion already applied in the main config.
if (Test-DeleteAbsorbed $v2norm $delBeforeCtx $delAfterCtx) { $absorbed += @{ Kind = 'delete' } }
# Nearest significant neighbours around the deleted block; adjacency in the significant
# projection means the block is already cut (blanks/comments left behind don't matter).
$delBeforeCtx = $null; for ($z = $op.Start - 1; $z -ge 0; $z--) { if (Test-Significant $v1norm[$z]) { $delBeforeCtx = $v1norm[$z]; break } }
$delAfterCtx = $null; for ($z = $op.End + 1; $z -lt $v1norm.Count; $z++) { if (Test-Significant $v1norm[$z]) { $delAfterCtx = $v1norm[$z]; break } }
if (Test-DeleteAbsorbed $v2proj.Sig $delBeforeCtx $delAfterCtx) { $absorbed += @{ Kind = 'delete' } }
else { $disputed += @{ Kind = 'delete'; Lines = $op.Lines } }
}
}
@@ -658,7 +701,7 @@ function Invoke-Resync {
if ($ReportOnly) {
$st = if ($disputed.Count -gt 0) { 'КОНФЛИКТ' } elseif ($transferred.Count -eq 0 -and $absorbed.Count -gt 0) { 'ПЕРЕНЕСЕНО В ОСНОВНУЮ' } else { 'ДРЕЙФ' }
$rsn = if ($disputed.Count -gt 0) { Get-ResyncConflictReason $disputed } elseif ($st -eq 'ПЕРЕНЕСЕНО В ОСНОВНУЮ') { 'все правки уже в основной конфигурации' } else { '' }
return @{ Id = $methodId; Status = $st; ExtBsl = $extBsl; Transferred = $transferred.Count; Absorbed = $absorbed.Count; Disputed = $disputed.Count; Reason = $rsn }
return @{ Id = $methodId; Status = $st; ExtBsl = $extBsl; Transferred = $transferred.Count; Absorbed = $absorbed.Count; Disputed = $disputed.Count; Reason = $rsn; AbsorbedNotes = $absorbedNotes }
}
# assemble new marked body
@@ -710,7 +753,7 @@ function Invoke-Resync {
}
$status = if ($disputed.Count -gt 0) { 'ЧАСТИЧНО' } elseif ($transferred.Count -eq 0 -and $absorbed.Count -gt 0) { 'ПЕРЕНЕСЕНО В ОСНОВНУЮ' } else { 'АКТУАЛИЗИРОВАН' }
$rsn = if ($disputed.Count -gt 0) { Get-ResyncConflictReason $disputed } elseif ($status -eq 'ПЕРЕНЕСЕНО В ОСНОВНУЮ') { 'все правки уже в основной конфигурации — перехватчик можно удалить' } else { '' }
return @{ Id = $methodId; Status = $status; ExtBsl = $extBsl; Transferred = $transferred.Count; Absorbed = $absorbed.Count; Disputed = $disputed.Count; ConflictDir = $conflictDir; Reason = $rsn }
return @{ Id = $methodId; Status = $status; ExtBsl = $extBsl; Transferred = $transferred.Count; Absorbed = $absorbed.Count; Disputed = $disputed.Count; ConflictDir = $conflictDir; Reason = $rsn; AbsorbedNotes = $absorbedNotes }
}
# Write run-root index.md (only if there are conflicts). Returns run-root or $null.
@@ -819,6 +862,7 @@ if ($Check -or $Actualize) {
$line = " {0,-22} {1}" -f $p.Status, $p.Id
if ($p.Reason) { $line += " $($p.Reason)" }
Write-Host $line
if ($p.AbsorbedNotes) { foreach ($n in $p.AbsorbedNotes) { Write-Host " ⚠ комментарий не перенесён (код в основной конфигурации): $n" } }
}
$transf = @($results | Where-Object { $_.Status -eq 'ПЕРЕНЕСЕНО В ОСНОВНУЮ' }).Count
if ($Check) {
@@ -945,6 +989,7 @@ if ($dup) {
}
default { Write-Host "[$($res.Status)] &ИзменениеИКонтроль(`"$MethodName`") — $($res.Reason)" }
}
if ($res.AbsorbedNotes) { foreach ($n in $res.AbsorbedNotes) { Write-Host " ⚠ комментарий не перенесён (код в основной конфигурации): $n" } }
Write-Host " Файл: $extBsl"
exit 0
}
.claude/skills/cfe-patch-method/scripts/cfe-patch-method.py
+71 -16
View File
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
# cfe-patch-method v2.4 — Source-aware method interceptor for 1C extension (CFE)
# cfe-patch-method v2.5 — Source-aware method interceptor for 1C extension (CFE)
# Source: https://github.com/Nikolay-Shirokov/cc-1c-skills
import argparse
@@ -411,6 +411,23 @@ def find_unique_run(v2norm, keys):
return found
def test_significant(norm_line):
"""A significant line carries code: non-empty and not a whole-line comment (//).
Blank/comment-only lines are cosmetic — transparent to anchor/absorption matching."""
return norm_line != "" and not norm_line.startswith("//")
def significant_projection(norm):
"""Project normalized lines to significant-only. Returns (sig_values, orig_indices)."""
sig = []
idx = []
for i, ln in enumerate(norm):
if test_significant(ln):
sig.append(ln)
idx.append(i)
return sig, idx
def test_run_at(hay, keys, at):
"""True if normalized run `keys` sits in `hay` starting exactly at index `at` (contiguous)."""
if not keys or at < 0 or at + len(keys) > len(hay):
@@ -433,8 +450,8 @@ def test_delete_absorbed(v2norm, before_ctx, after_ctx):
return False
def resolve_insertion_point(v2norm, before_lines, after_lines):
"""Where an insertion lands in v2 using two-sided context.
def resolve_insertion_point_exact(v2norm, before_lines, after_lines):
"""Exact two-sided resolution over the given array.
Returns index to insert-after (-1 = top), or None if ambiguous/conflict."""
nb = len(before_lines)
na = len(after_lines)
@@ -479,6 +496,24 @@ def resolve_insertion_point(v2norm, before_lines, after_lines):
return None
def resolve_insertion_point(v2norm, before_lines, after_lines):
"""Exact first (comments/blanks included — keeps the insert's position relative to a stable
comment); on failure, retry on significant lines only (transparent to vendor-added blanks/
comments) and map back to a full-v2 index. Returns insert-after idx or None."""
k = resolve_insertion_point_exact(v2norm, before_lines, after_lines)
if k is not None:
return k
sig, idx = significant_projection(v2norm)
bs = [x for x in before_lines if test_significant(x)]
as_ = [x for x in after_lines if test_significant(x)]
ksig = resolve_insertion_point_exact(sig, bs, as_)
if ksig is None:
return None
if ksig < 0:
return -1
return idx[ksig]
def truncate(s, n=60):
t = s.strip()
return (t[:n] + "…") if len(t) > n else t
@@ -615,6 +650,8 @@ def main():
if pr.get("reason"):
line += " %s" % pr["reason"]
print(line)
for n in pr.get("absorbed_notes", []):
print(" ⚠ комментарий не перенесён (код в основной конфигурации): %s" % n)
transf = sum(1 for r in results if r["status"] == "ПЕРЕНЕСЕНО В ОСНОВНУЮ")
if check_mode:
drift = sum(1 for r in results if r["status"] == "ДРЕЙФ")
@@ -745,6 +782,8 @@ def main():
print(" Индекс: %s" % idx)
else:
print('[%s] &ИзменениеИКонтроль("%s") — %s' % (st, method_name, res.get("reason", "")))
for n in res.get("absorbed_notes", []):
print(" ⚠ комментарий не перенесён (код в основной конфигурации): %s" % n)
print(" Файл: %s" % ext_bsl)
sys.exit(0)
@@ -971,21 +1010,29 @@ def resync_one(ext_bsl, ext_lines, dup, method, logical_module, conflict_folder,
if "\n".join(v1norm) == "\n".join(v2norm):
return {"id": method_id, "status": "АКТУАЛЕН", "ext_bsl": ext_bsl}
insert_top = []; insert_after = {}; del_start = set(); del_end = set(); disputed = []; transferred = 0; absorbed = 0
insert_top = []; insert_after = {}; del_start = set(); del_end = set(); disputed = []; transferred = 0; absorbed = 0; absorbed_notes = []
v2sig, v2map = significant_projection(v2norm)
for op in ops:
if op["kind"] == "insert":
after = op["after"]
before_lines = v1norm[max(0, after - 2):after + 1] if after >= 0 else []
after_lines = v1norm[after + 1:after + 4]
k = resolve_insertion_point(v2norm, before_lines, after_lines)
payload_norm = [normalize(x) for x in op["lines"]]
# Payload already in the new original -> the change was carried into the main config.
if k is None:
is_absorbed = find_unique_run(v2norm, payload_norm) >= 0
else:
is_absorbed = test_run_at(v2norm, payload_norm, 0 if k < 0 else k + 1)
# Payload already in the new original -> change carried into the main config.
# Match on significant lines only, so vendor-added blanks/comments don't hide it.
payload_sig = [x for x in (normalize(y) for y in op["lines"]) if test_significant(x)]
is_absorbed = False
if payload_sig:
if k is None:
is_absorbed = find_unique_run(v2sig, payload_sig) >= 0
else:
sig_start = sum(1 for j in v2map if j <= k)
is_absorbed = test_run_at(v2sig, payload_sig, sig_start)
if is_absorbed:
absorbed += 1
for pl in op["lines"]:
if normalize(pl).startswith("//"):
absorbed_notes.append(pl.strip())
elif k is None:
dbefore = v1[max(0, after - 2):after + 1] if after >= 0 else []
dafter = v1[after + 1:after + 4]
@@ -1000,10 +1047,17 @@ def resync_one(ext_bsl, ext_lines, dup, method, logical_module, conflict_folder,
if p >= 0:
del_start.add(p); del_end.add(p + len(keys) - 1); transferred += 1
else:
before_ctx = v1norm[op["start"] - 1] if op["start"] > 0 else None
after_ctx = v1norm[op["end"] + 1] if op["end"] < len(v1norm) - 1 else None
# Block already cut from the new original -> deletion already applied in the main config.
if test_delete_absorbed(v2norm, before_ctx, after_ctx):
# Nearest significant neighbours; adjacency in the significant projection means the
# block is already cut (blanks/comments left behind don't matter).
before_ctx = None
for z in range(op["start"] - 1, -1, -1):
if test_significant(v1norm[z]):
before_ctx = v1norm[z]; break
after_ctx = None
for z in range(op["end"] + 1, len(v1norm)):
if test_significant(v1norm[z]):
after_ctx = v1norm[z]; break
if test_delete_absorbed(v2sig, before_ctx, after_ctx):
absorbed += 1
else:
disputed.append({"kind": "delete", "lines": op["lines"]})
@@ -1017,7 +1071,7 @@ def resync_one(ext_bsl, ext_lines, dup, method, logical_module, conflict_folder,
st = "ДРЕЙФ"
rsn = conflict_reason(disputed) if disputed else ("все правки уже в основной конфигурации" if st == "ПЕРЕНЕСЕНО В ОСНОВНУЮ" else "")
return {"id": method_id, "status": st, "ext_bsl": ext_bsl, "transferred": transferred,
"absorbed": absorbed, "disputed": len(disputed), "reason": rsn}
"absorbed": absorbed, "disputed": len(disputed), "reason": rsn, "absorbed_notes": absorbed_notes}
new_body = []
for blk in insert_top:
@@ -1073,7 +1127,8 @@ def resync_one(ext_bsl, ext_lines, dup, method, logical_module, conflict_folder,
status = "АКТУАЛИЗИРОВАН"
rsn = conflict_reason(disputed) if disputed else ("все правки уже в основной конфигурации — перехватчик можно удалить" if status == "ПЕРЕНЕСЕНО В ОСНОВНУЮ" else "")
return {"id": method_id, "status": status, "ext_bsl": ext_bsl, "transferred": transferred,
"absorbed": absorbed, "disputed": len(disputed), "conflict_dir": conflict_dir, "reason": rsn}
"absorbed": absorbed, "disputed": len(disputed), "conflict_dir": conflict_dir, "reason": rsn,
"absorbed_notes": absorbed_notes}
def write_resync_index(run_root, results, ext_name, config_path, verb):