MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-15953 Log new SDK

Browse Source 
(cherry picked from commit e3112caabbe2f32e72fd860899840536e0aebebb)

IJ-CR-182185

GitOrigin-RevId: d1959278a0a4b056067276313a2a6e53cc82398a
This commit is contained in:
Liudmila Kornilova
2025-11-12 14:05:08 +01:00
committed by intellij-monorepo-bot
parent 0881dc14e9
commit 13adc74931
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl/src/com/intellij/openapi/roots/impl/CompilerProjectExtensionImpl.java
View File

@@ -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);

2
java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelProjectExtensionImpl.java
View File

@@ -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);

7
platform/projectModel-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.kt
View File

@@ -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
}