Resolve global scope correctly in SolverManagerFacet

When MODIFY is parsed inside a non-global scope (e.g., MODIFY:Face on a
SIZE object), VarModifier.getLegalScope() reports the parsing scope, not
the variable's actual scope. Following that path produced a ScopeInstance
that did not match the one used when reading the variable, so modifiers
were applied to a different VariableID than channels read from.

Routine the scope through resolveScope(): if the parsed scope is global,
or if the variable is legally defined at the global scope, use the global
ScopeInstance. Otherwise fall back to the local scope as before.

Fixes the Pathfinder FACE tests (which use MODIFY:Face on SIZE objects
to set the global Face variable to "5,5") and the GlobalModifyTest
identity-mismatch failures.

Author: Vest

code/src/java/pcgen/cdom/facet/SolverManagerFacet.java

@@ -28,6 +28,7 @@
 import pcgen.cdom.content.VarModifier;
 import pcgen.cdom.enumeration.CharID;
 import pcgen.cdom.facet.base.AbstractItemFacet;
+import pcgen.rules.context.VariableContext;
 
 /**
  * This stores the SolverManager for each PlayerCharacter.
@@ -49,11 +50,9 @@ public <T> List<ProcessStep<T>> diagnose(CharID id, VariableID<T> varID)
 	public <T> boolean addModifier(CharID id, VarModifier<T> vm, VarScoped thisValue, Modifier<T> modifier,
 		ScopeInstance source)
 	{
-		ScopeInstance scope = vm.getLegalScope().isGlobal()
-			? scopeFacet.getGlobalScope(id)
-			: scopeFacet.get(id, vm.getFullLegalScopeName(), thisValue);
-		VariableID<T> varID = (VariableID<T>) loadContextFacet.get(id.getDatasetID()).get().getVariableContext()
-			.getVariableID(scope, vm.getVarName());
+		VariableContext varContext = loadContextFacet.get(id.getDatasetID()).get().getVariableContext();
+		ScopeInstance scope = resolveScope(id, vm, thisValue, varContext);
+		VariableID<T> varID = (VariableID<T>) varContext.getVariableID(scope, vm.getVarName());
 		SolverManager sm = get(id);
 		sm.addModifier(varID, modifier, source);
 		sm.processSolver(varID);
@@ -66,16 +65,25 @@ public <T> boolean addModifier(CharID id, VarModifier<T> vm, VarScoped thisValue
 	public <T> void removeModifier(CharID id, VarModifier<T> vm, VarScoped thisValue, Modifier<T> modifier,
 		ScopeInstance source)
 	{
-		ScopeInstance scope = vm.getLegalScope().isGlobal()
-			? scopeFacet.getGlobalScope(id)
-			: scopeFacet.get(id, vm.getFullLegalScopeName(), thisValue);
-		VariableID<T> varID = (VariableID<T>) loadContextFacet.get(id.getDatasetID()).get().getVariableContext()
-			.getVariableID(scope, vm.getVarName());
+		VariableContext varContext = loadContextFacet.get(id.getDatasetID()).get().getVariableContext();
+		ScopeInstance scope = resolveScope(id, vm, thisValue, varContext);
+		VariableID<T> varID = (VariableID<T>) varContext.getVariableID(scope, vm.getVarName());
 		SolverManager sm = get(id);
 		sm.removeModifier(varID, modifier, source);
 		sm.processSolver(varID);
 	}
 
+	private <T> ScopeInstance resolveScope(CharID id, VarModifier<T> vm, VarScoped thisValue,
+		VariableContext varContext)
+	{
+		if (vm.getLegalScope().isGlobal()
+			|| varContext.isLegalVariableID(scopeFacet.getGlobalScope(id).getImplementedScope(), vm.getVarName()))
+		{
+			return scopeFacet.getGlobalScope(id);
+		}
+		return scopeFacet.get(id, vm.getFullLegalScopeName(), thisValue);
+	}
+
 	public void setScopeFacet(ScopeFacet scopeFacet)
 	{
 		this.scopeFacet = scopeFacet;