AST: Removed extraneous space from let/var as a parameter fixit.

Author: sl

lib/AST/DiagnosticEngine.cpp

@@ -173,10 +173,12 @@ InFlightDiagnostic &InFlightDiagnostic::fixItRemove(SourceRange R) {
   // If we're removing something (e.g. a keyword), do a bit of extra work to
   // make sure that we leave the code in a good place, without extraneous white
   // space around its hole.  Specifically, check to see there is whitespace
-  // before and after the end of range.  If so, nuke the space afterward to keep
-  // things consistent.
+  // or a paren before and whitespace after the end of range.  If so, nuke
+  // the space afterward to keep things consistent.
+  char charBefore = extractCharBefore(SM, charRange.getStart());
+
   if (extractCharAfter(SM, charRange.getEnd()) == ' ' &&
-      isspace(extractCharBefore(SM, charRange.getStart()))) {
+      (isspace(charBefore) || charBefore == '(')) {
     charRange = CharSourceRange(charRange.getStart(),
                                 charRange.getByteLength()+1);
   }

test/FixCode/fixits-var-let-parameter.swift

@@ -0,0 +1,7 @@
+// RUN: not %swift -emit-sil -target %target-triple %s -emit-fixits-path %t.remap -diagnostics-editor-mode
+// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
+
+func foo(var arg: Int) {}
+func bar(let arg: Int) {}
+
+func baz(var arg: Int, var arg2: Int) {}

test/FixCode/fixits-var-let-parameter.swift.result

@@ -0,0 +1,7 @@
+// RUN: not %swift -emit-sil -target %target-triple %s -emit-fixits-path %t.remap -diagnostics-editor-mode
+// RUN: c-arcmt-test %t.remap | arcmt-test -verify-transformed-files %s.result
+
+func foo(arg: Int) {}
+func bar(arg: Int) {}
+
+func baz(arg: Int, arg2: Int) {}