Merge branch 'main' into feature/singular_prompt_builder

Author: worksofliam

.github/workflows/webpack_ci.yaml

@@ -35,7 +35,7 @@ jobs:
         cat $GITHUB_ENV
 
     - name: Upload dist artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test_vsix
         path: ${{env.vsix_name}}
@@ -70,4 +70,4 @@ jobs:
           👋 A new build is available for this PR based on ${{ github.event.pull_request.head.sha }}.
 
           * [Download here.](https://github.com/codefori/vscode-db2i/actions/runs/${{ github.run_id }})
-          * [Read more about how to test](https://github.com/codefori/vscode-db2i/blob/master/.github/pr_testing_template.md)
+          * [Read more about how to test](https://github.com/codefori/vscode-db2i/blob/master/.github/pr_testing_template.md)

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-db2i",
   "displayName": "Db2 for IBM i",
   "description": "Db2 for IBM i tools in VS Code",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "engines": {
     "vscode": "^1.95.0"
   },

src/language/providers/hoverProvider.ts

@@ -181,7 +181,7 @@ function addSymbol(base: MarkdownString, symbol: LookupResult) {
   else if ('COLUMN_NAME' in symbol) {
     base.appendCodeblock(prepareParamType(symbol) + `\n`, `sql`);
   }
-  else if ('name' in symbol) {
+  else if ('name' in symbol && symbol.text) {
     addList(base, [
       `**Description:** ${symbol.text}`,
     ]);

src/views/jobManager/selfCodes/selfCodesResultsView.ts

@@ -231,7 +231,10 @@ class SelfCodeItems extends ExtendedTreeItem {
 
   async getChildren(): Promise<ExtendedTreeItem[]> {
     const selfCodes = await this.selfView.getSelfCodes(this.selected, true);
-    return selfCodes.map((error) => new SelfCodeTreeItem(error));
+
+    if (selfCodes) {
+      return selfCodes.map((error) => new SelfCodeTreeItem(error));
+    }
   }
 }
 

src/views/types/function.ts

@@ -3,7 +3,11 @@ import Function from "../../database/callable";
 import ParmTreeItem from "./ParmTreeItem";
 
 export async function getChildren (schema: string, specificName: string): Promise<ParmTreeItem[]> {
-  const parms = await Function.getParms(schema, specificName);
+  const signatures = await Function.getSignaturesFor(schema, [specificName]);
+  const allParms = signatures.map(signature => signature.parms).flat();
+  const removedDupes = allParms.filter((parm, index) => {
+    return allParms.findIndex(p => p.PARAMETER_NAME === parm.PARAMETER_NAME && p.DATA_TYPE === p.DATA_TYPE) === index;
+  });
 
-  return parms.map(parm => new ParmTreeItem(schema, specificName, parm));
+  return removedDupes.map(parm => new ParmTreeItem(schema, specificName, parm));
 }

src/views/types/procedure.ts

@@ -3,7 +3,11 @@ import Procedure from "../../database/callable";
 import ParmTreeItem from "./ParmTreeItem";
 
 export async function getChildren(schema: string, specificName: string): Promise<ParmTreeItem[]> {
-  const parms = await Procedure.getParms(schema, specificName);
+  const signatures = await Procedure.getSignaturesFor(schema, [specificName]);
+  const allParms = signatures.map(signature => signature.parms).flat();
+  const removedDupes = allParms.filter((parm, index) => {
+    return allParms.findIndex(p => p.PARAMETER_NAME === parm.PARAMETER_NAME && p.DATA_TYPE === p.DATA_TYPE) === index;
+  });
 
-  return parms.map(parm => new ParmTreeItem(schema, specificName, parm));
+  return removedDupes.map(parm => new ParmTreeItem(schema, specificName, parm));
 }