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

Cleanup: apply "Convert lambda to reference"

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-02-22 16:12:01 +03:00
parent b121bf8802
commit 045a23ae10
82 changed files with 117 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMembersHandler.kt
+1 -1
View File
@@ -45,7 +45,7 @@ class OverrideMembersHandler(private val preferConstructorParameters: Boolean =
}
}
val realSupers = byOriginalRealSupers.values.map { it.realSuper }
val realSupers = byOriginalRealSupers.values.map(Data::realSuper)
val nonAbstractRealSupers = realSupers.filter { it.modality != Modality.ABSTRACT }
val realSupersToUse = if (nonAbstractRealSupers.isNotEmpty()) {
nonAbstractRealSupers
idea/idea-core/src/org/jetbrains/kotlin/idea/core/packageUtils.kt
+1 -1
View File
@@ -27,7 +27,7 @@ fun PsiDirectory.getPackage(): PsiPackage? = JavaDirectoryService.getInstance()!
fun PsiFile.getFqNameByDirectory(): FqName {
val qualifiedNameByDirectory = parent?.getPackage()?.qualifiedName
return qualifiedNameByDirectory?.let { FqName(it) } ?: FqName.ROOT
return qualifiedNameByDirectory?.let(::FqName) ?: FqName.ROOT
}
fun KtFile.packageMatchesDirectory(): Boolean = packageFqName == getFqNameByDirectory()
idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/gradleScriptTemplateProvider.kt
+7 -7
View File
@@ -49,7 +49,7 @@ class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider {
gradleExeSettings?.daemonVmOptions?.let { vmOptions ->
CommandLineTokenizer(vmOptions).toList()
.mapNotNull { it?.let { it as? String } }
.filterNot { it.isBlank() }
.filterNot(String::isBlank)
.distinct()
} ?: emptyList()
}
@@ -68,13 +68,13 @@ class GradleScriptTemplatesProvider(project: Project): ScriptTemplatesProvider {
override val environment: Map<String, Any?>? by lazy {
mapOf(
"gradleHome" to gradleExeSettings?.gradleHome?.let { File(it) },
"projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let { File(it) },
"gradleWithConnection" to { action: (ProjectConnection) -> Unit ->
"gradleHome" to gradleExeSettings?.gradleHome?.let(::File),
"projectRoot" to (project.basePath ?: project.baseDir.canonicalPath)?.let(::File),
"gradleWithConnection" to { action: (ProjectConnection) -> Unit ->
GradleExecutionHelper().execute(project.basePath!!, null) { action(it) } },
"gradleJavaHome" to gradleExeSettings?.javaHome,
"gradleJvmOptions" to gradleJvmOptions,
"getScriptSectionTokens" to ::topLevelSectionCodeTextTokens)
"gradleJavaHome" to gradleExeSettings?.javaHome,
"gradleJvmOptions" to gradleJvmOptions,
"getScriptSectionTokens" to ::topLevelSectionCodeTextTokens)
}
companion object {