Add logger to the app container (#1874)

Author: charisk

extensions/ql-vscode/src/common/app.ts

@@ -1,10 +1,12 @@
 import { Disposable } from "../pure/disposable-object";
 import { AppEventEmitter } from "./events";
+import { Logger } from "./logging";
 
 export interface App {
   createEventEmitter<T>(): AppEventEmitter<T>;
   executeCommand(command: string, ...args: any): Thenable<void>;
   mode: AppMode;
+  logger: Logger;
   subscriptions: Disposable[];
   extensionPath: string;
   globalStoragePath: string;

extensions/ql-vscode/src/common/vscode/vscode-app.ts

@@ -2,6 +2,7 @@ import * as vscode from "vscode";
 import { Disposable } from "../../pure/disposable-object";
 import { App, AppMode } from "../app";
 import { AppEventEmitter } from "../events";
+import { extLogger, Logger } from "../logging";
 import { VSCodeAppEventEmitter } from "./events";
 
 export class ExtensionApp implements App {
@@ -36,6 +37,10 @@ export class ExtensionApp implements App {
     }
   }
 
+  public get logger(): Logger {
+    return extLogger;
+  }
+
   public createEventEmitter<T>(): AppEventEmitter<T> {
     return new VSCodeAppEventEmitter<T>();
   }

extensions/ql-vscode/test/__mocks__/appMock.ts

@@ -1,6 +1,7 @@
 import { App, AppMode } from "../../src/common/app";
 import { AppEvent, AppEventEmitter } from "../../src/common/events";
 import { Disposable } from "../../src/pure/disposable-object";
+import { createMockLogger } from "./loggerMock";
 
 export function createMockApp({
   extensionPath = "/mock/extension/path",
@@ -17,6 +18,7 @@ export function createMockApp({
 }): App {
   return {
     mode: AppMode.Test,
+    logger: createMockLogger(),
     subscriptions: [],
     extensionPath,
     workspaceStoragePath,

extensions/ql-vscode/test/__mocks__/loggerMock.ts

@@ -0,0 +1,9 @@
+import { Logger } from "../../src/common";
+
+export function createMockLogger(): Logger {
+  return {
+    log: jest.fn(() => Promise.resolve()),
+    show: jest.fn(),
+    removeAdditionalLogLocation: jest.fn(),
+  };
+}