Merge #168

bors[bot] · kjeremy · bors[bot] · commit d10214581e18 · 2018-10-30T21:50:51.000Z
168: Fix param number r=matklad a=kjeremy

Fixes the parameter number if we are not in a method

Co-authored-by: Jeremy A. Kolb &lt;jkolb@ara.com&gt;
diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs
@@ -460,7 +460,7 @@ impl AnalysisImpl {
 
                         if num_params == 1 {
                             if !has_self {
-                                current_parameter = Some(1);
+                                current_parameter = Some(0);
                             }
                         } else if num_params > 1 {
                             // Count how many parameters into the call we are.

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ impl AnalysisImpl {`
`460`	`460`
`461`	`461`	`if num_params == 1 {`
`462`	`462`	`if !has_self {`
`463`		`- current_parameter = Some(1);`
	`463`	`+ current_parameter = Some(0);`
`464`	`464`	`}`
`465`	`465`	`} else if num_params > 1 {`
`466`	`466`	`// Count how many parameters into the call we are.`