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

Extract JSON utility functions

Browse Source
This commit is contained in:
Alexey Sedunov
2014-03-04 16:00:57 +04:00
parent 1edaa877dc
commit 36633af275
3 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt
+2 -11
View File
@@ -49,6 +49,8 @@ import com.intellij.psi.PsiFile
import com.intellij.psi.PsiManager
import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor
import com.intellij.refactoring.move.MoveHandler
import org.jetbrains.jet.getString
import org.jetbrains.jet.getNullableString
public abstract class AbstractJetMoveTest : MultiFileTestCase() {
protected fun doTest(path: String) {
@@ -127,17 +129,6 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() {
}
}
fun JsonObject.getString(name: String): String {
val member = getNullableString(name)
if (member == null) {
throw IllegalStateException("Member with name '$name' is expected in '$this'")
}
return member
}
fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString()
enum class MoveAction {
MOVE_MEMBERS {
override fun runRefactoring(rootDir: VirtualFile, mainFile: PsiFile, elementAtCaret: PsiElement?, config: JsonObject) {
idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt
+2 -12
View File
@@ -35,7 +35,6 @@ import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.JavaPsiFacade
import com.intellij.openapi.project.Project
import com.intellij.openapi.module.Module
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache
import org.jetbrains.jet.lang.resolve.BindingContext
import java.util.Collections
@@ -45,6 +44,8 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
import org.jetbrains.jet.lang.resolve.name.isSubpackageOf
import org.jetbrains.jet.getString
import org.jetbrains.jet.getNullableString
private enum class RenameType {
JAVA_CLASS
@@ -55,17 +56,6 @@ private enum class RenameType {
KOTLIN_PACKAGE
}
fun JsonObject.getString(name: String): String {
val member = getNullableString(name)
if (member == null) {
throw IllegalStateException("Member with name '$name' is expected in '$this'")
}
return member
}
fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString()
public abstract class AbstractRenameTest : MultiFileTestCase() {
inner class TestContext(
val project: Project = getProject()!!,