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-105409 Replace All is very slow when used with reg exp option

Browse Source
This commit is contained in:
andrey.zaytsev
2013-04-30 15:32:47 +04:00
parent 9d552d2129
commit 403c201a0f
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/FindUtil.java
+2 -1
View File
@@ -539,7 +539,8 @@ public class FindUtil {
String foundString = document.getCharsSequence().subSequence(startOffset, endOffset).toString();
String toReplace;
try {
toReplace = findManager.getStringToReplace(foundString, model, startOffset, document.getText());
CharSequence textToMatch = document.getCharsSequence().subSequence(offset, endOffset < document.getTextLength() ? endOffset+1 : endOffset);
toReplace = findManager.getStringToReplace(foundString, model, startOffset - offset, textToMatch);
}
catch (FindManager.MalformedReplacementStringException e) {
if (!ApplicationManager.getApplication().isUnitTestMode()) {
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+22 -12
View File
@@ -624,7 +624,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
@Override
public String getStringToReplace(@NotNull String foundString, @NotNull FindModel model,
int startOffset, @NotNull String documentText) throws MalformedReplacementStringException{
int startOffset, @NotNull CharSequence documentText) throws MalformedReplacementStringException{
String toReplace = model.getStringToReplace();
if (model.isRegularExpressions()) {
return getStringToReplaceByRegexp(model, documentText, startOffset);
@@ -635,7 +635,26 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
return toReplace;
}
private static String getStringToReplaceByRegexp(@NotNull final FindModel model, @NotNull String text, int startOffset) throws MalformedReplacementStringException{
private static String getStringToReplaceByRegexp(@NotNull final FindModel model, @NotNull CharSequence text, int startOffset) throws MalformedReplacementStringException {
Matcher matcher = compileRegexAndFindFirst(model, text, startOffset);
return getStringToReplaceByRegexp(model, matcher);
}
private static String getStringToReplaceByRegexp(@NotNull final FindModel model, Matcher matcher) throws MalformedReplacementStringException{
StringBuffer replaced = new StringBuffer();
if (matcher == null) return null;
try {
String toReplace = StringUtil.unescapeStringCharacters(model.getStringToReplace());
matcher.appendReplacement(replaced, toReplace);
return replaced.substring(matcher.start());
}
catch (Exception e) {
throw createMalformedReplacementException(model, e);
}
}
private static Matcher compileRegexAndFindFirst(FindModel model, CharSequence text, int startOffset) {
Matcher matcher = compileRegExp(model, text);
if (model.isForward()){
@@ -655,16 +674,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
return null;
}
}
try {
StringBuffer replaced = new StringBuffer();
String toReplace = StringUtil.unescapeStringCharacters(model.getStringToReplace());
matcher.appendReplacement(replaced, toReplace);
return replaced.substring(matcher.start());
}
catch (Exception e) {
throw createMalformedReplacementException(model, e);
}
return matcher;
}
private static MalformedReplacementStringException createMalformedReplacementException(FindModel model, Exception e) {