Add Garbage Collection button to debugToolbar (#10)

- Add 'CustomCommand' constructor
  - Adds 'cabal' and 'stack' initial configurations
  - Removes 'hello' configuration
  - Adds custom command to dap-extension for 'garbageCollect'

Author: dmjio

dap-extension/package.json

@@ -9,48 +9,51 @@
   "categories": [
     "Debuggers"
   ],
-  "activationEvents": [ "onDebug", "onDebugResolve:dap-extension", "onDebug:closures" ],
+  "activationEvents": [ "onDebug", "onDebugResolve:dap-extension", "onDebug:garbageCollect" ],
   "main": "./out/extension.js",
   "contributes": {
-    "views": {
-      "debug": [
-        { "id": "closures"
-        , "name": "closures"
-        , "visibility": "visible"
-        , "initialSize": 30
-        , "contextualTitle": "Closures for ${workspaceFolder}"
-        , "type": "tree"
-        }
+    "menus": {
+      "debug/toolBar":
+	[
+	 { "when": "inDebugMode",
+           "command": "dap-extension.garbageCollect",
+           "group": "debug"
+         }
       ]
     },
-    "debuggers": [
+    "commands" :[
       {
-        "type": "dap-extension",
-        "languages": [
-          "Haskell"
-        ],
-        "program": "${workspaceFolder}/test.fullpak",
-        "label": "dap-extension",
-        "configurationAttributes": {
-          "attach": {
-            "required": ["program"],
-            "properties": {
-              "program": {
-                "type": "string",
-                "description": "Absolute path to the program",
-                "default": "${workspaceFolder}/test.fullpak"
-              }
-            }
-          }
-        },
-        "initialConfigurations": [
-          {
-            "name": "my project",
-            "type": "dap-extension",
-            "request": "attach",
-            "program": "${workspaceFolder}/test.fullpak"
-          }
-        ]
+	"command": "dap-extension.garbageCollect",
+        "category": "debug",
+	"title": "Garbage Collect"
+      }
+    ],
+    "debuggers": [
+      { "type": "dap-extension",
+	"languages": [
+	    "haskell"
+	],
+	"program": "${workspaceFolder}/test.fullpak",
+	"label": "dap-extension",
+	"configurationAttributes": {
+	  "attach": {
+	    "required": ["program"],
+	    "properties": {
+	      "program": {
+		"type": "string",
+		"description": "Absolute path to the program",
+		"default": "${workspaceFolder}/test.fullpak"
+	      }
+	    }
+	  }
+	},
+	"initialConfigurations": [
+	  {
+	    "type": "Connect to DAP ESTGi",
+	    "request": "attach",
+	    "program": "${workspaceFolder}/test.fullpak"
+	  }
+	]
       }
     ]
   },

dap-extension/src/extension.ts

@@ -16,25 +16,23 @@ export function activate(context: vscode.ExtensionContext) {
 //    vscode.debug.onDidReceiveDebugSessionCustomEvent
 	// Use the console to output diagnostic information (console.log) and errors (console.error)
 	// This line of code will only be executed once when your extension is activated
-	console.log('Congratulations, your extension "external-stg-debugger" is now active!');
 
 	// The command has been defined in the package.json file
 	// Now provide the implementation of the command with registerCommand
 	// The commandId parameter must match the command field in package.json
-	let disposable = vscode.commands.registerCommand('external-stg-debugger.helloWorld', () => {
 		// The code you place here will be executed every time your command is executed
 		// Display a message box to the user
-		vscode.window.showInformationMessage('Hello World from external-stg-debugger!');
-	});
-    console.log('foo');
+	context.subscriptions.push(vscode.commands.registerCommand('dap-extension.garbageCollect', () => {
+		// The code you place here will be executed every time your command is executed
+		// Display a message box to the user
+		vscode.debug.activeDebugSession?.customRequest('garbageCollect');
+                window.showInformationMessage('Running garbage collection...');
+	}));
 
 	runDebugger (context, new MockDebugAdapterServerDescriptorFactory());
-
-	context.subscriptions.push(disposable);
 }
 
 export function runDebugger (context: vscode.ExtensionContext, factory: MockDebugAdapterServerDescriptorFactory) {
-
 	context.subscriptions.push(vscode.debug.registerDebugAdapterDescriptorFactory('dap-extension', factory));
 	console.log('made it to runDebugger');
 

dap/exe/Main.hs

@@ -216,6 +216,11 @@ talk CommandAttach = do
       emitEvent :: DebugOutput -> Adaptor ESTG ()
       emitEvent cmd = logInfo $ BL8.pack (show cmd)
 ----------------------------------------------------------------------------
+talk (CustomCommand "garbageCollect") = do
+  logInfo "Running garbage collection..."
+  sendAndWait (CmdInternal "gc")
+  sendSuccesfulEmptyResponse
+----------------------------------------------------------------------------
 talk CommandContinue = do
   ESTG {..} <- getDebugSession
   sendAndWait CmdContinue

dap/hello/.vscode/launch.json

@@ -8,7 +8,13 @@
             "type": "dap-extension",
             "request": "attach",
             "program": "${workspaceFolder}/hello-macos.fullpak",
-            "name": "hello"
+            "name": "stack"
+        },
+        {
+            "type": "dap-extension",
+            "request": "attach",
+            "program": "${workspaceFolder}/hello-macos.fullpak",
+            "name": "cabal"
         }
     ]
-}
+}

dap/src/DAP/Types.hs

@@ -978,7 +978,7 @@ data Command
   | CommandReadMemory
   | CommandWriteMemory
   | CommandDisassemble
-  | CommandUnknown Text
+  | CustomCommand Text
   deriving stock (Show, Eq, Read, Generic)
 ----------------------------------------------------------------------------
 instance FromJSON Command where
@@ -987,12 +987,12 @@ instance FromJSON Command where
       Just cmd ->
         pure cmd
       Nothing ->
-        pure (CommandUnknown command)
+        pure (CustomCommand command)
     where
       name = show (typeRep (Proxy @Command))
 ----------------------------------------------------------------------------
 instance ToJSON Command where
-  toJSON (CommandUnknown x) = toJSON x
+  toJSON (CustomCommand x) = toJSON x
   toJSON cmd = genericToJSONWithModifier cmd
 ----------------------------------------------------------------------------
 data ErrorMessage