Fix copying messages from log to clipboard (#1445)

Author: gjsjohnmurray

packages/extension/package.json

@@ -290,6 +290,10 @@
                 "command": "sqltools.copyTextFromTreeItem",
                 "category": "SQLTools Sidebar"
             },
+            {
+                "title": "Copy Selected Message(s)",
+                "command": "sqltools.copyTextFromConsoleMessages"
+            },
             {
                 "title": "Generate Insert Query",
                 "command": "sqltools.generateInsertQuery",
@@ -1034,6 +1038,10 @@
                     "command": "sqltools.copyTextFromTreeItem",
                     "when": "false"
                 },
+                {
+                    "command": "sqltools.copyTextFromConsoleMessages",
+                    "when": "false"
+                },
                 {
                     "command": "sqltools.refreshTree",
                     "when": "false"
@@ -1160,9 +1168,9 @@
                     "group": "sqltools.connectionExplorer.edit@1"
                 },
                 {
-                    "command": "sqltools.copyTextFromTreeItem",
+                    "command": "sqltools.copyTextFromConsoleMessages",
                     "when": "view == sqltoolsViewConsoleMessages",
-                    "group": "sqltools.connectionExplorer.edit@1"
+                    "group": "sqltools.consoleMessages.edit@1"
                 },
                 {
                     "command": "sqltools.selectConnection",

packages/plugins/connection-manager/explorer/index.ts

@@ -105,7 +105,7 @@ export class ConnectionExplorer implements TreeDataProvider<SidebarTreeItem>, Tr
       }
     });
     this.messagesTreeViewProvider = new MessagesProvider();
-    this.messagesTreeView = window.createTreeView(`${EXT_NAMESPACE}ViewConsoleMessages`, { treeDataProvider: this.messagesTreeViewProvider, canSelectMany: false, showCollapseAll: true });
+    this.messagesTreeView = window.createTreeView(`${EXT_NAMESPACE}ViewConsoleMessages`, { treeDataProvider: this.messagesTreeViewProvider, canSelectMany: true, showCollapseAll: true });
     Context.subscriptions.push(this.treeView, this.messagesTreeView);
   }
 

packages/plugins/connection-manager/extension.ts

@@ -654,6 +654,10 @@ export class ConnectionManagerPlugin implements IExtensionPlugin {
     this.updateAttachedConnectionsMap(fileUri);
   }
 
+  private ext_copyTextFromConsoleMessages = async (item, selectedNodes) => {
+    return commands.executeCommand(`${EXT_NAMESPACE}.copyMessages`, item, selectedNodes);
+  }
+
   private ext_copyTextFromTreeItem = async () => {
     const nodes = this.explorer.getSelection();
     if (!nodes || nodes.length === 0) return;
@@ -793,6 +797,7 @@ export class ConnectionManagerPlugin implements IExtensionPlugin {
       .registerCommand(`testConnection`, this.ext_testConnection)
       .registerCommand(`getConnections`, this.ext_getConnections)
       .registerCommand(`detachConnectionFromFile`, this.ext_detachConnectionFromFile)
+      .registerCommand(`copyTextFromConsoleMessages`, this.ext_copyTextFromConsoleMessages)
       .registerCommand(`copyTextFromTreeItem`, this.ext_copyTextFromTreeItem)
       .registerCommand(`getChildrenForTreeItem`, this.ext_getChildrenForTreeItem)
       .registerCommand(`getInsertQuery`, this.ext_getInsertQuery);

packages/plugins/formatter/extension.ts

@@ -55,6 +55,13 @@ function copyTextHandler(item: { value: string } | string, items?: ({ value: str
   return env.clipboard.writeText(copyText);
 }
 
+function copyMessagesHandler(item: { value: string } | string, items?: ({ value: string } | string)[]) {
+  items = items ? items : [item];
+  const copyText = items.filter(n => n !== null && typeof n !== 'undefined').map(item => `${(<any>item).label || item} [${(<any>item).description}]`).join('\n');
+  if (!copyText) return;
+  return env.clipboard.writeText(copyText);
+}
+
 async function generateInsertQueryHandler(item: SidebarItem) {
   const columns: NSDatabase.IColumn[] = await commands.executeCommand(`${EXT_NAMESPACE}.getChildrenForTreeItem`, {
     conn: item.conn,
@@ -76,6 +83,7 @@ const register = (extension: IExtension) => {
   extension.registerTextEditorCommand(`formatSql`, formatSqlHandler)
     .registerCommand(`insertText`, insertTextHandler)
     .registerCommand(`copyText`, copyTextHandler)
+    .registerCommand(`copyMessages`, copyMessagesHandler)
     .registerCommand(`generateInsertQuery`, generateInsertQueryHandler)
     .registerCommand(`newSqlFile`, newSqlFileHandler);
 }