Skip to content

Commit c10291a

Browse files
fix: remove UtilsKt usages (#429)
1 parent 7d4227a commit c10291a

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

src/main/kotlin/org/jetbrains/research/testspark/display/utils/java/JavaDisplayUtils.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import com.intellij.psi.PsiElementFactory
1515
import com.intellij.psi.PsiFile
1616
import com.intellij.psi.PsiJavaFile
1717
import com.intellij.psi.PsiManager
18-
import com.intellij.refactoring.suggested.startOffset
1918
import com.intellij.util.containers.stream
2019
import org.jetbrains.research.testspark.bundles.plugin.PluginLabelsBundle
2120
import org.jetbrains.research.testspark.data.UIContext
@@ -202,7 +201,7 @@ class JavaDisplayUtils : DisplayUtils {
202201

203202
// insert imports to a code
204203
PsiDocumentManager.getInstance(project).getDocument(outputFile)!!.insertString(
205-
outputFile.importList?.startOffset ?: outputFile.packageStatement?.startOffset ?: 0,
204+
outputFile.importList?.startOffsetInParent ?: outputFile.packageStatement?.startOffsetInParent ?: 0,
206205
uiContext.testGenerationOutput.importsCode.joinToString("\n") + "\n\n",
207206
)
208207

src/main/kotlin/org/jetbrains/research/testspark/display/utils/kotlin/KotlinDisplayUtils.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ import com.intellij.psi.PsiDocumentManager
1313
import com.intellij.psi.PsiFile
1414
import com.intellij.psi.PsiJavaFile
1515
import com.intellij.psi.PsiManager
16-
import com.intellij.refactoring.suggested.endOffset
17-
import com.intellij.refactoring.suggested.startOffset
1816
import com.intellij.util.containers.stream
1917
import org.jetbrains.kotlin.psi.KtClass
2018
import org.jetbrains.kotlin.psi.KtFile
2119
import org.jetbrains.kotlin.psi.KtPsiFactory
20+
import org.jetbrains.kotlin.psi.psiUtil.pureEndOffset
2221
import org.jetbrains.research.testspark.bundles.plugin.PluginLabelsBundle
2322
import org.jetbrains.research.testspark.data.UIContext
2423
import org.jetbrains.research.testspark.display.utils.ErrorMessageManager
@@ -213,8 +212,8 @@ class KotlinDisplayUtils : DisplayUtils {
213212
val importsString = uiContext.testGenerationOutput.importsCode.joinToString("\n") + "\n\n"
214213

215214
// Find the insertion offset
216-
val insertionOffset = outputFile.importList?.startOffset
217-
?: outputFile.packageDirective?.endOffset
215+
val insertionOffset = outputFile.importList?.startOffsetInParent
216+
?: outputFile.packageDirective?.pureEndOffset
218217
?: 0
219218

220219
// Insert the imports into the document

0 commit comments

Comments
 (0)