diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
commit | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (patch) | |
tree | 2f4cc6d69645bd460aa253fdecb606d764fbd25d /platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-1aa2e09bdbd413eacb677e9fa4b50630530d0656.tar.gz |
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Diffstat (limited to 'platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java index 27e2b7215f25..b7d58e926e30 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java @@ -387,7 +387,8 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo if (input == null || !input.isStringFound()) return true; NavigableMap<Integer, Integer> map = mySkipRangesSet.headMap(input.getStartOffset(), true); for(Map.Entry<Integer, Integer> e:map.descendingMap().entrySet()) { - if (e.getKey() <= input.getStartOffset() && e.getValue() >= input.getEndOffset()) return false; + // [e.key, e.value] intersect with [input.start, input.end] + if (e.getKey() <= input.getStartOffset() && (input.getStartOffset() <= e.getValue() || e.getValue() >= input.getEndOffset())) return false; if (e.getValue() <= input.getStartOffset()) break; } return true; |