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

handle escape sequences in LowLevelSearchUtil.searchWord() only in UsageSearchContext.IN_STRINGS

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-01-31 14:49:02 +01:00
parent 09c0a67d8b
commit 2467b934a7
4 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/indexing-impl/src/com/intellij/psi/impl/search/LowLevelSearchUtil.java
+2 -2
View File
@@ -205,11 +205,11 @@ public class LowLevelSearchUtil {
if (index > startOffset) {
char c = textArray != null ? textArray[index - 1]:text.charAt(index - 1);
if (Character.isJavaIdentifierPart(c) && c != '$') {
if (index < 2 || !isNotEscapedBackslash(text, textArray, startOffset, index-2)) { //escape sequence
if (searcher.isHandleEscapeSequences() && (index < 2 || !isNotEscapedBackslash(text, textArray, startOffset, index-2))) { //escape sequence
continue;
}
}
else if (index > 0 && isNotEscapedBackslash(text, textArray, startOffset, index-1)) {
else if (index > 0 && searcher.isHandleEscapeSequences() && isNotEscapedBackslash(text, textArray, startOffset, index-1)) {
continue;
}
}
platform/indexing-impl/src/com/intellij/psi/impl/search/PsiSearchHelperImpl.java
+7 -5
View File
@@ -126,14 +126,14 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
public AsyncFuture<Boolean> processElementsWithWordAsync(@NotNull final TextOccurenceProcessor processor,
@NotNull SearchScope searchScope,
@NotNull final String text,
short searchContext,
final short searchContext,
final boolean caseSensitively) {
if (text.isEmpty()) {
return AsyncFutureFactory.wrapException(new IllegalArgumentException("Cannot search for elements with empty text"));
}
final ProgressIndicator progress = ProgressIndicatorProvider.getGlobalProgressIndicator();
if (searchScope instanceof GlobalSearchScope) {
StringSearcher searcher = new StringSearcher(text, caseSensitively, true);
StringSearcher searcher = new StringSearcher(text, caseSensitively, true, searchContext == UsageSearchContext.IN_STRINGS);
return processElementsWithTextInGlobalScopeAsync(processor,
(GlobalSearchScope)searchScope,
@@ -154,6 +154,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
text,
caseSensitively,
ignoreInjectedPsi,
searchContext == UsageSearchContext.IN_STRINGS,
progress);
}
});
@@ -165,11 +166,12 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
final String word,
final boolean caseSensitive,
final boolean ignoreInjectedPsi,
final boolean handleEscapeSequences,
final ProgressIndicator progress) {
return ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
StringSearcher searcher = new StringSearcher(word, caseSensitive, true);
StringSearcher searcher = new StringSearcher(word, caseSensitive, true, handleEscapeSequences);
return LowLevelSearchUtil.processElementsContainingWordInElement(processor, scopeElement, searcher, !ignoreInjectedPsi, progress);
}
@@ -389,7 +391,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
}
});
final StringSearcher searcher = new StringSearcher(qName, true, true);
final StringSearcher searcher = new StringSearcher(qName, true, true, false);
if (progress != null) {
progress.pushState();
@@ -615,7 +617,7 @@ public class PsiSearchHelperImpl implements PsiSearchHelper {
final Map<RequestWithProcessor, StringSearcher> searchers = new HashMap<RequestWithProcessor, StringSearcher>();
final Set<String> allWords = new TreeSet<String>();
for (RequestWithProcessor singleRequest : candidateFiles.values()) {
searchers.put(singleRequest, new StringSearcher(singleRequest.request.word, singleRequest.request.caseSensitive, true));
searchers.put(singleRequest, new StringSearcher(singleRequest.request.word, singleRequest.request.caseSensitive, true, false));
allWords.add(singleRequest.request.word);
}
platform/platform-tests/testSrc/com/intellij/psi/impl/search/LowLevelSearchUtilTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class LowLevelSearchUtilTest extends TestCase {
}
private static int doTest(String pattern, String text) {
StringSearcher searcher = new StringSearcher(pattern, true, true);
StringSearcher searcher = new StringSearcher(pattern, true, true, true);
return LowLevelSearchUtil.searchWord(text, 0, text.length(), searcher, null);
}
}
platform/util/src/com/intellij/util/text/StringSearcher.java
+10
View File
@@ -32,12 +32,18 @@ public class StringSearcher {
private final boolean myCaseSensitive;
private final boolean myForwardDirection;
private final boolean myJavaIdentifier;
private final boolean myHandleEscapeSequences;
public int getPatternLength() {
return myPatternLength;
}
public StringSearcher(@NotNull String pattern, boolean caseSensitive, boolean forwardDirection) {
this(pattern, caseSensitive, forwardDirection, false);
}
public StringSearcher(@NotNull String pattern, boolean caseSensitive, boolean forwardDirection, boolean handleEscapeSequences) {
myHandleEscapeSequences = handleEscapeSequences;
LOG.assertTrue(!pattern.isEmpty());
myPattern = pattern;
myCaseSensitive = caseSensitive;
@@ -66,6 +72,10 @@ public class StringSearcher {
return myForwardDirection;
}
public boolean isHandleEscapeSequences() {
return myHandleEscapeSequences;
}
public int scan(@NotNull CharSequence text) {
return scan(text,0,text.length());
}