Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get PsiClass' package by declaration in containingFile and not by its directory #1081 #1111

Merged
merged 1 commit into from
Oct 7, 2022
Merged

Get PsiClass' package by declaration in containingFile and not by its directory #1081 #1111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/generator/UtTestsDialogProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ object UtTestsDialogProcessor {
val name = qualifiedName
?.substringAfter("$packageName.")
?.replace(".", "$")
?: ""
?: error("Unable to get canonical name for $this")
"$packageName.$name"
}
}
Expand Down
12 changes: 10 additions & 2 deletions utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/models/GenerateTestsModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ import com.intellij.openapi.projectRoots.JavaSdkVersion
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.newvfs.impl.FakeVirtualFile
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiJavaFile
import com.intellij.refactoring.util.classMembers.MemberInfo
import org.jetbrains.kotlin.idea.core.getPackage
import org.jetbrains.kotlin.psi.KtFile
import org.utbot.framework.plugin.api.JavaDocCommentStyle
import org.utbot.framework.util.ConflictTriggers
import org.utbot.intellij.plugin.ui.utils.jdkVersion
Expand Down Expand Up @@ -84,4 +85,11 @@ data class GenerateTestsModel(
}
}

val PsiClass.packageName: String get() = this.containingFile.containingDirectory.getPackage()?.qualifiedName ?: ""
val PsiClass.packageName: String
get() {
return when (val currentFile = containingFile) {
is PsiJavaFile -> currentFile.packageName
is KtFile -> currentFile.packageFqName.asString()
else -> error("Can't find package name for $this: it should be located either in Java or Kt file")
}
}