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

don't cancel search on ProcessCanceledExceptions from too long regexp processing

Browse Source 
Caused by: com.intellij.openapi.progress.ProcessCanceledException
 at com.intellij.openapi.util.text.StringUtil$9.checkCanceled(StringUtil.java:3192)
 ...
 at java.util.regex.Matcher.find(Matcher.java:637)
 at com.intellij.openapi.vcs.IssueNavigationConfiguration.findIssueLinks(IssueNavigationConfiguration.java:98)
 at com.intellij.psi.impl.source.resolve.reference.ArbitraryPlaceUrlReferenceProvider$1.lambda$compute$0(ArbitraryPlaceUrlReferenceProvider.java:51)
This commit is contained in:
Anna.Kozlova
2016-11-17 14:29:36 +01:00
parent 2c59fa5038
commit e04f0b083f
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/IssueNavigationConfiguration.java
+19 -13
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.SimpleModificationTracker;
import com.intellij.openapi.util.TextRange;
@@ -92,22 +93,27 @@ public class IssueNavigationConfiguration extends SimpleModificationTracker
public List<LinkMatch> findIssueLinks(CharSequence text) {
final List<LinkMatch> result = new ArrayList<>();
for (IssueNavigationLink link : myLinks) {
Pattern issuePattern = link.getIssuePattern();
Matcher m = issuePattern.matcher(text);
while (m.find()) {
try {
String replacement = issuePattern.matcher(m.group(0)).replaceFirst(link.getLinkRegexp());
addMatch(result, new TextRange(m.start(), m.end()), replacement);
}
catch (Exception e) {
LOG.debug("Malformed regex replacement. IssueLink: " + link + "; text: " + text, e);
try {
for (IssueNavigationLink link : myLinks) {
Pattern issuePattern = link.getIssuePattern();
Matcher m = issuePattern.matcher(text);
while (m.find()) {
try {
String replacement = issuePattern.matcher(m.group(0)).replaceFirst(link.getLinkRegexp());
addMatch(result, new TextRange(m.start(), m.end()), replacement);
}
catch (Exception e) {
LOG.debug("Malformed regex replacement. IssueLink: " + link + "; text: " + text, e);
}
}
}
Matcher m = URLUtil.URL_PATTERN.matcher(text);
while (m.find()) {
addMatch(result, new TextRange(m.start(), m.end()), m.group());
}
}
Matcher m = URLUtil.URL_PATTERN.matcher(text);
while (m.find()) {
addMatch(result, new TextRange(m.start(), m.end()), m.group());
catch (ProcessCanceledException e) {
//skip too long processing completely
}
Collections.sort(result);
return result;