Fix build directory for classes from Kotlin files #1019
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
volivan239
force-pushed
the
volivan239/fix_kotlin_compile_dir
branch
from
7ba3710 to
68442fb
Compare
volivan239
force-pushed
the
volivan239/fix_kotlin_compile_dir
branch
from
68442fb to
2e0427a
Compare
sergeypospelov
requested changes
Sep 28, 2022
|
|
||
| init { | ||
| if (!isCanceled()) { | ||
| checkFrameworkDependencies(dependencyPaths) | ||
|
|
||
| logger.trace("Initializing ${this.javaClass.name} with buildDir = $buildDir, classpath = $classpath") | ||
| logger.trace("Initializing ${this.javaClass.name} with buildDir = $buildDirs, classpath = $classpath") |
There was a problem hiding this comment.
Suggested change
| logger.trace("Initializing ${this.javaClass.name} with buildDir = $buildDirs, classpath = $classpath") | |
| logger.trace("Initializing ${this.javaClass.name} with buildDirs = ${buildDirs.joinToString(File.pathSeparator)}, classpath = $classpath") |
There was a problem hiding this comment.
fixed as suggested
| @@ -107,7 +107,7 @@ private fun initSoot(buildDir: Path, classpath: String?, jdkInfo: JdkInfo) { | |||
| + if (!classpath.isNullOrEmpty()) File.pathSeparator + "$classpath" else "" | |||
| ) | |||
| set_src_prec(Options.src_prec_only_class) | |||
| set_process_dir(listOf("$buildDir")) | |||
| set_process_dir(buildDirs.map { "$it" }) | |||
There was a problem hiding this comment.
Suggested change
| set_process_dir(buildDirs.map { "$it" }) | |
| set_process_dir(buildDirs.map { it.toString() }) |
it avoids creating unnecessary StringBuilder.
There was a problem hiding this comment.
fixed as suggested
| @@ -19,7 +19,7 @@ import org.utbot.engine.overrides.UtOverrideMock | |||
| import org.utbot.engine.overrides.collections.AbstractCollection | |||
| import org.utbot.engine.overrides.collections.AssociativeArray | |||
| import org.utbot.engine.overrides.collections.Collection | |||
| import org.utbot.engine.overrides.collections.List | |||
| import org.utbot.engine.overrides.collections.List as UtList | |||
There was a problem hiding this comment.
This may be confusing, because we already have UtList. Maybe use fqn like org.utbot.engine.overrides.collections.List?
There was a problem hiding this comment.
replaced all overrides with FQN
volivan239
force-pushed
the
volivan239/fix_kotlin_compile_dir
branch
from
2e0427a to
afd95ca
Compare
Vassiliy-Kudryashov
approved these changes
Sep 30, 2022
volivan239
force-pushed
the
volivan239/fix_kotlin_compile_dir
branch
from
afd95ca to
3d7829e
Compare
sergeypospelov
approved these changes
Sep 30, 2022
viktoriia-fomina
pushed a commit
that referenced
this pull request
Sep 30, 2022
7 tasks
AbdullinAM
pushed a commit
to AbdullinAM/UTBotJava
that referenced
this pull request
Oct 17, 2022
AbdullinAM
pushed a commit
to AbdullinAM/UTBotJava
that referenced
this pull request
Oct 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Changed the method used to compile classes so that now Kotlin files are compiled to
build/classes/kotlinand Java files are compiled tobuild/classes/java(previously the latter directory was used for both). This avoids duplication with classes generated by default IDEA actions.Also, refactored some methods to support multiple build directories (important when there are both Java and Kotlin files in project).
Fixes #950
Type of Change
How Has This Been Tested?
Manual Scenario
Launched plugin on scenario from #950 and several other scenarios with Kotlin files in projects -- everything works normal.
Checklist (remove irrelevant options):
This is the author self-check list