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

Cleanup in idea plugin modules, misc

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-29 04:41:02 +03:00
parent 865fdd7962
commit 145722b20d
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt
+1 -1
View File
@@ -53,7 +53,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi
kotlinInternalModeOriginalValue = KotlinInternalMode.enabled kotlinInternalModeOriginalValue = KotlinInternalMode.enabled
KotlinInternalMode.enabled = true KotlinInternalMode.enabled = true
getProject().getComponent(javaClass<EditorTracker>())?.projectOpened() getProject().getComponent(EditorTracker::class.java)?.projectOpened()
invalidateLibraryCache(project) invalidateLibraryCache(project)
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
+1 -1
View File
@@ -30,7 +30,7 @@ public abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
val offset = text.indexOf("<caret>") val offset = text.indexOf("<caret>")
if (offset >= 0) { if (offset >= 0) {
text.delete(offset, offset + "<caret>".length()) text.delete(offset, offset + "<caret>".length)
doc.setText(text.toString()) doc.setText(text.toString())
} }
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/testUtils.kt
+1 -1
View File
@@ -96,7 +96,7 @@ public fun unInvalidateBuiltinsAndStdLib(project: Project, runnable: RunnableWit
// Base tearDown() invalidates builtins and std-lib files. Restore them with brute force. // Base tearDown() invalidates builtins and std-lib files. Restore them with brute force.
fun unInvalidateFile(file: PsiFileImpl) { fun unInvalidateFile(file: PsiFileImpl) {
val field = javaClass<PsiFileImpl>().getDeclaredField("myInvalidated")!! val field = PsiFileImpl::class.java.getDeclaredField("myInvalidated")!!
field.setAccessible(true) field.setAccessible(true)
field.set(file, false) field.set(file, false)
} }
idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+1 -1
View File
@@ -129,7 +129,7 @@ private fun Int.skipDriveOnWin(line: String): Int {
private fun addMessage(message: Any?, messages: MutableList<Any>): Boolean { private fun addMessage(message: Any?, messages: MutableList<Any>): Boolean {
if (message == null) return false if (message == null) return false
var duplicatesPrevious = false var duplicatesPrevious = false
val messageCount = messages.size() val messageCount = messages.size
if (messageCount > 0) { if (messageCount > 0) {
val lastMessage = messages.get(messageCount - 1) val lastMessage = messages.get(messageCount - 1)
duplicatesPrevious = lastMessage == message duplicatesPrevious = lastMessage == message
idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression
import org.jetbrains.kotlin.psi.KtExpression import org.jetbrains.kotlin.psi.KtExpression
fun getReferenceExpression(element: PsiElement?): KtSimpleNameExpression? { fun getReferenceExpression(element: PsiElement?): KtSimpleNameExpression? {
return PsiTreeUtil.getParentOfType<KtSimpleNameExpression>(element, javaClass<KtSimpleNameExpression>()) return PsiTreeUtil.getParentOfType<KtSimpleNameExpression>(element, KtSimpleNameExpression::class.java)
} }
// given 'R.a.b' returns info for all three parts of the expression 'a', 'b', 'R' // given 'R.a.b' returns info for all three parts of the expression 'a', 'b', 'R'