extract intellij.platform.ide.observable (required to extract UI DSL)

GitOrigin-RevId: cf1e7fc1e73a9a6cfb29041d48dfd6f3286ef890
nrayburn-tech · Dec 16, 2024 · 87671ad · 87671ad
1 parent ad2ba1d
commit 87671ad
Show file tree

Hide file tree

Showing 141 changed files with 522 additions and 441 deletions.
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/build/tasks/intellij.idea.community.build.tasks.iml b/build/tasks/intellij.idea.community.build.tasks.iml
@@ -48,6 +48,7 @@
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry" />
     <orderEntry type="module" module-name="intellij.platform.diagnostic.telemetry.exporters" />
     <orderEntry type="library" scope="RUNTIME" name="slf4j-api" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" scope="RUNTIME" name="slf4j-jdk14" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="bouncy-castle-provider" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />

diff --git a/java/idea-ui/intellij.java.ui.iml b/java/idea-ui/intellij.java.ui.iml
@@ -17,6 +17,7 @@
     <orderEntry type="module" module-name="intellij.java.impl.refactorings" />
     <orderEntry type="module" module-name="intellij.java.aetherDependencyResolver" />
     <orderEntry type="module" module-name="intellij.platform.vcs.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="jna" level="project" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem" />

diff --git a/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml b/jps/model-serialization/intellij.platform.jps.model.serialization.tests.iml
@@ -12,6 +12,7 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model.tests" exported="" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.workspace.jps" scope="RUNTIME" />
   </component>
 </module>
diff --git a/json/tests/intellij.json.tests.iml b/json/tests/intellij.json.tests.iml
@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.json" scope="TEST" />
     <orderEntry type="module" module-name="intellij.spellchecker" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
     <orderEntry type="module" module-name="intellij.platform.langInjection" scope="TEST" />

diff --git a/notebooks/visualization/intellij.notebooks.visualization.iml b/notebooks/visualization/intellij.notebooks.visualization.iml
@@ -38,6 +38,7 @@
     <orderEntry type="module" module-name="intellij.platform.codeStyle" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" />
     <orderEntry type="module" module-name="intellij.notebooks.ui" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />

diff --git a/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml b/platform/build-scripts/tests/intellij.platform.buildScripts.tests.iml
@@ -26,6 +26,7 @@
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.zip" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
     <orderEntry type="module" module-name="intellij.idea.community.build.zip" scope="TEST" />
   </component>
 </module>
diff --git a/platform/built-in-server/intellij.platform.builtInServer.tests.iml b/platform/built-in-server/intellij.platform.builtInServer.tests.iml
@@ -11,6 +11,7 @@
     <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.debugger" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="gson" level="project" />

diff --git a/platform/built-in-server/testSrc/org/jetbrains/ide/BuiltInWebServerTest.kt b/platform/built-in-server/testSrc/org/jetbrains/ide/BuiltInWebServerTest.kt
@@ -167,7 +167,7 @@ internal class BuiltInWebServerAbsolutePathTest : BuiltInServerTestCase() {
 
     val host = "http://localhost:${BuiltInServerManager.getInstance().port}"
     val builder = HttpRequest.newBuilder(URI("$host/script.js"))
-    builder.header(TOKEN_HEADER_NAME, acquireToken())
+    builder.header(TOKEN_HEADER_NAME, service<BuiltInWebServerAuth>().acquireToken())
     builder.header(HttpHeaderNames.REFERER.toString(), "${host}/${project.name}/index.html")
 
     val client = HttpClient.newBuilder().followRedirects(HttpClient.Redirect.ALWAYS).build()

diff --git a/platform/collaboration-tools/intellij.platform.collaborationTools.iml b/platform/collaboration-tools/intellij.platform.collaborationTools.iml
@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="intellij.platform.vcs.log.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.core" />
     <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.editor.ex" />

diff --git a/platform/execution-impl/intellij.platform.execution.impl.iml b/platform/execution-impl/intellij.platform.execution.impl.iml
@@ -21,6 +21,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.core.plugins" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.concurrency" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.projectModel.impl" />
     <orderEntry type="library" name="fastutil-min" level="project" />

diff --git a/platform/execution-impl/intellij.platform.execution.tests.iml b/platform/execution-impl/intellij.platform.execution.tests.iml
@@ -10,6 +10,8 @@
     <orderEntry type="module" module-name="intellij.platform.ide.util.io" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.execution" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.concurrency" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
   </component>
 </module>
diff --git a/...cution-impl/src/com/intellij/execution/multilaunch/design/columns/impl/ConditionColumn.kt b/...cution-impl/src/com/intellij/execution/multilaunch/design/columns/impl/ConditionColumn.kt
@@ -1,6 +1,16 @@
 package com.intellij.execution.multilaunch.design.columns.impl
 
 import com.intellij.execution.ExecutionBundle
+import com.intellij.execution.multilaunch.design.ExecutableRow
+import com.intellij.execution.multilaunch.design.MultiLaunchConfigurationViewModel
+import com.intellij.execution.multilaunch.design.columns.ExecutableTableColumn
+import com.intellij.execution.multilaunch.design.components.DropDownDecorator
+import com.intellij.execution.multilaunch.design.components.UnknownItemLabel
+import com.intellij.execution.multilaunch.design.popups.SelectorPopupProvider
+import com.intellij.execution.multilaunch.design.popups.SelectorPopupsContainer
+import com.intellij.execution.multilaunch.execution.conditions.Condition
+import com.intellij.execution.multilaunch.execution.conditions.ConditionFactory
+import com.intellij.execution.multilaunch.execution.conditions.ConditionTemplate
 import com.intellij.ide.ui.laf.darcula.ui.DarculaButtonUI
 import com.intellij.openapi.observable.properties.AtomicProperty
 import com.intellij.openapi.ui.DialogPanel
@@ -15,24 +25,14 @@ import com.intellij.ui.dsl.builder.*
 import com.intellij.util.ui.AbstractTableCellEditor
 import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
-import com.intellij.execution.multilaunch.design.ExecutableRow
-import com.intellij.execution.multilaunch.design.MultiLaunchConfigurationViewModel
-import com.intellij.execution.multilaunch.design.columns.ExecutableTableColumn
-import com.intellij.execution.multilaunch.design.components.DropDownDecorator
-import com.intellij.execution.multilaunch.design.components.UnknownItemLabel
-import com.intellij.execution.multilaunch.design.popups.SelectorPopupProvider
-import com.intellij.execution.multilaunch.design.popups.SelectorPopupsContainer
-import com.intellij.execution.multilaunch.execution.conditions.Condition
-import com.intellij.execution.multilaunch.execution.conditions.ConditionFactory
-import com.intellij.execution.multilaunch.execution.conditions.ConditionTemplate
 import java.awt.Component
 import java.awt.Dimension
 import java.awt.event.ActionEvent
 import javax.swing.JLabel
 import javax.swing.JTable
 import javax.swing.table.DefaultTableCellRenderer
 
-class ConditionColumn(
+internal class ConditionColumn(
   private val viewModel: MultiLaunchConfigurationViewModel
 ) : ExecutableTableColumn<Condition>(
   ExecutionBundle.message("run.configurations.multilaunch.table.column.condition")) {

diff --git a/platform/external-system-api/intellij.platform.externalSystem.iml b/platform/external-system-api/intellij.platform.externalSystem.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.lang" />
     <orderEntry type="module" module-name="intellij.platform.externalSystem.rt" exported="" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" />

diff --git a/platform/external-system-impl/intellij.platform.externalSystem.impl.iml b/platform/external-system-impl/intellij.platform.externalSystem.impl.iml
@@ -36,6 +36,7 @@
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.execution.impl" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.testRunner" />
     <orderEntry type="module" module-name="intellij.platform.configurationStore.impl" />
     <orderEntry type="library" name="kotlin-reflect" level="project" />

diff --git a/platform/external-system-impl/intellij.platform.externalSystem.tests.iml b/platform/external-system-impl/intellij.platform.externalSystem.tests.iml
@@ -15,6 +15,7 @@
     <orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="module" module-name="intellij.platform.configurationStore.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler.tests" scope="TEST" />
     <orderEntry type="module" module-name="intellij.java.compiler.impl" scope="TEST" />

diff --git a/...al-system-impl/testSrc/com/intellij/openapi/externalSystem/autoimport/MockProjectAware.kt b/...al-system-impl/testSrc/com/intellij/openapi/externalSystem/autoimport/MockProjectAware.kt
@@ -161,7 +161,7 @@ class MockProjectAware(
     }
   }
 
-  val LOG = Logger.getInstance(MockProjectAware::class.java)
+  private val LOG = Logger.getInstance(MockProjectAware::class.java)
 
   fun <R> waitForAllProjectActivities(action: () -> R): R {
     return project.trackActivityBlocking(MockProjectReloadActivityKey, action)

diff --git a/platform/feedback/intellij.platform.feedback.iml b/platform/feedback/intellij.platform.feedback.iml
@@ -35,6 +35,7 @@
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
     <orderEntry type="library" name="kotlinx-serialization-core" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="library" name="kotlinx-serialization-json" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" name="kotlinx-datetime-jvm" level="project" />

diff --git a/...rm/feedback/src/com/intellij/platform/feedback/localization/LocalizationFeedbackDialog.kt b/...rm/feedback/src/com/intellij/platform/feedback/localization/LocalizationFeedbackDialog.kt
@@ -27,7 +27,7 @@ import javax.swing.Action
 import javax.swing.JComponent
 import javax.swing.SwingUtilities
 
-class LocalizationFeedbackDialog(
+internal class LocalizationFeedbackDialog(
   private val myProject: Project?,
   private val forTest: Boolean
 ) : DialogWrapper(myProject) {

diff --git a/platform/ide-core/plugins/exposed-third-party-api.txt b/platform/ide-core/plugins/exposed-third-party-api.txt
@@ -2,4 +2,4 @@ kotlin/jvm/internal/DefaultConstructorMarker
 kotlinx/serialization/descriptors/SerialDescriptor
 kotlinx/serialization/encoding/Decoder
 kotlinx/serialization/encoding/Encoder
-kotlinx/serialization/internal/GeneratedSerializer
+kotlinx/serialization/internal/GeneratedSerializer
diff --git a/platform/indexing-tests/intellij.platform.indexing.tests.iml b/platform/indexing-tests/intellij.platform.indexing.tests.iml
@@ -7,6 +7,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="intellij.platform.indexing.impl" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
   </component>
 </module>
diff --git a/platform/inspect/intellij.platform.inspect.iml b/platform/inspect/intellij.platform.inspect.iml
@@ -32,6 +32,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.extensions" exported="" />
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.util.jdom" />

diff --git a/platform/lang-impl/intellij.platform.lang.impl.iml b/platform/lang-impl/intellij.platform.lang.impl.iml
@@ -65,6 +65,7 @@
     <orderEntry type="library" name="jackson-databind" level="project" />
     <orderEntry type="library" name="jackson-module-kotlin" level="project" />
     <orderEntry type="library" name="xz" level="project" />
+    <orderEntry type="module" module-name="intellij.platform.ide.observable" />
     <orderEntry type="library" name="StreamEx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.statistics" />
     <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />

diff --git a/platform/lang-impl/intellij.platform.lang.tests.iml b/platform/lang-impl/intellij.platform.lang.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="library" name="OroMatcher" level="project" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
     <orderEntry type="module" module-name="intellij.platform.usageView" />
     <orderEntry type="library" name="cli-parser" level="project" />
     <orderEntry type="module" module-name="intellij.platform.indexing" />

diff --git a/platform/object-serializer/intellij.platform.objectSerializer.tests.iml b/platform/object-serializer/intellij.platform.objectSerializer.tests.iml
@@ -13,6 +13,7 @@
     <orderEntry type="module" module-name="intellij.platform.testExtensions" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="assertJ" level="project" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="module" module-name="intellij.platform.objectSerializer.annotations" scope="TEST" />
     <orderEntry type="library" name="ion" level="project" />
     <orderEntry type="library" name="fastutil-min" level="project" />