Merge pull request #1418 from Kotlin/jetbrains-junie-issue-1417-run-9adb9248-1a5b-4505-8012-2c3061ca05cf

[Junie]: refactor: rename add overloads to addAll and deprecate old versions

Author: Jolanrensen

core/api/core.api

@@ -358,6 +358,8 @@ public final class org/jetbrains/kotlinx/dataframe/api/AddKt {
 	public static final fun add (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
 	public static final fun add (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/BaseColumn;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
 	public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
+	public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/DataFrame;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
+	public static final fun addAll (Lorg/jetbrains/kotlinx/dataframe/DataFrame;[Lorg/jetbrains/kotlinx/dataframe/columns/BaseColumn;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
 	public static final fun addAllFrames (Lorg/jetbrains/kotlinx/dataframe/DataFrame;Ljava/lang/Iterable;)Lorg/jetbrains/kotlinx/dataframe/DataFrame;
 }
 

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/api/add.kt

@@ -26,6 +26,10 @@ import org.jetbrains.kotlinx.dataframe.exceptions.DuplicateColumnNamesException
 import org.jetbrains.kotlinx.dataframe.exceptions.UnequalColumnSizesException
 import org.jetbrains.kotlinx.dataframe.impl.api.insertImpl
 import org.jetbrains.kotlinx.dataframe.impl.columns.resolveSingle
+import org.jetbrains.kotlinx.dataframe.util.ADD_VARARG_COLUMNS
+import org.jetbrains.kotlinx.dataframe.util.ADD_VARARG_COLUMNS_REPLACE
+import org.jetbrains.kotlinx.dataframe.util.ADD_VARARG_FRAMES
+import org.jetbrains.kotlinx.dataframe.util.ADD_VARARG_FRAMES_REPLACE
 import org.jetbrains.kotlinx.dataframe.util.DEPRECATED_ACCESS_API
 import kotlin.reflect.KProperty
 
@@ -43,8 +47,27 @@ import kotlin.reflect.KProperty
  * @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
  * @return new [DataFrame] with added columns.
  */
+@Deprecated(
+    message = ADD_VARARG_COLUMNS,
+    replaceWith = ReplaceWith(ADD_VARARG_COLUMNS_REPLACE),
+    level = DeprecationLevel.WARNING,
+)
 public fun <T> DataFrame<T>.add(vararg columns: AnyBaseCol): DataFrame<T> = addAll(columns.asIterable())
 
+/**
+ * Adds new [columns] to the end of this [DataFrame] (at the top level).
+ *
+ * Returns a new [DataFrame] with the new [columns] appended to the original list of [DataFrame.columns].
+ *
+ * For more information: {@include [DocumentationUrls.Add]}.
+ *
+ * @param columns columns to add.
+ * @throws [DuplicateColumnNamesException] if columns in an expected result have repeated names.
+ * @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
+ * @return new [DataFrame] with added columns.
+ */
+public fun <T> DataFrame<T>.addAll(vararg columns: AnyBaseCol): DataFrame<T> = addAll(columns.asIterable())
+
 /**
  * Adds new [columns] to the end of this [DataFrame] (at the top level).
  *
@@ -73,8 +96,28 @@ public fun <T> DataFrame<T>.addAll(columns: Iterable<AnyBaseCol>): DataFrame<T>
  * @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
  * @return new [DataFrame] with added columns.
  */
+@Deprecated(
+    message = ADD_VARARG_FRAMES,
+    replaceWith = ReplaceWith(ADD_VARARG_FRAMES_REPLACE),
+    level = DeprecationLevel.WARNING,
+)
 public fun <T> DataFrame<T>.add(vararg dataFrames: AnyFrame): DataFrame<T> = addAll(dataFrames.asIterable())
 
+/**
+ * Adds all columns from the given [dataFrames] to the end of this [DataFrame] (at the top level).
+ *
+ * Returns a new [DataFrame] with the columns from the specified
+ * [dataFrames] appended to the original list of [DataFrame.columns].
+ *
+ * For more information: {@include [DocumentationUrls.Add]}.
+ *
+ * @param dataFrames dataFrames to get columns from.
+ * @throws [DuplicateColumnNamesException] if columns in an expected result have repeated names.
+ * @throws [UnequalColumnSizesException] if columns in an expected result have different sizes.
+ * @return new [DataFrame] with added columns.
+ */
+public fun <T> DataFrame<T>.addAll(vararg dataFrames: AnyFrame): DataFrame<T> = addAll(dataFrames.asIterable())
+
 /**
  * Adds all columns from the given [dataFrames] to the end of this [DataFrame] (at the top level).
  *

core/src/main/kotlin/org/jetbrains/kotlinx/dataframe/util/deprecationMessages.kt

@@ -239,6 +239,12 @@ internal const val LENGTH_REPLACE = "this.map { it?.length ?: 0 }"
 internal const val LOWERCASE_REPLACE = "this.map { it?.lowercase() }"
 internal const val UPPERCASE_REPLACE = "this.map { it?.uppercase() }"
 
+internal const val ADD_VARARG_COLUMNS = "Deprecated in favor of `addAll(vararg)` to improve completion. $MESSAGE_1_1"
+internal const val ADD_VARARG_COLUMNS_REPLACE = "this.addAll(*columns)"
+
+internal const val ADD_VARARG_FRAMES = "Deprecated in favor of `addAll(vararg)` to improve completion. $MESSAGE_1_1"
+internal const val ADD_VARARG_FRAMES_REPLACE = "this.addAll(*dataFrames)"
+
 // endregion
 
 // region keep across releases