Skip to content

Commit 0890fa0

Browse files
Hardes1intellij-monorepo-bot
authored andcommitted
[Java] IDEA-379682 + IDEA-379740 Move JShell UI and Jshell Protocols to the plugin
GitOrigin-RevId: d0bff379c9f73853ef6a172c4fe7c4c3055aea20
1 parent 2730387 commit 0890fa0

File tree

49 files changed

+233
-109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+233
-109
lines changed

.idea/modules.xml

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BUILD.bazel

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ jvm_library(
287287
"//plugins/maven/maven40-server-impl:server-m40",
288288
"//plugins/mcp-server:mcpserver",
289289
"//plugins/jshell",
290+
"//plugins/jshell/console",
290291
]
291292
)
292293

@@ -566,6 +567,7 @@ jvm_library(
566567
"//plugins/maven/maven40-server-impl:server-m40",
567568
"//plugins/mcp-server:mcpserver",
568569
"//plugins/jshell",
570+
"//plugins/jshell/console",
569571
]
570572
)
571573
### auto-generated section `build intellij.idea.community.main` end

build/bazel-generated-file-list.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ java/debugger/shared
272272
java/execution/backend
273273
java/execution/frontend
274274
java/execution/impl
275-
java/execution/jshell-frontend
276-
java/execution/jshell-protocol
277275
java/execution/openapi
278276
java/execution/shared
279277
java/ide-customization
@@ -880,6 +878,10 @@ plugins/javaFX/community
880878
plugins/javaFX/jps
881879
plugins/javaFX/sceneBuilder
882880
plugins/jshell
881+
plugins/jshell/console
882+
plugins/jshell/execution
883+
plugins/jshell/frontend
884+
plugins/jshell/protocol
883885
plugins/jsonpath
884886
plugins/junit
885887
plugins/junit/groovy-tests

intellij.idea.community.main.iml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,5 +258,6 @@
258258
<orderEntry type="module" module-name="intellij.mcpserver" scope="RUNTIME" />
259259
<orderEntry type="module" module-name="intellij.textmate.tests" scope="TEST" />
260260
<orderEntry type="module" module-name="intellij.java.jshell" scope="RUNTIME" />
261+
<orderEntry type="module" module-name="intellij.java.jshell.console" scope="RUNTIME" />
261262
</component>
262263
</module>

java/compiler/openapi/resources/messages/JavaCompilerBundle.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,6 @@ popup.title.choose.suite.to.add=Choose suite to add
280280
tab.title.thread.dump=Dump {0}
281281
whole.project=<whole project>
282282
dialog.message.jar.file.doesn.t.exist=JAR file ''{0}'' doesn''t exist
283-
jshell.nothing.to.execute=Nothing to execute
284-
jshell.internal.error=Internal Error
285-
jshell.dropped.x.code.snippets=Dropped {0} code snippets
286-
jshell.console=JShell Console
287283
all.inheritors=All ({0})
288284
label.debugger.mode=&Debugger mode:
289285
label.host=&Host:

java/execution/impl/BUILD.bazel

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
### auto-generated section `local-libs` start
2-
load("@rules_java//java:defs.bzl", "java_import")
3-
4-
java_import(
5-
name = "jshell-frontend",
6-
jars = ["jshell-frontend.jar"],
7-
visibility = ["//visibility:public"]
8-
)
9-
### auto-generated section `local-libs` end
10-
111
### auto-generated section `build intellij.java.execution.impl` start
122
load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup")
133

@@ -47,7 +37,6 @@ jvm_library(
4737
"//java/java-impl:impl",
4838
"//java/java-indexing-api:indexing",
4939
"//platform/smRunner",
50-
"//java/execution/jshell-protocol:java-jshell-protocol",
5140
"@lib//:intellij-test-discovery",
5241
"//platform/external-system-api:externalSystem",
5342
"//platform/external-system-impl:externalSystem-impl",
@@ -76,7 +65,6 @@ jvm_library(
7665
"//java/execution/openapi:java-execution",
7766
"//platform/testRunner",
7867
"//platform/statistics",
79-
],
80-
runtime_deps = ["//java/execution/impl:jshell-frontend"]
68+
]
8169
)
8270
### auto-generated section `build intellij.java.execution.impl` end

java/execution/impl/intellij.java.execution.impl.iml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,7 @@
3131
<orderEntry type="module" module-name="intellij.java.impl" />
3232
<orderEntry type="module" module-name="intellij.java.indexing" />
3333
<orderEntry type="module" module-name="intellij.platform.smRunner" />
34-
<orderEntry type="module" module-name="intellij.java.jshell.protocol" />
3534
<orderEntry type="library" name="intellij-test-discovery" level="project" />
36-
<orderEntry type="module-library" scope="RUNTIME">
37-
<library name="jshell-frontend">
38-
<CLASSES>
39-
<root url="jar://$MODULE_DIR$/jshell-frontend.jar!/" />
40-
</CLASSES>
41-
<JAVADOC />
42-
<SOURCES />
43-
</library>
44-
</orderEntry>
4535
<orderEntry type="module" module-name="intellij.platform.externalSystem" />
4636
<orderEntry type="module" module-name="intellij.platform.externalSystem.impl" />
4737
<orderEntry type="library" name="gson" level="project" />

java/execution/jshell-frontend/src/com/intellij/execution/jshell/frontend/Marker.java

Lines changed: 0 additions & 7 deletions
This file was deleted.

java/java-impl/resources/META-INF/JavaPlugin.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@
681681

682682
<!--<expectedTypesProvider implementation="com.intellij.codeInsight.JavaExpectedTypesProvider"/>-->
683683

684-
<editorNotificationProvider implementation="com.intellij.execution.jshell.SnippetEditorDecorator"/>
684+
685685

686686
<projectService serviceImplementation="com.intellij.execution.testDiscovery.JavaAutoRunManager"/>
687687
<registryKey defaultValue="true" description="Trigger autotest on delay instead of build events" key="trigger.autotest.on.delay"/>
@@ -891,7 +891,7 @@
891891
key="configurable.RemoteRepositoriesConfigurable.display.name" bundle="messages.JavaUiBundle"
892892
order="last"/>
893893

894-
<scratch.rootType implementation="com.intellij.execution.jshell.JShellRootType"/>
894+
895895
<scratch.creationHelper language="JAVA" implementationClass="com.intellij.ide.actions.JavaScratchFileCreationHelper"/>
896896

897897
<intentionAction>

java/plugin/plugin-content.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@
114114
- name: lib/jps-launcher.jar
115115
modules:
116116
- name: intellij.platform.jps.build.launcher
117-
- name: lib/jshell-frontend.jar
118-
library: jshell-frontend
119-
module: intellij.java.execution.impl
120-
files:
121-
- name: $PROJECT_DIR$/community/java/execution/impl/jshell-frontend.jar
122-
- name: lib/jshell-protocol.jar
123-
modules:
124-
- name: intellij.java.jshell.protocol
125117
- name: lib/kotlin-metadata.jar
126118
library: kotlin-metadata
127119
files:

0 commit comments

Comments
 (0)