diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt index 7c2af13497f..2202d9ed75d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ApplicationUtils.kt @@ -19,6 +19,8 @@ package org.jetbrains.jet.plugin.util.application import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.ShutDownTracker +import com.intellij.openapi.project.Project +import com.intellij.openapi.command.CommandProcessor public fun warnTimeConsuming(logger: Logger) { val application = ApplicationManager.getApplication()!! @@ -33,3 +35,21 @@ public fun warnTimeConsuming(logger: Logger) { logger.warn("This operation is time consuming and must not be called on EDT.") Throwable().printStackTrace() } + +public fun runReadAction(action: () -> T?): T? { + return ApplicationManager.getApplication()?.runReadAction(action) +} + +public fun runWriteAction(action: () -> T?): T? { + return ApplicationManager.getApplication()?.runWriteAction(action) +} + +public fun Project.executeWriteCommand(name: String, command: () -> Unit) { + CommandProcessor.getInstance().executeCommand(this, { runWriteAction(command) }, name, null) +} + +public fun Project.executeWriteCommand(name: String, command: () -> T): T { + var result: T? = null + CommandProcessor.getInstance().executeCommand(this, { result = runWriteAction(command) }, name, null) + return result!! +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt index 452d387436e..eb3fb7ab099 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.psi.JetExpression import org.jetbrains.jet.plugin.completion.ExpectedInfos import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession -import org.jetbrains.jet.plugin.refactoring.runWriteAction +import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.jet.plugin.refactoring.EmptyValidator fun insertLambdaTemplate(context: InsertionContext, placeholderRange: TextRange, lambdaType: JetType) { diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index e63a3e4b150..08ebba5857e 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -39,7 +39,7 @@ import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction public class KotlinSmartStepIntoHandler : JvmSmartStepIntoHandler() { diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index 2c038df74ce..5e512c02a2a 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import com.sun.jdi.VirtualMachine import org.jetbrains.jet.codegen.AsmUtil import com.sun.jdi.InvalidStackFrameException -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.jet.lang.psi.analysisContext import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.JvmClassName @@ -396,7 +396,8 @@ fun Type.getClassDescriptor(project: Project): ClassDescriptor? { return runReadAction { val classes = JavaPsiFacade.getInstance(project).findClasses(jvmName.asString(), GlobalSearchScope.allScope(project)) - if (classes.isEmpty()) null else { + if (classes.isEmpty()) null + else { val clazz = classes.first() JavaResolveExtension.getResolver(project, clazz).resolveClass(JavaClassImpl(clazz)) } diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt index bc957846a64..fa58e20a8d1 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/extractFunctionForDebuggerUtil.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Statu import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil import org.jetbrains.jet.plugin.refactoring.extractFunction.validate import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction import com.intellij.psi.PsiManager import com.intellij.psi.impl.PsiModificationTrackerImpl import org.jetbrains.jet.lang.psi.* diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt index 4f082eb30ea..0053035b29a 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinFindClassUsagesHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.findUsages.toSearchTarget import org.jetbrains.jet.plugin.findUsages.toClassHelper import org.jetbrains.jet.plugin.findUsages.toClassDeclarationsHelper import org.jetbrains.jet.plugin.search.usagesSearch.search -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction public class KotlinFindClassUsagesHandler( jetClass: JetClassOrObject, @@ -80,7 +80,7 @@ public class KotlinFindClassUsagesHandler( val classUsages = kotlinOptions.toClassHelper().newRequest(target).search() val declarationUsages = kotlinOptions.toClassDeclarationsHelper().newRequest(target).search() - (classUsages + declarationUsages).all { ref -> KotlinFindUsagesHandler.processUsage(processor, ref)} && processInheritors() + (classUsages + declarationUsages).all { ref -> KotlinFindUsagesHandler.processUsage(processor, ref) } && processInheritors() }!! } diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt index dabac8fc0c1..f649b73f5e4 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/handlers/KotlinTypeParameterFindUsagesHandler.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.findUsages.dialogs.KotlinTypeParameterFindUsages import org.jetbrains.jet.plugin.search.usagesSearch.DefaultSearchHelper import org.jetbrains.jet.plugin.findUsages.toSearchTarget import org.jetbrains.jet.plugin.search.usagesSearch.search -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction public class KotlinTypeParameterFindUsagesHandler( element: JetNamedDeclaration, @@ -46,7 +46,7 @@ public class KotlinTypeParameterFindUsagesHandler( return runReadAction { val target = options.toSearchTarget(element as JetNamedDeclaration, true) val request = DefaultSearchHelper().newRequest(target) - request.search().all {ref -> KotlinFindUsagesHandler.processUsage(processor, ref)} + request.search().all { ref -> KotlinFindUsagesHandler.processUsage(processor, ref) } }!! } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/functionBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/functionBuilder.kt index f3eb20de8eb..8cf559003cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/functionBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/functionBuilder.kt @@ -51,13 +51,13 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.refactoring.EmptyValidator import org.jetbrains.jet.plugin.refactoring.CollectingValidator import org.jetbrains.jet.plugin.util.isUnit -import org.jetbrains.jet.plugin.refactoring.runWriteAction import com.intellij.util.ArrayUtil import com.intellij.psi.PsiWhiteSpace import org.jetbrains.jet.plugin.refactoring.isMultiLine import org.jetbrains.jet.plugin.refactoring.getLineCount import com.intellij.psi.PsiElement import org.jetbrains.jet.lexer.JetTokens +import org.jetbrains.jet.plugin.util.application.runWriteAction private val TYPE_PARAMETER_LIST_VARIABLE_NAME = "typeParameterList" private val TEMPLATE_FROM_USAGE_FUNCTION_BODY = "New Kotlin Function Body.kt" @@ -128,7 +128,7 @@ class FunctionBuilder(val config: FunctionBuilderConfiguration) { return typeCandidates.getOrPut(typeInfo) { val types = typeInfo.getPossibleTypes(this).reverse() - val newTypes = LinkedHashSet(types) + val newTypes = LinkedHashSet(types) for (substitution in substitutions) { // each substitution can be applied or not, so we offer all options val toAdd = newTypes.map { theType -> theType.substitute(substitution, typeInfo.variance) } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt index 5b7656eef57..121c8590e69 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractKotlinFunctionHandler.kt @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.psi.JetElement import com.intellij.openapi.application.ApplicationManager import org.jetbrains.jet.lang.psi.psiUtil.getOutermostParentContainedIn import org.jetbrains.jet.plugin.refactoring.checkConflictsInteractively -import org.jetbrains.jet.plugin.refactoring.executeWriteCommand +import org.jetbrains.jet.plugin.util.application.executeWriteCommand import org.jetbrains.jet.lang.psi.JetBlockExpression import kotlin.test.fail import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status @@ -241,4 +241,4 @@ fun selectElements( editor.getScrollingModel().scrollToCaret(ScrollType.MAKE_VISIBLE) selectSingleExpression() -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/duplicateUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/duplicateUtil.kt index 9f8f8563951..5f3bfa64d85 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/duplicateUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/duplicateUtil.kt @@ -33,7 +33,7 @@ import com.intellij.codeInsight.highlighting.HighlightManager import com.intellij.codeInsight.folding.CodeFoldingManager import com.intellij.ui.ReplacePromptDialog import com.intellij.find.FindManager -import org.jetbrains.jet.plugin.refactoring.executeWriteCommand +import org.jetbrains.jet.plugin.util.application.executeWriteCommand import com.intellij.refactoring.util.duplicates.MethodDuplicatesHandler import com.intellij.refactoring.RefactoringBundle diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 1727c886fb2..2758ae95384 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -67,6 +67,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.psi.psiUtil.getParentByType import org.jetbrains.jet.lang.psi.psiUtil.isAncestor import org.jetbrains.jet.plugin.caches.resolve.getLazyResolveSession +import org.jetbrains.jet.plugin.util.application.runWriteAction import com.intellij.psi.PsiNamedElement import org.jetbrains.jet.plugin.project.AnalyzerFacadeWithCache import org.jetbrains.jet.lang.descriptors.FunctionDescriptor @@ -218,24 +219,6 @@ public fun Project.checkConflictsInteractively(conflicts: MultiMap(action: () -> T?): T? { - return ApplicationManager.getApplication()?.runReadAction(action) -} - -public fun runWriteAction(action: () -> T?): T? { - return ApplicationManager.getApplication()?.runWriteAction(action) -} - -public fun Project.executeWriteCommand(name: String, command: () -> Unit) { - CommandProcessor.getInstance().executeCommand(this, { runWriteAction(command) }, name, null) -} - -public fun Project.executeWriteCommand(name: String, command: () -> T): T { - var result: T? = null - CommandProcessor.getInstance().executeCommand(this, { result = runWriteAction(command) }, name, null) - return result!! -} - public fun getPsiElementPopup( editor: Editor, elements: List, diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt index 3bed97fe853..f7647e55cda 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinFunctionProcessor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.psi.JetNamedFunction import com.intellij.refactoring.rename.RenameJavaMethodProcessor import org.jetbrains.jet.asJava.KotlinLightMethod import kotlin.properties.Delegates -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction public class RenameKotlinFunctionProcessor : RenameKotlinPsiProcessor() { private val javaMethodProcessorInstance by Delegates.lazy { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt index e2d57cff636..32383b0ec69 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.jet.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction public class RenameKotlinPropertyProcessor : RenamePsiElementProcessor() { override fun canProcessElement(element: PsiElement): Boolean = element.namedUnwrappedElement is JetProperty diff --git a/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt b/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt index d6f8331a9e5..76d25cf64f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/usagesSearch/usagesSearch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,7 +47,7 @@ import java.util.Collections import com.intellij.openapi.roots.FileIndexFacade import com.intellij.util.indexing.FileBasedIndex import com.intellij.psi.impl.cache.impl.id.IdIndex -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction import com.intellij.psi.search.TextOccurenceProcessor import org.jetbrains.jet.plugin.references.JetMultiDeclarationReference import com.intellij.psi.PsiManager @@ -142,7 +142,7 @@ public class KotlinPsiSearchHelper(private val project: Project): PsiSearchHelpe val entries = Collections.singletonList(IdIndexEntry(text, caseSensitively)) val index = FileIndexFacade.getInstance(project) val checker: (Int?) -> Boolean = { (it!! and searchContext.toInt()) != 0 } - return runReadAction{ + return runReadAction { FileBasedIndex.getInstance().processFilesContainingAllKeys(IdIndex.NAME, entries, scope, checker) { file -> !index.shouldBeFound(scope, file) || processor.process(file) } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt index 99ac1860ccd..78d78a5d546 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt @@ -23,7 +23,7 @@ import com.intellij.debugger.DebuggerManagerEx import com.intellij.debugger.ui.breakpoints.LineBreakpoint import com.intellij.debugger.actions.MethodSmartStepTarget import com.intellij.debugger.engine.BasicStepMethodFilter -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.jet.InTextDirectivesUtils.* import com.intellij.openapi.util.io.FileUtil import java.io.File diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt index 7764db4b63d..07f457decd1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestBase.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.debugger import com.intellij.debugger.engine.DebugProcessImpl import com.intellij.debugger.engine.SuspendContextImpl import com.intellij.debugger.engine.MethodFilter -import org.jetbrains.jet.plugin.refactoring.runReadAction +import org.jetbrains.jet.plugin.util.application.runReadAction import com.intellij.debugger.impl.PositionUtil import com.intellij.execution.process.ProcessOutputTypes import com.intellij.openapi.roots.libraries.LibraryUtil @@ -46,7 +46,7 @@ abstract class KotlinDebuggerTestBase : KotlinDebuggerTestCase() { } protected fun SuspendContextImpl.printContext() { - runReadAction { (): Unit -> + runReadAction {(): Unit -> if (this.getFrameProxy() == null) { return@runReadAction println("Context thread is null", ProcessOutputTypes.SYSTEM) } diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt index 1c51314513c..a4ab53b80f3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -58,9 +58,9 @@ import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKo import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.plugin.search.allScope -import org.jetbrains.jet.plugin.refactoring.runWriteAction import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.jet.testing.ConfigLibraryUtil +import org.jetbrains.jet.plugin.util.application.runWriteAction public abstract class AbstractJetMoveTest : MultiFileTestCase() { protected fun doTest(path: String) { @@ -93,7 +93,7 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() { doTest { rootDir, rootAfter -> val mainFile = rootDir.findFileByRelativePath(mainFilePath)!! val mainPsiFile = PsiManager.getInstance(getProject()!!).findFile(mainFile)!! - val document = FileDocumentManager.getInstance()!!.getDocument(mainFile)!! + val document = FileDocumentManager.getInstance().getDocument(mainFile)!! val editor = EditorFactory.getInstance()!!.createEditor(document, getProject()!!)!! val caretOffset = extractCaretOffset(document) @@ -112,11 +112,11 @@ public abstract class AbstractJetMoveTest : MultiFileTestCase() { assert(!conflictFile.exists()) } catch(e: ConflictsInTestsException) { - JetTestUtils.assertEqualsToFile(conflictFile, e.getMessages().sort().makeString("\n")) + JetTestUtils.assertEqualsToFile(conflictFile, e.getMessages().sort().joinToString("\n")) } finally { PsiDocumentManager.getInstance(getProject()!!).commitAllDocuments() - FileDocumentManager.getInstance()?.saveAllDocuments() + FileDocumentManager.getInstance().saveAllDocuments() EditorFactory.getInstance()!!.releaseEditor(editor) } diff --git a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt index 28168306f40..888f9b68de4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/run/RunConfigurationTest.kt @@ -43,7 +43,7 @@ import com.intellij.openapi.module.Module import java.io.File import com.intellij.openapi.roots.ModuleRootModificationUtil import org.jetbrains.jet.plugin.search.allScope -import org.jetbrains.jet.plugin.refactoring.runWriteAction +import org.jetbrains.jet.plugin.util.application.runWriteAction class RunConfigurationTest: CodeInsightTestCase() { fun getTestProject() = myProject!!