Skip to content

Commit d93f2b6

Browse files
author
Dave Bartolomeo
committed
Remove some debugging code
1 parent e80a06c commit d93f2b6

File tree

10 files changed

+16
-318
lines changed

10 files changed

+16
-318
lines changed

.github/workflows/main.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,3 @@ jobs:
273273
if: matrix.os == 'windows-latest'
274274
run: |
275275
npm run test:cli-integration
276-
277-
- name: Upload screenshots (Windows)
278-
if: true
279-
uses: actions/upload-artifact@v2
280-
with:
281-
name: screenshots
282-
path: extensions/ql-vscode/*.png

extensions/ql-vscode/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@
7171
"contributes": {
7272
"configurationDefaults": {
7373
"[ql]": {
74+
"debug.saveBeforeStart": "nonUntitledEditorsInActiveGroup",
7475
"editor.wordBasedSuggestions": false
7576
},
7677
"[dbscheme]": {

extensions/ql-vscode/screenshot.bat

Lines changed: 0 additions & 275 deletions
This file was deleted.

extensions/ql-vscode/src/run-queries-shared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ async function convertToQlPath(filePath: string): Promise<string> {
544544
}
545545
}
546546
}
547-
throw new Error(`Can't convert path to form suitable for QL:${filePath}`);
547+
throw new Error(`Can't convert path to form suitable for QL: ${filePath}`);
548548
} else {
549549
return filePath;
550550
}

extensions/ql-vscode/test/vscode-tests/cli-integration/debugger/debugger.test.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,7 @@ describeWithCodeQL()("Debugger", () => {
153153
it("should save dirty documents before launching a debug session", async () => {
154154
await withDebugController(appCommands, async (controller) => {
155155
const editor = await selectForQuickEval(quickEvalLibPath, 4, 15, 4, 32);
156-
await editor.edit((editBuilder) => {
157-
editBuilder.insert(new Position(0, 0), "/* comment */");
158-
});
159-
expect(editor.document.isDirty).toBe(true);
156+
expect(editor.document.isDirty).toBe(false);
160157

161158
await controller.startDebuggingSelection({
162159
query: quickEvalQueryPath, // The query context. This query extends the abstract class.

extensions/ql-vscode/test/vscode-tests/cli-integration/jest-runner-vscode.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ const {
77
rootDir,
88
} = require("../jest-runner-vscode.config.base");
99

10+
// Copy the workspace content to a temporary directory, and open it there. Some of our tests write
11+
// to files in the workspace, so we don't want to do that in the source directory.
1012
const tmpDataDir = path.join(tmpDir.name, "data");
1113
fs.cpSync(path.resolve(rootDir, "test/data"), tmpDataDir, {
1214
recursive: true,

extensions/ql-vscode/test/vscode-tests/cli-integration/jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const config: Config = {
88
setupFilesAfterEnv: ["<rootDir>/jest.setup.ts"],
99
// CLI integration tests call into the CLI and execute queries, so these are expected to take a lot longer
1010
// than the default 5 seconds.
11-
testTimeout: 300_000, // 3 minutes
11+
testTimeout: 180_000, // 3 minutes
1212
};
1313

1414
export default config;

0 commit comments

Comments
 (0)