IDEX-447 fix some bugs in code assistant
Merge remote-tracking branch 'origin/master'