Update @types/vscode and fix naming conflicts
#2323
Merged
@types/vscode and fix naming conflicts
#2323