Merge pull request #2638 from SanjulaGanepola/feature/open-errors-workspace

Add options to `openErrors` command and fix `getLibraryList` API

Author: SanjulaGanepola

src/Instance.ts

@@ -206,8 +206,8 @@ export default class Instance {
     const env = workspaceFolder ? (await getEnvConfig(workspaceFolder)) : {};
 
     const librarySetup: ILELibrarySettings = {
-      currentLibrary: env[`&CURLIB`] || config.currentLibrary,
-      libraryList: env[`&LIBL`]?.split(` `) || config.libraryList,
+      currentLibrary: env[`CURLIB`] || config.currentLibrary,
+      libraryList: env[`LIBL`]?.split(` `) || config.libraryList,
     };
 
     return librarySetup;

src/commands/actions.ts

@@ -67,7 +67,7 @@ export function registerActionsCommands(instance: Instance): Disposable[] {
       return false;
     }),
 
-    commands.registerCommand(`code-for-ibmi.openErrors`, async (qualifiedObject?: string) => {
+    commands.registerCommand(`code-for-ibmi.openErrors`, async (options: { qualifiedObject?: string, workspace?: WorkspaceFolder, keepDiagnostics?: boolean }) => {
       interface ObjectDetail {
         asp?: string;
         lib: string;
@@ -84,17 +84,17 @@ export function registerActionsCommands(instance: Instance): Disposable[] {
 
       let inputPath: string | undefined
 
-      if (qualifiedObject) {
+      if (options.qualifiedObject) {
         // Value passed in via parameter
-        inputPath = qualifiedObject;
+        inputPath = options.qualifiedObject;
 
       } else {
         // Value collected from user input
 
         let initialPath = ``;
         const editor = window.activeTextEditor;
         const connection = instance.getConnection();
-        
+
         if (editor && connection) {
           const config = connection.getConfig();
           const uri = editor.document.uri;
@@ -135,7 +135,7 @@ export function registerActionsCommands(instance: Instance): Disposable[] {
         const [library, object] = inputPath.split(`/`);
         if (library && object) {
           const nameDetail = path.parse(object);
-          refreshDiagnosticsFromServer(instance, { library, object: nameDetail.name, extension: (nameDetail.ext.length > 1 ? nameDetail.ext.substring(1) : undefined) });
+          refreshDiagnosticsFromServer(instance, { library, object: nameDetail.name, extension: (nameDetail.ext.length > 1 ? nameDetail.ext.substring(1) : undefined), workspace: options.workspace }, options.keepDiagnostics);
         }
       }
     }),

src/ui/diagnostics.ts

@@ -57,15 +57,15 @@ export function clearDiagnostic(uri: vscode.Uri, changeRange: vscode.Range) {
   }
 }
 
-export async function refreshDiagnosticsFromServer(instance: Instance, evfeventInfo: EvfEventInfo) {
+export async function refreshDiagnosticsFromServer(instance: Instance, evfeventInfo: EvfEventInfo, keepDiagnostics?: boolean) {
   const connection = instance.getConnection();
 
   if (connection) {
     const content = connection.getContent();
     const tableData = await content.getTable(evfeventInfo.library, `EVFEVENT`, evfeventInfo.object);
     const lines = tableData.map(row => String(row.EVFEVENT));
 
-    if (IBMi.connectionManager.get(`clearErrorsBeforeBuild`)) {
+    if (IBMi.connectionManager.get(`clearErrorsBeforeBuild`) && !keepDiagnostics) {
       // Clear all errors if the user has this setting enabled
       clearDiagnostics();
     }