azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 'read action required' exception in scratch

Browse Source
This commit is contained in:
Natalia Selezneva
2018-12-05 09:36:01 +03:00
parent 9e2ff04e1b
commit 6291cfee49
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/ScratchFile.kt
+5 -5
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.scratch package org.jetbrains.kotlin.idea.scratch
import com.intellij.openapi.application.runReadAction
import com.intellij.openapi.fileEditor.TextEditor import com.intellij.openapi.fileEditor.TextEditor
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
@@ -24,13 +25,12 @@ import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile import com.intellij.psi.PsiFile
abstract class ScratchFile(val project: Project, val editor: TextEditor) { abstract class ScratchFile(val project: Project, val editor: TextEditor) {
fun getExpressions(): List<ScratchExpression> { fun getExpressions(): List<ScratchExpression> = runReadAction {
val psiFile = getPsiFile() ?: return emptyList() getPsiFile()?.let { getExpressions(it) } ?: emptyList()
return getExpressions(psiFile)
} }
fun getPsiFile(): PsiFile? { fun getPsiFile(): PsiFile? = runReadAction {
return PsiDocumentManager.getInstance(project).getPsiFile(editor.editor.document) PsiDocumentManager.getInstance(project).getPsiFile(editor.editor.document)
} }
fun getModule(): Module? { fun getModule(): Module? {