Revert sdk changes (#3638)

* Revert "Fix reset version and code reformat of SDK (#3632)"

This reverts commit c7146e6.

* Revert "convert sdk code to kotlin, and fix edt errors (#3631)"

This reverts commit dcfbf1a.

src/org/elixir_lang/Elixir.kt

@@ -14,16 +14,15 @@ object Elixir {
         environment: Map<String, String>,
         workingDirectory: String?,
         elixirSdk: Sdk,
-        erlArgumentList: kotlin.collections.List<String> = emptyList(),
+        erlArgumentList: kotlin.collections.List<String> = emptyList()
     ): GeneralCommandLine {
         val erlangSdk = elixirSdkToEnsuredErlangSdk(elixirSdk)
-        val commandLine =
-            org.elixir_lang.Erl.commandLine(
-                pty = false,
-                environment = environment,
-                workingDirectory = workingDirectory,
-                erlangSdk = erlangSdk,
-            )
+        val commandLine = org.elixir_lang.Erl.commandLine(
+            pty = false,
+            environment = environment,
+            workingDirectory = workingDirectory,
+            erlangSdk = erlangSdk
+        )
         // MUST be before `addElixir` because it ends with `-extra` which turns off argument parsing for `erl`
         commandLine.addParameters(erlArgumentList)
         addElixir(commandLine, elixirSdk, erlangSdk)
@@ -36,17 +35,13 @@ object Elixir {
             ?: throw MissingErlangSdk(elixirSdk)
 
     fun elixirSdkHasErlangSdk(elixirSdk: Sdk): Boolean = elixirSdkToErlangSdk(elixirSdk) != null
-
-    fun elixirSdkToErlangSdk(elixirSdk: Sdk): Sdk? = elixirSdk.sdkAdditionalData?.let { it as SdkAdditionalData }?.getErlangSdk()
+    fun elixirSdkToErlangSdk(elixirSdk: Sdk): Sdk? =
+        elixirSdk.sdkAdditionalData?.let { it as SdkAdditionalData }?.erlangSdk
 
     /**
      * Adds `-pa ebinDirectory` for those in the `elixirSdk` that aren't in the `erlangSdk`
      */
-    fun prependNewCodePaths(
-        commandLine: GeneralCommandLine,
-        elixirSdk: Sdk,
-        erlangSdk: Sdk,
-    ) {
+    fun prependNewCodePaths(commandLine: GeneralCommandLine, elixirSdk: Sdk, erlangSdk: Sdk) {
         val elixirEbinDirectories = elixirSdk.ebinDirectories()
         val erlangEbinDirectories = erlangSdk.ebinDirectories()
         prependNewCodePaths(commandLine, elixirEbinDirectories, erlangEbinDirectories)
@@ -55,11 +50,7 @@ object Elixir {
     /**
      * Keep in-suync with [org.elixir_lang.jps.Builder.addElixir]
      */
-    private fun addElixir(
-        commandLine: GeneralCommandLine,
-        elixirSdk: Sdk,
-        erlangSdk: Sdk,
-    ) {
+    private fun addElixir(commandLine: GeneralCommandLine, elixirSdk: Sdk, erlangSdk: Sdk) {
         prependNewCodePaths(commandLine, elixirSdk, erlangSdk)
         commandLine.addParameters("-noshell", "-s", "elixir", "start_cli")
         commandLine.addParameters("-elixir", "ansi_enabled", "true")
@@ -69,7 +60,7 @@ object Elixir {
     private fun prependNewCodePaths(
         commandLine: GeneralCommandLine,
         elixirEbinDirectories: kotlin.collections.List<String>,
-        erlangEbinDirectories: kotlin.collections.List<String>,
+        erlangEbinDirectories: kotlin.collections.List<String>
     ) {
         val newEbinDirectories = elixirEbinDirectories - erlangEbinDirectories
         prependCodePaths(commandLine, newEbinDirectories)

src/org/elixir_lang/facet/configurable/Provider.kt

@@ -5,6 +5,6 @@ import com.intellij.openapi.options.ConfigurableProvider
 import org.elixir_lang.sdk.ProcessOutput
 
 class Provider(private val project: com.intellij.openapi.project.Project): ConfigurableProvider() {
-    override fun canCreateConfigurable(): Boolean = ProcessOutput.isSmallIde
+    override fun canCreateConfigurable(): Boolean = ProcessOutput.isSmallIde()
     override fun createConfigurable(): Configurable = Project(project)
 }

src/org/elixir_lang/facet/sdks/Provider.kt

@@ -4,5 +4,5 @@ import com.intellij.openapi.options.ConfigurableProvider
 import org.elixir_lang.sdk.ProcessOutput
 
 abstract class Provider : ConfigurableProvider() {
-    override fun canCreateConfigurable(): Boolean = ProcessOutput.isSmallIde
+    override fun canCreateConfigurable(): Boolean = ProcessOutput.isSmallIde()
 }

src/org/elixir_lang/notification/setup_sdk/Action.kt

@@ -6,6 +6,8 @@ import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleType
 import com.intellij.openapi.project.Project
+import org.elixir_lang.notification.setup_sdk.Provider.Companion.showFacetSettings
+import org.elixir_lang.notification.setup_sdk.Provider.Companion.showModuleSettings
 
 /**
  * Created by zyuyou on 15/7/8.

src/org/elixir_lang/notification/setup_sdk/Provider.kt

@@ -1,7 +1,6 @@
 package org.elixir_lang.notification.setup_sdk
 
 import com.intellij.ide.actions.ShowSettingsUtilImpl
-import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.module.ModuleType
@@ -15,134 +14,127 @@ import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiManager
 import com.intellij.ui.EditorNotificationPanel
 import com.intellij.ui.EditorNotificationProvider
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import org.elixir_lang.ElixirFileType
 import org.elixir_lang.ElixirLanguage
 import org.elixir_lang.sdk.ProcessOutput
 import org.elixir_lang.sdk.elixir.Type
 import java.util.function.Function
 import javax.swing.JComponent
 
+/**
+ * https://github.com/ignatov/intellij-erlang/blob/master/src/org/intellij/erlang/inspection/SetupSDKNotificationProvider.java
+ */
 class Provider : EditorNotificationProvider {
     override fun collectNotificationData(
         project: Project,
-        file: VirtualFile,
+        file: VirtualFile
     ): Function<in FileEditor, out JComponent?> =
-        Function {
-            kotlinx.coroutines.runBlocking {
-                createNotificationPanel(file, project)
-            }
-        }
+        Function<FileEditor, JComponent?> { createNotificationPanel(file, project) }
 
-    private suspend fun createNotificationPanel(
+    private fun createNotificationPanel(
         virtualFile: VirtualFile,
-        project: Project,
+        project: Project
     ): EditorNotificationPanel? =
-        withContext(Dispatchers.Default) {
-            ReadAction.compute<EditorNotificationPanel?, Throwable> {
-                if (virtualFile.fileType is ElixirFileType) {
-                    PsiManager
-                        .getInstance(project)
-                        .findFile(virtualFile)
-                        ?.let { psiFile ->
-                            if (psiFile.language === ElixirLanguage &&
-                                Type.mostSpecificSdk(psiFile) == null
-                            ) {
-                                createPanel(project, psiFile)
-                            } else {
-                                null
-                            }
-                        }
-                } else {
-                    null
+        if (virtualFile.fileType is ElixirFileType) {
+            PsiManager
+                .getInstance(project)
+                .findFile(virtualFile)
+                ?.let { psiFile ->
+                    if (psiFile.language === ElixirLanguage &&
+                        Type.mostSpecificSdk(psiFile) == null
+                    ) {
+                        createPanel(project, psiFile)
+                    } else {
+                        null
+                    }
                 }
-            }
+        } else {
+            null
         }
 
-}
-
-fun showFacetSettings(project: Project) {
-    if (ProcessOutput.isSmallIde) {
-        showSmallIDEFacetSettings(project)
-    }
-    // TODO Elixir Facet in non-Elixir module in IntelliJ
-}
+    companion object {
+        fun showFacetSettings(project: Project) {
+            if (ProcessOutput.isSmallIde()) {
+                showSmallIDEFacetSettings(project)
+            }
+            // TODO Elixir Facet in non-Elixir module in IntelliJ
+        }
 
-fun showModuleSettings(
-    project: Project,
-    module: Module,
-) {
-    ProjectSettingsService.getInstance(project).openModuleSettings(module)
-}
+        fun showModuleSettings(project: Project, module: Module) {
+            ProjectSettingsService.getInstance(project).openModuleSettings(module)
+        }
 
-private fun showProjectSettings(project: Project) {
-    SdkPopupFactory.newBuilder()
-        .withProject(project)
-        .withSdkType(Type.instance)
-        .updateProjectSdkFromSelection()
-        .buildPopup()
-        .showInFocusCenter()
-}
+        private fun showProjectSettings(project: Project) {
+            SdkPopupFactory
+                .newBuilder()
+                .withProject(project)
+                .withSdkType(Type.instance)
+                .updateProjectSdkFromSelection()
+                .buildPopup()
+                .showInFocusCenter()
+        }
 
-private fun showSmallIDEFacetSettings(project: Project) {
-    ShowSettingsUtilImpl.showSettingsDialog(project, "language", "Elixir")
-}
+        private fun showSmallIDEFacetSettings(project: Project) {
+            ShowSettingsUtilImpl.showSettingsDialog(project, "language", "Elixir")
+        }
 
-private fun createSmallIDEFacetPanel(project: Project): EditorNotificationPanel =
-    EditorNotificationPanel().apply {
-        text = "Elixir Facet SDK is not defined"
-        @Suppress("DialogTitleCapitalization")
-        createActionLabel("Setup Elixir Facet SDK") {
-            showSmallIDEFacetSettings(project)
+        private fun createSmallIDEFacetPanel(project: Project): EditorNotificationPanel {
+            return EditorNotificationPanel().apply {
+                text = "Elixir Facet SDK is not defined"
+                @Suppress("DialogTitleCapitalization")
+                createActionLabel("Setup Elixir Facet SDK") {
+                    showSmallIDEFacetSettings(project)
+                }
+            }
         }
-    }
 
-private fun createFacetPanel(project: Project): EditorNotificationPanel? =
-    if (ProcessOutput.isSmallIde) {
-        createSmallIDEFacetPanel(project)
-    } else {
-        // TODO Elixir Facet in non-Elixir module in IntelliJ
-        null
-    }
+        private fun createFacetPanel(project: Project): EditorNotificationPanel? {
+            return if (ProcessOutput.isSmallIde()) {
+                createSmallIDEFacetPanel(project)
+            } else {
+                // TODO Elixir Facet in non-Elixir module in IntelliJ
+                null
+            }
+        }
 
-private fun createModulePanel(
-    project: Project,
-    module: Module,
-): EditorNotificationPanel =
-    EditorNotificationPanel().apply {
-        text = "Elixir Module SDK is not defined"
-        @Suppress("DialogTitleCapitalization")
-        createActionLabel("Setup Elixir Module SDK") {
-            showModuleSettings(project, module)
+        private fun createModulePanel(project: Project, module: Module): EditorNotificationPanel {
+            return EditorNotificationPanel().apply {
+                text = "Elixir Module SDK is not defined"
+                @Suppress("DialogTitleCapitalization")
+                createActionLabel("Setup Elixir Module SDK") {
+                    showModuleSettings(project, module)
+                }
+            }
         }
-    }
 
-private fun createPanel(
-    project: Project,
-    psiFile: PsiFile,
-): EditorNotificationPanel? {
-    val module = ModuleUtilCore.findModuleForPsiElement(psiFile)
+        private fun createPanel(project: Project, psiFile: PsiFile): EditorNotificationPanel? {
+            val module = ModuleUtilCore.findModuleForPsiElement(psiFile)
 
-    return when {
-        module != null -> {
-            // CANNOT use ModuleType.is(module, ElixirModuleType.getInstance()) as ElixirModuleType depends on
-            // JavaModuleBuilder and so only available in IntelliJ
-            if (ModuleType.get(module).id == "ELIXIR_MODULE") {
-                createModulePanel(project, module)
+            return if (module != null) {
+                // CANNOT use ModuleType.is(module, ElixirModuleType.getInstance()) as ElixirModuleType depends on
+                // JavaModuleBuilder and so only available in IntelliJ
+                if (ModuleType.get(module).id == "ELIXIR_MODULE") {
+                    createModulePanel(project, module)
+                } else {
+                    createFacetPanel(project)
+                }
             } else {
-                createFacetPanel(project)
+                if (ProcessOutput.isSmallIde()) {
+                    createSmallIDEFacetPanel(project)
+                } else {
+                    createProjectPanel(project)
+                }
             }
         }
-        ProcessOutput.isSmallIde -> createSmallIDEFacetPanel(project)
-        else -> createProjectPanel(project)
-    }
-}
 
-private fun createProjectPanel(project: Project): EditorNotificationPanel =
-    EditorNotificationPanel().apply {
-        text = "Project SDK is not defined"
-        createActionLabel(ProjectBundle.message("project.sdk.setup")) {
-            showProjectSettings(project)
+        private fun createProjectPanel(project: Project): EditorNotificationPanel {
+            return EditorNotificationPanel().apply {
+                text = "Project SDK is not defined"
+                createActionLabel(ProjectBundle.message("project.sdk.setup")) {
+                    showProjectSettings(project)
+                }
+            }
+
         }
-    }
+    }
+}