diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /resources/src/idea/RichPlatformPlugin.xml | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'resources/src/idea/RichPlatformPlugin.xml')
| -rw-r--r-- | resources/src/idea/RichPlatformPlugin.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/resources/src/idea/RichPlatformPlugin.xml b/resources/src/idea/RichPlatformPlugin.xml index 92ae7046006e..93aa37c999c8 100644 --- a/resources/src/idea/RichPlatformPlugin.xml +++ b/resources/src/idea/RichPlatformPlugin.xml @@ -339,6 +339,7 @@ <stepsBeforeRunProvider implementation="com.intellij.compiler.options.CompileStepBeforeRunNoErrorCheck" id="compileBeforeRunNoErrorCheck" order="after compileBeforeRun"/> <stepsBeforeRunProvider implementation="com.intellij.packaging.impl.run.BuildArtifactsBeforeRunTaskProvider" order="after compileBeforeRunNoErrorCheck"/> <programRunner id="defaultRunRunner" implementation="com.intellij.execution.impl.DefaultJavaProgramRunner"/> + <programRunner implementation="com.intellij.execution.runners.BasicProgramRunner" order="last"/> <hectorComponentProvider implementation="com.intellij.codeInsight.daemon.impl.ImportPopupHectorComponentProvider"/> @@ -372,6 +373,8 @@ <projectStructure.sourceRootEditHandler implementation="com.intellij.openapi.roots.ui.configuration.JavaTestResourceRootEditHandler"/> <buildProcess.parametersProvider implementation="com.intellij.compiler.classFilesIndex.api.index.ClassFilesIndexerBuilderParametersProvider"/> + + <org.jetbrains.webServerRootsProvider implementation="org.jetbrains.builtInWebServer.ArtifactWebServerRootsProvider" order="last"/> </extensions> <xi:include href="/META-INF/xdebugger.xml" xpointer="xpointer(/idea-plugin/*)"/> |