From f6683ddd773f7d245eae437906317e0d1094429b Mon Sep 17 00:00:00 2001 From: tsantalis Date: Sun, 5 May 2024 18:36:08 -0400 Subject: [PATCH] Fix failing tests --- .../codetracker/BlockTrackerChangeHistory.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java index a7525f6fa1e..8d8d9c36568 100644 --- a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java +++ b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java @@ -153,13 +153,17 @@ public boolean checkForExtractionOrInline(ArrayDeque blocks, Version curr Block blockBefore = Block.of(rightBlock.getComposite(), rightBlock.getOperation(), parentVersion); if (matchedBlockFromSourceMethod == null) { blockChangeHistory.handleAdd(blockBefore, rightBlock, extractOperationRefactoring.toString()); - blocks.add(blockBefore); + if(extractMatches == 0) { + blocks.add(blockBefore); + } } else { VariableDeclarationContainer sourceOperation = extractOperationRefactoring.getSourceOperationBeforeExtraction(); Method sourceMethod = Method.of(sourceOperation, parentVersion); Block leftBlock = Block.of(matchedBlockFromSourceMethod, sourceMethod); - blocks.add(leftBlock); + if(extractMatches == 0) { + blocks.add(leftBlock); + } } blockChangeHistory.connectRelatedNodes(); extractMatches++; @@ -544,7 +548,9 @@ else if (tryBefore.getFinallyClause() != null && tryAfter.getFinallyClause() == if (!bodyChange && !catchOrFinallyChange) { blockChangeHistory.addChange(blockBefore, blockAfter, ChangeFactory.of(AbstractChange.Type.NO_CHANGE)); } - blocks.add(blockBefore); + if(matches == 0) { + blocks.add(blockBefore); + } blockChangeHistory.connectRelatedNodes(); matches++; } @@ -559,7 +565,9 @@ else if (mapping instanceof LeafMapping && mapping.getFragment2() instanceof Sta else { blockChangeHistory.addChange(blockBefore, blockAfter, ChangeFactory.of(AbstractChange.Type.NO_CHANGE)); } - blocks.add(blockBefore); + if(matches == 0) { + blocks.add(blockBefore); + } blockChangeHistory.connectRelatedNodes(); matches++; }