[Parser] Set local discriminator to ParamDecls

We have to discriminate between params and local variables.

Author: rintaro

include/swift/Parse/Parser.h

@@ -761,6 +761,7 @@ class Parser {
   ParserStatus parseLineDirective(bool isLine = false);
 
   void setLocalDiscriminator(ValueDecl *D);
+  void setLocalDiscriminatorToParamList(ParameterList *PL);
 
   /// Parse the optional attributes before a declaration.
   bool parseDeclAttributeList(DeclAttributes &Attributes,

lib/Parse/ParseDecl.cpp

@@ -2409,6 +2409,14 @@ void Parser::setLocalDiscriminator(ValueDecl *D) {
   D->setLocalDiscriminator(discriminator);
 }
 
+void Parser::setLocalDiscriminatorToParamList(ParameterList *PL) {
+  for (auto P : *PL) {
+    if (!P->hasName() || P->isImplicit())
+      continue;
+    setLocalDiscriminator(P);
+  }
+}
+
 void Parser::delayParseFromBeginningToHere(ParserPosition BeginParserPosition,
                                            ParseDeclOptions Flags) {
   auto CurLoc = Tok.getLoc();
@@ -4282,6 +4290,8 @@ bool Parser::parseGetSetImpl(ParseDeclOptions Flags,
 
       // Establish the new context.
       ParseFunctionBody CC(*this, TheDecl);
+      for (auto PL : TheDecl->getParameterLists())
+        setLocalDiscriminatorToParamList(PL);
 
       // Parse the body.
       SmallVector<ASTNode, 16> Entries;
@@ -4373,6 +4383,8 @@ void Parser::parseAccessorBodyDelayed(AbstractFunctionDecl *AFD) {
   // Re-enter the lexical scope.
   Scope S(this, AccessorParserState->takeScope());
   ParseFunctionBody CC(*this, AFD);
+  for (auto PL : AFD->getParameterLists())
+    setLocalDiscriminatorToParamList(PL);
 
   SmallVector<ASTNode, 16> Entries;
   parseBraceItems(Entries);
@@ -5325,6 +5337,8 @@ Parser::parseDeclFunc(SourceLoc StaticLoc, StaticSpellingKind StaticSpelling,
 
     // Establish the new context.
     ParseFunctionBody CC(*this, FD);
+    for (auto PL : FD->getParameterLists())
+      setLocalDiscriminatorToParamList(PL);
 
     // Check to see if we have a "{" to start a brace statement.
     if (Tok.is(tok::l_brace)) {
@@ -5395,6 +5409,8 @@ bool Parser::parseAbstractFunctionBodyDelayed(AbstractFunctionDecl *AFD) {
   // Re-enter the lexical scope.
   Scope S(this, FunctionParserState->takeScope());
   ParseFunctionBody CC(*this, AFD);
+  for (auto PL : AFD->getParameterLists())
+    setLocalDiscriminatorToParamList(PL);
 
   ParserResult<BraceStmt> Body =
       parseBraceItemList(diag::func_decl_without_brace);
@@ -6257,6 +6273,8 @@ Parser::parseDeclInit(ParseDeclOptions Flags, DeclAttributes &Attributes) {
     } else {
       // Parse the body.
       ParseFunctionBody CC(*this, CD);
+      for (auto PL : CD->getParameterLists())
+        setLocalDiscriminatorToParamList(PL);
 
       if (!isDelayedParsingEnabled()) {
         if (Context.Stats)

lib/Parse/ParseExpr.cpp

@@ -2731,6 +2731,7 @@ ParserResult<Expr> Parser::parseExprClosure() {
   if (params) {
     // Add the parameters into scope.
     addParametersToScope(params);
+    setLocalDiscriminatorToParamList(params);
   } else {
     // There are no parameters; allow anonymous closure variables.
     // FIXME: We could do this all the time, and then provide Fix-Its

test/refactoring/rename/Outputs/local/casebind_1.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/casebind_2.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/catch_1.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/catch_2.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/ifbind_1.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/ifbind_2.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/localvar_1.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/localvar_2.swift.expected

@@ -39,8 +39,8 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
-
-
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 

test/refactoring/rename/Outputs/local/param_1.swift.expected

@@ -0,0 +1,46 @@
+func test1() {
+  if true {
+    let x = 1
+    print(x)
+  } else {
+    let x = 2
+    print(x)
+  }
+}
+
+func test2(arg1: Int?, arg2: (Int, String)?) {
+  if let x = arg1 {
+    print(x)
+  } else if let (x, y) = arg2 {
+    print(x, y)
+  }
+}
+
+func test3(arg: Int?) {
+  switch arg {
+  case let .some(x) where x == 0:
+    print(x)
+  case let .some(x) where x == 1,
+       let .some(x) where x == 2: // FIXME: This 'x' in '.some(x)' isn't properly renamed in 'casebind_2' case.
+    print(x)
+  default:
+    break
+  }
+}
+
+struct Err1 : Error { }
+func test4(arg: () throws -> Void) {
+  do {
+    try arg()
+  } catch let x as Err1 {
+    print(x)
+  } catch let x {
+    print(x)
+  }
+}
+
+func test5(_ xRenamed: Int) {
+  let x = xRenamed 
+  print(x)
+}
+

test/refactoring/rename/Outputs/local/param_2.swift.expected

@@ -0,0 +1,46 @@
+func test1() {
+  if true {
+    let x = 1
+    print(x)
+  } else {
+    let x = 2
+    print(x)
+  }
+}
+
+func test2(arg1: Int?, arg2: (Int, String)?) {
+  if let x = arg1 {
+    print(x)
+  } else if let (x, y) = arg2 {
+    print(x, y)
+  }
+}
+
+func test3(arg: Int?) {
+  switch arg {
+  case let .some(x) where x == 0:
+    print(x)
+  case let .some(x) where x == 1,
+       let .some(x) where x == 2: // FIXME: This 'x' in '.some(x)' isn't properly renamed in 'casebind_2' case.
+    print(x)
+  default:
+    break
+  }
+}
+
+struct Err1 : Error { }
+func test4(arg: () throws -> Void) {
+  do {
+    try arg()
+  } catch let x as Err1 {
+    print(x)
+  } catch let x {
+    print(x)
+  }
+}
+
+func test5(_ x: Int) {
+  let xRenamed = x 
+  print(xRenamed)
+}
+

test/refactoring/rename/local.swift

@@ -39,25 +39,29 @@ func test4(arg: () throws -> Void) {
   }
 }
 
-
+func test5(_ x: Int) {
+  let x = x 
+  print(x)
+}
 
 // RUN: %empty-directory(%t.result)
 // RUN: %refactor -rename -source-filename %s -pos=3:9 -new-name="xRenamed" >> %t.result/localvar_1.swift
 // RUN: %refactor -rename -source-filename %s -pos=7:11 -new-name="xRenamed" >> %t.result/localvar_2.swift
 // RUN: diff -u %S/Outputs/local/localvar_1.swift.expected %t.result/localvar_1.swift
 // RUN: diff -u %S/Outputs/local/localvar_2.swift.expected %t.result/localvar_2.swift
-
 // RUN: %refactor -rename -source-filename %s -pos=12:10 -new-name="xRenamed" >> %t.result/ifbind_1.swift
 // RUN: %refactor -rename -source-filename %s -pos=15:11 -new-name="xRenamed" >> %t.result/ifbind_2.swift
 // RUN: diff -u %S/Outputs/local/ifbind_1.swift.expected %t.result/ifbind_1.swift
 // RUN: diff -u %S/Outputs/local/ifbind_2.swift.expected %t.result/ifbind_2.swift
-
 // RUN: %refactor -rename -source-filename %s -pos=21:18 -new-name="xRenamed" >> %t.result/casebind_1.swift
 // RUN: %refactor -rename -source-filename %s -pos=25:11 -new-name="xRenamed" >> %t.result/casebind_2.swift
 // RUN: diff -u %S/Outputs/local/casebind_1.swift.expected %t.result/casebind_1.swift
 // RUN: diff -u %S/Outputs/local/casebind_2.swift.expected %t.result/casebind_2.swift
-
 // RUN: %refactor -rename -source-filename %s -pos=35:15 -new-name="xRenamed" >> %t.result/catch_1.swift
 // RUN: %refactor -rename -source-filename %s -pos=38:11 -new-name="xRenamed" >> %t.result/catch_2.swift
 // RUN: diff -u %S/Outputs/local/catch_1.swift.expected %t.result/catch_1.swift
 // RUN: diff -u %S/Outputs/local/catch_2.swift.expected %t.result/catch_2.swift
+// RUN: %refactor -rename -source-filename %s -pos=42:14 -new-name="xRenamed" >> %t.result/param_1.swift
+// RUN: %refactor -rename -source-filename %s -pos=44:9 -new-name="xRenamed" >> %t.result/param_2.swift
+// RUN: diff -u %S/Outputs/local/param_1.swift.expected %t.result/param_1.swift
+// RUN: diff -u %S/Outputs/local/param_2.swift.expected %t.result/param_2.swift