integrate ConsoleFolding plugin into the core

This commit is contained in:
peter
2010-07-12 20:12:06 +01:00
parent ce58aee0bc
commit ce27ad559c
10 changed files with 24 additions and 51 deletions
@@ -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;
@@ -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;
@@ -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;
@@ -1,4 +1,6 @@
package com.intellij.execution;
package com.intellij.execution.console;
import com.intellij.execution.ConsoleFolding;
import java.util.List;
@@ -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>
@@ -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"/>
-14
View File
@@ -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>
@@ -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>
+6
View File
@@ -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>
+1
View File
@@ -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>