From 6b87c7c1f82a3389003eebf7f6b967bbd3272594 Mon Sep 17 00:00:00 2001 From: Mikhail Golubev Date: Wed, 5 Aug 2015 16:54:06 +0300 Subject: [PATCH] PY-9795 Add method contains in Substring, its indexOf always returns -1 if substring wasn't found --- .../psi-api/src/com/jetbrains/python/toolbox/Substring.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/psi-api/src/com/jetbrains/python/toolbox/Substring.java b/python/psi-api/src/com/jetbrains/python/toolbox/Substring.java index b21d954adb0d..4c7cc724ebcf 100644 --- a/python/psi-api/src/com/jetbrains/python/toolbox/Substring.java +++ b/python/psi-api/src/com/jetbrains/python/toolbox/Substring.java @@ -186,7 +186,11 @@ public class Substring implements CharSequence { public int indexOf(@NotNull String s) { int n = myString.indexOf(s, myStartOffset); - return n < myEndOffset ? n - myStartOffset : -1; + return n >= 0 && n < myEndOffset ? n - myStartOffset : -1; + } + + public boolean contains(@NotNull String s) { + return indexOf(s) >= 0; } @NotNull