From 530dc1ca95d240bdddf7081cf22ee4b0c6b3d425 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Mon, 20 May 2013 12:23:39 +0400
Subject: [PATCH] ~ Trying to run with IDEA 13 EAP (130.555)

---
 .../jet/plugin/project/K2JSModuleComponent.java      |  7 ++-----
 .../jet/plugin/quickfix/ExclExclCallFix.java         |  4 ++--
 .../jet/plugin/quickfix/JetIntentionAction.java      |  7 ++-----
 .../plugin/quickfix/MapPlatformClassToKotlinFix.java |  2 +-
 update_dependencies.xml                              | 12 ++++++------
 5 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java b/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java
index c25cbe3fac1..90d4caf28c1 100644
--- a/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java
+++ b/idea/src/org/jetbrains/jet/plugin/project/K2JSModuleComponent.java
@@ -21,17 +21,14 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleComponent;
-import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
-import com.intellij.util.xmlb.XmlSerializerUtil;
+import com.intellij.openapi.roots.impl.storage.ClassPathStorageUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.k2js.config.EcmaVersion;
 
 @Deprecated
 @State(
         name = "K2JSModule",
         storages = @Storage(
-          id = ClasspathStorage.DEFAULT_STORAGE,
+          id = ClassPathStorageUtil.DEFAULT_STORAGE,
           file = "$MODULE_FILE$"
         )
 )
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
index efb955cff18..8db90f07d04 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ExclExclCallFix.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
-import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -79,7 +79,7 @@ public class ExclExclCallFix implements IntentionAction {
 
     @Override
     public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
-        if (!CodeInsightUtilBase.prepareFileForWrite(file)) {
+        if (!FileModificationService.getInstance().prepareFileForWrite(file)) {
             return;
         }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java b/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java
index d05abb298e2..9e0c4d4210a 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/JetIntentionAction.java
@@ -16,17 +16,14 @@
 
 package org.jetbrains.jet.plugin.quickfix;
 
-import com.intellij.codeInsight.CodeInsightUtilBase;
+import com.intellij.codeInsight.FileModificationService;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.diagnostics.Diagnostic;
 import org.jetbrains.jet.lang.psi.JetFile;
 
 public abstract class JetIntentionAction<T extends PsiElement> implements IntentionAction {
@@ -46,7 +43,7 @@ public abstract class JetIntentionAction<T extends PsiElement> implements Intent
     @Override
     public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
         if (file instanceof JetFile) {
-            if (CodeInsightUtilBase.prepareFileForWrite(element.getContainingFile())) {
+            if (FileModificationService.getInstance().prepareFileForWrite(element.getContainingFile())) {
                 invoke(project, editor, (JetFile) file);
             }
         }
diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
index 7ff095f5768..414018fb505 100644
--- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
+++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java
@@ -150,7 +150,7 @@ public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReference
         caretModel.moveToOffset(file.getNode().getStartOffset());
 
         TemplateBuilderImpl builder = new TemplateBuilderImpl(file);
-        Expression expression = new MyLookupExpression(primaryReplacedExpression.getText(), options, null, false,
+        Expression expression = new MyLookupExpression(primaryReplacedExpression.getText(), options, null, null, false,
                                                        JetBundle.message("map.platform.class.to.kotlin.advertisement"));
 
         builder.replaceElement(primaryReplacedExpression, PRIMARY_USAGE, expression, true);
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 3fc8c81ac46..0a24d39d144 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -3,15 +3,15 @@
 
     <target name="update" depends="fetch-third-party">
         <execute_update
-            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt410/82629:id"
-            build.zip="ideaIC-129.SNAPSHOT.win.zip"
+            base.url="http://teamcity.jetbrains.com/guestAuth/repository/download/bt410/83110:id"
+            build.zip="ideaIC-130.SNAPSHOT.win.zip"
         />
     </target>
 
     <target name="jb_update" depends="fetch-third-party">
         <execute_update
-            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt3498/1864599:id"
-            build.zip="ideaIC-129.SNAPSHOT.win.zip"
+            base.url="http://buildserver.labs.intellij.net/guestAuth/repository/download/bt3498/1885470:id"
+            build.zip="ideaIC-130.SNAPSHOT.win.zip"
         />
     </target>
 
@@ -114,7 +114,7 @@
         -->
 
         <!-- Guava 12 sources-->
-        <get-maven-library prefix="com/google/guava" lib="guava" version="12.0" bin="false"/>
+        <get-maven-library prefix="com/google/guava" lib="guava" version="14.0" bin="false"/>
 
         <!-- ASM 4 -->
         <get-asm4-and-rename-packages/>
@@ -190,7 +190,7 @@
                     <get src="@{base.url.for.core}/core/intellij-core.jar" dest="${core}/intellij-core.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/annotations.jar" dest="${core}/annotations.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/cli-parser-1.1.jar" dest="${core}/cli-parser-1.1.jar" usetimestamp="true"/>
-                    <get src="@{base.url}/core/guava-12.0.jar" dest="${core}/guava-12.0.jar" usetimestamp="true"/>
+                    <get src="@{base.url}/core/guava-14.0.1.jar" dest="${core}/guava-14.0.1.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/picocontainer.jar" dest="${core}/picocontainer.jar" usetimestamp="true"/>
                     <get src="@{base.url}/core/trove4j.jar" dest="${core}/trove4j.jar" usetimestamp="true"/>