From b7a7329aff1abb7e877bb3fb086befca660eb053 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 May 2023 11:32:45 +0100 Subject: [PATCH] Move selection-commands.ts to be in the vscode directory --- .../ql-vscode/src/common/{ => vscode}/selection-commands.ts | 4 ++-- extensions/ql-vscode/src/databases/local-databases-ui.ts | 2 +- extensions/ql-vscode/src/local-queries/local-queries.ts | 2 +- .../ql-vscode/src/query-history/query-history-manager.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename extensions/ql-vscode/src/common/{ => vscode}/selection-commands.ts (95%) diff --git a/extensions/ql-vscode/src/common/selection-commands.ts b/extensions/ql-vscode/src/common/vscode/selection-commands.ts similarity index 95% rename from extensions/ql-vscode/src/common/selection-commands.ts rename to extensions/ql-vscode/src/common/vscode/selection-commands.ts index 1861339696c..0d930b8e198 100644 --- a/extensions/ql-vscode/src/common/selection-commands.ts +++ b/extensions/ql-vscode/src/common/vscode/selection-commands.ts @@ -1,9 +1,9 @@ -import { showAndLogErrorMessage } from "../helpers"; +import { showAndLogErrorMessage } from "../../helpers"; import { ExplorerSelectionCommandFunction, TreeViewContextMultiSelectionCommandFunction, TreeViewContextSingleSelectionCommandFunction, -} from "./commands"; +} from "../commands"; // A hack to match types that are not an array, which is useful to help avoid // misusing createSingleSelectionCommand, e.g. where T accidentally gets instantiated diff --git a/extensions/ql-vscode/src/databases/local-databases-ui.ts b/extensions/ql-vscode/src/databases/local-databases-ui.ts index 0839b2afc43..5fbc23c564a 100644 --- a/extensions/ql-vscode/src/databases/local-databases-ui.ts +++ b/extensions/ql-vscode/src/databases/local-databases-ui.ts @@ -49,7 +49,7 @@ import { LocalDatabasesCommands } from "../common/commands"; import { createMultiSelectionCommand, createSingleSelectionCommand, -} from "../common/selection-commands"; +} from "../common/vscode/selection-commands"; enum SortOrder { NameAsc = "NameAsc", diff --git a/extensions/ql-vscode/src/local-queries/local-queries.ts b/extensions/ql-vscode/src/local-queries/local-queries.ts index a5b7f3028d5..fa69f256f74 100644 --- a/extensions/ql-vscode/src/local-queries/local-queries.ts +++ b/extensions/ql-vscode/src/local-queries/local-queries.ts @@ -47,7 +47,7 @@ import { App } from "../common/app"; import { DisposableObject } from "../pure/disposable-object"; import { SkeletonQueryWizard } from "../skeleton-query-wizard"; import { LocalQueryRun } from "./local-query-run"; -import { createMultiSelectionCommand } from "../common/selection-commands"; +import { createMultiSelectionCommand } from "../common/vscode/selection-commands"; interface DatabaseQuickPickItem extends QuickPickItem { databaseItem: DatabaseItem; diff --git a/extensions/ql-vscode/src/query-history/query-history-manager.ts b/extensions/ql-vscode/src/query-history/query-history-manager.ts index ac24cd0bf73..2b42c3ddf50 100644 --- a/extensions/ql-vscode/src/query-history/query-history-manager.ts +++ b/extensions/ql-vscode/src/query-history/query-history-manager.ts @@ -59,7 +59,7 @@ import { tryOpenExternalFile } from "../common/vscode/external-files"; import { createMultiSelectionCommand, createSingleSelectionCommand, -} from "../common/selection-commands"; +} from "../common/vscode/selection-commands"; /** * query-history-manager.ts