From 9c783010082c57ebe488fb939f93f61f19fc3d5e Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 14 Nov 2016 18:17:51 +0300 Subject: [PATCH] Invoke rename handler with editor if possible in IllegalIdentifierInspection.RenameIdentifierFix #KT-14760 Fixed #KT-11646 Fixed --- .../inspection/IllegalIdentifierInspection.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt index 2c1cdc4282f..d3e6c1b1e55 100644 --- a/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt +++ b/idea/idea-android/src/org/jetbrains/kotlin/android/inspection/IllegalIdentifierInspection.kt @@ -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) + } } } } \ No newline at end of file