From ef6110719dc741feb0096881efcba51f3f6d7dfe Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Wed, 8 Jul 2026 11:09:44 +0400 Subject: [PATCH] OpenIDE fix welcome screen --- lib/BUILD.bazel | 15 --------------- platform/platform-impl/BUILD.bazel | 4 ---- .../platform-impl/intellij.platform.ide.impl.iml | 2 -- platform/platform-impl/jcef/BUILD.bazel | 2 ++ .../jcef/intellij.platform.ide.impl.jcef.iml | 1 + .../resources/intellij.platform.ide.impl.jcef.xml | 8 ++++++++ .../action/OpenIdeWelcomeScreenOpenAction.kt | 0 .../src/ru/openide/html/HtmlEditorProvider.kt | 0 .../src/ru/openide/html/HtmlEditorTemplate.kt | 0 .../src/ru/openide/html/HtmlFileEditor.kt | 0 .../{ => jcef}/src/ru/openide/html/model.kt | 0 .../welcome/screen/OpenIdeProjectLocalState.kt | 0 .../screen/OpenIdeWelcomeScreenProjectActivity.kt | 0 .../openide/welcome/screen/WelcomeScreenHelper.kt | 0 .../welcome/screen/editor/WelcomeScreenFile.kt | 0 .../screen/editor/WelcomeScreenFileSystem.kt | 0 .../screen/editor/WelcomeScreenFileType.kt | 0 .../src/META-INF/PlatformExtensions.xml | 3 --- .../src/idea/PlatformActions.xml | 1 - platform/platform-tests/benchmarks/BUILD.bazel | 9 --------- plugins/javaFX/community/BUILD.bazel | 1 + 21 files changed, 12 insertions(+), 34 deletions(-) rename platform/platform-impl/{ => jcef}/src/ru/openide/action/OpenIdeWelcomeScreenOpenAction.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/html/HtmlEditorProvider.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/html/HtmlEditorTemplate.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/html/HtmlFileEditor.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/html/model.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/OpenIdeProjectLocalState.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/OpenIdeWelcomeScreenProjectActivity.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/WelcomeScreenHelper.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/editor/WelcomeScreenFile.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/editor/WelcomeScreenFileSystem.kt (100%) rename platform/platform-impl/{ => jcef}/src/ru/openide/welcome/screen/editor/WelcomeScreenFileType.kt (100%) diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index dd11c55778ab..5de8b0cb69eb 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -641,21 +641,6 @@ jvm_import( visibility = ["//visibility:public"], ) -copy_file( - name = "com.jetbrains.cloudconfig/cloudconfig-2023.9.jar_copy", - src = "@com_jetbrains_cloudconfig-cloudconfig-2023_9_http//file", - out = "com.jetbrains.cloudconfig/cloudconfig-2023.9.jar", - allow_symlink = True, - visibility = ["//visibility:public"], -) - -jvm_import( - name = "cloud-config-client", - jar = "@com_jetbrains_cloudconfig-cloudconfig-2023_9_http//file", - source_jar = "@com_jetbrains_cloudconfig-cloudconfig-2023_9-sources_http//file", - visibility = ["//visibility:public"], -) - copy_file( name = "org.jetbrains.patronus/codeowners-lib-ownership-2026.04.09-1517.jar_copy", src = "@org_jetbrains_patronus-codeowners-lib-ownership-2026_04_09-1517_http//file", diff --git a/platform/platform-impl/BUILD.bazel b/platform/platform-impl/BUILD.bazel index e8b5317da4a1..d16e468f01de 100644 --- a/platform/platform-impl/BUILD.bazel +++ b/platform/platform-impl/BUILD.bazel @@ -188,8 +188,6 @@ jvm_library( "//libraries/rd/core", "//platform/forms_rt:java-guiForms-rt", "//fleet/rhizomedb", - "//platform/ui.jcef", - "//libraries/jcef", "@lib//:jetbrains-intellij-deps-java-atk-wrapper-linux", "@lib//:io-sentry", ], @@ -354,8 +352,6 @@ jvm_library( "//libraries/rd/core:core_test_lib", "//platform/forms_rt:java-guiForms-rt_test_lib", "//fleet/rhizomedb:rhizomedb_test_lib", - "//platform/ui.jcef:ui.jcef_test_lib", - "//libraries/jcef:jcef_test_lib", ], ) ### auto-generated section `build intellij.platform.ide.impl` end diff --git a/platform/platform-impl/intellij.platform.ide.impl.iml b/platform/platform-impl/intellij.platform.ide.impl.iml index defcd9229b6e..3926315fb916 100644 --- a/platform/platform-impl/intellij.platform.ide.impl.iml +++ b/platform/platform-impl/intellij.platform.ide.impl.iml @@ -175,8 +175,6 @@ - - diff --git a/platform/platform-impl/jcef/BUILD.bazel b/platform/platform-impl/jcef/BUILD.bazel index e84f63a8cabf..ac1f967a1c6a 100644 --- a/platform/platform-impl/jcef/BUILD.bazel +++ b/platform/platform-impl/jcef/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "@lib//:jetbrains-annotations", "//libraries/jcef", "//platform/core-impl", + "//platform/ide-core-impl", "//platform/platform-impl:ide-impl", "//platform/ui.jcef", "//platform/analysis-api:analysis", @@ -59,6 +60,7 @@ jvm_library( ":jcef", "//libraries/jcef:jcef_test_lib", "//platform/core-impl:core-impl_test_lib", + "//platform/ide-core-impl:ide-core-impl_test_lib", "//platform/platform-impl:ide-impl_test_lib", "//platform/ui.jcef:ui.jcef_test_lib", "//platform/analysis-api:analysis_test_lib", diff --git a/platform/platform-impl/jcef/intellij.platform.ide.impl.jcef.iml b/platform/platform-impl/jcef/intellij.platform.ide.impl.jcef.iml index 17e80730fb10..619c63de09d4 100644 --- a/platform/platform-impl/jcef/intellij.platform.ide.impl.jcef.iml +++ b/platform/platform-impl/jcef/intellij.platform.ide.impl.jcef.iml @@ -11,6 +11,7 @@ + diff --git a/platform/platform-impl/jcef/resources/intellij.platform.ide.impl.jcef.xml b/platform/platform-impl/jcef/resources/intellij.platform.ide.impl.jcef.xml index ebe164d16e79..e53c520487c4 100644 --- a/platform/platform-impl/jcef/resources/intellij.platform.ide.impl.jcef.xml +++ b/platform/platform-impl/jcef/resources/intellij.platform.ide.impl.jcef.xml @@ -12,11 +12,19 @@ + + + + + + + + diff --git a/platform/platform-impl/src/ru/openide/action/OpenIdeWelcomeScreenOpenAction.kt b/platform/platform-impl/jcef/src/ru/openide/action/OpenIdeWelcomeScreenOpenAction.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/action/OpenIdeWelcomeScreenOpenAction.kt rename to platform/platform-impl/jcef/src/ru/openide/action/OpenIdeWelcomeScreenOpenAction.kt diff --git a/platform/platform-impl/src/ru/openide/html/HtmlEditorProvider.kt b/platform/platform-impl/jcef/src/ru/openide/html/HtmlEditorProvider.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/html/HtmlEditorProvider.kt rename to platform/platform-impl/jcef/src/ru/openide/html/HtmlEditorProvider.kt diff --git a/platform/platform-impl/src/ru/openide/html/HtmlEditorTemplate.kt b/platform/platform-impl/jcef/src/ru/openide/html/HtmlEditorTemplate.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/html/HtmlEditorTemplate.kt rename to platform/platform-impl/jcef/src/ru/openide/html/HtmlEditorTemplate.kt diff --git a/platform/platform-impl/src/ru/openide/html/HtmlFileEditor.kt b/platform/platform-impl/jcef/src/ru/openide/html/HtmlFileEditor.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/html/HtmlFileEditor.kt rename to platform/platform-impl/jcef/src/ru/openide/html/HtmlFileEditor.kt diff --git a/platform/platform-impl/src/ru/openide/html/model.kt b/platform/platform-impl/jcef/src/ru/openide/html/model.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/html/model.kt rename to platform/platform-impl/jcef/src/ru/openide/html/model.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/OpenIdeProjectLocalState.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/OpenIdeProjectLocalState.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/OpenIdeProjectLocalState.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/OpenIdeProjectLocalState.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/OpenIdeWelcomeScreenProjectActivity.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/OpenIdeWelcomeScreenProjectActivity.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/OpenIdeWelcomeScreenProjectActivity.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/OpenIdeWelcomeScreenProjectActivity.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/WelcomeScreenHelper.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/WelcomeScreenHelper.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/WelcomeScreenHelper.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/WelcomeScreenHelper.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFile.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFile.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFile.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFile.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFileSystem.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFileSystem.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFileSystem.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFileSystem.kt diff --git a/platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFileType.kt b/platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFileType.kt similarity index 100% rename from platform/platform-impl/src/ru/openide/welcome/screen/editor/WelcomeScreenFileType.kt rename to platform/platform-impl/jcef/src/ru/openide/welcome/screen/editor/WelcomeScreenFileType.kt diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 2c86ac6e39da..1a574f805e98 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -232,7 +232,6 @@ The refresh itself is toggled by (Preferences | Appearance & Behavior | Syst - @@ -1255,8 +1254,6 @@ The refresh itself is toggled by (Preferences | Appearance & Behavior | Syst - - diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index fc35f51a8ff7..b75480420599 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -968,7 +968,6 @@ - diff --git a/platform/platform-tests/benchmarks/BUILD.bazel b/platform/platform-tests/benchmarks/BUILD.bazel index e41f4b9f2305..4e94b87e1643 100644 --- a/platform/platform-tests/benchmarks/BUILD.bazel +++ b/platform/platform-tests/benchmarks/BUILD.bazel @@ -3,14 +3,6 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "kt_javac_options") ### auto-generated section `build intellij.platform.benchmarks` start -kt_javac_options( - name = "custom-javac-options", - add_exports = [], - no_proc = False, - warn = "off", - x_ep_disable_all_checks = True, -) - jvm_library( name = "benchmarks", srcs = glob( @@ -39,7 +31,6 @@ jvm_library( ], allow_empty = True, ), - javac_opts = ":custom-javac-options", module_name = "intellij.platform.benchmarks", visibility = ["//visibility:public"], runtime_deps = [ diff --git a/plugins/javaFX/community/BUILD.bazel b/plugins/javaFX/community/BUILD.bazel index bbb9749e46f8..b01bde0d2689 100644 --- a/plugins/javaFX/community/BUILD.bazel +++ b/plugins/javaFX/community/BUILD.bazel @@ -122,6 +122,7 @@ jvm_library( "testSrc/**/*.form", ], allow_empty = True, + exclude = ["testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxGenerateDefaultPropertyValuesScript.java"], ), associates = [ "//plugins/javaFX/community",