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

Make editor in SelfTargetingIntention.invoke nullable

Browse Source 
This prevents EA-105844 from happening.
Should fix KT-20899.
This commit is contained in:
Mikhail Glukhikh
2017-10-23 16:26:54 +03:00
parent 68870a16bb
commit 5a6f22cc95
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/intentions/SelfTargetingIntention.kt
+2 -1
View File
@@ -87,7 +87,8 @@ abstract class SelfTargetingIntention<TElement : PsiElement>(
var inspection: IntentionBasedInspection<TElement>? = null var inspection: IntentionBasedInspection<TElement>? = null
internal set internal set
final override fun invoke(project: Project, editor: Editor, file: PsiFile): Unit { final override fun invoke(project: Project, editor: Editor?, file: PsiFile) {
editor ?: return
PsiDocumentManager.getInstance(project).commitAllDocuments() PsiDocumentManager.getInstance(project).commitAllDocuments()
val target = getTarget(editor, file) ?: return val target = getTarget(editor, file) ?: return
if (!FileModificationService.getInstance().preparePsiElementForWrite(target)) return if (!FileModificationService.getInstance().preparePsiElementForWrite(target)) return