diff --git a/platform/platform-resources/src/brokenPlugins.txt b/platform/platform-resources/src/brokenPlugins.txt index 567a67ed53a5..2d6efa8e3f41 100644 --- a/platform/platform-resources/src/brokenPlugins.txt +++ b/platform/platform-resources/src/brokenPlugins.txt @@ -61,7 +61,7 @@ com.hasintech.intellij.angularTemplates 1.0.2 1.1.2 com.jetbrains.plugins.jade 144.2931 142.4651 141.506 140.2144 140.1212 140.216 138.1744 133.74 130.1520 121.390 122.668 121.185 com.jetbrains.ec2manager 1.0.5 1.0.4 1.0.3 1.0.2 1.0.1 1.0 0.3.4 0.3.4 0.3.2 0.3.1 0.3.0 0.2.0 0.1.2 0.1.1 0.1.0 AAHack 0.1 -QAPlug 1.3.11 1.3.10 1.3.9 1.3.8 1.3.7 +QAPlug 1.3.11 1.3.10 1.3.9 1.3.8 1.3.7 1.3.8 1.3.9 1.3.10 1.3.11 1.3.12 org.jetbrains.memory.view 0.0.2 0.0.3 0.0.4 0.0.5 0.0.6 0.0.7 0.0.8 0.0.9 0.0.10 0.9 0.91 0.91.145 0.91.162 0.92.145 0.92.162 0.93.145 0.93.162 0.93.171 com.jetbrains.intellij.api.watcher 5.0.0 5.1.0 5.2.0 5.3.0 5.4.0 com.jetbrains.performancePlugin 1.1 1.3 1.3.1 1.3.2 @@ -74,4 +74,5 @@ cco.atoth.intellij.plugin.chucknorris 1.0 1.1 de.halirutan.mathematica 2.0.24 com.intellij.plugin.applescript 0.115 org.argus.cit.intellij 1.0.2 1.0.3 1.0.4 -com.intellij.appcode-ui-designer 1.0 1.1 \ No newline at end of file +com.intellij.appcode-ui-designer 1.0 1.1 +io.t28.json2java 0.1.0 0.2.0 0.2.1 \ No newline at end of file diff --git a/platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt b/platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt index 9a488f071a25..d5412608c8d9 100644 --- a/platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt +++ b/platform/testFramework/src/com/intellij/testFramework/FixtureRule.kt @@ -68,7 +68,7 @@ open class ApplicationRule : ExternalResource() { /** * Project created on request, so, could be used as a bare (only application). */ -class ProjectRule : ApplicationRule() { +class ProjectRule(val projectDescriptor: LightProjectDescriptor = LightProjectDescriptor()) : ApplicationRule() { companion object { private var sharedProject: ProjectEx? = null private val projectOpened = AtomicBoolean() @@ -137,7 +137,7 @@ class ProjectRule : ApplicationRule() { var result = sharedModule if (result == null) { runInEdtAndWait { - LightProjectDescriptor().setUpProject(project, object : LightProjectDescriptor.SetupHandler { + projectDescriptor.setUpProject(project, object : LightProjectDescriptor.SetupHandler { override fun moduleCreated(module: Module) { result = module sharedModule = module