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

Usages of Array.plus: return type changed.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-07-14 15:26:27 +03:00
parent 25e5172591
commit b5b6e2e598
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyReferenceCodegen.kt
+1 -1
View File
@@ -172,7 +172,7 @@ public class PropertyReferenceCodegen(
if (!target.isVar()) return if (!target.isVar()) return
val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)).toTypedArray() val setterParameters = (getterParameters + arrayOf(OBJECT_TYPE)).toList().toTypedArray()
generateAccessor(method("set", Type.VOID_TYPE, *setterParameters)) { value -> generateAccessor(method("set", Type.VOID_TYPE, *setterParameters)) { value ->
// Hard-coded 1 or 2 is safe here because there's only java/lang/Object in the signature, no double/long parameters // Hard-coded 1 or 2 is safe here because there's only java/lang/Object in the signature, no double/long parameters
value.store(StackValue.local(if (receiverType != null) 2 else 1, OBJECT_TYPE), this) value.store(StackValue.local(if (receiverType != null) 2 else 1, OBJECT_TYPE), this)
idea/src/org/jetbrains/kotlin/idea/debugger/filter/DebuggerFiltersUtil.kt
+2 -1
View File
@@ -25,7 +25,8 @@ private val KOTLIN_STDLIB_FILTER = "kotlin.*"
public fun addKotlinStdlibDebugFilterIfNeeded() { public fun addKotlinStdlibDebugFilterIfNeeded() {
if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) { if (!KotlinDebuggerSettings.getInstance().DEBUG_IS_FILTER_FOR_STDLIB_ALREADY_ADDED) {
val settings = DebuggerSettings.getInstance()!! val settings = DebuggerSettings.getInstance()!!
val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toTypedArray() // TODO: Remove toList().toTypedArray() after bootstrap
val newFilters = (settings.getSteppingFilters() + ClassFilter(KOTLIN_STDLIB_FILTER)).toList().toTypedArray()
settings.setSteppingFilters(newFilters) settings.setSteppingFilters(newFilters)
libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt
+2 -2
View File
@@ -228,7 +228,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
} }
public fun addLibraryFiles(vararg fs: String) { public fun addLibraryFiles(vararg fs: String) {
kotlinOptions.libraryFiles = (kotlinOptions.libraryFiles + (fs as Array<String>)).copyToArray() kotlinOptions.libraryFiles += fs
} }
public fun addLibraryFiles(vararg fs: File) { public fun addLibraryFiles(vararg fs: File) {
@@ -261,7 +261,7 @@ public open class Kotlin2JsCompile() : AbstractKotlinCompile<K2JSCompilerArgumen
.filter { LibraryUtils.isKotlinJavascriptLibrary(it) } .filter { LibraryUtils.isKotlinJavascriptLibrary(it) }
.map { it.getAbsolutePath() } .map { it.getAbsolutePath() }
args.libraryFiles = (kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies).copyToArray() args.libraryFiles = kotlinOptions.libraryFiles + kotlinJsLibsFromDependencies
args.target = kotlinOptions.target args.target = kotlinOptions.target
args.sourceMap = kotlinOptions.sourceMap args.sourceMap = kotlinOptions.sourceMap
libraries/tools/kotlin-gradle-plugin/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt
+1 -1
View File
@@ -96,7 +96,7 @@ abstract class BaseGradleIT {
private fun Project.createCommand(params: Array<out String>): List<String> { private fun Project.createCommand(params: Array<out String>): List<String> {
val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath() val pathToKotlinPlugin = "-PpathToKotlinPlugin=" + File("local-repo").getAbsolutePath()
val tailParameters = params + val tailParameters = params.asList() +
listOf(pathToKotlinPlugin, "--no-daemon", "--${minLogLevel.name().toLowerCase()}", "-Pkotlin.gradle.test=true") listOf(pathToKotlinPlugin, "--no-daemon", "--${minLogLevel.name().toLowerCase()}", "-Pkotlin.gradle.test=true")
return if (isWindows()) return if (isWindows())