Convert Property to Function Intention: Search occurrences using progress dialog
#KT-14569 Fixed
This commit is contained in:
@@ -216,6 +216,14 @@ These artifacts include extensions for the types available in the latter JDKs, s
|
|||||||
+ [`KT-12389`](https://youtrack.jetbrains.com/issue/KT-12389) Do not exit from REPL when toString() of user class throws an exception
|
+ [`KT-12389`](https://youtrack.jetbrains.com/issue/KT-12389) Do not exit from REPL when toString() of user class throws an exception
|
||||||
+ [`KT-12129`](https://youtrack.jetbrains.com/issue/KT-12129) Fixed link on api reference page in KDoc
|
+ [`KT-12129`](https://youtrack.jetbrains.com/issue/KT-12129) Fixed link on api reference page in KDoc
|
||||||
|
|
||||||
|
## 1.0.6
|
||||||
|
|
||||||
|
### IDE
|
||||||
|
|
||||||
|
#### Intention actions, inspections and quickfixes
|
||||||
|
|
||||||
|
- [`KT-14569`](https://youtrack.jetbrains.com/issue/KT-14569) Convert Property to Function Intention: Search occurrences using progress dialog
|
||||||
|
|
||||||
## 1.0.5
|
## 1.0.5
|
||||||
|
|
||||||
### IDE
|
### IDE
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.idea.intentions
|
|||||||
|
|
||||||
import com.intellij.codeInsight.intention.LowPriorityAction
|
import com.intellij.codeInsight.intention.LowPriorityAction
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
|
import com.intellij.openapi.progress.ProgressManager
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.util.text.StringUtil
|
import com.intellij.openapi.util.text.StringUtil
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
@@ -28,11 +29,7 @@ import org.jetbrains.kotlin.asJava.namedUnwrappedElement
|
|||||||
import org.jetbrains.kotlin.descriptors.CallableDescriptor
|
import org.jetbrains.kotlin.descriptors.CallableDescriptor
|
||||||
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
import org.jetbrains.kotlin.idea.caches.resolve.analyze
|
||||||
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
|
import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde
|
||||||
import org.jetbrains.kotlin.idea.refactoring.checkConflictsInteractively
|
import org.jetbrains.kotlin.idea.refactoring.*
|
||||||
import org.jetbrains.kotlin.idea.refactoring.reportDeclarationConflict
|
|
||||||
import org.jetbrains.kotlin.idea.refactoring.CallableRefactoring
|
|
||||||
import org.jetbrains.kotlin.idea.refactoring.getAffectedCallables
|
|
||||||
import org.jetbrains.kotlin.idea.refactoring.getContainingScope
|
|
||||||
import org.jetbrains.kotlin.idea.references.KtReference
|
import org.jetbrains.kotlin.idea.references.KtReference
|
||||||
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
|
import org.jetbrains.kotlin.idea.references.KtSimpleNameReference
|
||||||
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
|
import org.jetbrains.kotlin.idea.util.application.executeWriteCommand
|
||||||
@@ -93,7 +90,12 @@ class ConvertPropertyToFunctionIntention : SelfTargetingIntention<KtProperty>(Kt
|
|||||||
val kotlinRefsToReplaceWithCall = ArrayList<KtSimpleNameExpression>()
|
val kotlinRefsToReplaceWithCall = ArrayList<KtSimpleNameExpression>()
|
||||||
val refsToRename = ArrayList<PsiReference>()
|
val refsToRename = ArrayList<PsiReference>()
|
||||||
val javaRefsToReplaceWithCall = ArrayList<PsiReferenceExpression>()
|
val javaRefsToReplaceWithCall = ArrayList<PsiReferenceExpression>()
|
||||||
for (callable in callables) {
|
|
||||||
|
project.runSynchronouslyWithProgress("Looking for usages and conflicts...", true) {
|
||||||
|
val progressStep = 1.0/callables.size
|
||||||
|
for ((i, callable) in callables.withIndex()) {
|
||||||
|
ProgressManager.getInstance().progressIndicator.fraction = (i + 1)*progressStep
|
||||||
|
|
||||||
if (callable !is PsiNamedElement) continue
|
if (callable !is PsiNamedElement) continue
|
||||||
|
|
||||||
if (!checkModifiable(callable)) {
|
if (!checkModifiable(callable)) {
|
||||||
@@ -155,6 +157,7 @@ class ConvertPropertyToFunctionIntention : SelfTargetingIntention<KtProperty>(Kt
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
project.checkConflictsInteractively(conflicts) {
|
project.checkConflictsInteractively(conflicts) {
|
||||||
project.executeWriteCommand(text) {
|
project.executeWriteCommand(text) {
|
||||||
|
|||||||
Reference in New Issue
Block a user