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

Invoke rename handler with editor if possible in IllegalIdentifierInspection.RenameIdentifierFix

Browse Source 
#KT-14760 Fixed
#KT-11646 Fixed
This commit is contained in:
Vyacheslav Gerasimov
2016-11-14 18:17:51 +03:00
parent 1f26c3098f
commit 9c78301008
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt
+10 -3
View File
@@ -82,10 +82,17 @@ class IllegalIdentifierInspection : AbstractKotlinInspection() {
val file = element.containingFile ?: return
if (!FileModificationService.getInstance().prepareFileForWrite(file)) return
val editorManager = FileEditorManager.getInstance(project)
val editor = editorManager.getSelectedEditor(file.virtualFile) ?: return
val dataContext = DataManager.getInstance().getDataContext(editor.component)
val fileEditor = editorManager.getSelectedEditor(file.virtualFile) ?: return
val dataContext = DataManager.getInstance().getDataContext(fileEditor.component)
val renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(dataContext)
renameHandler?.invoke(project, arrayOf(element), dataContext)
val editor = editorManager.selectedTextEditor
if (editor != null) {
renameHandler?.invoke(project, editor, file, dataContext)
}
else {
renameHandler?.invoke(project, arrayOf(element.parent), dataContext)
}
}
}
}