Merge pull request #532 from IBM/fix/variable-context-value

Fix Db2i commands being contributed to variable tree items
IBM · Jul 5, 2024 · 234e646 · 234e646
2 parents 77cbf0e + ac982eb
commit 234e646
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1247,7 +1247,7 @@
       "view/item/context": [
         {
           "command": "vscode-ibmi-projectexplorer.projectExplorer.refresh",
-          "when": "view == projectExplorer && viewItem =~ /^(?!(objectFile(PHY|PF)|memberFile|sourceFile|ifsFile|variable(?!s)|includePath_local|error)).*/",
+          "when": "view == projectExplorer && viewItem =~ /^(?!(objectFile(PHY|PF)|memberFile|sourceFile|ifsFile|variableItem|includePath_local|error)).*/",
           "group": "0_refresh@0"
         },
         {
@@ -1362,12 +1362,12 @@
         },
         {
           "command": "vscode-ibmi-projectexplorer.projectExplorer.editVariable",
-          "when": "view == projectExplorer && viewItem =~ /^variable(?!s).*/",
+          "when": "view == projectExplorer && viewItem =~ /^variableItem.*/",
           "group": "inline@0"
         },
         {
           "command": "vscode-ibmi-projectexplorer.projectExplorer.editVariable",
-          "when": "view == projectExplorer && viewItem =~ /^variable(?!s).*/",
+          "when": "view == projectExplorer && viewItem =~ /^variableItem.*/",
           "group": "1_edit@0"
         },
         {

diff --git a/src/decorationProvider.ts b/src/decorationProvider.ts
@@ -19,7 +19,7 @@ export class DecorationProvider implements FileDecorationProvider {
                     tooltip: l10n.t('{0} Unresolved Variable(s)', uri.path)
                 };
             }
-        } else if (uri.scheme === 'variable' && uri.path === 'unresolved') {
+        } else if (uri.scheme === 'variableItem' && uri.path === 'unresolved') {
             // Variable tree item in project explorer
             return {
                 badge: '?',

diff --git a/src/ibmiProjectExplorer.ts b/src/ibmiProjectExplorer.ts
@@ -43,7 +43,7 @@ export enum ContextValue {
   deleted = '_deleted',
   sourceDirectory = 'sourceDirectory',
   variables = 'variables',
-  variable = 'variable',
+  variableItem = 'variableItem',
   libraryList = 'libraryList',
   library = 'library',
   system = '_system',

diff --git a/src/testing/suites/decorationProvider.ts b/src/testing/suites/decorationProvider.ts
@@ -35,8 +35,8 @@ export const decorationProviderSuite: TestSuite = {
         },
         {
             name: `Test variable decoration`, test: async () => {
-                const uri1 = Uri.parse(`variable:resolved`, true);
-                const uri2 = Uri.parse(`variable:unresolved`, true);
+                const uri1 = Uri.parse(`variableItem:resolved`, true);
+                const uri2 = Uri.parse(`variableItem:unresolved`, true);
                 const decoration1 = decorationProvider.provideFileDecoration(uri1, cancellationTokenSource.token);
                 const decoration2 = decorationProvider.provideFileDecoration(uri2, cancellationTokenSource.token);
 

diff --git a/src/views/projectExplorer/variable.ts b/src/views/projectExplorer/variable.ts
@@ -10,14 +10,14 @@ import { ContextValue } from "../../ibmiProjectExplorer";
  * Tree item for a variable.
  */
 export default class Variable extends TreeItem implements ProjectExplorerTreeItem {
-  static contextValue = ContextValue.variable;
+  static contextValue = ContextValue.variableItem;
   value?: string;
 
   constructor(public workspaceFolder: WorkspaceFolder, name: string, value?: string) {
     super(name, TreeItemCollapsibleState.None);
 
     this.value = value;
-    this.resourceUri = Uri.parse(`variable:${value ? 'resolved' : 'unresolved'}`, true);
+    this.resourceUri = Uri.parse(`variableItem:${value ? 'resolved' : 'unresolved'}`, true);
     this.contextValue = Variable.contextValue;
     this.description = value || l10n.t('No value');
     this.iconPath = new ThemeIcon(`pencil`);