development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-11-05 18:29:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into ben/labels

Browse source
This commit is contained in:
Benjamin Pasero 2018-12-19 14:40:58 +01:00
commit 51914673cb
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/gulpfile.vscode.linux.js
View file

@ -198,7 +198,7 @@ function prepareSnapPackage(arch) {
const snapcraft = gulp.src('resources/linux/snap/snapcraft.yaml', { base: '.' })
.pipe(replace('@@NAME@@', product.applicationName))
.pipe(replace('@@VERSION@@', commit))
.pipe(replace('@@VERSION@@', commit.substr(32)))
.pipe(rename('snap/snapcraft.yaml'));
const snapUpdate = gulp.src('resources/linux/snap/snapUpdate.sh', { base: '.' })

1
src/tsconfig.strictNullChecks.json
View file

@ -76,6 +76,7 @@
"./vs/base/browser/ui/toolbar/toolbar.ts",
"./vs/base/browser/ui/tree/abstractTree.ts",
"./vs/base/browser/ui/tree/asyncDataTree.ts",
"./vs/base/browser/ui/tree/dataTree.ts",
"./vs/base/browser/ui/tree/indexTree.ts",
"./vs/base/browser/ui/tree/indexTreeModel.ts",
"./vs/base/browser/ui/tree/objectTree.ts",

10
src/vs/base/browser/ui/tree/dataTree.ts
View file

@ -20,9 +20,9 @@ export interface IDataTreeViewState {
readonly collapsed: string[];
}
export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | null, TFilterData, TInput | T> {
export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | null, TFilterData, T | null> {
protected model: ObjectTreeModel<T | null, TFilterData>;
protected model: ObjectTreeModel<T, TFilterData>;
private input: TInput | undefined;
private identityProvider: IIdentityProvider<T> | undefined;
@ -76,7 +76,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
this.setSelection(selection);
}
refresh(element: TInput | T = this.input): void {
refresh(element: TInput | T = this.input!): void {
if (typeof this.input === 'undefined') {
throw new Error('Tree input not set');
}
@ -118,10 +118,10 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
const queue = [root];
while (queue.length > 0) {
const node = queue.shift();
const node = queue.shift()!;
if (node !== root && node.collapsed) {
collapsed.push(getId(node.element));
collapsed.push(getId(node.element!));
}
queue.push(...node.children);

14
src/vs/workbench/parts/debug/node/debugAdapter.ts
View file

@ -332,13 +332,17 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter {
"Cannot determine executable for debug adapter '{0}'.", this.debugType)));
}
let env = objects.mixin({}, process.env);
if (this.adapterExecutable.options && this.adapterExecutable.options.env) {
env = objects.mixin(env, this.adapterExecutable.options.env);
}
delete env.VSCODE_PREVENT_FOREIGN_INSPECT;
if (this.adapterExecutable.command === 'node') {
if (Array.isArray(this.adapterExecutable.args) && this.adapterExecutable.args.length > 0) {
const isElectron = !!process.env['ELECTRON_RUN_AS_NODE'] || !!process.versions['electron'];
const options: cp.ForkOptions = {
env: this.adapterExecutable.options && this.adapterExecutable.options.env
? objects.mixin(objects.mixin({}, process.env), this.adapterExecutable.options.env)
: process.env,
env: env,
execArgv: isElectron ? ['-e', 'delete process.env.ELECTRON_RUN_AS_NODE;require(process.argv[1])'] : [],
silent: true
};
@ -356,9 +360,7 @@ export class ExecutableDebugAdapter extends StreamDebugAdapter {
}
} else {
const options: cp.SpawnOptions = {
env: this.adapterExecutable.options && this.adapterExecutable.options.env
? objects.mixin(objects.mixin({}, process.env), this.adapterExecutable.options.env)
: process.env
env: env
};
if (this.adapterExecutable.options && this.adapterExecutable.options.cwd) {
options.cwd = this.adapterExecutable.options.cwd;