From 13adc749311f17f645e3e06f49da29fd04db8ea8 Mon Sep 17 00:00:00 2001 From: Liudmila Kornilova Date: Wed, 12 Nov 2025 14:05:08 +0100 Subject: [PATCH] IJPL-15953 Log new SDK (cherry picked from commit e3112caabbe2f32e72fd860899840536e0aebebb) IJ-CR-182185 GitOrigin-RevId: d1959278a0a4b056067276313a2a6e53cc82398a --- .../openapi/roots/impl/CompilerProjectExtensionImpl.java | 2 +- .../roots/impl/LanguageLevelProjectExtensionImpl.java | 2 +- .../intellij/openapi/roots/impl/ProjectRootManagerImpl.kt | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java index 028d6d94e316..e2a2151d49a1 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java +++ b/java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java @@ -57,7 +57,7 @@ final class CompilerProjectExtensionImpl extends CompilerProjectExtension implem WorkspaceModel workspaceModel = WorkspaceModel.getInstance(project); VirtualFileUrlManager vfum = workspaceModel.getVirtualFileUrlManager(); - workspaceModel.updateProjectModel("setCompilerOutputWSM", mutableStorage -> { + workspaceModel.updateProjectModel("setCompilerOutputWSM: " + fileUrl, mutableStorage -> { JavaEntitiesWsmUtils.addOrModifyJavaProjectSettingsEntity(project, mutableStorage, entity -> { VirtualFileUrl vfu = fileUrl != null ? vfum.getOrCreateFromUrl(fileUrl) : null; entity.setCompilerOutput(vfu); diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java index 181d9e3032a0..8aeb14829d0d 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java +++ b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java @@ -90,7 +90,7 @@ public final class LanguageLevelProjectExtensionImpl extends LanguageLevelProjec ThreadingAssertions.assertWriteAccess(); WorkspaceModel workspaceModel = WorkspaceModel.getInstance(myProject); - workspaceModel.updateProjectModel("setLanguageLevelInternal", mutableStorage -> { + workspaceModel.updateProjectModel("setLanguageLevelInternal: " + languageLevel + " default: " + isDefault, mutableStorage -> { JavaEntitiesWsmUtils.addOrModifyJavaProjectSettingsEntity(myProject, mutableStorage, entity -> { var ll = languageLevel != null ? languageLevel.name() : null; entity.setLanguageLevelId(ll); diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt index 1eab73e6c301..7c59cbb8449a 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt +++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt @@ -56,10 +56,11 @@ open class ProjectRootManagerImpl( override fun jdkNameChanged(jdk: Sdk, previousName: String) { val currentName = projectSdkName if (previousName == currentName) { + val sdkId = SdkId(jdk.getName(), jdk.getSdkType().getName()) // if already had jdk name and that name was the name of the jdk just changed - project.workspaceModel.updateProjectModel("jdkNameChanged") { mutableStorage -> + project.workspaceModel.updateProjectModel("jdkNameChanged: $sdkId") { mutableStorage -> WsmProjectSettingsEntityUtils.addOrModifyProjectSettingsEntity(project, mutableStorage) { entity -> - entity.projectSdk = SdkId(jdk.getName(), jdk.getSdkType().getName()) + entity.projectSdk = sdkId } } } @@ -335,7 +336,7 @@ open class ProjectRootManagerImpl( private fun setOrClearProjectSdkName(name: String?, sdkTypeName: String?) { ThreadingAssertions.assertWriteAccess() val newSdk = if (name != null && sdkTypeName != null) SdkId(name, sdkTypeName) else null - project.workspaceModel.updateProjectModel("setOrClearProjectSdkName") { mutableStorage -> + project.workspaceModel.updateProjectModel("setOrClearProjectSdkName: $newSdk") { mutableStorage -> WsmProjectSettingsEntityUtils.addOrModifyProjectSettingsEntity(project, mutableStorage) { entity -> entity.projectSdk = newSdk }