Skip to content

Commit

Permalink
Fix handling of Move Code refactoring for comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@tsantalis
tsantalis committed Oct 24, 2024
1 parent 7e40c88 commit c20a12a
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 43 deletions.
17 changes: 3 additions & 14 deletions src/main/java/org/codetracker/CommentTrackerChangeHistory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,27 +307,16 @@ public boolean checkForExtractionOrInline(Version currentVersion, Version parent
}
}
}
Comment commentBefore;
if (rightComment.getOperation().isPresent())
commentBefore = Comment.of(rightComment.getComment(), rightComment.getOperation().get(), parentVersion);
else
commentBefore = Comment.of(rightComment.getComment(), rightComment.getClazz().get(), parentVersion);
if (matchedCommentFromSourceMethod == null) {
commentChangeHistory.handleAdd(commentBefore, rightComment, moveCodeRefactoring.toString());
if(extractMatches == 0) {
elements.addFirst(commentBefore);
}
}
else {
if (matchedCommentFromSourceMethod != null) {
VariableDeclarationContainer sourceOperation = moveCodeRefactoring.getSourceContainer();
Method sourceMethod = Method.of(sourceOperation, parentVersion);
Comment leftComment = Comment.of(matchedCommentFromSourceMethod, sourceMethod);
if(extractMatches == 0) {
elements.addFirst(leftComment);
}
commentChangeHistory.connectRelatedNodes();
extractMatches++;
}
commentChangeHistory.connectRelatedNodes();
extractMatches++;
}
break;
}
Expand Down
30 changes: 15 additions & 15 deletions src/test/resources/blame/blameTestWithLocalRepo14.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ ec752138b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispat
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 64) LeaderElectionService leaderElectionService,
ab8316f31 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-18 09:12:54 +0000 65) FatalErrorHandler fatalErrorHandler) throws IOException {
66)
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 67) super(
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 68) endpointConfiguration,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 69) leaderRetriever,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 70) clusterConfiguration,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 71) restConfiguration,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 72) resourceManagerRetriever,
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 67) super(
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 68) endpointConfiguration,
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 69) leaderRetriever,
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 70) clusterConfiguration,
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 71) restConfiguration,
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 72) resourceManagerRetriever,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 73) transientBlobService,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 74) executor,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 75) metricQueryServiceRetriever,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 76) leaderElectionService,
5f573804f flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-06 12:34:21 +0000 77) fatalErrorHandler);
0e3027d4b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-12-13 21:34:32 +0000 74) executor,
ac8225fd5 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (gyao 2018-01-26 12:50:25 +0000 75) metricQueryServiceRetriever,
ac8225fd5 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (gyao 2018-01-26 12:50:25 +0000 76) leaderElectionService,
ac8225fd5 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (gyao 2018-01-26 12:50:25 +0000 77) fatalErrorHandler);
78)
ec752138b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2018-02-19 16:27:33 +0000 79) webSubmissionExtension = WebMonitorExtension.empty();
6a62f1455 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-09-19 22:34:13 +0000 80) }
Expand All @@ -87,11 +87,11 @@ ec752138b flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/Dispat
87)
c6243b8b1 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-09-21 07:30:50 +0000 88) final Time timeout = restConfiguration.getTimeout();
89)
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 90) JobSubmitHandler jobSubmitHandler = new JobSubmitHandler(
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 91) restAddressFuture,
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 92) leaderRetriever,
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 93) timeout,
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 94) responseHeaders,
eddb5b0a4 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-11-07 14:07:41 +0000 90) JobSubmitHandler jobSubmitHandler = new JobSubmitHandler(
eddb5b0a4 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-11-07 14:07:41 +0000 91) restAddressFuture,
eddb5b0a4 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-11-07 14:07:41 +0000 92) leaderRetriever,
eddb5b0a4 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (Till Rohrmann 2017-11-07 14:07:41 +0000 93) timeout,
a25cd3fed flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-03 19:08:45 +0000 94) responseHeaders,
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 95) executor,
0a5aebb01 flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherRestEndpoint.java (zentol 2018-07-16 12:09:42 +0000 96) clusterConfiguration);
97)
Expand Down
16 changes: 8 additions & 8 deletions src/test/resources/blame/blameTestWithLocalRepo15.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,10 @@ bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (
bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Kevin Cooney 2012-10-24 19:31:00 +0000 371) */
078e45bd3 src/main/java/org/junit/internal/runners/BlockJUnit4ClassRunner.java (kbeck 2008-06-16 17:52:02 +0000 372) protected Statement withBefores(FrameworkMethod method, Object target,
bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Kevin Cooney 2012-10-24 19:31:00 +0000 373) Statement statement) {
123432f73 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (dsaff 2008-07-23 20:39:42 +0000 374) List<FrameworkMethod> befores = getTestClass().getAnnotatedMethods(
123432f73 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (dsaff 2008-07-23 20:39:42 +0000 375) Before.class);
198df01b7 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (David Saff 2009-05-12 03:29:36 +0000 376) return befores.isEmpty() ? statement : new RunBefores(statement,
198df01b7 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (David Saff 2009-05-12 03:29:36 +0000 377) befores, target);
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 374) List<FrameworkMethod> befores = getTestClass().getAnnotatedMethods(
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 375) Before.class);
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 376) return befores.isEmpty() ? statement : new RunBefores(statement,
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 377) befores, target);
078e45bd3 src/main/java/org/junit/internal/runners/BlockJUnit4ClassRunner.java (kbeck 2008-06-16 17:52:02 +0000 378) }
379)
7a3e99635 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (dsaff 2008-07-23 15:59:22 +0000 380) /**
Expand All @@ -386,10 +386,10 @@ bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (
bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Kevin Cooney 2012-10-24 19:31:00 +0000 386) */
078e45bd3 src/main/java/org/junit/internal/runners/BlockJUnit4ClassRunner.java (kbeck 2008-06-16 17:52:02 +0000 387) protected Statement withAfters(FrameworkMethod method, Object target,
bb91daf8e src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Kevin Cooney 2012-10-24 19:31:00 +0000 388) Statement statement) {
123432f73 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (dsaff 2008-07-23 20:39:42 +0000 389) List<FrameworkMethod> afters = getTestClass().getAnnotatedMethods(
123432f73 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (dsaff 2008-07-23 20:39:42 +0000 390) After.class);
198df01b7 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (David Saff 2009-05-12 03:29:36 +0000 391) return afters.isEmpty() ? statement : new RunAfters(statement, afters,
198df01b7 src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (David Saff 2009-05-12 03:29:36 +0000 392) target);
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 389) List<FrameworkMethod> afters = getTestClass().getAnnotatedMethods(
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 390) After.class);
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 391) return afters.isEmpty() ? statement : new RunAfters(statement, afters,
b5fb9c92d src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alistair A. Israel 2010-05-06 08:09:38 +0000 392) target);
078e45bd3 src/main/java/org/junit/internal/runners/BlockJUnit4ClassRunner.java (kbeck 2008-06-16 17:52:02 +0000 393) }
394)
aad22b88b src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java (Alex Panchenko 2017-08-07 00:11:20 +0000 395) private Statement withRules(FrameworkMethod method, Object target, Statement statement) {
Expand Down
Loading

0 comments on commit c20a12a

Please sign in to comment.