Skip to content

Commit 75a323b

Browse files
Merge pull request #711 from gjsjohnmurray/fix-691
fix #691 Add `objectscript.serverSourceControl.disableOtherActionTriggers` setting
2 parents f70ce69 + 922672d commit 75a323b

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -785,6 +785,11 @@
785785
}
786786
}
787787
},
788+
"objectscript.serverSourceControl.disableOtherActionTriggers": {
789+
"description": "Prevent server-side source control 'other action' triggers from firing.",
790+
"type": "boolean",
791+
"scope": "resource"
792+
},
788793
"objectscript.export": {
789794
"type": "object",
790795
"description": "Control what to export from the server into the local folder.",

src/commands/studio.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,9 @@ export async function _contextMenu(sourceControl: boolean, node: PackageNode | C
459459

460460
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
461461
export async function fireOtherStudioAction(action: OtherStudioAction, uri?: vscode.Uri, userAction?): Promise<void> {
462+
if (vscode.workspace.getConfiguration("objectscript.serverSourceControl", uri)?.get("disableOtherActionTriggers")) {
463+
return;
464+
}
462465
const studioActions = new StudioActions(uri);
463466
return studioActions && studioActions.fireOtherStudioAction(action, userAction);
464467
}

0 commit comments

Comments
 (0)