From ce27ad559ce4ab2aaa271ce4094c1a0f52185ca2 Mon Sep 17 00:00:00 2001
From: peter <peter.gromov@jetbrains.com>
Date: Mon, 12 Jul 2010 18:18:38 +0100
Subject: [PATCH] integrate ConsoleFolding plugin into the core

---
 .../console}/ConsoleFoldingConfigurable.java  |  2 +-
 .../console}/ConsoleFoldingSettings.java      |  2 +-
 .../CustomizableConsoleFoldingBean.java       |  2 +-
 .../console}/SubstringConsoleFolding.java     |  4 ++-
 .../src/META-INF/LangExtensionPoints.xml      |  3 ++
 .../src/META-INF/LangExtensions.xml           |  8 +++++
 plugins/consoleFolding/consoleFolding.iml     | 14 --------
 .../consoleFolding/src/META-INF/plugin.xml    | 33 -------------------
 plugins/groovy/src/META-INF/plugin.xml        |  6 ++++
 plugins/junit/src/META-INF/plugin.xml         |  1 +
 10 files changed, 24 insertions(+), 51 deletions(-)
 rename {plugins/consoleFolding/src/com/intellij/execution => platform/lang-impl/src/com/intellij/execution/console}/ConsoleFoldingConfigurable.java (98%)
 rename {plugins/consoleFolding/src/com/intellij/execution => platform/lang-impl/src/com/intellij/execution/console}/ConsoleFoldingSettings.java (98%)
 rename {plugins/consoleFolding/src/com/intellij/execution => platform/lang-impl/src/com/intellij/execution/console}/CustomizableConsoleFoldingBean.java (93%)
 rename {plugins/consoleFolding/src/com/intellij/execution => platform/lang-impl/src/com/intellij/execution/console}/SubstringConsoleFolding.java (85%)
 delete mode 100644 plugins/consoleFolding/consoleFolding.iml
 delete mode 100644 plugins/consoleFolding/src/META-INF/plugin.xml

diff --git a/plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingConfigurable.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingConfigurable.java
similarity index 98%
rename from plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingConfigurable.java
rename to platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingConfigurable.java
index 7e5a195e3fd3..83900aa42e3a 100644
--- a/plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingConfigurable.java
@@ -1,4 +1,4 @@
-package com.intellij.execution;
+package com.intellij.execution.console;
 
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
diff --git a/plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingSettings.java b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
similarity index 98%
rename from plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingSettings.java
rename to platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
index 43c1f8668f73..f912b09b93b3 100644
--- a/plugins/consoleFolding/src/com/intellij/execution/ConsoleFoldingSettings.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/ConsoleFoldingSettings.java
@@ -1,4 +1,4 @@
-package com.intellij.execution;
+package com.intellij.execution.console;
 
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.State;
diff --git a/plugins/consoleFolding/src/com/intellij/execution/CustomizableConsoleFoldingBean.java b/platform/lang-impl/src/com/intellij/execution/console/CustomizableConsoleFoldingBean.java
similarity index 93%
rename from plugins/consoleFolding/src/com/intellij/execution/CustomizableConsoleFoldingBean.java
rename to platform/lang-impl/src/com/intellij/execution/console/CustomizableConsoleFoldingBean.java
index b9ccbdd102ce..441dc98e6d5d 100644
--- a/plugins/consoleFolding/src/com/intellij/execution/CustomizableConsoleFoldingBean.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/CustomizableConsoleFoldingBean.java
@@ -1,4 +1,4 @@
-package com.intellij.execution;
+package com.intellij.execution.console;
 
 import com.intellij.openapi.extensions.AbstractExtensionPointBean;
 import com.intellij.openapi.extensions.ExtensionPointName;
diff --git a/plugins/consoleFolding/src/com/intellij/execution/SubstringConsoleFolding.java b/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java
similarity index 85%
rename from plugins/consoleFolding/src/com/intellij/execution/SubstringConsoleFolding.java
rename to platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java
index bb23a8f9a757..825a24763d1e 100644
--- a/plugins/consoleFolding/src/com/intellij/execution/SubstringConsoleFolding.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/SubstringConsoleFolding.java
@@ -1,4 +1,6 @@
-package com.intellij.execution;
+package com.intellij.execution.console;
+
+import com.intellij.execution.ConsoleFolding;
 
 import java.util.List;
 
diff --git a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
index a57031b4547c..c6322fd86420 100644
--- a/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensionPoints.xml
@@ -442,4 +442,7 @@
   <extensionPoint name="typeIcon" beanClass="com.intellij.ide.TypeIconEP"/>
 
   <extensionPoint name="analyzeStacktraceFilter" interface="com.intellij.execution.filters.Filter" area="IDEA_PROJECT"/>
+
+  <extensionPoint name="stacktrace.fold" beanClass="com.intellij.execution.console.CustomizableConsoleFoldingBean"/>
+
 </extensionPoints>
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index e92940282c5e..21b6000930ab 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -366,6 +366,14 @@
   <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.LegacyCompletionContributor" id="legacy" order="last"/>
   <completion.contributor language="any" implementationClass="com.intellij.codeInsight.completion.FilePathCompletionContributor" id="filePath" order="before javaClassName"/>
 
+  <applicationService serviceInterface="com.intellij.execution.console.ConsoleFoldingSettings" serviceImplementation="com.intellij.execution.console.ConsoleFoldingSettings"/>
+  <console.folding implementation="com.intellij.execution.console.SubstringConsoleFolding"/>
+  <applicationConfigurable implementation="com.intellij.execution.console.ConsoleFoldingConfigurable"/>
+
+  <stacktrace.fold substring="at java.lang.reflect.Method.invoke("/>
+  <stacktrace.fold substring="at java.lang.reflect.Constructor.newInstance("/>
+  <stacktrace.fold substring="at sun.reflect."/>
+
   <psi.referenceContributor implementation="com.intellij.psi.PsiReferenceContributorImpl"/>
 
   <lookup.charFilter implementation="com.intellij.codeInsight.completion.CompletionCharFilter" order="last" id="completion"/>
diff --git a/plugins/consoleFolding/consoleFolding.iml b/plugins/consoleFolding/consoleFolding.iml
deleted file mode 100644
index 2d8ecbfc9d4c..000000000000
--- a/plugins/consoleFolding/consoleFolding.iml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="module" module-name="lang-impl" />
-  </component>
-</module>
-
diff --git a/plugins/consoleFolding/src/META-INF/plugin.xml b/plugins/consoleFolding/src/META-INF/plugin.xml
deleted file mode 100644
index 581ba8ab2662..000000000000
--- a/plugins/consoleFolding/src/META-INF/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<idea-plugin url="http://www.jetbrains.net/confluence/display/GRVY/Groovy+Home">
-  <id>com.intellij.console.folding</id>
-  <name>Console Folding</name>
-  <description>Adds a customization for folding non-interesting lines in console</description>
-  <version>0.1</version>
-  <idea-version since-build="95.28"/>
-  <vendor logo="/images/pluginIcon.png" url="http://www.jetbrains.com">JetBrains Inc.</vendor>
-
-  <extensionPoints>
-    <extensionPoint qualifiedName="com.intellij.stacktrace.fold" beanClass="com.intellij.execution.CustomizableConsoleFoldingBean"/>
-  </extensionPoints>
-
-  <extensions defaultExtensionNs="com.intellij">
-    <applicationService serviceInterface="com.intellij.execution.ConsoleFoldingSettings" serviceImplementation="com.intellij.execution.ConsoleFoldingSettings"/>
-    <console.folding implementation="com.intellij.execution.SubstringConsoleFolding"/>
-    <applicationConfigurable implementation="com.intellij.execution.ConsoleFoldingConfigurable"/>
-
-    <!--<stacktrace.fold substring="at org.codehaus.groovy."/>
-    <stacktrace.fold substring="at groovy."/>
-    <stacktrace.fold substring="at groovy."/>
-    <stacktrace.fold substring="at org.codehaus.groovy.runtime.DefaultGroovyMethods." negate="true"/>
-    <stacktrace.fold substring="at org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods." negate="true"/>
-    <stacktrace.fold substring="at org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport." negate="true"/>
-
-    <stacktrace.fold substring="at java.lang.reflect.Method.invoke("/>
-    <stacktrace.fold substring="at java.lang.reflect.Constructor.newInstance("/>
-    <stacktrace.fold substring="at sun.reflect."/>-->
-
-    <stacktrace.fold substring="at org.junit.internal.runners."/>
-
-  </extensions>
-
-</idea-plugin>
diff --git a/plugins/groovy/src/META-INF/plugin.xml b/plugins/groovy/src/META-INF/plugin.xml
index 10c662e4b25d..de73473985d4 100644
--- a/plugins/groovy/src/META-INF/plugin.xml
+++ b/plugins/groovy/src/META-INF/plugin.xml
@@ -256,6 +256,12 @@
 
     <patterns.patternClass className="org.jetbrains.plugins.groovy.lang.psi.patterns.GroovyPatterns" alias="groovy"/>
 
+    <stacktrace.fold substring="at org.codehaus.groovy."/>
+    <stacktrace.fold substring="at groovy."/>
+    <stacktrace.fold substring="at org.codehaus.groovy.runtime.DefaultGroovyMethods." negate="true"/>
+    <stacktrace.fold substring="at org.codehaus.groovy.vmplugin.v5.PluginDefaultGroovyMethods." negate="true"/>
+    <stacktrace.fold substring="at org.codehaus.groovy.runtime.DefaultGroovyMethodsSupport." negate="true"/>
+
     <!-- control flow -->
     <intentionAction>
       <bundleName>org.jetbrains.plugins.groovy.intentions.GroovyIntentionsBundle</bundleName>
diff --git a/plugins/junit/src/META-INF/plugin.xml b/plugins/junit/src/META-INF/plugin.xml
index 23c63070a133..5e545c5270c5 100644
--- a/plugins/junit/src/META-INF/plugin.xml
+++ b/plugins/junit/src/META-INF/plugin.xml
@@ -30,6 +30,7 @@
     <testFramework implementation="com.intellij.execution.junit.JUnit3Framework"/>
     <testFramework implementation="com.intellij.execution.junit.JUnit4Framework"/>
     <configurationType implementation="com.intellij.execution.junit.JUnitConfigurationType"/>
+    <stacktrace.fold substring="at org.junit.internal.runners."/>
   </extensions>
 
   <extensionPoints>