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-141800 "Except comments" replacement option doesn't work as expected

Browse Source
This commit is contained in:
Maxim.Mossienko
2015-06-23 16:20:05 +02:00
parent 63770fd167
commit 4e057fa62a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+9 -3
View File
@@ -65,6 +65,7 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Predicate;
import com.intellij.util.messages.MessageBus;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.util.text.ImmutableCharSequence;
import com.intellij.util.text.StringSearcher;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
@@ -303,10 +304,12 @@ public class FindManagerImpl extends FindManager {
private final VirtualFile myFile;
private final FindModel myFindModel;
private final TreeMap<Integer, Integer> mySkipRangesSet;
private final CharSequence myText;
private FindExceptCommentsOrLiteralsData(VirtualFile file, FindModel model, CharSequence text) {
myFile = file;
myFindModel = model.clone();
myText = ImmutableCharSequence.asImmutable(text);
TreeMap<Integer, Integer> result = new TreeMap<Integer, Integer>();
@@ -340,8 +343,11 @@ public class FindManagerImpl extends FindManager {
}
}
boolean isAcceptableFor(FindModel model, VirtualFile file) {
return Comparing.equal(myFile, file) && myFindModel.equals(model);
boolean isAcceptableFor(FindModel model, VirtualFile file, CharSequence text) {
return Comparing.equal(myFile, file) &&
myFindModel.equals(model) &&
Comparing.equal(myText, text)
;
}
@Override
@@ -367,7 +373,7 @@ public class FindManagerImpl extends FindManager {
}
FindExceptCommentsOrLiteralsData data = model.getUserData(ourExceptCommentsOrLiteralsDataKey);
if (data == null || !data.isAcceptableFor(model, file)) {
if (data == null || !data.isAcceptableFor(model, file, text)) {
model.putUserData(ourExceptCommentsOrLiteralsDataKey, data = new FindExceptCommentsOrLiteralsData(file, model, text));
}