Merge remote-tracking branch 'origin/main' into koesie10/auto-name-extension-pack

Author: koesie10

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,7 +1,7 @@
 import * as semver from "semver";
 import { runCodeQlCliCommand } from "./cli";
-import { Logger } from "../common";
-import { getErrorMessage } from "../pure/helpers-pure";
+import { Logger } from "../common/logging";
+import { getErrorMessage } from "../common/helpers-pure";
 
 /**
  * Get the version of a CodeQL CLI.

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

@@ -11,7 +11,7 @@ import tk from "tree-kill";
 import { promisify } from "util";
 import { CancellationToken, Disposable, Uri } from "vscode";
 
-import { BQRSInfo, DecodedBqrsChunk } from "../pure/bqrs-cli-types";
+import { BQRSInfo, DecodedBqrsChunk } from "../common/bqrs-cli-types";
 import { allowCanaryQueryServer, CliConfig } from "../config";
 import {
   DistributionProvider,
@@ -21,10 +21,11 @@ import {
   assertNever,
   getErrorMessage,
   getErrorStack,
-} from "../pure/helpers-pure";
-import { walkDirectory } from "../pure/files";
-import { QueryMetadata, SortDirection } from "../pure/interface-types";
-import { BaseLogger, Logger, ProgressReporter } from "../common";
+} from "../common/helpers-pure";
+import { walkDirectory } from "../common/files";
+import { QueryMetadata, SortDirection } from "../common/interface-types";
+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,
@@ -17,7 +17,7 @@ import {
   deprecatedCodeQlLauncherName,
   extractZipArchive,
   getRequiredAssetName,
-} from "../pure/distribution";
+} from "../common/distribution";
 import {
   InvocationRateLimiter,
   InvocationRateLimiterResultKind,

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 { QueryMetadata } from "../common/interface-types";
+import { extLogger } from "../common/logging/vscode";
 
 /**
  * Gets metadata for a query, if it exists.

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

@@ -1,5 +1,5 @@
 import { Credentials } from "./authentication";
-import { Disposable } from "../pure/disposable-object";
+import { Disposable } from "./disposable-object";
 import { AppEventEmitter } from "./events";
 import { NotificationLogger } from "./logging";
 import { Memento } from "./memento";

…ons/ql-vscode/src/pure/bqrs-cli-types.ts …s/ql-vscode/src/common/bqrs-cli-types.tsextensions/ql-vscode/src/pure/bqrs-cli-types.ts renamed to extensions/ql-vscode/src/common/bqrs-cli-types.ts extensions/ql-vscode/src/pure/bqrs-cli-types.ts renamed to extensions/ql-vscode/src/common/bqrs-cli-types.ts

@@ -4,7 +4,7 @@ import {
   LineColumnLocation,
   WholeFileLocation,
 } from "./bqrs-cli-types";
-import { createRemoteFileRef } from "./location-link-utils";
+import { createRemoteFileRef } from "../common/location-link-utils";
 
 /**
  * The CodeQL filesystem libraries use this pattern in `getURL()` predicates