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

Migrate IDEA plugin code to Android Studio 2.2 (br 145)

Browse Source
This commit is contained in:
Yan Zhulanow
2016-05-26 19:42:08 +02:00
committed by Dmitry Jemerov
parent 99af2a809b
commit 24c9b6e171
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-android/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCase.java
+2 -2
View File
@@ -17,8 +17,8 @@
package org.jetbrains.kotlin.android; package org.jetbrains.kotlin.android;
import com.android.SdkConstants; import com.android.SdkConstants;
import com.android.ide.common.rendering.RenderSecurityManager; import com.android.tools.idea.rendering.RenderSecurityManager;
import com.android.tools.idea.rendering.PsiProjectListener; import com.android.tools.idea.res.PsiProjectListener;
import com.intellij.facet.FacetManager; import com.intellij.facet.FacetManager;
import com.intellij.facet.ModifiableFacetModel; import com.intellij.facet.ModifiableFacetModel;
import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.ide.startup.impl.StartupManagerImpl;
idea/src/org/jetbrains/kotlin/idea/quickfix/SuperClassNotInitialized.kt
+1 -1
View File
@@ -122,7 +122,7 @@ object SuperClassNotInitialized : KotlinIntentionActionsFactory() {
val offset = newSpecifier.valueArgumentList!!.leftParenthesis!!.endOffset val offset = newSpecifier.valueArgumentList!!.leftParenthesis!!.endOffset
editor.moveCaret(offset) editor.moveCaret(offset)
if (!ApplicationManager.getApplication().isUnitTestMode) { if (!ApplicationManager.getApplication().isUnitTestMode) {
ShowParameterInfoHandler.invoke(project, editor, file, offset - 1, null) ShowParameterInfoHandler.invoke(project, editor, file, offset - 1, null, true)
} }
} }
} }
idea/tests/org/jetbrains/kotlin/idea/parameterInfo/AbstractParameterInfoTest.kt
+1 -1
View File
@@ -63,7 +63,7 @@ abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() {
else -> error("Unexpected last file child") else -> error("Unexpected last file child")
} }
val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1) val context = ShowParameterInfoContext(editor, project, file, editor.caretModel.offset, -1, true)
val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!! val handlers = ShowParameterInfoHandler.getHandlers(project, KotlinLanguage.INSTANCE)!!
val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null } val handler = handlers.firstOrNull { it.findElementForParameterInfo(context) != null }
plugins/lint/lint-idea/src/org/jetbrains/android/inspections/klint/IntellijViewTypeDetector.java
+1 -1
View File
@@ -19,7 +19,7 @@ import com.android.annotations.NonNull;
import com.android.annotations.Nullable; import com.android.annotations.Nullable;
import com.android.ide.common.res2.AbstractResourceRepository; import com.android.ide.common.res2.AbstractResourceRepository;
import com.android.ide.common.res2.ResourceItem; import com.android.ide.common.res2.ResourceItem;
import com.android.tools.idea.rendering.LocalResourceRepository; import com.android.tools.idea.res.LocalResourceRepository;
import com.android.tools.klint.checks.ViewTypeDetector; import com.android.tools.klint.checks.ViewTypeDetector;
import com.android.tools.klint.detector.api.Context; import com.android.tools.klint.detector.api.Context;
import com.android.tools.klint.detector.api.Implementation; import com.android.tools.klint.detector.api.Implementation;