Skip to content

Commit 8c727fd

Browse files
Merge pull request #456 from codefori/fix/runEditorStatementWithClosedEditor
Fixed `runEditorStatement` command crashing when invoked with no editor opened
2 parents 365ff2c + 288188b commit 8c727fd

File tree

1 file changed

+14
-15
lines changed

1 file changed

+14
-15
lines changed

src/views/results/index.ts

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
import * as vscode from "vscode";
2-
import crypto from "crypto";
3-
import { SnippetString, ViewColumn, TreeView, window } from "vscode"
2+
import { SnippetString, TreeView, ViewColumn, window } from "vscode";
43

54
import * as csv from "csv/sync";
65

76
import { JobManager } from "../../config";
7+
import Configuration from "../../configuration";
8+
import { ExplainType } from "../../connection/types";
9+
import { DbCache } from "../../language/providers/logic/cache";
10+
import { getSqlDocument } from "../../language/providers/logic/parse";
811
import Document from "../../language/sql/document";
9-
import { ObjectRef, ParsedEmbeddedStatement, StatementGroup, StatementType } from "../../language/sql/types";
1012
import Statement from "../../language/sql/statement";
11-
import { ExplainTree } from "./explain/nodes";
12-
import { DoveResultsView, ExplainTreeItem } from "./explain/doveResultsView";
13-
import { DoveNodeView, PropertyNode } from "./explain/doveNodeView";
14-
import { DoveTreeDecorationProvider } from "./explain/doveTreeDecorationProvider";
15-
import { ResultSetPanelProvider, SqlParameter } from "./resultSetPanelProvider";
16-
import { generateSqlForAdvisedIndexes } from "./explain/advice";
13+
import { ObjectRef, ParsedEmbeddedStatement, StatementGroup, StatementType } from "../../language/sql/types";
1714
import { updateStatusBar } from "../jobManager/statusBar";
18-
import { DbCache } from "../../language/providers/logic/cache";
19-
import { ExplainType } from "../../connection/types";
20-
import { queryResultToRpgDs } from "./codegen";
21-
import Configuration from "../../configuration";
22-
import { getSqlDocument } from "../../language/providers/logic/parse";
2315
import { getLiteralsFromStatement, getPriorBindableStatement } from "./binding";
16+
import { queryResultToRpgDs } from "./codegen";
2417
import { registerRunStatement } from "./editorUi";
18+
import { generateSqlForAdvisedIndexes } from "./explain/advice";
19+
import { DoveNodeView, PropertyNode } from "./explain/doveNodeView";
20+
import { DoveResultsView, ExplainTreeItem } from "./explain/doveResultsView";
21+
import { DoveTreeDecorationProvider } from "./explain/doveTreeDecorationProvider";
22+
import { ExplainTree } from "./explain/nodes";
23+
import { ResultSetPanelProvider, SqlParameter } from "./resultSetPanelProvider";
2524

2625
export type StatementQualifier = "statement" | "bind" | "update" | "explain" | "onlyexplain" | "json" | "csv" | "cl" | "sql" | "rpg";
2726

@@ -379,7 +378,7 @@ async function runHandler(options?: StatementInfo) {
379378
}
380379

381380
const uiId = registerRunStatement(statementDetail);
382-
const eol = editor.document.eol === vscode.EndOfLine.CRLF ? `\r\n` : `\n`;
381+
const eol = editor?.document.eol === vscode.EndOfLine.CRLF ? `\r\n` : `\n`;
383382
const basicSelect = statementDetail.content.split(eol).filter(line => !line.trimStart().startsWith(`--`)).join(eol);
384383

385384
chosenView.setScrolling({ // Never errors

0 commit comments

Comments
 (0)