From 6b340091d253bea4984d8dce03fbfcad3fdfc84e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 15 May 2015 18:16:52 +0200
Subject: [PATCH] update to M11 syntax

---
 .../jetbrains/jps/builders/java/MockPackageFacadeBuilder.kt   | 4 ++--
 platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt  | 2 +-
 platform/built-in-server/testSrc/TestManager.kt               | 2 +-
 .../graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilder.kt b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilder.kt
index cc1549cd51f1..e2faedf81813 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilder.kt
+++ b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/java/MockPackageFacadeBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -149,7 +149,7 @@ class MockPackageFacadeGenerator : ModuleLevelBuilder(BuilderCategory.SOURCE_PRO
     return "Mock Package Facade Generator"
   }
 
-  class object {
+  companion object {
     private val PACKAGE_CACHE_STORAGE_PROVIDER = object : StorageProvider<AbstractStateStorage<String, String>>() {
       override fun createStorage(targetDataDir: File): AbstractStateStorage<String, String> {
         val storageFile = File(targetDataDir, "mockPackageFacade/packages")
diff --git a/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt b/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt
index 05fca4ada6aa..58706aea2232 100644
--- a/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt
+++ b/platform/built-in-server/testSrc/BinaryRequestHandlerTest.kt
@@ -89,7 +89,7 @@ public class BinaryRequestHandlerTest {
   }
 
   class MyBinaryRequestHandler : BinaryRequestHandler() {
-    class object {
+    companion object {
       val ID = UUID.fromString("E5068DD6-1DB7-437C-A3FC-3CA53B6E1AC9")
     }
 
diff --git a/platform/built-in-server/testSrc/TestManager.kt b/platform/built-in-server/testSrc/TestManager.kt
index 818da87fd8f2..1bf563726872 100644
--- a/platform/built-in-server/testSrc/TestManager.kt
+++ b/platform/built-in-server/testSrc/TestManager.kt
@@ -16,7 +16,7 @@ import com.intellij.openapi.util.io.FileUtilRt
 import java.io.File
 
 class TestManager(val projectFixture: IdeaProjectTestFixture) : TestWatcher() {
-  class object {
+  companion object {
     val EXCLUDED_DIR_NAME = "excludedDir"
   }
 
diff --git a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt
index 65f30c8784dd..6f63650a1c3f 100644
--- a/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt
+++ b/platform/vcs-log/graph/test/com/intellij/vcs/log/graph/TestGraphBuilder.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2015 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.
@@ -93,7 +93,7 @@ public class TestGraphBuilder : BaseTestGraphBuilder {
 
     val SimpleEdge.toIndex: Int?  get() = toNode?.let { nodeIdToIndex[it] }
 
-    ;{
+    init {
       val idsMap = HashMap<Int, Int>()
       nodes = buildNodes.map2 {(index, it) ->
         idsMap[index] = it.nodeId