Merge branch 'main' into feature/output_parameters

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

src/views/results/index.ts

@@ -265,6 +265,7 @@ async function runHandler(options?: StatementInfo) {
   vscode.commands.executeCommand('vscode-db2i.dove.close');
 
   if (optionsIsValid || (editor && editor.document.languageId === `sql`)) {
+    const eol = editor.document.eol === vscode.EndOfLine.CRLF ? `\r\n` : `\n`;
     let chosenView = resultSetProvider;
 
     const useWindow = (title: string, column?: ViewColumn) => {
@@ -379,9 +380,10 @@ async function runHandler(options?: StatementInfo) {
             }
 
             const uiId = registerRunStatement(statementDetail);
+            const basicSelect = statementDetail.content.split(eol).filter(line => !line.trimStart().startsWith(`--`)).join(eol);
 
             chosenView.setScrolling({ // Never errors
-              basicSelect: statementDetail.content,
+              basicSelect: basicSelect,
               withCancel: inWindow,
               ref: updatableTable,
               parameters,