Fix "Attempt to modify PSI for non-committed document" for some cases

It can be thrown after an action when optimize imports is called
This commit is contained in:
Ilya Kirillov
2019-08-01 18:27:54 +03:00
parent 1981e8b9bf
commit be7b228cf6
2 changed files with 4 additions and 0 deletions
@@ -93,6 +93,7 @@ class ConvertReceiverToParameterIntention : SelfTargetingOffsetIndependentIntent
runWriteAction {
function.setReceiverTypeReference(addedParameter.typeReference)
function.valueParameterList!!.removeParameter(addedParameter)
PsiDocumentManager.getInstance(project).commitDocument(editor.document)
}
}
@@ -35,6 +35,9 @@ class FqNameFixingMoveJavaFileHandler : MoveFileHandler() {
val newPackage = JavaDirectoryService.getInstance().getPackage(moveDestination) ?: return
if (!FileTypeUtils.isInServerPageFile(file) && !PsiUtil.isModuleFile(file)) {
file.packageName = newPackage.qualifiedName
with(PsiDocumentManager.getInstance(file.project)) {
commitDocument(getDocument(file) ?: return@with)
}
}
}
}