Some more cleanup

Author: award999

lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts

@@ -231,8 +231,7 @@ export class LLDBDapDescriptorFactory
     executable: vscode.DebugAdapterExecutable | undefined,
   ): Promise<vscode.DebugAdapterDescriptor | undefined> {
     this.logger.info(`Creating debug adapter for session "${session.name}"`);
-    this.logger.debug(`Session "${session.name}" debug configuration:`);
-    this.logger.debug(JSON.stringify(session.configuration, undefined, 2));
+    this.logger.debug(`Session "${session.name}" debug configuration:\n` + JSON.stringify(session.configuration, undefined, 2));
     if (executable) {
       const error = new Error(
         "Setting the debug adapter executable in the package.json is not supported.",

lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts

@@ -80,8 +80,7 @@ export class LLDBDapConfigurationProvider
     token?: vscode.CancellationToken,
   ): Promise<vscode.DebugConfiguration> {
     this.logger.info(`Resolving debug configuration for "${debugConfiguration.name}"`);
-    this.logger.debug("Initial debug configuration:");
-    this.logger.debug(JSON.stringify(debugConfiguration, undefined, 2));
+    this.logger.debug("Initial debug configuration:\n" + JSON.stringify(debugConfiguration, undefined, 2));
     let config = vscode.workspace.getConfiguration("lldb-dap");
     for (const [key, cfg] of Object.entries(configurations)) {
       if (Reflect.has(debugConfiguration, key)) {
@@ -189,8 +188,7 @@ export class LLDBDapConfigurationProvider
         }
       }
 
-      this.logger.debug("Resolved debug configuration:");
-      this.logger.debug(JSON.stringify(debugConfiguration, undefined, 2));
+      this.logger.debug("Resolved debug configuration:\n" + JSON.stringify(debugConfiguration, undefined, 2));
 
       return debugConfiguration;
     } catch (error) {

lldb/tools/lldb-dap/src-ts/logger.ts

@@ -71,10 +71,12 @@ export class Logger implements vscode.Disposable {
     private normalizeMessage(message: any) {
         if (typeof message === "string") {
             return message;
-        } else if (typeof message === "object") {
+        }
+        try {
             return JSON.stringify(message);
+        } catch (e) {
+            return `${message}`;
         }
-        return `${message}`;
     }
 
     private outputChannelLevel(): string {