[release:patch] Fix: Static Slicing For Inverted Caller

Author: EagleoutIce

src/documentation/print-query-wiki.ts

@@ -23,7 +23,7 @@ import { executeDataflowQuery } from '../queries/catalog/dataflow-query/dataflow
 import { executeIdMapQuery } from '../queries/catalog/id-map-query/id-map-query-executor';
 import { executeNormalizedAstQuery } from '../queries/catalog/normalized-ast-query/normalized-ast-query-executor';
 import { executeDataflowClusterQuery } from '../queries/catalog/cluster-query/cluster-query-executor';
-import { executeStaticSliceClusterQuery } from '../queries/catalog/static-slice-query/static-slice-query-executor';
+import { executeStaticSliceQuery } from '../queries/catalog/static-slice-query/static-slice-query-executor';
 import { executeLineageQuery } from '../queries/catalog/lineage-query/lineage-query-executor';
 import { executeDependenciesQuery } from '../queries/catalog/dependencies-query/dependencies-query-executor';
 import { getReplCommand } from './doc-util/doc-cli-option';
@@ -296,7 +296,7 @@ registerQueryDocumentation('static-slice', {
 	name:             'Static Slice Query',
 	type:             'active',
 	shortDescription: 'Slice the dataflow graph reducing the code to just the parts relevant for the given criteria.',
-	functionName:     executeStaticSliceClusterQuery.name,
+	functionName:     executeStaticSliceQuery.name,
 	functionFile:     '../queries/catalog/static-slice-query/static-slice-query-executor.ts',
 	buildExplanation: async(shell: RShell) => {
 		const exampleCode = 'x <- 1\ny <- 2\nx';

src/queries/catalog/static-slice-query/static-slice-query-executor.ts

@@ -10,7 +10,7 @@ export function fingerPrintOfQuery(query: StaticSliceQuery): string {
 	return JSON.stringify(query);
 }
 
-export function executeStaticSliceClusterQuery({ graph, ast }: BasicQueryData, queries: readonly StaticSliceQuery[]): StaticSliceQueryResult {
+export function executeStaticSliceQuery({ graph, ast }: BasicQueryData, queries: readonly StaticSliceQuery[]): StaticSliceQueryResult {
 	const start = Date.now();
 	const results: StaticSliceQueryResult['results'] = {};
 	for(const query of queries) {

src/queries/catalog/static-slice-query/static-slice-query-format.ts

@@ -9,7 +9,7 @@ import type { QueryResults, SupportedQuery } from '../../query';
 import { bold } from '../../../util/ansi';
 import { printAsMs } from '../../../util/time';
 import Joi from 'joi';
-import { executeStaticSliceClusterQuery } from './static-slice-query-executor';
+import { executeStaticSliceQuery } from './static-slice-query-executor';
 
 import { summarizeIdsIfTooLong } from '../../query-print';
 
@@ -39,7 +39,7 @@ export interface StaticSliceQueryResult extends BaseQueryResult {
 }
 
 export const StaticSliceQueryDefinition = {
-	executor:        executeStaticSliceClusterQuery,
+	executor:        executeStaticSliceQuery,
 	asciiSummarizer: (formatter, _processed, queryResults, result) => {
 		const out = queryResults as QueryResults<'static-slice'>['static-slice'];
 		result.push(`Query: ${bold('static-slice', formatter)} (${printAsMs(out['.meta'].timing, 0)})`);

src/slicing/static/slice-call.ts

@@ -24,14 +24,15 @@ import { ReferenceType } from '../../dataflow/environments/identifier';
 function retrieveActiveEnvironment(callerInfo: DataflowGraphVertexFunctionCall, baseEnvironment: REnvironmentInformation): REnvironmentInformation {
 	let callerEnvironment = callerInfo.environment;
 
-	const level = callerEnvironment?.level ?? 0;
+	let level = callerEnvironment?.level ?? 0;
 
 	if(baseEnvironment.level !== level) {
 		while(baseEnvironment.level < level) {
 			baseEnvironment = pushLocalEnvironment(baseEnvironment);
 		}
 		while(baseEnvironment.level > level) {
 			callerEnvironment = pushLocalEnvironment(callerEnvironment ?? initializeCleanEnvironments(true));
+			level = callerEnvironment.level;
 		}
 	}