Skip to content

Commit 37ceab6

Browse files
committed
fix(rename): ensure correct handling of target elements and improve error handling.
1 parent b79415a commit 37ceab6

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/kotlin/cc/unitmesh/devti/practise/RenameLookupManagerListener.kt

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,15 @@ class RenameLookupManagerListener(val project: Project) : LookupManagerListener
3030

3131
val lookupImpl = newLookup as? LookupImpl ?: return
3232
val editor = lookupImpl.editor as? EditorEx ?: return
33-
34-
val targetElement: PsiElement? = lookupElement(lookupImpl, editor)
33+
val targetElement: PsiElement = lookupElement(lookupImpl, editor) ?: return
3534

3635
// maybe user just typing, we should handle for this
37-
val element = targetElement ?: return
38-
val originName = (element as? PsiNameIdentifierOwner)?.name ?: return
36+
val originName = (targetElement as? PsiNameIdentifierOwner)?.name ?: return
3937

4038
if (originName.isBlank()) return
4139

4240
val promptText =
43-
"$originName is a badname. Please provide 5 better options name for follow code: \n```${element.language.displayName}\n${element.text}\n```\n\n1."
44-
41+
"$originName is a badname. Please provide 5 better options name for follow code: \n```${targetElement.language.displayName}\n${targetElement.text}\n```\n\n1."
4542

4643
try {
4744
doExecuteNameSuggest(promptText, lookupImpl)
@@ -77,14 +74,13 @@ class RenameLookupManagerListener(val project: Project) : LookupManagerListener
7774

7875
runInEdt {
7976
if (!lookupImpl.isLookupDisposed) {
80-
logger.info("refreshUi for RenameLookupManagerListener")
8177
lookupImpl.isCalculating = false
8278
lookupImpl.refreshUi(true, false)
8379
}
8480
}
8581
} catch (e: Exception) {
86-
AutoDevStatusService.notifyApplication(AutoDevStatus.Error)
8782
logger.error("Error in RenameLookupManagerListener", e)
83+
AutoDevStatusService.notifyApplication(AutoDevStatus.Error)
8884
}
8985

9086
AutoDevStatusService.notifyApplication(AutoDevStatus.Ready)
@@ -118,6 +114,7 @@ class RenameLookupManagerListener(val project: Project) : LookupManagerListener
118114
if (targetElement is LeafPsiElement || targetElement is PsiWhiteSpace) {
119115
targetElement = targetElement.parent
120116
}
117+
121118
return targetElement
122119
}
123120

0 commit comments

Comments
 (0)