Merge pull request #2754 from github/starcke/rename-directories

Starcke/rename directories

CODEOWNERS

@@ -1,5 +1,5 @@
 **/* @github/codeql-vscode-reviewers
 **/variant-analysis/ @github/code-scanning-secexp-reviewers
 **/databases/ @github/code-scanning-secexp-reviewers
-**/data-extensions-editor/ @github/code-scanning-secexp-reviewers
+**/model-editor/ @github/code-scanning-secexp-reviewers
 **/queries-panel/ @github/code-scanning-secexp-reviewers

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

@@ -12,7 +12,7 @@ import type {
 } from "../variant-analysis/shared/variant-analysis";
 import type { QLDebugConfiguration } from "../debugger/debug-configuration";
 import type { QueryTreeViewItem } from "../queries-panel/query-tree-view-item";
-import type { Usage } from "../data-extensions-editor/external-api-usage";
+import type { Usage } from "../model-editor/external-api-usage";
 
 // A command function matching the signature that VS Code calls when
 // a command is invoked from a context menu on a TreeView with

extensions/ql-vscode/src/common/interface-types.ts

@@ -17,13 +17,10 @@ import {
 } from "../variant-analysis/shared/variant-analysis-filter-sort";
 import { ErrorLike } from "../common/errors";
 import { DataFlowPaths } from "../variant-analysis/shared/data-flow-paths";
-import {
-  ExternalApiUsage,
-  Usage,
-} from "../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../data-extensions-editor/modeled-method";
-import { DataExtensionEditorViewState } from "../data-extensions-editor/shared/view-state";
-import { Mode } from "../data-extensions-editor/shared/mode";
+import { ExternalApiUsage, Usage } from "../model-editor/external-api-usage";
+import { ModeledMethod } from "../model-editor/modeled-method";
+import { DataExtensionEditorViewState } from "../model-editor/shared/view-state";
+import { Mode } from "../model-editor/shared/mode";
 
 /**
  * This module contains types and code that are shared between

extensions/ql-vscode/src/extension.ts

@@ -128,7 +128,7 @@ import { getAstCfgCommands } from "./language-support/ast-viewer/ast-cfg-command
 import { App } from "./common/app";
 import { registerCommandWithErrorHandling } from "./common/vscode/commands";
 import { DebuggerUI } from "./debugger/debugger-ui";
-import { DataExtensionsEditorModule } from "./data-extensions-editor/data-extensions-editor-module";
+import { DataExtensionsEditorModule } from "./model-editor/data-extensions-editor-module";
 import { TestManager } from "./query-testing/test-manager";
 import { TestRunner } from "./query-testing/test-runner";
 import { TestManagerBase } from "./query-testing/test-manager-base";

extensions/ql-vscode/src/stories/model-editor/DataExtensionsEditor.stories.tsx

@@ -2,9 +2,9 @@ import * as React from "react";
 
 import { Meta, StoryFn } from "@storybook/react";
 
-import { Mode } from "../../data-extensions-editor/shared/mode";
-import { DataExtensionsEditor as DataExtensionsEditorComponent } from "../../view/data-extensions-editor/DataExtensionsEditor";
-import { CallClassification } from "../../data-extensions-editor/external-api-usage";
+import { Mode } from "../../model-editor/shared/mode";
+import { DataExtensionsEditor as DataExtensionsEditorComponent } from "../../view/model-editor/DataExtensionsEditor";
+import { CallClassification } from "../../model-editor/external-api-usage";
 
 export default {
   title: "CodeQL Model Editor/CodeQL Model Editor",

extensions/ql-vscode/src/stories/model-editor/MethodRow.stories.tsx

@@ -2,8 +2,8 @@ import * as React from "react";
 
 import { Meta, StoryFn } from "@storybook/react";
 
-import { MethodRow as MethodRowComponent } from "../../view/data-extensions-editor/MethodRow";
-import { CallClassification } from "../../data-extensions-editor/external-api-usage";
+import { MethodRow as MethodRowComponent } from "../../view/model-editor/MethodRow";
+import { CallClassification } from "../../model-editor/external-api-usage";
 
 export default {
   title: "CodeQL Model Editor/Method Row",

extensions/ql-vscode/src/view/model-editor/DataExtensionsEditor.tsx

@@ -7,19 +7,19 @@ import {
   VSCodeTag,
 } from "@vscode/webview-ui-toolkit/react";
 import { styled } from "styled-components";
-import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../model-editor/external-api-usage";
+import { ModeledMethod } from "../../model-editor/modeled-method";
 import { assertNever } from "../../common/helpers-pure";
 import { vscode } from "../vscode-api";
-import { calculateModeledPercentage } from "../../data-extensions-editor/shared/modeled-percentage";
+import { calculateModeledPercentage } from "../../model-editor/shared/modeled-percentage";
 import { LinkIconButton } from "../variant-analysis/LinkIconButton";
-import { DataExtensionEditorViewState } from "../../data-extensions-editor/shared/view-state";
+import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
 import { ModeledMethodsList } from "./ModeledMethodsList";
 import { percentFormatter } from "./formatters";
-import { Mode } from "../../data-extensions-editor/shared/mode";
-import { InProgressMethods } from "../../data-extensions-editor/shared/in-progress-methods";
+import { Mode } from "../../model-editor/shared/mode";
+import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 import { getLanguageDisplayName } from "../../common/query-language";
-import { INITIAL_HIDE_MODELED_APIS_VALUE } from "../../data-extensions-editor/shared/hide-modeled-apis";
+import { INITIAL_HIDE_MODELED_APIS_VALUE } from "../../model-editor/shared/hide-modeled-apis";
 
 const LoadingContainer = styled.div`
   text-align: center;

extensions/ql-vscode/src/view/model-editor/KindInput.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { ChangeEvent, useCallback, useEffect, useMemo } from "react";
-import type { ModeledMethod } from "../../data-extensions-editor/modeled-method";
+import type { ModeledMethod } from "../../model-editor/modeled-method";
 import { Dropdown } from "../common/Dropdown";
 
 type Props = {

extensions/ql-vscode/src/view/model-editor/LibraryRow.tsx

@@ -1,20 +1,20 @@
 import * as React from "react";
 import { useCallback, useMemo, useState } from "react";
 import { styled } from "styled-components";
-import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../model-editor/external-api-usage";
+import { ModeledMethod } from "../../model-editor/modeled-method";
 import { ModeledMethodDataGrid } from "./ModeledMethodDataGrid";
-import { calculateModeledPercentage } from "../../data-extensions-editor/shared/modeled-percentage";
+import { calculateModeledPercentage } from "../../model-editor/shared/modeled-percentage";
 import { percentFormatter } from "./formatters";
 import { Codicon } from "../common";
-import { Mode } from "../../data-extensions-editor/shared/mode";
+import { Mode } from "../../model-editor/shared/mode";
 import {
   VSCodeButton,
   VSCodeDivider,
   VSCodeTag,
 } from "@vscode/webview-ui-toolkit/react";
-import { DataExtensionEditorViewState } from "../../data-extensions-editor/shared/view-state";
-import { InProgressMethods } from "../../data-extensions-editor/shared/in-progress-methods";
+import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
+import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 
 const LibraryContainer = styled.div`
   background-color: var(--vscode-peekViewResult-background);

extensions/ql-vscode/src/view/model-editor/MethodClassifications.tsx

@@ -3,7 +3,7 @@ import { useMemo } from "react";
 import {
   CallClassification,
   ExternalApiUsage,
-} from "../../data-extensions-editor/external-api-usage";
+} from "../../model-editor/external-api-usage";
 import { VSCodeTag } from "@vscode/webview-ui-toolkit/react";
 import { styled } from "styled-components";
 

extensions/ql-vscode/src/view/model-editor/MethodRow.tsx

@@ -9,15 +9,15 @@ import { ChangeEvent, useCallback, useMemo } from "react";
 import { styled } from "styled-components";
 import { vscode } from "../vscode-api";
 
-import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
+import { ExternalApiUsage } from "../../model-editor/external-api-usage";
 import {
   ModeledMethod,
   ModeledMethodType,
   Provenance,
-} from "../../data-extensions-editor/modeled-method";
+} from "../../model-editor/modeled-method";
 import { KindInput } from "./KindInput";
-import { extensiblePredicateDefinitions } from "../../data-extensions-editor/predicates";
-import { Mode } from "../../data-extensions-editor/shared/mode";
+import { extensiblePredicateDefinitions } from "../../model-editor/predicates";
+import { Mode } from "../../model-editor/shared/mode";
 import { Dropdown } from "../common/Dropdown";
 import { MethodClassifications } from "./MethodClassifications";
 import {

extensions/ql-vscode/src/view/model-editor/ModeledMethodDataGrid.tsx

@@ -5,12 +5,12 @@ import {
   VSCodeDataGridRow,
 } from "@vscode/webview-ui-toolkit/react";
 import { MethodRow } from "./MethodRow";
-import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../model-editor/external-api-usage";
+import { ModeledMethod } from "../../model-editor/modeled-method";
 import { useMemo } from "react";
-import { Mode } from "../../data-extensions-editor/shared/mode";
-import { sortMethods } from "../../data-extensions-editor/shared/sorting";
-import { InProgressMethods } from "../../data-extensions-editor/shared/in-progress-methods";
+import { Mode } from "../../model-editor/shared/mode";
+import { sortMethods } from "../../model-editor/shared/sorting";
+import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 
 type Props = {
   packageName: string;

extensions/ql-vscode/src/view/model-editor/ModeledMethodsList.tsx

@@ -1,15 +1,15 @@
 import * as React from "react";
 import { useMemo } from "react";
-import { ExternalApiUsage } from "../../data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../model-editor/external-api-usage";
+import { ModeledMethod } from "../../model-editor/modeled-method";
 import { LibraryRow } from "./LibraryRow";
-import { Mode } from "../../data-extensions-editor/shared/mode";
+import { Mode } from "../../model-editor/shared/mode";
 import {
   groupMethods,
   sortGroupNames,
-} from "../../data-extensions-editor/shared/sorting";
-import { DataExtensionEditorViewState } from "../../data-extensions-editor/shared/view-state";
-import { InProgressMethods } from "../../data-extensions-editor/shared/in-progress-methods";
+} from "../../model-editor/shared/sorting";
+import { DataExtensionEditorViewState } from "../../model-editor/shared/view-state";
+import { InProgressMethods } from "../../model-editor/shared/in-progress-methods";
 
 type Props = {
   externalApiUsages: ExternalApiUsage[];

extensions/ql-vscode/test/factories/data-extension/external-api-factories.ts

@@ -2,8 +2,8 @@ import {
   Usage,
   ExternalApiUsage,
   CallClassification,
-} from "../../../src/data-extensions-editor/external-api-usage";
-import { ModeledMethodType } from "../../../src/data-extensions-editor/modeled-method";
+} from "../../../src/model-editor/external-api-usage";
+import { ModeledMethodType } from "../../../src/model-editor/modeled-method";
 import { ResolvableLocationValue } from "../../../src/common/bqrs-cli-types";
 
 export function createExternalApiUsage({

extensions/ql-vscode/test/unit-tests/model-editor/auto-model.test.ts

@@ -2,14 +2,14 @@ import {
   createAutoModelRequest,
   encodeSarif,
   getCandidates,
-} from "../../../src/data-extensions-editor/auto-model";
-import { Mode } from "../../../src/data-extensions-editor/shared/mode";
-import { AutomodelMode } from "../../../src/data-extensions-editor/auto-model-api";
-import { AutoModelQueriesResult } from "../../../src/data-extensions-editor/auto-model-codeml-queries";
+} from "../../../src/model-editor/auto-model";
+import { Mode } from "../../../src/model-editor/shared/mode";
+import { AutomodelMode } from "../../../src/model-editor/auto-model-api";
+import { AutoModelQueriesResult } from "../../../src/model-editor/auto-model-codeml-queries";
 import * as sarif from "sarif";
 import { gzipDecode } from "../../../src/common/zlib";
-import { ExternalApiUsage } from "../../../src/data-extensions-editor/external-api-usage";
-import { ModeledMethod } from "../../../src/data-extensions-editor/modeled-method";
+import { ExternalApiUsage } from "../../../src/model-editor/external-api-usage";
+import { ModeledMethod } from "../../../src/model-editor/modeled-method";
 
 describe("createAutoModelRequest", () => {
   const createSarifLog = (queryId: string): sarif.Log => {

extensions/ql-vscode/test/unit-tests/model-editor/bqrs.test.ts

@@ -1,6 +1,6 @@
-import { decodeBqrsToExternalApiUsages } from "../../../src/data-extensions-editor/bqrs";
+import { decodeBqrsToExternalApiUsages } from "../../../src/model-editor/bqrs";
 import { DecodedBqrsChunk } from "../../../src/common/bqrs-cli-types";
-import { CallClassification } from "../../../src/data-extensions-editor/external-api-usage";
+import { CallClassification } from "../../../src/model-editor/external-api-usage";
 
 describe("decodeBqrsToExternalApiUsages", () => {
   const chunk: DecodedBqrsChunk = {

extensions/ql-vscode/test/unit-tests/model-editor/extension-pack-name.test.ts

@@ -3,7 +3,7 @@ import {
   formatPackName,
   parsePackName,
   validatePackName,
-} from "../../../src/data-extensions-editor/extension-pack-name";
+} from "../../../src/model-editor/extension-pack-name";
 
 describe("autoNameExtensionPack", () => {
   const testCases: Array<{

extensions/ql-vscode/test/unit-tests/model-editor/library.test.ts

@@ -1,4 +1,4 @@
-import { parseLibraryFilename } from "../../../src/data-extensions-editor/library";
+import { parseLibraryFilename } from "../../../src/model-editor/library";
 
 describe("parseLibraryFilename", () => {
   const testCases = [

extensions/ql-vscode/test/unit-tests/model-editor/shared/modeled-percentage.spec.ts

@@ -1,4 +1,4 @@
-import { calculateModeledPercentage } from "../../../../src/data-extensions-editor/shared/modeled-percentage";
+import { calculateModeledPercentage } from "../../../../src/model-editor/shared/modeled-percentage";
 
 describe("calculateModeledPercentage", () => {
   it("when there are no external API usages", () => {

extensions/ql-vscode/test/unit-tests/model-editor/yaml.test.ts

@@ -4,8 +4,8 @@ import {
   createDataExtensionYamlsForFrameworkMode,
   createFilenameForLibrary,
   loadDataExtensionYaml,
-} from "../../../src/data-extensions-editor/yaml";
-import { CallClassification } from "../../../src/data-extensions-editor/external-api-usage";
+} from "../../../src/model-editor/yaml";
+import { CallClassification } from "../../../src/model-editor/external-api-usage";
 
 describe("createDataExtensionYaml", () => {
   it("creates the correct YAML file", () => {

extensions/ql-vscode/test/vscode-tests/cli-integration/model-editor/modeled-method-fs.test.ts

@@ -6,8 +6,8 @@ import { mkdirSync, writeFileSync } from "fs";
 import {
   listModelFiles,
   loadModeledMethods,
-} from "../../../../src/data-extensions-editor/modeled-method-fs";
-import { ExtensionPack } from "../../../../src/data-extensions-editor/shared/extension-pack";
+} from "../../../../src/model-editor/modeled-method-fs";
+import { ExtensionPack } from "../../../../src/model-editor/shared/extension-pack";
 import { join } from "path";
 import { extLogger } from "../../../../src/common/logging/vscode";
 import { homedir } from "os";

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/auto-model-codeml-queries.test.ts

@@ -8,13 +8,13 @@ import { QueryResultType } from "../../../../src/query-server/new-messages";
 import {
   generateCandidateFilterPack,
   runAutoModelQueries,
-} from "../../../../src/data-extensions-editor/auto-model-codeml-queries";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+} from "../../../../src/model-editor/auto-model-codeml-queries";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { QueryRunner } from "../../../../src/query-server";
 import * as queryResolver from "../../../../src/local-queries/query-resolver";
-import { MethodSignature } from "../../../../src/data-extensions-editor/external-api-usage";
+import { MethodSignature } from "../../../../src/model-editor/external-api-usage";
 import { join } from "path";
 import { exists, readFile } from "fs-extra";
 import { load as loadYaml } from "js-yaml";

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/data-extensions-editor-queries.test.ts

@@ -1,11 +1,11 @@
 import { readFile, readFileSync, readdir } from "fs-extra";
 import { join } from "path";
 import { load } from "js-yaml";
-import { setUpPack } from "../../../../src/data-extensions-editor/data-extensions-editor-queries";
+import { setUpPack } from "../../../../src/model-editor/data-extensions-editor-queries";
 import { dirSync } from "tmp-promise";
-import { fetchExternalApiQueries } from "../../../../src/data-extensions-editor/queries";
+import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
 import { QueryLanguage } from "../../../../src/common/query-language";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { mockedObject } from "../../utils/mocking.helpers";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extension-pack-picker.test.ts

@@ -16,8 +16,8 @@ import { QlpacksInfo } from "../../../../src/codeql-cli/cli";
 
 import * as config from "../../../../src/config";
 
-import { pickExtensionPack } from "../../../../src/data-extensions-editor/extension-pack-picker";
-import { ExtensionPack } from "../../../../src/data-extensions-editor/shared/extension-pack";
+import { pickExtensionPack } from "../../../../src/model-editor/extension-pack-picker";
+import { ExtensionPack } from "../../../../src/model-editor/shared/extension-pack";
 import { createMockLogger } from "../../../__mocks__/loggerMock";
 import { vscodeGetConfigurationMock } from "../../test-config";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/extensions-workspace-folder.test.ts

@@ -1,7 +1,7 @@
 import { Uri, workspace, WorkspaceFolder } from "vscode";
 import { dir, DirectoryResult } from "tmp-promise";
 import { join } from "path";
-import { autoPickExtensionsDirectory } from "../../../../src/data-extensions-editor/extensions-workspace-folder";
+import { autoPickExtensionsDirectory } from "../../../../src/model-editor/extensions-workspace-folder";
 import * as files from "../../../../src/common/files";
 import { mkdirp } from "fs-extra";
 

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/external-api-usage-query.test.ts

@@ -1,7 +1,7 @@
 import {
   readQueryResults,
   runExternalApiQueries,
-} from "../../../../src/data-extensions-editor/external-api-usage-queries";
+} from "../../../../src/model-editor/external-api-usage-queries";
 import { createMockLogger } from "../../../__mocks__/loggerMock";
 import {
   DatabaseItem,
@@ -9,13 +9,13 @@ import {
 } from "../../../../src/databases/local-databases";
 import { dirSync, file } from "tmp-promise";
 import { QueryResultType } from "../../../../src/query-server/new-messages";
-import { fetchExternalApiQueries } from "../../../../src/data-extensions-editor/queries";
+import { fetchExternalApiQueries } from "../../../../src/model-editor/queries";
 import * as log from "../../../../src/common/logging/notifications";
 import { RedactableError } from "../../../../src/common/errors";
 import { showAndLogExceptionWithTelemetry } from "../../../../src/common/logging";
 import { QueryLanguage } from "../../../../src/common/query-language";
 import { mockedObject, mockedUri } from "../../utils/mocking.helpers";
-import { Mode } from "../../../../src/data-extensions-editor/shared/mode";
+import { Mode } from "../../../../src/model-editor/shared/mode";
 import { join } from "path";
 import { CodeQLCliServer } from "../../../../src/codeql-cli/cli";
 import { QueryRunner } from "../../../../src/query-server";

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-data-provider.test.ts

@@ -1,6 +1,6 @@
 import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
-import { ExternalApiUsage } from "../../../../../src/data-extensions-editor/external-api-usage";
-import { MethodsUsageDataProvider } from "../../../../../src/data-extensions-editor/methods-usage/methods-usage-data-provider";
+import { ExternalApiUsage } from "../../../../../src/model-editor/external-api-usage";
+import { MethodsUsageDataProvider } from "../../../../../src/model-editor/methods-usage/methods-usage-data-provider";
 import { DatabaseItem } from "../../../../../src/databases/local-databases";
 import {
   createExternalApiUsage,

extensions/ql-vscode/test/vscode-tests/no-workspace/model-editor/methods-usage/methods-usage-panel.test.ts

@@ -1,7 +1,7 @@
 import { window, TreeView } from "vscode";
 import { CodeQLCliServer } from "../../../../../src/codeql-cli/cli";
-import { ExternalApiUsage } from "../../../../../src/data-extensions-editor/external-api-usage";
-import { MethodsUsagePanel } from "../../../../../src/data-extensions-editor/methods-usage/methods-usage-panel";
+import { ExternalApiUsage } from "../../../../../src/model-editor/external-api-usage";
+import { MethodsUsagePanel } from "../../../../../src/model-editor/methods-usage/methods-usage-panel";
 import { DatabaseItem } from "../../../../../src/databases/local-databases";
 import { mockedObject } from "../../../utils/mocking.helpers";
 import {