MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-68160 Find & Replace: preserve case bug

Browse Source
This commit is contained in:
Maxim.Mossienko
2016-01-14 23:26:16 +01:00
parent 6429d76a87
commit bafd756a9e
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/find/FindManagerTest.java
+8
View File
@@ -633,6 +633,14 @@ public class FindManagerTest extends DaemonAnalyzerTestCase {
FindUtil.replace(myProject, myEditor, 0, model);
assertEquals("FooBar fooBar", myEditor.getDocument().getText());
configureByText(FileTypes.PLAIN_TEXT, "abc1 Abc1 ABC1");
model.setStringToFind("ABC1");
model.setStringToReplace("DEF1");
FindUtil.replace(myProject, myEditor, 0, model);
assertEquals("def1 Def1 DEF1", myEditor.getDocument().getText());
}
public void testFindWholeWords() {
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+12 -6
View File
@@ -864,23 +864,29 @@ public class FindManagerImpl extends FindManager {
}
boolean isReplacementLowercase = true;
boolean isReplacementUppercase = true;
for (int i = 1; i < toReplace.length(); i++) {
isReplacementLowercase = Character.isLowerCase(toReplace.charAt(i));
if (!isReplacementLowercase) break;
char replacementChar = toReplace.charAt(i);
if (!Character.isLetter(replacementChar)) continue;
isReplacementLowercase &= Character.isLowerCase(replacementChar);
isReplacementUppercase &= Character.isUpperCase(replacementChar);
if (!isReplacementLowercase && !isReplacementUppercase) break;
}
boolean isTailUpper = true;
boolean isTailLower = true;
for (int i = 1; i < foundString.length(); i++) {
isTailUpper &= Character.isUpperCase(foundString.charAt(i));
isTailLower &= Character.isLowerCase(foundString.charAt(i));
char foundChar = foundString.charAt(i);
if (!Character.isLetter(foundChar)) continue;
isTailUpper &= Character.isUpperCase(foundChar);
isTailLower &= Character.isLowerCase(foundChar);
if (!isTailUpper && !isTailLower) break;
}
if (isTailUpper && isReplacementLowercase) {
if (isTailUpper && (isReplacementLowercase || isReplacementUppercase)) {
buffer.append(StringUtil.toUpperCase(toReplace.substring(1)));
}
else if (isTailLower && isReplacementLowercase) {
else if (isTailLower && (isReplacementLowercase || isReplacementUppercase)) {
buffer.append(toReplace.substring(1).toLowerCase());
}
else {