Skip to content

Commit e3cc503

Browse files
TyriarTyriar
committed
Merge remote-tracking branch 'origin/master' into tyriar/puppeteer
2 parents 4a5d1ec + 9d34c82 commit e3cc503

179 files changed

Lines changed: 7726 additions & 6234 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/commands.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
{
55
type: 'comment',
66
name: 'question',
7-
allowUsers: ['cleidigh', 'usernamehw'],
7+
allowUsers: ['cleidigh', 'usernamehw', 'gjsjohnmurray', 'IllusionMH'],
88
action: 'updateLabels',
99
addLabel: '*question'
1010
},
@@ -60,7 +60,7 @@
6060
{
6161
type: 'comment',
6262
name: 'duplicate',
63-
allowUsers: ['cleidigh', 'usernamehw'],
63+
allowUsers: ['cleidigh', 'usernamehw', 'gjsjohnmurray', 'IllusionMH'],
6464
action: 'updateLabels',
6565
addLabel: '*duplicate'
6666
},
@@ -74,7 +74,7 @@
7474
{
7575
type: 'comment',
7676
name: 'confirm',
77-
allowUsers: ['cleidigh', 'usernamehw'],
77+
allowUsers: ['cleidigh', 'usernamehw', 'gjsjohnmurray', 'IllusionMH'],
7878
action: 'updateLabels',
7979
addLabel: 'confirmed',
8080
removeLabel: 'confirmation-pending'
@@ -90,14 +90,14 @@
9090
{
9191
type: 'comment',
9292
name: 'findDuplicates',
93-
allowUsers: ['cleidigh', 'usernamehw'],
93+
allowUsers: ['cleidigh', 'usernamehw', 'gjsjohnmurray', 'IllusionMH'],
9494
action: 'comment',
9595
comment: "Potential duplicates:\n${potentialDuplicates}"
9696
},
9797
{
9898
type: 'comment',
9999
name: 'needsMoreInfo',
100-
allowUsers: ['cleidigh', 'usernamehw'],
100+
allowUsers: ['cleidigh', 'usernamehw', 'gjsjohnmurray', 'IllusionMH'],
101101
action: 'updateLabels',
102102
addLabel: 'needs more info',
103103
comment: "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines. Please take the time to review these and update the issue.\n\nHappy Coding!"

‎.yarnrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
disturl "https://atom.io/download/electron"
2-
target "4.2.7"
2+
target "4.2.9"
33
runtime "electron"

‎build/builtInExtensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
{
3333
"name": "ms-vscode.references-view",
34-
"version": "0.0.29",
34+
"version": "0.0.30",
3535
"repo": "https://github.com/Microsoft/vscode-reference-view",
3636
"metadata": {
3737
"id": "dc489f46-520d-4556-ae85-1f9eab3c412d",

‎build/gulpfile.vscode.js‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ const nodeModules = ['electron', 'original-fs']
4747

4848
// Build
4949
const vscodeEntryPoints = _.flatten([
50-
buildfile.entrypoint('vs/workbench/workbench.main'),
50+
buildfile.entrypoint('vs/workbench/workbench.desktop.main'),
5151
buildfile.base,
5252
buildfile.serviceWorker,
5353
buildfile.workbench,
@@ -250,8 +250,8 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
250250
const out = sourceFolderName;
251251

252252
const checksums = computeChecksums(out, [
253-
'vs/workbench/workbench.main.js',
254-
'vs/workbench/workbench.main.css',
253+
'vs/workbench/workbench.desktop.main.js',
254+
'vs/workbench/workbench.desktop.main.css',
255255
'vs/code/electron-browser/workbench/workbench.html',
256256
'vs/code/electron-browser/workbench/workbench.js'
257257
]);
@@ -365,12 +365,15 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
365365
.pipe(electron(_.extend({}, config, { platform, arch, ffmpegChromium: true })))
366366
.pipe(filter(['**', '!LICENSE', '!LICENSES.chromium.html', '!version'], { dot: true }));
367367

368-
result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
369-
.pipe(replace('@@APPNAME@@', product.applicationName))
370-
.pipe(rename(function (f) { f.basename = product.applicationName; })));
371-
result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
372-
.pipe(replace('@@APPNAME@@', product.applicationName))
373-
.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
368+
if (platform === 'linux') {
369+
result = es.merge(result, gulp.src('resources/completions/bash/code', { base: '.' })
370+
.pipe(replace('@@APPNAME@@', product.applicationName))
371+
.pipe(rename(function (f) { f.basename = product.applicationName; })));
372+
373+
result = es.merge(result, gulp.src('resources/completions/zsh/_code', { base: '.' })
374+
.pipe(replace('@@APPNAME@@', product.applicationName))
375+
.pipe(rename(function (f) { f.basename = '_' + product.applicationName; })));
376+
}
374377

375378
if (platform === 'win32') {
376379
result = es.merge(result, gulp.src('resources/win32/bin/code.js', { base: 'resources/win32', allowEmpty: true }));

‎build/lib/extensions.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,18 @@ const commit = util.getVersion(root);
2929
const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
3030
function fromLocal(extensionPath) {
3131
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
32-
if (fs.existsSync(webpackFilename)) {
33-
return fromLocalWebpack(extensionPath);
34-
}
35-
else {
36-
return fromLocalNormal(extensionPath);
37-
}
32+
const input = fs.existsSync(webpackFilename)
33+
? fromLocalWebpack(extensionPath)
34+
: fromLocalNormal(extensionPath);
35+
const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
36+
return input
37+
.pipe(tmLanguageJsonFilter)
38+
.pipe(buffer())
39+
.pipe(es.mapSync((f) => {
40+
f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
41+
return f;
42+
}))
43+
.pipe(tmLanguageJsonFilter.restore);
3844
}
3945
function fromLocalWebpack(extensionPath) {
4046
const result = es.through();

‎build/lib/extensions.ts‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,20 @@ const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${
3030

3131
function fromLocal(extensionPath: string): Stream {
3232
const webpackFilename = path.join(extensionPath, 'extension.webpack.config.js');
33-
if (fs.existsSync(webpackFilename)) {
34-
return fromLocalWebpack(extensionPath);
35-
} else {
36-
return fromLocalNormal(extensionPath);
37-
}
33+
const input = fs.existsSync(webpackFilename)
34+
? fromLocalWebpack(extensionPath)
35+
: fromLocalNormal(extensionPath);
36+
37+
const tmLanguageJsonFilter = filter('**/*.tmLanguage.json', { restore: true });
38+
39+
return input
40+
.pipe(tmLanguageJsonFilter)
41+
.pipe(buffer())
42+
.pipe(es.mapSync((f: File) => {
43+
f.contents = Buffer.from(JSON.stringify(JSON.parse(f.contents.toString('utf8'))));
44+
return f;
45+
}))
46+
.pipe(tmLanguageJsonFilter.restore);
3847
}
3948

4049
function fromLocalWebpack(extensionPath: string): Stream {

‎build/npm/postinstall.js‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,42 @@ const processTreeDts = path.join('node_modules', 'windows-process-tree', 'typing
7878
if (fs.existsSync(processTreeDts)) {
7979
console.log('Removing windows-process-tree.d.ts');
8080
fs.unlinkSync(processTreeDts);
81-
}
81+
}
82+
83+
function getInstalledVersion(packageName, cwd) {
84+
const opts = {};
85+
if (cwd) {
86+
opts.cwd = cwd;
87+
}
88+
89+
const result = cp.spawnSync(yarn, ['list', '--pattern', packageName], opts);
90+
const stdout = result.stdout.toString();
91+
const match = stdout.match(new RegExp(packageName + '@(\\S+)'));
92+
if (!match || !match[1]) {
93+
throw new Error('Unexpected output from yarn list: ' + stdout);
94+
}
95+
96+
return match[1];
97+
}
98+
99+
function assertSameVersionsBetweenFolders(packageName, otherFolder) {
100+
const baseVersion = getInstalledVersion(packageName);
101+
const otherVersion = getInstalledVersion(packageName, otherFolder);
102+
103+
if (baseVersion !== otherVersion) {
104+
throw new Error(`Mismatched versions installed for ${packageName}: root has ${baseVersion}, ./${otherFolder} has ${otherVersion}. These should be the same!`);
105+
}
106+
}
107+
108+
// Check that modules in both the base package.json and remote/ have the same version installed
109+
const requireSameVersionsInRemote = [
110+
'xterm',
111+
'xterm-addon-search',
112+
'xterm-addon-web-links',
113+
'node-pty',
114+
'vscode-ripgrep'
115+
];
116+
117+
requireSameVersionsInRemote.forEach(packageName => {
118+
assertSameVersionsBetweenFolders(packageName, 'remote');
119+
});

‎build/npm/update-grammar.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ exports.update = function (repoId, repoPath, dest, modifyGrammar, version = 'mas
132132
if (packageJsonPathOverride) {
133133
packageJsonPath += packageJsonPathOverride;
134134
}
135-
packageJsonPath += '/package.json';
135+
packageJsonPath += 'package.json';
136136
for (let i = 0; i < cgmanifestRead.registrations.length; i++) {
137137
if (cgmanifestRead.registrations[i].component.git.repositoryUrl.substr(cgmanifestRead.registrations[i].component.git.repositoryUrl.length - repoId.length, repoId.length) === repoId) {
138138
cgmanifestRead.registrations[i].component.git.commitHash = info.commitSha;

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"tslint": "^5.9.1",
4343
"typescript": "3.5.2",
4444
"vsce": "1.48.0",
45-
"vscode-telemetry-extractor": "1.5.3",
45+
"vscode-telemetry-extractor": "^1.5.4",
4646
"xml2js": "^0.4.17"
4747
},
4848
"scripts": {

‎build/yarn.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2313,19 +2313,19 @@ vsce@1.48.0:
23132313
yauzl "^2.3.1"
23142314
yazl "^2.2.2"
23152315

2316-
vscode-ripgrep@^1.5.5:
2317-
version "1.5.5"
2318-
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.5.tgz#24c0e9cb356cf889c98e15ecb58f9cf654a1d961"
2319-
integrity sha512-OrPrAmcun4+uZAuNcQvE6CCPskh+5AsjANod/Q3zRcJcGNxgoOSGlQN9RPtatkUNmkN8Nn8mZBnS1jMylu/dKg==
2316+
vscode-ripgrep@^1.5.6:
2317+
version "1.5.6"
2318+
resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.5.6.tgz#93bf5c99ca5f8248950a305e224f6ca153c30af4"
2319+
integrity sha512-WRIM9XpUj6dsfdAmuI3ANbmT1ysPUVsYy/2uCLDHJa9kbiB4T7uGvFnnc0Rgx2qQnyRAwL7PeWaFgUljPPxf2g==
23202320

2321-
vscode-telemetry-extractor@1.5.3:
2322-
version "1.5.3"
2323-
resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.5.3.tgz#c17f9065a47425edafd23ea161e80c23274e009d"
2324-
integrity sha512-feioJ1e1KyMa9rzblnLbSOduo+Ny0l62H3/bSDgfgCSnU/km+tTSYxPBvZHVr7iQfQGC95J61yC/ObqS9EbaQg==
2321+
vscode-telemetry-extractor@^1.5.4:
2322+
version "1.5.4"
2323+
resolved "https://registry.yarnpkg.com/vscode-telemetry-extractor/-/vscode-telemetry-extractor-1.5.4.tgz#bcb0d17667fa1b77715e3a3bf372ade18f846782"
2324+
integrity sha512-MN9LNPo0Rc6cy3sIWTAG97PTWkEKdRnP0VeYoS8vjKSNtG9CAsrUxHgFfYoHm2vNK/ijd0a4NzETyVGO2kT6hw==
23252325
dependencies:
23262326
command-line-args "^5.1.1"
23272327
ts-morph "^3.1.3"
2328-
vscode-ripgrep "^1.5.5"
2328+
vscode-ripgrep "^1.5.6"
23292329

23302330
vso-node-api@6.1.2-preview:
23312331
version "6.1.2-preview"

0 commit comments

Comments
 (0)