development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tyriar/electron-1.7.3

Browse source
This commit is contained in:
Daniel Imms 2017-08-23 19:59:45 -07:00
parent 754940284e 4e5b74a4b7
commit 0aa551ce45
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
npm-shrinkwrap.json generated
View file

@ -561,11 +561,6 @@
"from": "vscode-textmate@3.1.5",
"resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-3.1.5.tgz"
},
"windows-process-tree": {
"version": "0.1.2",
"from": "windows-process-tree@0.1.2",
"resolved": "https://registry.npmjs.org/windows-process-tree/-/windows-process-tree-0.1.2.tgz"
},
"winreg": {
"version": "1.2.0",
"from": "winreg@1.2.0",

2
package.json
View file

@ -126,7 +126,7 @@
"url": "https://github.com/Microsoft/vscode/issues"
},
"optionalDependencies": {
"windows-process-tree": "0.1.2",
"windows-process-tree": "0.1.3",
"windows-foreground-love": "0.1.0",
"windows-mutex": "^0.2.0",
"fsevents": "0.3.8"

2
src/vs/base/test/common/uri.test.ts
View file

@ -312,7 +312,7 @@ suite('URI', () => {
test('VSCode URI module\'s driveLetterPath regex is incorrect, #32961', function () {
let uri = URI.parse('file:///_:/path');
assert.equal(uri.fsPath, '/_:/path');
assert.equal(uri.fsPath, isWindows ? '\\_:\\path' : '/_:/path');
});
test('URI#file, no path-is-uri check', () => {