From 35fb7482d4a67c44176c9dba053625e8dac45e67 Mon Sep 17 00:00:00 2001
From: Pavlo Skliar <pavlo.skliar@jetbrains.com>
Date: Mon, 12 May 2025 11:21:15 +0200
Subject: [PATCH] IJPL-185171 - Fixed false positive notification about
 untrusted project

GitOrigin-RevId: 3053533958fcd06153fa38065a8946e4b77aa8d5
---
 .../org/jetbrains/intellij/build/impl/PlatformModules.kt | 1 -
 .../eel/resources/intellij.platform.ide.impl.wsl.xml     | 3 +++
 .../intellij/openapi/project/impl/ProjectManagerImpl.kt  | 9 +++++++++
 .../src/META-INF/PlatformExtensions.xml                  | 4 ----
 .../src/META-INF/PlatformLangPlugin.xml                  | 1 +
 .../src/META-INF/common-ide-modules.xml                  | 1 +
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
index 7fb7fd185c81..552e74be45e3 100644
--- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
+++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/PlatformModules.kt
@@ -90,7 +90,6 @@ private val PLATFORM_IMPLEMENTATION_MODULES = java.util.List.of(
 
   "intellij.platform.externalSystem.impl",
   "intellij.platform.credentialStore.ui",
-  "intellij.platform.ide.impl.wsl",
 
   // do we need it?
   "intellij.platform.sqlite",
diff --git a/platform/platform-impl/eel/resources/intellij.platform.ide.impl.wsl.xml b/platform/platform-impl/eel/resources/intellij.platform.ide.impl.wsl.xml
index 8b695f0ed148..7712929092d6 100644
--- a/platform/platform-impl/eel/resources/intellij.platform.ide.impl.wsl.xml
+++ b/platform/platform-impl/eel/resources/intellij.platform.ide.impl.wsl.xml
@@ -1,4 +1,7 @@
 <idea-plugin>
   <extensions defaultExtensionNs="com.intellij">
+    <eelProvider implementation="com.intellij.platform.ide.impl.wsl.WslEelProvider" os="windows"/>
+    <applicationService serviceInterface="com.intellij.execution.wsl.WslIjentManager"
+                        serviceImplementation="com.intellij.platform.ide.impl.wsl.ProductionWslIjentManager"/>
   </extensions>
 </idea-plugin>
\ No newline at end of file
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt
index d1c3aceb5d73..4c79cfc36282 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.kt
@@ -71,7 +71,9 @@ import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeFrame
 import com.intellij.platform.PlatformProjectOpenProcessor
 import com.intellij.platform.PlatformProjectOpenProcessor.Companion.isLoadedFromCacheButHasNoModules
 import com.intellij.platform.attachToProjectAsync
+import com.intellij.platform.core.nio.fs.MultiRoutingFileSystem
 import com.intellij.platform.diagnostic.telemetry.impl.span
+ import com.intellij.platform.eel.provider.EelInitialization
 import com.intellij.platform.project.ProjectEntitiesStorage
 import com.intellij.platform.workspace.jps.JpsMetrics
 import com.intellij.projectImport.ProjectAttachProcessor
@@ -101,6 +103,7 @@ import java.util.concurrent.CancellationException
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicLong
 import kotlin.coroutines.coroutineContext
+import kotlin.io.path.Path
 import kotlin.system.measureTimeMillis
 
 @Internal
@@ -540,6 +543,12 @@ open class ProjectManagerImpl : ProjectManagerEx(), Disposable {
   }
 
   final override suspend fun openProjectAsync(projectStoreBaseDir: Path, options: OpenProjectTask): Project? {
+    if (projectStoreBaseDir.fileSystem.javaClass.name == MultiRoutingFileSystem::javaClass.name) {
+      span("EelInitialization.runEelInitialization") {
+        EelInitialization.runEelInitialization(projectStoreBaseDir.toString())
+      }
+    }
+
     jpsMetrics.startNewSpan("project.opening", JpsMetrics.jpsSyncSpanName)
 
     if (LOG.isDebugEnabled && !ApplicationManager.getApplication().isUnitTestMode) {
diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
index bf83df17ddd0..8d8a2b5562f0 100644
--- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml
+++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml
@@ -194,10 +194,6 @@
                         serviceImplementation="com.intellij.execution.wsl.WslDistributionManagerImpl"/>
     <applicationService serviceInterface="com.intellij.execution.wsl.WslIjentAvailabilityService"
                         serviceImplementation="com.intellij.execution.wsl.DummyWslIjentAvailabilityService"/>
-    <applicationService serviceInterface="com.intellij.execution.wsl.WslIjentManager"
-                        serviceImplementation="com.intellij.platform.ide.impl.wsl.ProductionWslIjentManager"/>
-
-    <eelProvider implementation="com.intellij.platform.ide.impl.wsl.WslEelProvider" os="windows"/>
 
     <executionTargetType implementation="com.intellij.execution.wsl.target.WslTargetType" os="windows"/>
 
diff --git a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
index 807f716e2dca..bd7242eb4415 100644
--- a/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
+++ b/platform/platform-resources/src/META-INF/PlatformLangPlugin.xml
@@ -7,6 +7,7 @@
   <module value="com.intellij.modules.lang"/>
   <module value="com.intellij.modules.xdebugger"/>
   <module value="com.intellij.modules.externalSystem"/>
+  <module value="com.intellij.platform.ide.impl.wsl"/>
 
   <xi:include href="PlatformLangComponents.xml"/>
   <xi:include href="/idea/PriorityEditorLangActions.xml"/>
diff --git a/platform/platform-resources/src/META-INF/common-ide-modules.xml b/platform/platform-resources/src/META-INF/common-ide-modules.xml
index ed841a1586ab..287fb95b8e34 100644
--- a/platform/platform-resources/src/META-INF/common-ide-modules.xml
+++ b/platform/platform-resources/src/META-INF/common-ide-modules.xml
@@ -24,6 +24,7 @@
     <module name="intellij.platform.diagnostic.freezes"/>
     <module name="intellij.settingsSync.core"/>
     <module name="intellij.emojipicker"/>
+    <module name="intellij.platform.ide.impl.wsl"/>
   </content>
 
   <xi:include href="/META-INF/grid-core-modules.xml"/>