Skip to content

Commit 9e8b1ff

Browse files
committed
Update to VS Code 1.57.0
This version of VS Code has workspace trust enabled by default
1 parent 06b2251 commit 9e8b1ff

File tree

3 files changed

+36
-12
lines changed

3 files changed

+36
-12
lines changed

extensions/ql-vscode/package-lock.json

Lines changed: 8 additions & 8 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "https://github.com/github/vscode-codeql"
1414
},
1515
"engines": {
16-
"vscode": "^1.48.0"
16+
"vscode": "^1.57.0"
1717
},
1818
"categories": [
1919
"Programming Languages"
@@ -916,7 +916,7 @@
916916
"@types/through2": "^2.0.36",
917917
"@types/tmp": "^0.1.0",
918918
"@types/unzipper": "~0.10.1",
919-
"@types/vscode": "^1.48.0",
919+
"@types/vscode": "^1.57.0",
920920
"@types/webpack": "^4.32.1",
921921
"@types/xml2js": "~0.4.4",
922922
"@typescript-eslint/eslint-plugin": "^4.26.0",

extensions/ql-vscode/src/vscode-tests/no-workspace/helpers.test.ts

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { expect } from 'chai';
22
import 'mocha';
3-
import { EnvironmentVariableCollection, EnvironmentVariableMutator, ExtensionContext, ExtensionMode, Memento, Uri, window } from 'vscode';
3+
import { EnvironmentVariableCollection, EnvironmentVariableMutator, Event, ExtensionContext, ExtensionMode, Memento, SecretStorage, SecretStorageChangeEvent, Uri, window } from 'vscode';
44
import * as yaml from 'js-yaml';
55
import * as tmp from 'tmp';
66
import * as path from 'path';
@@ -149,7 +149,7 @@ describe('helpers', () => {
149149
extensionMode: ExtensionMode = 3;
150150
subscriptions: { dispose(): unknown }[] = [];
151151
workspaceState: Memento = new MockMemento();
152-
globalState: Memento = new MockMemento();
152+
globalState = new MockGlobalStorage();
153153
extensionPath = '';
154154
asAbsolutePath(_relativePath: string): string {
155155
throw new Error('Method not implemented.');
@@ -159,6 +159,11 @@ describe('helpers', () => {
159159
logPath = '';
160160
extensionUri = Uri.parse('');
161161
environmentVariableCollection = new MockEnvironmentVariableCollection();
162+
secrets = new MockSecretStorage();
163+
storageUri = Uri.parse('');
164+
globalStorageUri = Uri.parse('');
165+
logUri = Uri.parse('');
166+
extension: any;
162167
}
163168

164169
class MockEnvironmentVariableCollection implements EnvironmentVariableCollection {
@@ -212,6 +217,25 @@ describe('helpers', () => {
212217
}
213218
}
214219

220+
class MockGlobalStorage extends MockMemento {
221+
public setKeysForSync(_keys: string[]): void {
222+
return;
223+
}
224+
}
225+
226+
class MockSecretStorage implements SecretStorage {
227+
get(_key: string): Thenable<string | undefined> {
228+
throw new Error('Method not implemented.');
229+
}
230+
store(_key: string, _value: string): Thenable<void> {
231+
throw new Error('Method not implemented.');
232+
}
233+
delete(_key: string): Thenable<void> {
234+
throw new Error('Method not implemented.');
235+
}
236+
onDidChange!: Event<SecretStorageChangeEvent>;
237+
}
238+
215239
it('should report stream progress', () => {
216240
const spy = sandbox.spy();
217241
const mockReadable = {

0 commit comments

Comments
 (0)