From a4e026e22e562b88127c2102097e39b17cd16a1d Mon Sep 17 00:00:00 2001 From: "alexey.afanasiev" Date: Mon, 20 Aug 2018 17:53:48 +0300 Subject: [PATCH] IDEA-CR-36222 IDEA-196685 IDEA 2018.2 freezes on specific editing of build.gradle file --- .../src/com/intellij/openapi/util/RecursionManager.java | 8 ++++---- .../lang/highlighting/GrLatestHighlightingTest.groovy | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/RecursionManager.java b/platform/util/src/com/intellij/openapi/util/RecursionManager.java index 021ab7912671..ed7cb0249bf1 100644 --- a/platform/util/src/com/intellij/openapi/util/RecursionManager.java +++ b/platform/util/src/com/intellij/openapi/util/RecursionManager.java @@ -347,8 +347,8 @@ public class RecursionManager { } @TestOnly - public static void assertOnRecursionPrevention(@NotNull Disposable parentDisposable, boolean enableAssert) { - ourAssertOnPrevention = enableAssert; + public static void assertOnRecursionPrevention(@NotNull Disposable parentDisposable) { + ourAssertOnPrevention = true; Disposer.register(parentDisposable, new Disposable() { @Override public void dispose() { @@ -359,7 +359,7 @@ public class RecursionManager { } @TestOnly - public static void assertOnRecursionPrevention(@NotNull Disposable parentDisposable) { - assertOnRecursionPrevention(parentDisposable, true); + public static void disableAssertOnRecursionPrevention() { + ourAssertOnPrevention = false; } } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrLatestHighlightingTest.groovy b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrLatestHighlightingTest.groovy index c8dade18382e..10ae29e54ad0 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrLatestHighlightingTest.groovy +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/lang/highlighting/GrLatestHighlightingTest.groovy @@ -390,7 +390,7 @@ class GoodCodeRed { } void 'test recursive generics'() { - RecursionManager.assertOnRecursionPrevention(myFixture.testRootDisposable, false) + RecursionManager.disableAssertOnRecursionPrevention() testHighlighting ''' import groovy.transform.CompileStatic