fix(centralui): diagnose cache keyed on editor context; surface blocking-wait advisory as Monaco warning (review 2026-10-21 07/C-1, lane F)
This commit is contained in:
@@ -136,7 +136,7 @@ public class ScriptAnalysisService
|
||||
if (string.IsNullOrEmpty(request.Code))
|
||||
return new DiagnoseResponse(Array.Empty<DiagnosticMarker>());
|
||||
|
||||
var cacheKey = "diag:" + (int)request.Kind + ":" + HashCode(request.Code);
|
||||
var cacheKey = "diag:" + (int)request.Kind + ":" + HashCode(request.Code) + ":" + ContextHash(request);
|
||||
if (_cache.TryGetValue(cacheKey, out DiagnoseResponse? cached) && cached is not null)
|
||||
return cached;
|
||||
|
||||
@@ -171,9 +171,54 @@ public class ScriptAnalysisService
|
||||
markers.AddRange(FindUnknownChildren(tree, request.Children));
|
||||
}
|
||||
|
||||
markers.AddRange(FindBlockingWaits(request.Code, GlobalsTypeFor(request.Kind)));
|
||||
|
||||
return Cache(cacheKey, new DiagnoseResponse(markers));
|
||||
}
|
||||
|
||||
private static readonly System.Text.RegularExpressions.Regex AdvisoryLine =
|
||||
new(@"\(line (\d+)\)", System.Text.RegularExpressions.RegexOptions.Compiled);
|
||||
|
||||
/// <summary>
|
||||
/// Surfaces <see cref="SharedTrust.BlockingWaitAnalyzer"/> advisories (a script blocking on a
|
||||
/// Task with <c>.Result</c>/<c>.Wait()</c>/<c>GetAwaiter().GetResult()</c>) as warning markers
|
||||
/// on the offending line. Advisory only; the analyzer failing never costs the other diagnostics.
|
||||
/// </summary>
|
||||
private static IEnumerable<DiagnosticMarker> FindBlockingWaits(string code, Type globalsType)
|
||||
{
|
||||
IReadOnlyList<string> advisories;
|
||||
try { advisories = SharedTrust.BlockingWaitAnalyzer.Find(code, globalsType); }
|
||||
catch (Exception) { yield break; }
|
||||
|
||||
var lines = code.Split('\n');
|
||||
foreach (var advisory in advisories)
|
||||
{
|
||||
var m = AdvisoryLine.Match(advisory);
|
||||
var line = m.Success && int.TryParse(m.Groups[1].Value, out var n) ? n : 1;
|
||||
line = Math.Clamp(line, 1, lines.Length);
|
||||
var endColumn = Math.Max(2, lines[line - 1].TrimEnd('\r').Length + 1);
|
||||
yield return new DiagnosticMarker(4, line, 1, line, endColumn, advisory, "SCADA_BLOCKING_WAIT");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Hash of the request context the context-dependent walkers read (declared parameters,
|
||||
/// self attributes, children, parent, sibling scripts) so two requests with identical code but
|
||||
/// different context never share a cached answer (review 2026-10-21 07/C-1).
|
||||
/// </summary>
|
||||
private static string ContextHash(DiagnoseRequest request)
|
||||
{
|
||||
var json = JsonSerializer.Serialize(new
|
||||
{
|
||||
request.DeclaredParameters,
|
||||
request.SiblingScripts,
|
||||
request.SelfAttributes,
|
||||
request.Children,
|
||||
request.Parent,
|
||||
});
|
||||
return HashCode(json);
|
||||
}
|
||||
|
||||
private const int SandboxMaxTimeoutSeconds = 10;
|
||||
private const int SandboxDefaultTimeoutSeconds = 5;
|
||||
private const int SandboxMaxConsoleChars = 32_000;
|
||||
|
||||
Reference in New Issue
Block a user