diff --git a/quickinput-sample/package-lock.json b/quickinput-sample/package-lock.json index 4087603a..05241265 100644 --- a/quickinput-sample/package-lock.json +++ b/quickinput-sample/package-lock.json @@ -4,16 +4,10 @@ "lockfileVersion": 1, "requires": true, "dependencies": { - "@types/mocha": { - "version": "2.2.48", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.48.tgz", - "integrity": "sha512-nlK/iyETgafGli8Zh9zJVCTicvU3iajSkRwOh3Hhiva598CMqNJ4NcVCGMTGKpGpTYj/9R8RLzS9NAykSSCqGw==", - "dev": true - }, "@types/node": { - "version": "7.0.66", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.66.tgz", - "integrity": "sha512-W11u5kUNSX2+N6bJ7rPyLW4N98/xzrZg8apRoTwC0zbFjIie//oxgKAvqkQNQ97KVchB49ost74kgzoeDiE+Uw==", + "version": "10.3.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.3.6.tgz", + "integrity": "sha512-h7VDRFL8IhdPw1JjiNVvhr+WynfKW09q2BOflIOA0yeuXNeXBP1bIRuBrysSryH4keaJ5bYUNp63aIyQL9YpDQ==", "dev": true }, "ajv": { @@ -871,7 +865,7 @@ "node.extend": "1.1.6", "request": "2.87.0", "through2": "2.0.3", - "vinyl": "2.1.0" + "vinyl": "2.2.0" }, "dependencies": { "clone": { @@ -887,9 +881,9 @@ "dev": true }, "vinyl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", - "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "dev": true, "requires": { "clone": "2.1.1", @@ -999,7 +993,7 @@ "event-stream": "3.3.4", "queue": "4.4.2", "through2": "2.0.3", - "vinyl": "2.1.0", + "vinyl": "2.2.0", "vinyl-fs": "2.4.4", "yauzl": "2.9.2", "yazl": "2.4.3" @@ -1027,9 +1021,9 @@ } }, "vinyl": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", - "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz", + "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==", "dev": true, "requires": { "clone": "2.1.1", @@ -1784,7 +1778,7 @@ "safe-buffer": "5.1.2", "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", - "uuid": "3.2.1" + "uuid": "3.3.0" } }, "requires-port": { @@ -1794,9 +1788,9 @@ "dev": true }, "resolve": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", - "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -2023,9 +2017,9 @@ } }, "tslib": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.2.tgz", - "integrity": "sha512-AVP5Xol3WivEr7hnssHDsaM+lVrVXWUvd1cfXTRkTj80b//6g2wIFEH6hZG0muGZRnHGrfttpdzRk3YlBkWjKw==", + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", + "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", "dev": true }, "tslint": { @@ -2042,9 +2036,9 @@ "glob": "7.1.2", "js-yaml": "3.12.0", "minimatch": "3.0.4", - "resolve": "1.7.1", + "resolve": "1.8.1", "semver": "5.5.0", - "tslib": "1.9.2", + "tslib": "1.9.3", "tsutils": "2.27.1" } }, @@ -2054,7 +2048,7 @@ "integrity": "sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w==", "dev": true, "requires": { - "tslib": "1.9.2" + "tslib": "1.9.3" } }, "tunnel-agent": { @@ -2106,9 +2100,9 @@ "dev": true }, "uuid": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", - "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz", + "integrity": "sha512-ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==", "dev": true }, "vali-date": { diff --git a/quickinput-sample/package.json b/quickinput-sample/package.json index a5c4e10d..f30d9004 100644 --- a/quickinput-sample/package.json +++ b/quickinput-sample/package.json @@ -30,10 +30,9 @@ "postinstall": "node ./node_modules/vscode/bin/install" }, "devDependencies": { - "typescript": "^2.6.1", - "vscode": "^1.1.6", - "tslint": "^5.8.0", - "@types/node": "^7.0.43", - "@types/mocha": "^2.2.42" + "@types/node": "10.3.6", + "tslint": "5.10.0", + "typescript": "2.9.2", + "vscode": "1.1.18" } -} \ No newline at end of file +} diff --git a/quickinput-sample/src/quickOpen.ts b/quickinput-sample/src/quickOpen.ts index 9878a2be..3fb95cfa 100644 --- a/quickinput-sample/src/quickOpen.ts +++ b/quickinput-sample/src/quickOpen.ts @@ -62,8 +62,9 @@ async function pickFile() { } input.busy = true; const cwds = workspace.workspaceFolders ? workspace.workspaceFolders.map(f => f.uri.fsPath) : [process.cwd()]; + const q = process.platform === 'win32' ? '"' : '\''; rgs = cwds.map(cwd => { - const rg = cp.exec(`rg --files -g '*${value}*'`, { cwd }, (err, stdout) => { + const rg = cp.exec(`rg --files -g ${q}*${value}*${q}`, { cwd }, (err, stdout) => { const i = rgs.indexOf(rg); if (i !== -1) { if (rgs.length === cwds.length) {