Allow per-instance file regions cache to be set on InsertOptionalData…

…Visitor. (#2543)

src/ReleaseHistory.md

@@ -1,7 +1,6 @@
 # SARIF Package Release History (SDK, Driver, Converters, and Multitool)
 
-## Unreleased
-
+* FEATURE: Allow initialization of file regions cache in `InsertOptionalDataVisitor` (previously initialized exclusively from `FileRegionsCache.Instance`).
 * BUGFIX: Resolve issue where `match-results-forward` command fails to generate VersionControlDetails data. [#2487](https://github.com/microsoft/sarif-sdk/pull/2487)
 * BUGFIX: Remove duplicated rule definitions when executing `match-results-forward` commands for results with sub-rule ids. [#2486](https://github.com/microsoft/sarif-sdk/pull/2486)
 * BUGFIX: Update `merge` command to properly produce runs by tool and version when passed the `--merge-runs` argument. [#2488](https://github.com/microsoft/sarif-sdk/pull/2488)

src/Sarif/Visitors/InsertOptionalDataVisitor.cs

@@ -43,7 +43,8 @@ public InsertOptionalDataVisitor(
  IDictionary<string, ArtifactLocation> originalUriBaseIds = null,
  IFileSystem fileSystem = null,
  GitHelper.ProcessRunner processRunner = null,
- IEnumerable<string> insertProperties = null)
+ IEnumerable<string> insertProperties = null,
+ FileRegionsCache fileRegionsCache = null)
  {
  _fileSystem = fileSystem ?? FileSystem.Instance;
  _processRunner = processRunner;
@@ -53,6 +54,8 @@ public InsertOptionalDataVisitor(
  _dataToInsert = dataToInsert;
  _originalUriBaseIds = originalUriBaseIds;
  _insertProperties = insertProperties ?? new List<string>();
+
+ _fileRegionsCache = fileRegionsCache ?? FileRegionsCache.Instance;
  }
 
  public override Run VisitRun(Run node)
@@ -111,8 +114,6 @@ public override PhysicalLocation VisitPhysicalLocation(PhysicalLocation node)
  Region expandedRegion;
  ArtifactLocation artifactLocation = node.ArtifactLocation;
 
- _fileRegionsCache ??= FileRegionsCache.Instance;
-
  if (artifactLocation.Uri == null && artifactLocation.Index >= 0)
  {
  // Uri is not stored at result level, but we have an index to go look in run.Artifacts