From 93c07390660673d718aa7c0ff88c48cd0e619dca Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Sat, 5 Mar 2016 17:23:32 +0300 Subject: [PATCH] [console filter] inline bomb with 100 ms --- .../src/com/intellij/execution/filters/RegexpFilter.java | 8 +------- .../gradle/execution/GradleConsoleFilterProvider.java | 3 ++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java b/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java index 87ea575b7e66..3f65be074c6c 100644 --- a/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java +++ b/platform/lang-api/src/com/intellij/execution/filters/RegexpFilter.java @@ -20,7 +20,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.File; @@ -140,7 +139,7 @@ public class RegexpFilter implements Filter { @Override public Result applyFilter(String line, int entireLength) { - Matcher matcher = myPattern.matcher(oneSecondBomb(line)); + Matcher matcher = myPattern.matcher(StringUtil.newBombedCharSequence(line, 100)); if (!matcher.find()) { return null; } @@ -178,11 +177,6 @@ public class RegexpFilter implements Filter { return new Result(highlightStartOffset, highlightEndOffset, info); } - @NotNull - protected static CharSequence oneSecondBomb(@NotNull String line) { - return StringUtil.newBombedCharSequence(line, 1000); - } - @Nullable protected HyperlinkInfo createOpenFileHyperlink(String fileName, final int line, final int column) { fileName = fileName.replace(File.separatorChar, '/'); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterProvider.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterProvider.java index af0afb8e1f89..3f3d1ac9ad55 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterProvider.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterProvider.java @@ -24,6 +24,7 @@ import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootModificationTracker; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.util.CachedValueImpl; @@ -50,7 +51,7 @@ public class GradleConsoleFilterProvider implements ConsoleFilterProvider { Result result = super.applyFilter(line, entireLength); if (result == null) return null; Pattern pattern = getPattern(); - Matcher matcher = pattern.matcher(oneSecondBomb(line)); + Matcher matcher = pattern.matcher(StringUtil.newBombedCharSequence(line, 100)); if (!matcher.lookingAt()) return result; int lineStart = entireLength - line.length(); int start = lineStart + matcher.start(); -- 2.32.0