diff --git a/extensions/ql-vscode/package-lock.json b/extensions/ql-vscode/package-lock.json index 128cae42b..dec284168 100644 --- a/extensions/ql-vscode/package-lock.json +++ b/extensions/ql-vscode/package-lock.json @@ -57,7 +57,7 @@ "@types/through2": "^2.0.36", "@types/tmp": "^0.1.0", "@types/unzipper": "~0.10.1", - "@types/vscode": "^1.48.0", + "@types/vscode": "^1.57.0", "@types/webpack": "^4.32.1", "@types/xml2js": "~0.4.4", "@typescript-eslint/eslint-plugin": "^4.26.0", @@ -97,7 +97,7 @@ "webpack-cli": "^4.6.0" }, "engines": { - "vscode": "^1.48.0" + "vscode": "^1.57.0" } }, "node_modules/@babel/code-frame": { @@ -675,9 +675,9 @@ } }, "node_modules/@types/vscode": { - "version": "1.48.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.48.0.tgz", - "integrity": "sha512-sZJKzsJz1gSoFXcOJWw3fnKl2sseUgZmvB4AJZS+Fea+bC/jfGPVhmFL/FfQHld/TKtukVONsmoD3Pkyx9iadg==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.57.0.tgz", + "integrity": "sha512-FeznBFtIDCWRluojTsi9c3LLcCHOXP5etQfBK42+ixo1CoEAchkw39tuui9zomjZuKfUVL33KZUDIwHZ/xvOkQ==", "dev": true }, "node_modules/@types/webpack": { @@ -12350,9 +12350,9 @@ } }, "@types/vscode": { - "version": "1.48.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.48.0.tgz", - "integrity": "sha512-sZJKzsJz1gSoFXcOJWw3fnKl2sseUgZmvB4AJZS+Fea+bC/jfGPVhmFL/FfQHld/TKtukVONsmoD3Pkyx9iadg==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.57.0.tgz", + "integrity": "sha512-FeznBFtIDCWRluojTsi9c3LLcCHOXP5etQfBK42+ixo1CoEAchkw39tuui9zomjZuKfUVL33KZUDIwHZ/xvOkQ==", "dev": true }, "@types/webpack": { diff --git a/extensions/ql-vscode/package.json b/extensions/ql-vscode/package.json index 7288fdbb2..0ecb185b7 100644 --- a/extensions/ql-vscode/package.json +++ b/extensions/ql-vscode/package.json @@ -13,7 +13,7 @@ "url": "https://github.com/github/vscode-codeql" }, "engines": { - "vscode": "^1.48.0" + "vscode": "^1.57.0" }, "categories": [ "Programming Languages" @@ -916,7 +916,7 @@ "@types/through2": "^2.0.36", "@types/tmp": "^0.1.0", "@types/unzipper": "~0.10.1", - "@types/vscode": "^1.48.0", + "@types/vscode": "^1.57.0", "@types/webpack": "^4.32.1", "@types/xml2js": "~0.4.4", "@typescript-eslint/eslint-plugin": "^4.26.0", diff --git a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts b/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts index 9a94ea946..65551e5dc 100644 --- a/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts +++ b/extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import 'mocha'; -import { EnvironmentVariableCollection, EnvironmentVariableMutator, ExtensionContext, ExtensionMode, Memento, Uri, window } from 'vscode'; +import { EnvironmentVariableCollection, EnvironmentVariableMutator, Event, ExtensionContext, ExtensionMode, Memento, SecretStorage, SecretStorageChangeEvent, Uri, window } from 'vscode'; import * as yaml from 'js-yaml'; import * as tmp from 'tmp'; import * as path from 'path'; @@ -149,7 +149,7 @@ describe('helpers', () => { extensionMode: ExtensionMode = 3; subscriptions: { dispose(): unknown }[] = []; workspaceState: Memento = new MockMemento(); - globalState: Memento = new MockMemento(); + globalState = new MockGlobalStorage(); extensionPath = ''; asAbsolutePath(_relativePath: string): string { throw new Error('Method not implemented.'); @@ -159,6 +159,11 @@ describe('helpers', () => { logPath = ''; extensionUri = Uri.parse(''); environmentVariableCollection = new MockEnvironmentVariableCollection(); + secrets = new MockSecretStorage(); + storageUri = Uri.parse(''); + globalStorageUri = Uri.parse(''); + logUri = Uri.parse(''); + extension: any; } class MockEnvironmentVariableCollection implements EnvironmentVariableCollection { @@ -212,6 +217,25 @@ describe('helpers', () => { } } + class MockGlobalStorage extends MockMemento { + public setKeysForSync(_keys: string[]): void { + return; + } + } + + class MockSecretStorage implements SecretStorage { + get(_key: string): Thenable { + throw new Error('Method not implemented.'); + } + store(_key: string, _value: string): Thenable { + throw new Error('Method not implemented.'); + } + delete(_key: string): Thenable { + throw new Error('Method not implemented.'); + } + onDidChange!: Event; + } + it('should report stream progress', () => { const spy = sandbox.spy(); const mockReadable = {