Merge pull request #420 from SanjulaGanepola/feature/merlin-context-v…

…alue

Add merlin context value

package.json

@@ -1209,7 +1209,7 @@
         },
         {
           "command": "vscode-ibmi-projectexplorer.uploadAndReplace",
-          "when": "view == projectExplorer && viewItem =~ /^member*/",
+          "when": "view == projectExplorer && viewItem =~ /^member*/ && !vscode-ibmi-projectexplorer:isInMerlin",
           "group": "5_transfer@1"
         },
         {

src/contextValueManager.ts

@@ -0,0 +1,21 @@
+/*
+ * (c) Copyright IBM Corp. 2023
+ */
+
+import { commands } from "vscode";
+import { EnvironmentManager } from "./environmentManager";
+
+/**
+ * Represents a manager for the custom context values used by the extension.
+ */
+export namespace ContextValueManager {
+    /**
+     * Initialize the custom context values.
+     */
+    export async function initialize() {
+        const isInMerlin = EnvironmentManager.isInMerlin();
+        if (isInMerlin) {
+            await commands.executeCommand('setContext', 'vscode-ibmi-projectexplorer:isInMerlin', isInMerlin);
+        }
+    }
+}

src/extension.ts

@@ -11,6 +11,7 @@ import { IBMiProjectExplorer } from './ibmiProjectExplorer';
 import { initialise } from './testing';
 import { ProjectFileWatcher } from './fileWatcher';
 import { ConfigurationManager } from './configurationManager';
+import { ContextValueManager } from './contextValueManager';
 
 export async function activate(context: ExtensionContext): Promise<IBMiProjectExplorer> {
 	console.log(l10n.t('Congratulations, your extension "vscode-ibmi-projectexplorer" is now active!'));
@@ -24,6 +25,9 @@ export async function activate(context: ExtensionContext): Promise<IBMiProjectEx
 	// Initialize configuration manager
 	ConfigurationManager.initialize(context);
 
+	// Initialize context value manager
+	await ContextValueManager.initialize();
+
 	// Setup tree views
 	const projectExplorer = new ProjectExplorer(context);
 	const projectExplorerTreeView = window.createTreeView(`projectExplorer`, { treeDataProvider: projectExplorer, showCollapseAll: true });

src/views/projectExplorer/index.ts

@@ -1170,11 +1170,9 @@ export default class ProjectExplorer implements TreeDataProvider<ProjectExplorer
           await commands.executeCommand(`workbench.action.addRootFolder`);
         }
       }),
-      commands.registerCommand(`vscode-ibmi-projectexplorer.openConnectionBrowser`, async (element: ErrorItem) => {
-        if (element) {
-          const isInMerlin = EnvironmentManager.isInMerlin();
-          await commands.executeCommand(isInMerlin ? `ibmideveloper.connectionBrowser.focus` : `connectionBrowser.focus`);
-        }
+      commands.registerCommand(`vscode-ibmi-projectexplorer.openConnectionBrowser`, async (element?: ErrorItem) => {
+        const isInMerlin = EnvironmentManager.isInMerlin();
+        await commands.executeCommand(isInMerlin ? `ibmideveloper.connectionBrowser.focus` : `connectionBrowser.focus`);
       }),
       commands.registerCommand(`vscode-ibmi-projectexplorer.setDeployLocation`, async (element: ErrorItem | WorkspaceFolder) => {
         const workspaceFolder = element instanceof ErrorItem ? element.workspaceFolder : element;