azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor and fix files previously affected by 192 patchset (KTI-315)

Browse Source
This commit is contained in:
Yunir Salimzyanov
2020-08-17 10:14:06 +03:00
parent 42da9e62db
commit 70cda1b113
46 changed files with 301 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
+2 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.PathMacros
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.util.io.FileUtil
@@ -110,7 +111,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
}
override fun doCreateProject(projectFile: Path): Project {
return loadProjectCompat(projectFile)
return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
}
private val projectName: String
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.203
+2 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.openapi.application.PathMacros
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ProjectRootManager
import com.intellij.openapi.util.io.FileUtil
@@ -113,7 +114,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
override fun doCreateAndOpenProject(): Project {
val projectFile = getProjectDirOrFile(isCreateDirectoryBasedProject)
return loadProjectCompat(projectFile)
return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
}
private val projectName: String
idea/tests/org/jetbrains/kotlin/idea/configuration/compat.kt
-15
View File
@@ -1,15 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ex.ProjectManagerEx
import java.nio.file.Path
// FIX ME WHEN BUNCH 192 REMOVED
internal fun loadProjectCompat(projectFile: Path): Project {
return (ProjectManagerEx.getInstanceEx()).loadProject(projectFile)
}