Skip to content

Commit b75d7ac

Browse files
committed
refactor(python-auto-test-service): improve test file handling and directory structure resolution.
1 parent ad1c4e8 commit b75d7ac

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

pycharm/src/main/kotlin/cc/unitmesh/python/provider/PythonAutoTestService.kt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import com.intellij.lang.injection.InjectedLanguageManager
1212
import com.intellij.openapi.application.WriteAction
1313
import com.intellij.openapi.editor.Editor
1414
import com.intellij.openapi.project.Project
15-
import com.intellij.openapi.project.guessProjectDir
1615
import com.intellij.openapi.roots.ProjectFileIndex
1716
import com.intellij.openapi.vfs.VfsUtil
1817
import com.intellij.openapi.vfs.VirtualFile
@@ -21,7 +20,6 @@ import com.intellij.psi.PsiFile
2120
import com.intellij.psi.PsiManager
2221
import com.intellij.psi.util.PsiTreeUtil
2322
import com.intellij.psi.util.PsiUtilBase
24-
import com.intellij.util.concurrency.annotations.RequiresReadLock
2523
import com.intellij.util.concurrency.annotations.RequiresWriteLock
2624
import com.jetbrains.python.PythonLanguage
2725
import com.jetbrains.python.psi.PyClass
@@ -82,7 +80,6 @@ class PythonAutoTestService : AutoTestService() {
8280
return TestFileContext(true, testFile, listOf(), "", PythonLanguage.INSTANCE)
8381
}
8482

85-
@RequiresReadLock
8683
private fun getTestNameExample(file: VirtualFile): String {
8784
val children = file.children
8885
for (child in children) {
@@ -95,8 +92,7 @@ class PythonAutoTestService : AutoTestService() {
9592
return "test_example.py"
9693
}
9794

98-
@RequiresWriteLock
99-
fun getTestsDirectory(file: VirtualFile, project: Project): VirtualFile {
95+
private fun getTestsDirectory(file: VirtualFile, project: Project): VirtualFile {
10096
val baseDirectory: VirtualFile? = ProjectFileIndex.getInstance(project).getContentRootForFile(file)
10197
if (baseDirectory == null) {
10298
val parent = file.parent
@@ -107,8 +103,8 @@ class PythonAutoTestService : AutoTestService() {
107103
return testDir
108104
}
109105

110-
private fun toTestFileName(testFileName: String, testNameExample: String): String {
111-
if (testNameExample.startsWith("test_")) return "test_$testFileName.py"
106+
private fun toTestFileName(testFileName: String, exampleName: String): String {
107+
if (exampleName.startsWith("test_")) return "test_$testFileName.py"
112108
return "${testFileName}_test.py"
113109
}
114110

0 commit comments

Comments
 (0)