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

idea: cleanup 'public', property access syntax

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-01-07 18:12:30 +01:00
parent 4afbf02bdd
commit 43a6e13f4b
728 changed files with 4001 additions and 4069 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/KotlinOutputParserHelper.kt
+2 -2
View File
@@ -37,7 +37,7 @@ fun parse(line: String, reader: OutputLineReader, messages: MutableList<Any>, lo
if (colonIndex2 >= 0) {
val path = lineWoSeverity.substringBeforeAndTrim(colonIndex2)
val file = File(path)
if (!file.isFile() && FileUtilRt.getExtension(file.getName()) != "kt") {
if (!file.isFile && FileUtilRt.getExtension(file.name) != "kt") {
return addMessage(KotlinOutputParserHelper.createMessage(logger, severity, lineWoSeverity.amendNextLinesIfNeeded(reader)), messages)
}
@@ -223,7 +223,7 @@ object KotlinOutputParserHelper {
else
Class.forName("$packagePrefix.GradleMessage\$Kind")
val messageKindConstants = messageKindClass.getEnumConstants() as Array<Any>
val messageKindConstants = messageKindClass.enumConstants as Array<Any>
for (kind in messageKindConstants) {
when(kind.toString()) {
"ERROR" -> severityObjectMap.put("e", kind)
idea/kotlin-android-plugin/src/org/jetbrains/kotlin/android/navigation/gotoResourceHelper.kt
+6 -6
View File
@@ -43,12 +43,12 @@ fun getInfo(
if (info != null) return info
val topMostQualified = referenceExpression.getParentQualified().getParentQualified() ?: return null
val selectorCandidate = topMostQualified.getSelectorExpression() as? KtSimpleNameExpression ?: return null
val selectorCandidate = topMostQualified.selectorExpression as? KtSimpleNameExpression ?: return null
return getReferredInfo(selectorCandidate, facet)
}
private fun KtExpression?.getParentQualified(): KtDotQualifiedExpression? {
return this?.getParent() as? KtDotQualifiedExpression
return this?.parent as? KtDotQualifiedExpression
}
// returns info if passed expression is 'b' in 'R.a.b'
@@ -71,19 +71,19 @@ private fun getReferredInfo(
//the following code is copied from
// org.jetbrains.android.util.AndroidResourceUtil.getReferredResourceOrManifestField
// (org.jetbrains.android.facet.AndroidFacet, com.intellij.psi.PsiReferenceExpression, java.lang.String, boolean)
val classShortName = resolvedClass.getName()
val classShortName = resolvedClass.name
val fromManifest = AndroidUtils.MANIFEST_CLASS_NAME == classShortName
if (!fromManifest && AndroidUtils.R_CLASS_NAME != classShortName) {
return null
}
val qName = resolvedClass.getQualifiedName()
val qName = resolvedClass.qualifiedName
if (SdkConstants.CLASS_R == qName || AndroidPsiElementFinder.INTERNAL_R_CLASS_QNAME == qName) {
return AndroidResourceUtil.MyReferredResourceFieldInfo(resClassName, resFieldName, true, false)
}
val containingFile = resolvedClass.getContainingFile() ?: return null
val containingFile = resolvedClass.containingFile ?: return null
val isFromCorrectFile =
if (fromManifest) AndroidResourceUtil.isManifestJavaFile(facet, containingFile)
@@ -103,7 +103,7 @@ private fun getReceiverAsSimpleNameExpression(exp: KtSimpleNameExpression): KtSi
receiver
}
is KtDotQualifiedExpression -> {
receiver.getSelectorExpression() as? KtSimpleNameExpression
receiver.selectorExpression as? KtSimpleNameExpression
}
else -> null
}