File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed
extensions/ql-vscode/src/data-extensions-editor Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -294,7 +294,11 @@ export class DataExtensionsEditorView extends AbstractWebview<
294294 tokenSource . token ,
295295 ) ;
296296 } catch ( e : unknown ) {
297- void extLogger . log ( `Error: ${ getErrorMessage ( e ) } ` ) ;
297+ void showAndLogExceptionWithTelemetry (
298+ redactableError (
299+ asError ( e ) ,
300+ ) `Failed to generate flow model: ${ getErrorMessage ( e ) } ` ,
301+ ) ;
298302 }
299303
300304 await this . databaseManager . removeDatabaseItem (
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ import { DatabaseItem } from "../local-databases";
33import { join } from "path" ;
44import { QueryRunner } from "../queryRunner" ;
55import { CodeQLCliServer } from "../cli" ;
6- import { extLogger , TeeLogger } from "../common" ;
6+ import { TeeLogger } from "../common" ;
77import { extensiblePredicateDefinitions } from "./yaml" ;
88import { ProgressCallback } from "../progress" ;
99import { getOnDiskWorkspaceFolders } from "../helpers" ;
@@ -27,7 +27,7 @@ class FlowModelGenerator {
2727 type : Exclude < ModeledMethodType , "none" > ,
2828 queryName : string ,
2929 queryStep : number ,
30- ) : Promise < ModeledMethodWithSignature [ ] | undefined > {
30+ ) : Promise < ModeledMethodWithSignature [ ] > {
3131 const definition = extensiblePredicateDefinitions [ type ] ;
3232
3333 const query = join (
@@ -63,10 +63,9 @@ class FlowModelGenerator {
6363
6464 const bqrsInfo = await this . cli . bqrsInfo ( bqrsPath ) ;
6565 if ( bqrsInfo [ "result-sets" ] . length !== 1 ) {
66- void extLogger . log (
66+ throw new Error (
6767 `Expected exactly one result set, got ${ bqrsInfo [ "result-sets" ] . length } ` ,
6868 ) ;
69- return undefined ;
7069 }
7170
7271 const resultSet = bqrsInfo [ "result-sets" ] [ 0 ] ;
You can’t perform that action at this time.
0 commit comments