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 56b66f1ae63e..a4a611fcddad 100644
--- a/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindManagerImpl.java
@@ -365,7 +365,7 @@ public class FindManagerImpl extends FindManager implements PersistentStateCompo
       index = res < 0 ? -1 : res;
     }
     else{
-      index = searcher.scan(text, textArray, 0, offset);
+      index = searcher.scan(text, textArray, 0, offset-1);
     }
     if (index < 0){
       return NOT_FOUND_RESULT;
diff --git a/platform/util/src/com/intellij/util/text/StringSearcher.java b/platform/util/src/com/intellij/util/text/StringSearcher.java
index 0532b850cef1..69ae27789464 100644
--- a/platform/util/src/com/intellij/util/text/StringSearcher.java
+++ b/platform/util/src/com/intellij/util/text/StringSearcher.java
@@ -1,176 +1,176 @@
-/*
- * Copyright 2000-2011 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.util.text;
-
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.text.StringUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-
-public class StringSearcher {
-  private static final Logger LOG = Logger.getInstance("#com.intellij.util.text.StringSearcher");
-
-  private final String myPattern;
-  private final char[] myPatternArray;
-  private final int myPatternLength;
-  private final int[] mySearchTable = new int[128];
-  private final boolean myCaseSensitive;
-  private final boolean myForwardDirection;
-  private final boolean myJavaIdentifier;
-
-  public int getPatternLength() {
-    return myPatternLength;
-  }
-
-  public StringSearcher(@NotNull String pattern, boolean caseSensitive, boolean forwardDirection) {
-    LOG.assertTrue(!pattern.isEmpty());
-    myPattern = pattern;
-    myCaseSensitive = caseSensitive;
-    myForwardDirection = forwardDirection;
-    myPatternArray = myCaseSensitive ? myPattern.toCharArray() : myPattern.toLowerCase().toCharArray();
-    myPatternLength = myPatternArray.length;
-    Arrays.fill(mySearchTable, -1);
-    myJavaIdentifier = pattern.isEmpty() ||
-                       Character.isJavaIdentifierPart(pattern.charAt(0)) &&
-                       Character.isJavaIdentifierPart(pattern.charAt(pattern.length() - 1));
-  }
-
-  public String getPattern(){
-    return myPattern;
-  }
-
-  public boolean isCaseSensitive() {
-    return myCaseSensitive;
-  }
-
-  public boolean isJavaIdentifier() {
-    return myJavaIdentifier;
-  }
-
-  public boolean isForwardDirection() {
-    return myForwardDirection;
-  }
-
-  public int scan(@NotNull CharSequence text) {
-    return scan(text,0,text.length());
-  }
-
-  public int scan(@NotNull CharSequence text, int _start, int _end) {
-    return scan(text, null, _start, _end);
-  }
-
-  public int scan(@NotNull CharSequence text, @Nullable char[] textArray, int _start, int _end) {
-    LOG.assertTrue(_start <= _end, _start - _end);
-    final int textLength = text.length();
-    LOG.assertTrue(_end <= textLength, textLength - _end);
-    if (myForwardDirection) {
-      if (myPatternLength == 1) {
-        // optimization
-        return StringUtil.indexOf(text, myPatternArray[0], _start, _end, myCaseSensitive);
-      }
-      int start = _start;
-      int end = _end - myPatternLength;
-
-      while (start <= end) {
-        int i = myPatternLength - 1;
-        char lastChar = textArray != null ? textArray[start + i]:text.charAt(start + i);
-        if (!myCaseSensitive) {
-          lastChar = StringUtil.toLowerCase(lastChar);
-        }
-        if (myPatternArray[i] == lastChar) {
-          i--;
-          while (i >= 0) {
-            char c = textArray != null ? textArray[start + i]:text.charAt(start + i);
-            if (!myCaseSensitive) {
-              c = StringUtil.toLowerCase(c);
-            }
-            if (myPatternArray[i] != c) break;
-            i--;
-          }
-          if (i < 0) {
-            return start;
-          }
-        }
-
-        int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1;
-
-        if (step <= 0) {
-          int index;
-          for (index = myPatternLength - 2; index >= 0; index--) {
-            if (myPatternArray[index] == lastChar) break;
-          }
-          step = myPatternLength - index - 1;
-          mySearchTable[lastChar] = step;
-        }
-
-        start += step;
-      }
-      return -1;
-    }
-    else {
-      int start = 1;
-      int end = textLength - myPatternLength + 1;
-      while (start <= end) {
-        int i = myPatternLength - 1;
-        char lastChar = textArray != null ? textArray[textLength - (start + i)]:text.charAt(textLength - (start + i));
-        if (!myCaseSensitive) {
-          lastChar = StringUtil.toLowerCase(lastChar);
-        }
-        if (myPatternArray[myPatternLength - 1 - i] == lastChar) {
-          i--;
-          while (i >= 0) {
-            char c = textArray != null ? textArray[textLength - (start + i)]:text.charAt(textLength - (start + i));
-            if (!myCaseSensitive) {
-              c = StringUtil.toLowerCase(c);
-            }
-            if (myPatternArray[myPatternLength - 1 - i] != c) break;
-            i--;
-          }
-          if (i < 0) return textLength - start - myPatternLength + 1;
-        }
-
-        int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1;
-
-        if (step <= 0) {
-          int index;
-          for (index = myPatternLength - 2; index >= 0; index--) {
-            if (myPatternArray[myPatternLength - 1 - index] == lastChar) break;
-          }
-          step = myPatternLength - index - 1;
-          mySearchTable[lastChar] = step;
-        }
-
-        start += step;
-      }
-      return -1;
-    }
-
-  }
-
-  /**
-   * @deprecated Use {@link #scan(CharSequence)} instead
-   * @param text
-   * @param startOffset
-   * @param endOffset
-   * @return
-   */
-  public int scan(char[] text, int startOffset, int endOffset){
-    final int res = scan(new CharArrayCharSequence(text),text, startOffset, endOffset);
-    return res >= 0 ? res: -1;
-  }
-}
+/*
+ * Copyright 2000-2011 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.util.text;
+
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.util.text.StringUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+
+public class StringSearcher {
+  private static final Logger LOG = Logger.getInstance("#com.intellij.util.text.StringSearcher");
+
+  private final String myPattern;
+  private final char[] myPatternArray;
+  private final int myPatternLength;
+  private final int[] mySearchTable = new int[128];
+  private final boolean myCaseSensitive;
+  private final boolean myForwardDirection;
+  private final boolean myJavaIdentifier;
+
+  public int getPatternLength() {
+    return myPatternLength;
+  }
+
+  public StringSearcher(@NotNull String pattern, boolean caseSensitive, boolean forwardDirection) {
+    LOG.assertTrue(!pattern.isEmpty());
+    myPattern = pattern;
+    myCaseSensitive = caseSensitive;
+    myForwardDirection = forwardDirection;
+    myPatternArray = myCaseSensitive ? myPattern.toCharArray() : myPattern.toLowerCase().toCharArray();
+    myPatternLength = myPatternArray.length;
+    Arrays.fill(mySearchTable, -1);
+    myJavaIdentifier = pattern.isEmpty() ||
+                       Character.isJavaIdentifierPart(pattern.charAt(0)) &&
+                       Character.isJavaIdentifierPart(pattern.charAt(pattern.length() - 1));
+  }
+
+  public String getPattern(){
+    return myPattern;
+  }
+
+  public boolean isCaseSensitive() {
+    return myCaseSensitive;
+  }
+
+  public boolean isJavaIdentifier() {
+    return myJavaIdentifier;
+  }
+
+  public boolean isForwardDirection() {
+    return myForwardDirection;
+  }
+
+  public int scan(@NotNull CharSequence text) {
+    return scan(text,0,text.length());
+  }
+
+  public int scan(@NotNull CharSequence text, int _start, int _end) {
+    return scan(text, null, _start, _end);
+  }
+
+  public int scan(@NotNull CharSequence text, @Nullable char[] textArray, int _start, int _end) {
+    LOG.assertTrue(_start <= _end, _start - _end);
+    final int textLength = text.length();
+    LOG.assertTrue(_end <= textLength, textLength - _end);
+    if (myForwardDirection) {
+      if (myPatternLength == 1) {
+        // optimization
+        return StringUtil.indexOf(text, myPatternArray[0], _start, _end, myCaseSensitive);
+      }
+      int start = _start;
+      int end = _end - myPatternLength;
+
+      while (start <= end) {
+        int i = myPatternLength - 1;
+        char lastChar = textArray != null ? textArray[start + i]:text.charAt(start + i);
+        if (!myCaseSensitive) {
+          lastChar = StringUtil.toLowerCase(lastChar);
+        }
+        if (myPatternArray[i] == lastChar) {
+          i--;
+          while (i >= 0) {
+            char c = textArray != null ? textArray[start + i]:text.charAt(start + i);
+            if (!myCaseSensitive) {
+              c = StringUtil.toLowerCase(c);
+            }
+            if (myPatternArray[i] != c) break;
+            i--;
+          }
+          if (i < 0) {
+            return start;
+          }
+        }
+
+        int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1;
+
+        if (step <= 0) {
+          int index;
+          for (index = myPatternLength - 2; index >= 0; index--) {
+            if (myPatternArray[index] == lastChar) break;
+          }
+          step = myPatternLength - index - 1;
+          mySearchTable[lastChar] = step;
+        }
+
+        start += step;
+      }
+      return -1;
+    }
+    else {
+      int start = 1;
+      int end = _end+1;
+      while (start <= end - myPatternLength + 1) {
+        int i = myPatternLength - 1;
+        char lastChar = textArray != null ? textArray[end - (start + i)]:text.charAt(end - (start + i));
+        if (!myCaseSensitive) {
+          lastChar = StringUtil.toLowerCase(lastChar);
+        }
+        if (myPatternArray[myPatternLength - 1 - i] == lastChar) {
+          i--;
+          while (i >= 0) {
+            char c = textArray != null ? textArray[end - (start + i)]:text.charAt(end - (start + i));
+            if (!myCaseSensitive) {
+              c = StringUtil.toLowerCase(c);
+            }
+            if (myPatternArray[myPatternLength - 1 - i] != c) break;
+            i--;
+          }
+          if (i < 0) return end - start - myPatternLength + 1;
+        }
+
+        int step = 0 <= lastChar && lastChar < 128 ? mySearchTable[lastChar] : 1;
+
+        if (step <= 0) {
+          int index;
+          for (index = myPatternLength - 2; index >= 0; index--) {
+            if (myPatternArray[myPatternLength - 1 - index] == lastChar) break;
+          }
+          step = myPatternLength - index - 1;
+          mySearchTable[lastChar] = step;
+        }
+
+        start += step;
+      }
+      return -1;
+    }
+
+  }
+
+  /**
+   * @deprecated Use {@link #scan(CharSequence)} instead
+   * @param text
+   * @param startOffset
+   * @param endOffset
+   * @return
+   */
+  public int scan(char[] text, int startOffset, int endOffset){
+    final int res = scan(new CharArrayCharSequence(text),text, startOffset, endOffset);
+    return res >= 0 ? res: -1;
+  }
+}