Merge branch 'main' into robertbrignull/data-unsaved-changes

Author: robertbrignull

extensions/ql-vscode/src/code-tour.ts …ons/ql-vscode/src/code-tour/code-tour.tsextensions/ql-vscode/src/code-tour.ts renamed to extensions/ql-vscode/src/code-tour/code-tour.ts extensions/ql-vscode/src/code-tour.ts renamed to extensions/ql-vscode/src/code-tour/code-tour.ts

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

extensions/ql-vscode/src/databases/local-databases/database-manager.ts

@@ -21,7 +21,7 @@ import {
 } from "../../common/vscode/workspace-folders";
 import { isQueryLanguage } from "../../common/query-language";
 import { existsSync } from "fs";
-import { QlPackGenerator } from "../../qlpack-generator";
+import { QlPackGenerator } from "../../local-queries/qlpack-generator";
 import { asError, getErrorMessage } from "../../common/helpers-pure";
 import { DatabaseItem, PersistedDatabaseItem } from "./database-item";
 import { redactableError } from "../../common/errors";

extensions/ql-vscode/src/extension.ts

@@ -56,7 +56,7 @@ import {
   GithubRateLimitedError,
 } from "./codeql-cli/distribution";
 import { tmpDir, tmpDirDisposal } from "./tmp-dir";
-import { prepareCodeTour } from "./code-tour";
+import { prepareCodeTour } from "./code-tour/code-tour";
 import {
   showBinaryChoiceDialog,
   showInformationMessageWithAction,

extensions/ql-vscode/src/local-queries/local-queries.ts

@@ -44,7 +44,7 @@ import { CliVersionConstraint, CodeQLCliServer } from "../codeql-cli/cli";
 import { LocalQueryCommands } from "../common/commands";
 import { App } from "../common/app";
 import { DisposableObject } from "../common/disposable-object";
-import { SkeletonQueryWizard } from "../skeleton-query-wizard";
+import { SkeletonQueryWizard } from "./skeleton-query-wizard";
 import { LocalQueryRun } from "./local-query-run";
 import { createMultiSelectionCommand } from "../common/vscode/selection-commands";
 import { findLanguage } from "../codeql-cli/query-language";

…nsions/ql-vscode/src/qlpack-generator.ts …de/src/local-queries/qlpack-generator.tsextensions/ql-vscode/src/qlpack-generator.ts renamed to extensions/ql-vscode/src/local-queries/qlpack-generator.ts extensions/ql-vscode/src/qlpack-generator.ts renamed to extensions/ql-vscode/src/local-queries/qlpack-generator.ts

@@ -2,8 +2,8 @@ import { mkdir, writeFile } from "fs-extra";
 import { dump } from "js-yaml";
 import { join } from "path";
 import { Uri } from "vscode";
-import { CodeQLCliServer } from "./codeql-cli/cli";
-import { QueryLanguage } from "./common/query-language";
+import { CodeQLCliServer } from "../codeql-cli/cli";
+import { QueryLanguage } from "../common/query-language";
 
 export class QlPackGenerator {
   private readonly qlpackName: string;

…s/ql-vscode/src/skeleton-query-wizard.ts …c/local-queries/skeleton-query-wizard.tsextensions/ql-vscode/src/skeleton-query-wizard.ts renamed to extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts extensions/ql-vscode/src/skeleton-query-wizard.ts renamed to extensions/ql-vscode/src/local-queries/skeleton-query-wizard.ts

@@ -1,31 +1,31 @@
 import { join } from "path";
 import { Uri, workspace, window as Window } from "vscode";
-import { CodeQLCliServer } from "./codeql-cli/cli";
-import { BaseLogger } from "./common/logging";
-import { Credentials } from "./common/authentication";
-import { QueryLanguage } from "./common/query-language";
+import { CodeQLCliServer } from "../codeql-cli/cli";
+import { BaseLogger } from "../common/logging";
+import { Credentials } from "../common/authentication";
+import { QueryLanguage } from "../common/query-language";
 import {
   getFirstWorkspaceFolder,
   isFolderAlreadyInWorkspace,
-} from "./common/vscode/workspace-folders";
-import { getErrorMessage } from "./common/helpers-pure";
+} from "../common/vscode/workspace-folders";
+import { getErrorMessage } from "../common/helpers-pure";
 import { QlPackGenerator } from "./qlpack-generator";
-import { DatabaseItem, DatabaseManager } from "./databases/local-databases";
+import { DatabaseItem, DatabaseManager } from "../databases/local-databases";
 import {
   ProgressCallback,
   UserCancellationException,
-} from "./common/vscode/progress";
+} from "../common/vscode/progress";
 import {
   askForGitHubRepo,
   downloadGitHubDatabase,
-} from "./databases/database-fetcher";
+} from "../databases/database-fetcher";
 import {
   getQlPackLocation,
   isCodespacesTemplate,
   setQlPackLocation,
-} from "./config";
+} from "../config";
 import { existsSync } from "fs-extra";
-import { askForLanguage } from "./codeql-cli/query-language";
+import { askForLanguage } from "../codeql-cli/query-language";
 
 type QueryLanguagesToDatabaseMap = Record<string, string>;
 

extensions/ql-vscode/src/query-history/history-item-label-provider.ts

@@ -10,7 +10,7 @@ import {
 import { VariantAnalysisHistoryItem } from "./variant-analysis-history-item";
 import { assertNever } from "../common/helpers-pure";
 import { pluralize } from "../common/word";
-import { humanizeQueryStatus } from "../query-status";
+import { humanizeQueryStatus } from "./query-status";
 
 interface InterpolateReplacements {
   t: string; // Start time

extensions/ql-vscode/src/query-history/history-tree-data-provider.ts

@@ -11,7 +11,7 @@ import {
 import { DisposableObject } from "../common/disposable-object";
 import { assertNever } from "../common/helpers-pure";
 import { QueryHistoryInfo } from "./query-history-info";
-import { QueryStatus } from "../query-status";
+import { QueryStatus } from "./query-status";
 import { HistoryItemLabelProvider } from "./history-item-label-provider";
 
 export enum SortOrder {

extensions/ql-vscode/src/query-history/query-history-manager.ts

@@ -33,7 +33,7 @@ import { registerQueryHistoryScrubber } from "./query-history-scrubber";
 import {
   QueryStatus,
   variantAnalysisStatusToQueryStatus,
-} from "../query-status";
+} from "./query-status";
 import { readQueryHistoryFromFile, writeQueryHistoryToFile } from "./store";
 import { pathExists } from "fs-extra";
 import { CliVersionConstraint } from "../codeql-cli/cli";

extensions/ql-vscode/src/query-status.ts …vscode/src/query-history/query-status.tsextensions/ql-vscode/src/query-status.ts renamed to extensions/ql-vscode/src/query-history/query-status.ts extensions/ql-vscode/src/query-status.ts renamed to extensions/ql-vscode/src/query-history/query-status.ts

@@ -1,5 +1,5 @@
-import { assertNever } from "./common/helpers-pure";
-import { VariantAnalysisStatus } from "./variant-analysis/shared/variant-analysis";
+import { assertNever } from "../common/helpers-pure";
+import { VariantAnalysisStatus } from "../variant-analysis/shared/variant-analysis";
 
 export enum QueryStatus {
   InProgress = "InProgress",