MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-165 fixing ruby inconsistent additional data modifications

Browse Source 
GitOrigin-RevId: 1bdb6a7012625f53b736f2e29f30b0a3bdfcd5bc
This commit is contained in:
Alexandr Evstigneev
2023-12-14 17:16:24 +00:00
committed by intellij-monorepo-bot
parent 54a59c69c1
commit 70519ef3cd
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/remote/RemoteSdkFactoryImpl.java
+10 -2
View File
@@ -4,6 +4,7 @@ package com.intellij.remote;
import com.intellij.ide.IdeBundle;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.SdkModificator;
@@ -16,6 +17,7 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
public abstract class RemoteSdkFactoryImpl<T extends RemoteSdkAdditionalData> implements RemoteSdkFactory<T> {
private static final Logger LOG = Logger.getInstance(RemoteSdkFactoryImpl.class);
@Override
public Sdk createRemoteSdk(@Nullable Project project, @NotNull T data, @Nullable String sdkName, Collection<Sdk> existingSdks)
throws RemoteSdkException {
@@ -35,6 +37,14 @@ public abstract class RemoteSdkFactoryImpl<T extends RemoteSdkAdditionalData> im
SdkModificator sdkModificator = sdk.getSdkModificator();
sdkModificator.setVersionString(sdkVersion);
var modifiableAdditionalData = sdkModificator.getSdkAdditionalData();
if (!(modifiableAdditionalData instanceof RemoteSdkAdditionalData<?> remoteSdkAdditionalData)) {
LOG.error("Expected remote additional data, got " + modifiableAdditionalData + " in " + sdk);
throw new RemoteSdkException("Internal error");
}
remoteSdkAdditionalData.setValid(true);
Application application = ApplicationManager.getApplication();
Runnable runnable = () -> sdkModificator.commitChanges();
if (application.isDispatchThread()) {
@@ -43,8 +53,6 @@ public abstract class RemoteSdkFactoryImpl<T extends RemoteSdkAdditionalData> im
application.invokeAndWait(() -> application.runWriteAction(runnable));
}
data.setValid(true);
return sdk;
}
platform/platform-impl/src/com/intellij/remote/SshConfigCredentialsHolder.java
+17
View File
@@ -7,6 +7,8 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Objects;
public final class SshConfigCredentialsHolder {
private static final @NonNls String SSH_CREDENTIALS_ID = "SSH_CREDENTIALS_ID";
@@ -69,4 +71,19 @@ public final class SshConfigCredentialsHolder {
myCredentialsId = credentials.myCredentialsId;
mySshId = credentials.mySshId == null ? null : credentials.mySshId.clone();
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof SshConfigCredentialsHolder holder)) return false;
return myCredentialsId.equals(holder.myCredentialsId) && Objects.equals(mySshId, holder.mySshId);
}
@Override
public int hashCode() {
int result = myCredentialsId.hashCode();
result = 31 * result + Objects.hashCode(mySshId);
return result;
}
}