Merge branch 'main' into robertbrignull/move-pure-1

Author: robertbrignull

extensions/ql-vscode/src/code-tour.ts

@@ -4,7 +4,7 @@ import { join } from "path";
 import { pathExists } from "fs-extra";
 import { isCodespacesTemplate } from "./config";
 import { showBinaryChoiceDialog } from "./common/vscode/dialog";
-import { extLogger } from "./common";
+import { extLogger } from "./common/logging/vscode";
 
 /**
  * Check if the current workspace is the CodeTour and open the workspace folder.

extensions/ql-vscode/src/codeql-cli/cli-version.ts

@@ -1,6 +1,6 @@
 import * as semver from "semver";
 import { runCodeQlCliCommand } from "./cli";
-import { Logger } from "../common";
+import { Logger } from "../common/logging";
 import { getErrorMessage } from "../common/helpers-pure";
 
 /**

extensions/ql-vscode/src/codeql-cli/cli.ts

@@ -24,7 +24,8 @@ import {
 } from "../common/helpers-pure";
 import { walkDirectory } from "../common/files";
 import { QueryMetadata, SortDirection } from "../pure/interface-types";
-import { BaseLogger, Logger, ProgressReporter } from "../common";
+import { BaseLogger, Logger } from "../common/logging";
+import { ProgressReporter } from "../common/logging/vscode";
 import { CompilationMessage } from "../pure/legacy-messages";
 import { sarifParser } from "../common/sarif-parser";
 import { App } from "../common/app";

extensions/ql-vscode/src/codeql-cli/distribution.ts

@@ -6,7 +6,7 @@ import * as semver from "semver";
 import { URL } from "url";
 import { ExtensionContext, Event } from "vscode";
 import { DistributionConfig } from "../config";
-import { extLogger } from "../common";
+import { extLogger } from "../common/logging/vscode";
 import { getCodeQlCliVersion } from "./cli-version";
 import {
   ProgressCallback,

extensions/ql-vscode/src/codeql-cli/query-language.ts

@@ -2,7 +2,7 @@ import { CodeQLCliServer } from "./cli";
 import { Uri, window } from "vscode";
 import { isQueryLanguage, QueryLanguage } from "../common/query-language";
 import { getOnDiskWorkspaceFolders } from "../common/vscode/workspace-folders";
-import { extLogger } from "../common";
+import { extLogger } from "../common/logging/vscode";
 import { UserCancellationException } from "../common/vscode/progress";
 import { showAndLogErrorMessage } from "../common/logging";
 

extensions/ql-vscode/src/codeql-cli/query-metadata.ts

@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "./cli";
 import { QueryMetadata } from "../pure/interface-types";
-import { extLogger } from "../common";
+import { extLogger } from "../common/logging/vscode";
 
 /**
  * Gets metadata for a query, if it exists.

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

@@ -2,5 +2,3 @@ export * from "./logger";
 export * from "./notification-logger";
 export * from "./notifications";
 export * from "./tee-logger";
-export * from "./vscode/loggers";
-export * from "./vscode/output-channel-logger";

extensions/ql-vscode/src/common/logging/index.ts

@@ -0,0 +1,2 @@
+export * from "./loggers";
+export * from "./output-channel-logger";

extensions/ql-vscode/src/common/logging/vscode/index.ts

@@ -1,7 +1,7 @@
 import { pathExists } from "fs-extra";
 import * as unzipper from "unzipper";
 import * as vscode from "vscode";
-import { extLogger } from "..";
+import { extLogger } from "../logging/vscode";
 
 // All path operations in this file must be on paths *within* the zip
 // archive.