Move bqrs-utils.ts to /common

Author: robertbrignull

…ensions/ql-vscode/src/pure/bqrs-utils.ts …sions/ql-vscode/src/common/bqrs-utils.tsextensions/ql-vscode/src/pure/bqrs-utils.ts renamed to extensions/ql-vscode/src/common/bqrs-utils.ts extensions/ql-vscode/src/pure/bqrs-utils.ts renamed to extensions/ql-vscode/src/common/bqrs-utils.ts

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

extensions/ql-vscode/src/databases/local-databases/locations.ts

@@ -18,7 +18,7 @@ import {
 import {
   isLineColumnLoc,
   tryGetResolvableLocation,
-} from "../../pure/bqrs-utils";
+} from "../../common/bqrs-utils";
 import { getErrorMessage } from "../../pure/helpers-pure";
 import { Logger } from "../../common";
 import { DatabaseItem } from "./database-item";

extensions/ql-vscode/src/language-support/ast-viewer/ast-viewer.ts

@@ -22,7 +22,7 @@ import {
   isStringLoc,
   isWholeFileLoc,
   isLineColumnLoc,
-} from "../../pure/bqrs-utils";
+} from "../../common/bqrs-utils";
 import { DisposableObject } from "../../pure/disposable-object";
 import { asError, getErrorMessage } from "../../pure/helpers-pure";
 import { redactableError } from "../../pure/errors";

extensions/ql-vscode/src/language-support/contextual/file-range-from-uri.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 
 import { UrlValue, LineColumnLocation } from "../../common/bqrs-cli-types";
-import { isEmptyPath } from "../../pure/bqrs-utils";
+import { isEmptyPath } from "../../common/bqrs-utils";
 import { DatabaseItem } from "../../databases/local-databases";
 
 export function fileRangeFromURI(

extensions/ql-vscode/src/variant-analysis/markdown-generation.ts

@@ -1,5 +1,5 @@
 import { CellValue } from "../common/bqrs-cli-types";
-import { tryGetRemoteLocation } from "../pure/bqrs-utils";
+import { tryGetRemoteLocation } from "../common/bqrs-utils";
 import { createRemoteFileRef } from "../pure/location-link-utils";
 import { parseHighlightedLine, shouldHighlightLine } from "../pure/sarif-utils";
 import { convertNonPrintableChars } from "../pure/text-utils";

extensions/ql-vscode/src/view/results/alert-table.tsx

@@ -28,7 +28,7 @@ import {
   isNoLocation,
 } from "../../pure/sarif-utils";
 import { vscode } from "../vscode-api";
-import { isWholeFileLoc, isLineColumnLoc } from "../../pure/bqrs-utils";
+import { isWholeFileLoc, isLineColumnLoc } from "../../common/bqrs-utils";
 import { ScrollIntoViewHelper } from "./scroll-into-view-helper";
 import { sendTelemetry } from "../common/telemetry";
 

extensions/ql-vscode/src/view/results/graph.tsx

@@ -6,7 +6,7 @@ import {
   GraphInterpretationData,
 } from "../../pure/interface-types";
 import { graphviz, GraphvizOptions } from "d3-graphviz";
-import { tryGetLocationFromString } from "../../pure/bqrs-utils";
+import { tryGetLocationFromString } from "../../common/bqrs-utils";
 export type GraphProps = ResultTableProps & {
   resultSet: InterpretedResultSet<GraphInterpretationData>;
 };

extensions/ql-vscode/src/view/results/raw-results-table.tsx

@@ -16,7 +16,7 @@ import RawTableHeader from "./RawTableHeader";
 import RawTableRow from "./RawTableRow";
 import { ResultRow } from "../../common/bqrs-cli-types";
 import { onNavigation } from "./results";
-import { tryGetResolvableLocation } from "../../pure/bqrs-utils";
+import { tryGetResolvableLocation } from "../../common/bqrs-utils";
 import { ScrollIntoViewHelper } from "./scroll-into-view-helper";
 import { sendTelemetry } from "../common/telemetry";
 

extensions/ql-vscode/src/view/results/result-table-utils.tsx

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { UrlValue, ResolvableLocationValue } from "../../common/bqrs-cli-types";
-import { isStringLoc, tryGetResolvableLocation } from "../../pure/bqrs-utils";
+import { isStringLoc, tryGetResolvableLocation } from "../../common/bqrs-utils";
 import {
   RawResultsSortState,
   QueryMetadata,

extensions/ql-vscode/src/view/variant-analysis/RawResultsTable.tsx

@@ -7,7 +7,7 @@ import {
   RawResultSet,
   ResultSetSchema,
 } from "../../common/bqrs-cli-types";
-import { tryGetRemoteLocation } from "../../pure/bqrs-utils";
+import { tryGetRemoteLocation } from "../../common/bqrs-utils";
 import TextButton from "../common/TextButton";
 import { convertNonPrintableChars } from "../../pure/text-utils";
 import { sendTelemetry, useTelemetryOnChange } from "../common/telemetry";