From f166d51731403e5f1b624ed6e119e5a758becebf Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 12 Mar 2019 14:42:47 +0100 Subject: [PATCH] SSR: no need to wrap exception --- .../com/intellij/structuralsearch/Matcher.java | 16 +++++----------- .../plugin/replace/impl/Replacer.java | 3 +++ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java index 56b07ba6e8bc..a5f2646198d8 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/Matcher.java @@ -31,7 +31,6 @@ import com.intellij.structuralsearch.plugin.ui.Configuration; import com.intellij.structuralsearch.plugin.ui.ConfigurationManager; import com.intellij.structuralsearch.plugin.util.CollectingMatchResultSink; import com.intellij.structuralsearch.plugin.util.DuplicateFilteringResultSink; -import com.intellij.util.IncorrectOperationException; import com.intellij.util.PairProcessor; import com.intellij.util.SmartList; import com.intellij.util.indexing.FileBasedIndex; @@ -317,11 +316,11 @@ public class Matcher { * @throws UnsupportedPatternException */ public List testFindMatches(String source, - MatchOptions options, - boolean fileContext, - FileType sourceFileType, - String sourceExtension, - boolean physicalSourceFile) + MatchOptions options, + boolean fileContext, + FileType sourceFileType, + String sourceExtension, + boolean physicalSourceFile) throws MalformedPatternException, UnsupportedPatternException { CollectingMatchResultSink sink = new CollectingMatchResultSink(); @@ -335,11 +334,6 @@ public class Matcher { options.setScope(new LocalSearchScope(elements)); testFindMatches(sink, options); - } - catch (IncorrectOperationException e) { - MalformedPatternException exception = new MalformedPatternException(); - exception.initCause(e); - throw exception; } finally { options.setScope(null); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java index 87c23e948ef6..53bfc426f293 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/replace/impl/Replacer.java @@ -135,6 +135,9 @@ public class Replacer { return result; } + catch (RuntimeException e) { + throw e; + } catch (Exception e) { throw new IncorrectOperationException(e); }