Skip to content

Commit 49dca7c

Browse files
joaomorenojoaomoreno
committed
Merge branch 'master' into scm-api
2 parents 4aa4758 + 4dcbad3 commit 49dca7c

6 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎build/gulpfile.hygiene.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,11 +189,12 @@ const hygiene = exports.hygiene = (some, options) => {
189189
});
190190

191191
const tsl = es.through(function (file) {
192-
const configuration = tslint.findConfiguration(null, '.');
193-
const options = { configuration, formatter: 'json', rulesDirectory: 'build/lib/tslint' };
192+
const configuration = tslint.Configuration.findConfiguration(null, '.');
193+
const options = { formatter: 'json', rulesDirectory: 'build/lib/tslint' };
194194
const contents = file.contents.toString('utf8');
195-
const linter = new tslint(file.relative, contents, options);
196-
const result = linter.lint();
195+
const linter = new tslint.Linter(options);
196+
linter.lint(file.relative, contents, configuration.results);
197+
const result = linter.getResult();
197198

198199
if (result.failureCount > 0) {
199200
reportFailures(result.failures);

‎build/gulpfile.mixin.js‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,18 @@ gulp.task('mixin', function () {
5151
const build = all.pipe(filter('build/**'));
5252
const productJsonFilter = filter('product.json', { restore: true });
5353

54+
const vsdaFilter = (function() {
55+
const filter = [];
56+
if (process.platform !== 'win32') { filter.push('!**/vsda_win32.node'); }
57+
if (process.platform !== 'darwin') { filter.push('!**/vsda_darwin.node'); }
58+
if (process.platform !== 'linux' || process.arch !== 'x64') { filter.push('!**/vsda_linux64.node'); }
59+
if (process.platform !== 'linux' || process.arch === 'x64') { filter.push('!**/vsda_linux32.node'); }
60+
61+
return filter;
62+
})();
63+
5464
const mixin = all
55-
.pipe(filter('quality/' + quality + '/**'))
65+
.pipe(filter(['quality/' + quality + '/**'].concat(vsdaFilter)))
5666
.pipe(util.rebase(2))
5767
.pipe(productJsonFilter)
5868
.pipe(buffer())
@@ -71,4 +81,4 @@ gulp.task('mixin', function () {
7181
return f;
7282
}))
7383
.pipe(gulp.dest('.'));
74-
});
84+
});

‎build/gulpfile.vscode.js‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ const product = require('../product.json');
3030
const shrinkwrap = require('../npm-shrinkwrap.json');
3131
const crypto = require('crypto');
3232

33-
const dependencies = Object.keys(shrinkwrap.dependencies).concat(['vsda' /* vsda can come in from distro build, do not remove */]);
33+
const dependencies = Object.keys(shrinkwrap.dependencies)
34+
.concat(Array.isArray(product.extraNodeModules) ? product.extraNodeModules : []); // additional dependencies from our product configuration
3435
const baseModules = Object.keys(process.binding('natives')).filter(n => !/^_|\//.test(n));
3536
const nodeModules = ['electron', 'original-fs']
3637
.concat(dependencies)
@@ -269,13 +270,7 @@ function packageTask(platform, arch, opts) {
269270
.pipe(util.cleanNodeModule('native-keymap', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node']))
270271
.pipe(util.cleanNodeModule('windows-foreground-love', ['binding.gyp', 'build/**', 'src/**'], ['**/*.node']))
271272
.pipe(util.cleanNodeModule('gc-signals', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['**/*.node', 'src/index.js']))
272-
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']))
273-
// vsda can come in from distro build, do not remove
274-
.pipe(util.cleanNodeModule('vsda', ['**'], [(function () {
275-
if (process.platform === 'win32') { return 'build/Release/vsda_win32.node'; }
276-
if (process.platform === 'darwin') { return 'build/Release/vsda_darwin.node'; }
277-
if (process.platform === 'linux') { return process.arch === 'x64' ? 'build/Release/vsda_linux64.node' : 'build/Release/vsda_linux32.node'; }
278-
})(), 'index.js']));
273+
.pipe(util.cleanNodeModule('node-pty', ['binding.gyp', 'build/**', 'src/**', 'deps/**'], ['build/Release/**']));
279274

280275
let all = es.merge(
281276
packageJsonStream,

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "code-oss-dev",
33
"version": "1.9.0",
44
"electronVersion": "1.4.6",
5-
"distro": "47280b25a68a86e8edb9ce69c649ba529136bcaf",
5+
"distro": "07e460da0e2854e12c183abaa5acbcd7b8c48d7f",
66
"author": {
77
"name": "Microsoft Corporation"
88
},

‎src/vs/platform/node/product.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export interface IProductConfiguration {
5252
npsSurveyUrl: string;
5353
checksums: { [path: string]: string; };
5454
checksumFailMoreInfoUrl: string;
55+
extraNodeModules: string[];
5556
}
5657

5758
const rootPath = path.dirname(uri.parse(require.toUrl('')).fsPath);

‎src/vs/workbench/parts/debug/electron-browser/debugHover.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ export class DebugHoverWidget implements IContentWidget {
213213
}
214214

215215
// Find the most specific scope containing the range #16632
216-
return [scopes.filter(scope => Range.containsRange(scope.range, expressionRange))
216+
return [scopes.filter(scope => scope.range && Range.containsRange(scope.range, expressionRange))
217217
.sort((first, second) => (first.range.endLineNumber - first.range.startLineNumber) - (second.range.endLineNumber - second.range.startLineNumber)).shift()];
218218
})
219219
.then(scopes => TPromise.join(scopes.map(scope => this.doFindExpression(scope, namesToFind))))

0 commit comments

Comments
 (0)