VIM-794 Fixed NCDFE related to 'number' in IDEs other than IntelliJ