@@ -104,10 +104,18 @@ const registerSharedCommands = (): vscode.Disposable => {
104104 projectDeployStart ( isDeployOnSave , true )
105105 ) ,
106106 vscode . commands . registerCommand ( 'sf.project.retrieve.start' , projectRetrieveStart ) ,
107+ vscode . commands . registerCommand ( 'sf.project.retrieve.start.ignore.conflicts' , ( ) => projectRetrieveStart ( true ) ) ,
107108 vscode . commands . registerCommand ( 'sf.view.all.changes' , viewAllChanges ) ,
108109 vscode . commands . registerCommand ( 'sf.view.local.changes' , viewLocalChanges ) ,
109110 vscode . commands . registerCommand ( 'sf.view.remote.changes' , viewRemoteChanges ) ,
110- vscode . commands . registerCommand ( 'sf.apex.generate.class' , apexGenerateClass )
111+ vscode . commands . registerCommand ( 'sf.apex.generate.class' , apexGenerateClass ) ,
112+ vscode . commands . registerCommand ( 'sf.delete.source' , deleteSource ) ,
113+ vscode . commands . registerCommand ( 'sf.delete.source.current.file' , deleteSource ) ,
114+ vscode . commands . registerCommand ( 'sf.deploy.source.path' , deploySourcePaths ) ,
115+ vscode . commands . registerCommand ( 'sf.deploy.in.manifest' , deployManifest ) ,
116+ vscode . commands . registerCommand ( 'sf.retrieve.source.path' , retrieveSourcePaths ) ,
117+ vscode . commands . registerCommand ( 'sf.retrieve.current.source.file' , retrieveSourcePaths ) ,
118+ vscode . commands . registerCommand ( 'sf.retrieve.in.manifest' , retrieveManifest )
111119 ) ;
112120} ;
113121
@@ -122,16 +130,8 @@ const registerCommands = (extensionContext: vscode.ExtensionContext): vscode.Dis
122130 vscode . commands . registerCommand ( 'sf.diff' , sourceDiff ) ,
123131 vscode . commands . registerCommand ( 'sf.open.documentation' , openDocumentation ) ,
124132 vscode . commands . registerCommand ( 'sf.internal.refreshsobjects' , refreshSObjects ) ,
125- vscode . commands . registerCommand ( 'sf.delete.source' , deleteSource ) ,
126- vscode . commands . registerCommand ( 'sf.delete.source.current.file' , deleteSource ) ,
127133 vscode . commands . registerCommand ( 'sf.deploy.current.source.file' , deploySourcePaths ) ,
128- vscode . commands . registerCommand ( 'sf.deploy.in.manifest' , deployManifest ) ,
129134 vscode . commands . registerCommand ( 'sf.deploy.multiple.source.paths' , deploySourcePaths ) ,
130- vscode . commands . registerCommand ( 'sf.deploy.source.path' , deploySourcePaths ) ,
131- vscode . commands . registerCommand ( 'sf.project.retrieve.start.ignore.conflicts' , ( ) => projectRetrieveStart ( true ) ) ,
132- vscode . commands . registerCommand ( 'sf.retrieve.source.path' , retrieveSourcePaths ) ,
133- vscode . commands . registerCommand ( 'sf.retrieve.current.source.file' , retrieveSourcePaths ) ,
134- vscode . commands . registerCommand ( 'sf.retrieve.in.manifest' , retrieveManifest ) ,
135135 vscode . commands . registerCommand ( 'sf.task.stop' , taskStop ) ,
136136 vscode . commands . registerCommand ( 'sf.apex.generate.unit.test.class' , apexGenerateUnitTestClass ) ,
137137 vscode . commands . registerCommand ( 'sf.analytics.generate.template' , analyticsGenerateTemplate ) ,
0 commit comments