For loop auto rename variable name on auto completion does not work anymore

When autocompleting a for loop (by typing for and then Ctrl + Space, Enter), the automatically created variable var won't be automatically renamed in the condition nor expression of the for loop.

To reproduce

1. Type
   for
2. Hit Ctrl + Space (to open autocompletion selection window)
3. Autocomplete for loop by selecting appropriate line and pressing Enter
4. Rename variable var after int in for loop declaration

After 3.

for (int var = 0; var < total; ++var) {} 

Current behavior after 4.

for (int test = 0; var < total; ++var) {}  

Expected (and old) behavior:

for (int test = 0; test < total; ++test) {}