feat-fix(reconstruct): if-then-else now slices the array

it doesn't `splice`
Code-Inspect · May 11, 2024 · a7fc3f7 · a7fc3f7
1 parent a203042
commit a7fc3f7
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/src/dataflow/environments/built-in.ts b/src/dataflow/environments/built-in.ts
@@ -165,7 +165,7 @@ registerBuiltInFunctions(['<<-'],                            processAssignment,
 registerBuiltInFunctions(['->'],                             processAssignment,         { swapSourceAndTarget: true, canBeReplacement: true },                       )
 registerBuiltInFunctions(['->>'],                            processAssignment,         { superAssignment: true, swapSourceAndTarget: true, canBeReplacement: true } )
 registerBuiltInFunctions(['&&', '||', '&', '|'],             processSpecialBinOp,       { lazy: true }                                                               )
-registerBuiltInFunctions(['|>'],                             processPipe,               {},                                                                          )
+registerBuiltInFunctions(['|>', '%>%'],                      processPipe,               {},                                                                          )
 registerBuiltInFunctions(['function', '\\'],                 processFunctionDefinition, {},                                                                          )
 registerBuiltInFunctions(['quote', 'substitute', 'bquote'],  processQuote,              { quoteArgumentsWithIndex: 0 },                                              )
 registerBuiltInFunctions(['for'],                            processForLoop,            {},                                                                          )

diff --git a/src/reconstruct/reconstruct.ts b/src/reconstruct/reconstruct.ts
@@ -211,7 +211,7 @@ function reconstructIfThenElse(ifThenElse: RIfThenElse<ParentInformation>, condi
 			return otherwise
 		}
 	} else {
-		const thenRemainder = indentBy(then.splice(1), 1)
+		const thenRemainder = indentBy(then.slice(1), 1)
 		if(thenRemainder.length > 0) {
 			if(!thenRemainder[thenRemainder.length - 1].line.trim().endsWith('else')) {
 				thenRemainder[thenRemainder.length - 1].line += ' else '

diff --git a/src/slicing/criterion/filters/all-variables.ts b/src/slicing/criterion/filters/all-variables.ts
@@ -46,7 +46,7 @@ const defaultAllVariablesCollectorFolds: FoldFunctions<ParentInformation, NodeId
 			if(c.flavor === 'named') {
 				return c.functionName.content === 'library' ? args.slice(1) : args
 			} else {
-				return [...a, ...args]
+				return [...a.filter(x => x !== EmptyArgument), ...args]
 			}
 		},
 		foldArgument:  (_: unknown, _a: unknown, b: NodeId[] | undefined) => b ?? [],

diff --git a/test/functionality/slicing/static-program-slices/calls-tests.ts b/test/functionality/slicing/static-program-slices/calls-tests.ts
@@ -484,5 +484,29 @@ cat(4 %a% 5)`)
 			assertSliced(label('Slice for variable in last filter', caps),
 				shell, code, ['12@Y'], 'Y')
 		})
+		describe('if-then-else formattings', () => {
+			const caps: SupportedFlowrCapabilityId[] = ['name-normal', ...OperatorDatabase['<-'].capabilities, 'numbers', 'if', 'logical', 'binary-operator', 'infix-calls', 'call-normal', 'newlines', 'unnamed-arguments', 'precedence']
+			const code = `x <- 3
+{
+if (x == 3)
+{ x <- 4 
+y <- 2 }
+else { x <- y <- 3 }
+}
+print(x)			
+			`
+			assertSliced(label('Slice for initial x should return noting else', caps),
+				shell, code, ['1@x'], 'x <- 3')
+			assertSliced(label('Slice for first condition', caps),
+				shell, code, ['3@x'], 'x <- 3\nx')
+			assertSliced(label('Slice for last x', caps),
+				shell, code, ['8@x'], `x <- 3
+if(x == 3) { 
+        x <- 4
+        y <- 2
+    } else 
+{ x <- y <- 3 }
+x`)
+		})
 	})
 }))