Skip to content

Make use of asError instead of reimplementing #1997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
robertbrignull merged 2 commits into from
Jan 23, 2023
Merged

Make use of asError instead of reimplementing #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3316d17
Make use of asError instead of reimplementing
robertbrignull Jan 23, 2023
cc76ca8
Don't change compileAndRunQuery
robertbrignull Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions extensions/ql-vscode/src/commandRunner.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "vscode";
import { showAndLogErrorMessage, showAndLogWarningMessage } from "./helpers";
import { extLogger } from "./common";
import { getErrorMessage, getErrorStack } from "./pure/helpers-pure";
import { asError, getErrorMessage, getErrorStack } from "./pure/helpers-pure";
import { telemetryListener } from "./telemetry";

export class UserCancellationException extends Error {
Expand Down Expand Up @@ -126,7 +126,7 @@ export function commandRunner(
return await task(...args);
} catch (e) {
const errorMessage = `${getErrorMessage(e) || e} (${commandId})`;
error = e instanceof Error ? e : new Error(errorMessage);
error = asError(e);
const errorStack = getErrorStack(e);
if (e instanceof UserCancellationException) {
// User has cancelled this action manually
Expand Down Expand Up @@ -179,7 +179,7 @@ export function commandRunnerWithProgress<R>(
return await withProgress(progressOptionsWithDefaults, task, ...args);
} catch (e) {
const errorMessage = `${getErrorMessage(e) || e} (${commandId})`;
error = e instanceof Error ? e : new Error(errorMessage);
error = asError(e);
const errorStack = getErrorStack(e);
if (e instanceof UserCancellationException) {
// User has cancelled this action manually
Expand Down
4 changes: 2 additions & 2 deletions extensions/ql-vscode/src/databases.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from "./archive-filesystem-provider";
import { DisposableObject } from "./pure/disposable-object";
import { Logger, extLogger } from "./common";
import { getErrorMessage } from "./pure/helpers-pure";
import { asError, getErrorMessage } from "./pure/helpers-pure";
import { QueryRunner } from "./queryRunner";
import { pathsEqual } from "./pure/files";

Expand Down Expand Up @@ -370,7 +370,7 @@ export class DatabaseItemImpl implements DatabaseItem {
this._error = undefined;
} catch (e) {
this._contents = undefined;
this._error = e instanceof Error ? e : new Error(String(e));
this._error = asError(e);
throw e;
}
} finally {
Expand Down
6 changes: 3 additions & 3 deletions extensions/ql-vscode/src/pure/helpers-pure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ export const REPO_REGEX = /^[a-zA-Z0-9-_\.]+\/[a-zA-Z0-9-_\.]+$/;
*/
export const OWNER_REGEX = /^[a-zA-Z0-9-_\.]+$/;

export function getErrorMessage(e: any) {
export function getErrorMessage(e: unknown) {
return e instanceof Error ? e.message : String(e);
}

export function getErrorStack(e: any) {
export function getErrorStack(e: unknown) {
return e instanceof Error ? e.stack ?? "" : "";
}

export function asError(e: any): Error {
export function asError(e: unknown): Error {
return e instanceof Error ? e : new Error(String(e));
}
7 changes: 4 additions & 3 deletions extensions/ql-vscode/src/run-queries-shared.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import { DatabaseManager } from "./databases";
import { DecodedBqrsChunk } from "./pure/bqrs-cli-types";
import { extLogger, Logger } from "./common";
import { generateSummarySymbolsFile } from "./log-insights/summary-parser";
import { asError } from "./pure/helpers-pure";
import { getErrorMessage } from "./pure/helpers-pure";

/**
* run-queries.ts
Expand Down Expand Up @@ -270,9 +270,10 @@ export class QueryEvaluationInfo {
);
return this.evalLogSummaryPath;
} catch (e) {
const err = asError(e);
void showAndLogWarningMessage(
`Failed to generate human-readable structured evaluator log summary. Reason: ${err.message}`,
`Failed to generate human-readable structured evaluator log summary. Reason: ${getErrorMessage(
e,
)}`,
);
return undefined;
}
Expand Down