Skip to content

Commit 35e9da8

Browse files
committed
Add source map support and clean test dependencies
1. Source map support means that stack traces will point to the *.ts file instead of the generated *.js file 2. Cleaning test dependencies means moving all mocha and chai registration into the respective index files and removing unnecessary imports.
1 parent 48174c3 commit 35e9da8

30 files changed

Lines changed: 37 additions & 104 deletions

extensions/ql-vscode/package-lock.json

Lines changed: 7 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

extensions/ql-vscode/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,6 +1202,7 @@
12021202
"proxyquire": "~2.1.3",
12031203
"sinon": "~9.0.0",
12041204
"sinon-chai": "~3.5.0",
1205+
"source-map-support": "^0.5.21",
12051206
"style-loader": "~0.23.1",
12061207
"through2": "^4.0.2",
12071208
"ts-loader": "^8.1.0",

extensions/ql-vscode/src/extension.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'source-map-support/register';
12
import {
23
CancellationToken,
34
CancellationTokenSource,

extensions/ql-vscode/src/vscode-tests/cli-integration/helpers.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as path from 'path';
22
import { extensions } from 'vscode';
3-
import 'mocha';
43

54
import { CodeQLCliServer } from '../../cli';
65
import { CodeQLExtensionInterface } from '../../extension';

extensions/ql-vscode/src/vscode-tests/cli-integration/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import 'source-map-support/register';
12
import { runTestsInDirectory } from '../index-template';
23
import 'mocha';
34
import * as sinonChai from 'sinon-chai';
45
import * as chai from 'chai';
6+
import 'chai/register-should';
57
import * as chaiAsPromised from 'chai-as-promised';
68
chai.use(chaiAsPromised);
79
chai.use(sinonChai);

extensions/ql-vscode/src/vscode-tests/cli-integration/packaging.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import * as sinon from 'sinon';
22
import { extensions, window } from 'vscode';
3-
import 'mocha';
43
import * as path from 'path';
54

65
import * as pq from 'proxyquire';

extensions/ql-vscode/src/vscode-tests/cli-integration/queries.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { CancellationToken, commands, ExtensionContext, extensions, Uri } from '
33
import * as sinon from 'sinon';
44
import * as path from 'path';
55
import * as fs from 'fs-extra';
6-
import 'mocha';
76
import { expect } from 'chai';
87
import * as yaml from 'js-yaml';
98

extensions/ql-vscode/src/vscode-tests/cli-integration/query.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { expect } from 'chai';
22
import * as fs from 'fs-extra';
3-
import 'mocha';
43
import * as path from 'path';
54
import * as tmp from 'tmp';
65
import * as url from 'url';

extensions/ql-vscode/src/vscode-tests/cli-integration/run-remote-query.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { assert, expect } from 'chai';
22
import * as path from 'path';
33
import * as sinon from 'sinon';
44
import { CancellationToken, extensions, QuickPickItem, Uri, window } from 'vscode';
5-
import 'mocha';
65
import * as fs from 'fs-extra';
76
import * as os from 'os';
87
import * as yaml from 'js-yaml';

extensions/ql-vscode/src/vscode-tests/minimal-workspace/activation.test.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
import * as assert from 'assert';
2-
import * as chai from 'chai';
3-
import * as chaiAsPromised from 'chai-as-promised';
4-
import 'mocha';
52
import * as path from 'path';
63
import * as vscode from 'vscode';
74
import * as determiningSelectedQueryTest from './determining-selected-query-test';
85

9-
chai.use(chaiAsPromised);
10-
116
describe('launching with a minimal workspace', async () => {
127

138
const ext = vscode.extensions.getExtension('GitHub.vscode-codeql');

0 commit comments

Comments
 (0)