[migrator] Migrate '.index(where:)' to '.firstIndex(where:)'

akyrtzi · akyrtzi · commit 9c9f194902ef · 2019-01-15T15:39:42.000-08:00
rdar://47296913
diff --git a/lib/Migrator/overlay4.json b/lib/Migrator/overlay4.json
@@ -1332,4 +1332,15 @@
     "RightComment": "firstIndex",
     "ModuleName": "Swift"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "Rename",
+    "ChildIndex": "0",
+    "LeftUsr": "s:SlsE5index5where5IndexQzSgSb7ElementQzKXE_tKF",
+    "LeftComment": "index",
+    "RightUsr": "",
+    "RightComment": "firstIndex",
+    "ModuleName": "Swift"
+  },
 ]
diff --git a/lib/Migrator/overlay42.json b/lib/Migrator/overlay42.json
@@ -10,4 +10,15 @@
     "RightComment": "firstIndex",
     "ModuleName": "Swift"
   },
+  {
+    "DiffItemKind": "CommonDiffItem",
+    "NodeKind": "Function",
+    "NodeAnnotation": "Rename",
+    "ChildIndex": "0",
+    "LeftUsr": "s:SlsE5index5where5IndexQzSgSb7ElementQzKXE_tKF",
+    "LeftComment": "index",
+    "RightUsr": "",
+    "RightComment": "firstIndex",
+    "ModuleName": "Swift"
+  },
 ]
diff --git a/test/Migrator/stdlib_rename.swift b/test/Migrator/stdlib_rename.swift
@@ -6,6 +6,7 @@
 
 func test1(_ a: [String], s: String) {
   _ = a.index(of: s)
+  _ = a.index(where: { _ in true })
 }
 func test2(_ s: String, c: Character) {
   _ = s.index(of: c)
diff --git a/test/Migrator/stdlib_rename.swift.expected b/test/Migrator/stdlib_rename.swift.expected
@@ -6,6 +6,7 @@
 
 func test1(_ a: [String], s: String) {
   _ = a.firstIndex(of: s)
+  _ = a.firstIndex(where: { _ in true })
 }
 func test2(_ s: String, c: Character) {
   _ = s.firstIndex(of: c)

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`func test1(_ a: [String], s: String) {`
`8`	`8`	`_ = a.index(of: s)`
	`9`	`+ _ = a.index(where: { _ in true })`
`9`	`10`	`}`
`10`	`11`	`func test2(_ s: String, c: Character) {`
`11`	`12`	`_ = s.index(of: c)`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`func test1(_ a: [String], s: String) {`
`8`	`8`	`_ = a.firstIndex(of: s)`
	`9`	`+ _ = a.firstIndex(where: { _ in true })`
`9`	`10`	`}`
`10`	`11`	`func test2(_ s: String, c: Character) {`
`11`	`12`	`_ = s.firstIndex(of: c)`