Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 09:38:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into notebook/dev

Browse Source
This commit is contained in:
Johannes Rieken
2021-04-20 11:38:33 +02:00
parent b06388f501 40c99293c8
commit 3abadabac8
208 changed files with 4279 additions and 2801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/vscode-api-tests/src/singlefolder-tests/index.ts
View File

@@ -8,7 +8,7 @@ const testRunner = require('../../../../test/integration/electron/testrunner');
const options: any = {
ui: 'tdd',
color: (!process.env.BUILD_ARTIFACTSTAGINGDIRECTORY && process.platform !== 'win32'),
color: true,
timeout: 60000
};

2
extensions/vscode-api-tests/src/singlefolder-tests/workspace.test.ts
View File

@@ -619,7 +619,7 @@ suite('vscode API - workspace', () => {
assert.equal(results.length, 1);
const match = <vscode.TextSearchMatch>results[0];
assert(match.preview.text.indexOf('foo') >= 0);
assert.equal(vscode.workspace.asRelativePath(match.uri), '10linefile.ts');
assert.equal(basename(vscode.workspace.asRelativePath(match.uri)), '10linefile.ts');
});
test('findTextInFiles, cancellation', async () => {