Kotlin: Rewrite MutableList.removeAt(int) -> remove(int)

The Kotlin authors changed this to avoid a clash on List<Int>, but we must reverse the renaming so the Kotlin and Java views of the same class file extract alike.

Author: smowton

java/kotlin-extractor/src/main/kotlin/KotlinUsesExtractor.kt

@@ -83,7 +83,9 @@ open class KotlinUsesExtractor(
         makeDescription(StandardNames.FqNames.map, "<get-values>") to "values",
         makeDescription(FqName("java.util.Map"), "<get-values>") to "values",
         makeDescription(StandardNames.FqNames.map, "<get-entries>") to "entrySet",
-        makeDescription(FqName("java.util.Map"), "<get-entries>") to "entrySet"
+        makeDescription(FqName("java.util.Map"), "<get-entries>") to "entrySet",
+        makeDescription(StandardNames.FqNames.mutableList, "removeAt") to "remove",
+        makeDescription(FqName("java.util.List"), "removeAt") to "remove"
     )
 
     private val specialFunctionShortNames = specialFunctions.keys.map { it.functionName }.toSet()

java/ql/test/kotlin/library-tests/java-list-kotlin-user/MyList.java

@@ -0,0 +1,11 @@
+import java.util.AbstractList;
+
+public class MyList<T> extends AbstractList<T> {
+
+  public T get(int idx) { return null; } 
+
+  public T remove(int idx) { return null; }
+
+  public int size() { return 0; }
+
+}

java/ql/test/kotlin/library-tests/java-list-kotlin-user/test.expected

@@ -0,0 +1,3 @@
+| get |
+| remove |
+| size |

java/ql/test/kotlin/library-tests/java-list-kotlin-user/test.kt

@@ -0,0 +1,2 @@
+
+fun f(l: MyList<String>) = l.get(0)

java/ql/test/kotlin/library-tests/java-list-kotlin-user/test.ql

@@ -0,0 +1,5 @@
+import java
+
+from Method m
+where m.getDeclaringType().getName().matches("MyList%")
+select m.toString()