Skip to content

Conversation

@Ivan-Veselov
Copy link
Collaborator

This PR continues integration and adds new modules to current system.
Contains commits from #94 and thus fixes #71

Ivan-Veselov and others added 30 commits July 16, 2018 11:08
Pulled list of algorithms from RefactoringExecutionContext to AlgorithmsRepository.
… in order to get rid of confusion with MoveMethodFeaturesExtractor.
@Ivan-Veselov Ivan-Veselov changed the base branch from integration to master August 14, 2018 13:10
@@ -0,0 +1,9 @@
if [ $# -ne "3" ]; then
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shebang missing

return;
}

System.out.println("Found " + refactorings.size() + " refactorings: ");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use log?

RamSaw and others added 12 commits August 15, 2018 12:41
…rchitectureReloaded into smartPsiElementPointer_integration

# Conflicts:
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmsRepository.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/RefactoringExecutionContext.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/PsiSearchUtil.java
#	core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmAbstractTest.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactoringAnnotator.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/AlgorithmsSelectionPanel.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/ClassRefactoringPanel.java
…rchitectureReloaded into smartPsiElementPointer_integration

# Conflicts:
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmsRepository.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/algorithm/RefactoringExecutionContext.java
#	core/src/main/java/org/jetbrains/research/groups/ml_methods/utils/PsiSearchUtil.java
#	core/src/test/java/org/jetbrains/research/groups/ml_methods/algorithm/AlgorithmAbstractTest.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/intention/RefactoringAnnotator.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/AlgorithmsSelectionPanel.java
#	src/main/java/org/jetbrains/research/groups/ml_methods/ui/ClassRefactoringPanel.java
…_integration

 Migration to SmartPsiElementPointer and erasing name-based search and identification.
public static String extractMethodDeclaration(final @NotNull PsiMethod method) {
String code = method.getText();

code = Pattern.compile("/\\*.*?\\*/", Pattern.DOTALL).matcher(code).replaceAll("");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

можно тут хотя бы комменты добавить про эти регэкспы?

@ujohnny ujohnny merged commit 035d3b8 into master Aug 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Create AlgorithmsRepository class

4 participants