Ignore matching file and line argument labels

We don't provide default argument completions for `#file` and `#line`,
for now let's skip matching `file` and `line` as argument labels.

Author: hamishknight

SourceKitStressTester/Sources/StressTester/SourceKitDocument.swift

@@ -718,8 +718,24 @@ public struct CompletionMatcher {
   private func matchesCall(paramLabels: [String]) -> Bool {
     var remainingArgLabels = expected.name.argLabels[...]
 
+    func skipIgnorableArgLabels(skipEmpty: Bool = false) {
+      if skipEmpty || remainingArgLabels.count < expected.name.argLabels.count {
+        // If previous param was matched, allow consuming unlabeled args to
+        // handle variadic cases.
+        remainingArgLabels = remainingArgLabels.drop { $0.isEmpty }
+      }
+      // Ignore `file` and `line` since we don't include `#file` and `#line`
+      // default args for completion.
+      // FIXME: We ought to have this be configurable and enable it for the stress
+      // tester.
+      remainingArgLabels = remainingArgLabels.drop {
+        $0 == "file" || $0 == "line"
+      }
+    }
+
     guard !paramLabels.isEmpty else {
-      return remainingArgLabels.allSatisfy { $0.isEmpty }
+      skipIgnorableArgLabels(skipEmpty: true)
+      return remainingArgLabels.isEmpty
     }
     for nextParamLabel in paramLabels {
       if nextParamLabel.isEmpty {
@@ -732,12 +748,9 @@ public struct CompletionMatcher {
           continue
         }
       } else {
-        // Has param label
-        if remainingArgLabels.count < expected.name.argLabels.count {
-          // A previous param was matched, so assume it was variadic and consume
-          // any leading unlabelled args so the next arg is labelled
-          remainingArgLabels = remainingArgLabels.drop{ $0.isEmpty }
-        }
+        // Has param label, skip any ignorable labels before matching.
+        skipIgnorableArgLabels()
+
         guard let nextArgLabel = remainingArgLabels.first else {
           // Assume any unprocessed parameters are defaulted
           return true
@@ -750,9 +763,7 @@ public struct CompletionMatcher {
         // Else assume this param was defaulted and skip it.
       }
     }
-    // If at least one arglabel was matched, allow for it being variadic
-    let hadMatch = remainingArgLabels.count < expected.name.argLabels.count
-    return  remainingArgLabels.isEmpty || hadMatch &&
-      remainingArgLabels.allSatisfy { $0.isEmpty }
+    skipIgnorableArgLabels()
+    return remainingArgLabels.isEmpty
   }
 }

SourceKitStressTester/Tests/StressTesterToolTests/ActionGeneratorTests.swift

@@ -153,7 +153,17 @@ class ActionGeneratorTests: XCTestCase {
       (match: .pattern, of: "first(_:z:)", against: "first(x:y:)", ignoreArgs: false, result: false),
       (match: .pattern, of: "first(_:)", against: "first", ignoreArgs: false, result: false),
       (match: .pattern, of: "first(_:)", against: "first()", ignoreArgs: false, result: true),
-      (match: .pattern, of: "first(_:_:)", against: "first()", ignoreArgs: false, result: true)
+      (match: .pattern, of: "first(_:_:)", against: "first()", ignoreArgs: false, result: true),
+
+      // We don't do matching for `file` and `line`.
+      (match: .call, of: "foo(x:file:line:)", against: "foo(x:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(x:file:line:)", against: "foo(x:file:line:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(x:file:line:y:)", against: "foo(x:y:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(file:line:y:)", against: "foo(file:line:x:y:z:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(x:file:line:y:)", against: "foo(x:y:z:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(file:line:y:)", against: "foo(x:y:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(file:line:)", against: "foo(_:)", ignoreArgs: false, result: true),
+      (match: .call, of: "foo(file:line:)", against: "foo()", ignoreArgs: false, result: true),
     ]
 
     for test in cases {