From 3a428109bd73a49dfa43225b0807dbc265d615a8 Mon Sep 17 00:00:00 2001 From: anna Date: Wed, 9 Dec 2009 14:09:34 +0300 Subject: [PATCH] rename: check for empty strings (IDEADEV-41909) --- .../com/intellij/refactoring/rename/RenameUtil.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java index 9de2b4f22cf2..0e9f4d23d534 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java +++ b/platform/lang-impl/src/com/intellij/refactoring/rename/RenameUtil.java @@ -87,11 +87,13 @@ public class RenameUtil { if (searchForTextOccurences && searchForInComments != null) { String stringToSearch = ElementDescriptionUtil.getElementDescription(searchForInComments, NonCodeSearchDescriptionLocation.NON_JAVA); - final String stringToReplace = getStringToReplace(element, newName, true, processor); - addTextOccurence(searchForInComments, result, projectScope, stringToSearch, stringToReplace); + if (stringToSearch.length() > 0) { + final String stringToReplace = getStringToReplace(element, newName, true, processor); + addTextOccurence(searchForInComments, result, projectScope, stringToSearch, stringToReplace); + } - Pair additionalStringToSearch = processor.getTextOccurrenceSearchStrings(searchForInComments, newName); - if (additionalStringToSearch != null) { + final Pair additionalStringToSearch = processor.getTextOccurrenceSearchStrings(searchForInComments, newName); + if (additionalStringToSearch != null && additionalStringToSearch.first.length() > 0) { addTextOccurence(searchForInComments, result, projectScope, additionalStringToSearch.first, additionalStringToSearch.second); } }