Skip to content

Commit

Permalink
fix #79454
Browse files Browse the repository at this point in the history
  • Loading branch information
bpasero committed Aug 22, 2019
1 parent d98eb32 commit fa1fb02
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 4 deletions.
2 changes: 1 addition & 1 deletion build/gulpfile.hygiene.js
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ gulp.task('tslint', () => {
.pipe(filter(tslintExtensionsFilter))
.pipe(gulptslint.default({ rulesDirectory: 'build/lib/tslint' }))
.pipe(gulptslint.default.report({ emitError: true }))
]);
]).pipe(es.through());
});

function hygiene(some) {
Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/test/node/keytar.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ suite('Keytar', () => {
}
})().then(done, done);
});
});
});
1 change: 0 additions & 1 deletion src/vs/workbench/browser/web.simpleservices.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import { IRecentlyOpened, IRecent, isRecentFile, isRecentFolder } from 'vs/platf
import { ISerializableCommandAction } from 'vs/platform/actions/common/actions';
import { IWorkspaceEditingService } from 'vs/workbench/services/workspace/common/workspaceEditing';
import { ITunnelService } from 'vs/platform/remote/common/tunnel';
// tslint:disable-next-line: import-patterns
import { IWorkspaceContextService, WorkbenchState, IWorkspace } from 'vs/platform/workspace/common/workspace';
import { addDisposableListener, EventType, windowOpenNoOpener } from 'vs/base/browser/dom';
import { IEditorService, IResourceEditor } from 'vs/workbench/services/editor/common/editorService';
Expand Down
4 changes: 4 additions & 0 deletions src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ export class TerminalTaskSystem implements ITaskSystem {
private async executeTask(task: Task, resolver: ITaskResolver, trigger: string): Promise<ITaskSummary> {
let promises: Promise<ITaskSummary>[] = [];
if (task.configurationProperties.dependsOn) {
// tslint:disable-next-line: no-for-in-array
for (let index in task.configurationProperties.dependsOn) {
const dependency = task.configurationProperties.dependsOn[index];
let dependencyTask = resolver.resolve(dependency.workspaceFolder, dependency.task!);
Expand Down Expand Up @@ -1375,6 +1376,7 @@ export class TerminalTaskSystem implements ITaskSystem {
return command;
}
if (cwd === undefined) {
// tslint:disable-next-line: no-nodejs-globals
cwd = process.cwd();
}
const dir = path.dirname(command);
Expand All @@ -1383,7 +1385,9 @@ export class TerminalTaskSystem implements ITaskSystem {
// to the current working directory.
return path.join(cwd, command);
}
// tslint:disable-next-line: no-nodejs-globals
if (paths === undefined && Types.isString(process.env.PATH)) {
// tslint:disable-next-line: no-nodejs-globals
paths = process.env.PATH.split(path.delimiter);
}
// No PATH environment. Make path absolute to the cwd.
Expand Down
1 change: 1 addition & 0 deletions src/vs/workbench/contrib/tasks/common/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,7 @@ export namespace KeyedTaskIdentifier {
function sortedStringify(literal: any): string {
const keys = Object.keys(literal).sort();
let result: string = '';
// tslint:disable-next-line: no-for-in-array
for (let position in keys) {
let stringified = literal[keys[position]];
if (stringified instanceof Object) {
Expand Down
4 changes: 4 additions & 0 deletions src/vs/workbench/contrib/terminal/common/terminal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ export interface ITerminalService {
/**
* Creates a raw terminal instance, this should not be used outside of the terminal part.
*/
// tslint:disable-next-line: no-dom-globals
createInstance(container: HTMLElement | undefined, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
getInstanceFromId(terminalId: number): ITerminalInstance | undefined;
getInstanceFromIndex(terminalIndex: number): ITerminalInstance;
Expand Down Expand Up @@ -279,6 +280,7 @@ export interface ITerminalService {

selectDefaultWindowsShell(): Promise<void>;

// tslint:disable-next-line: no-dom-globals
setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;
manageWorkspaceShellPermissions(): void;

Expand Down Expand Up @@ -337,6 +339,7 @@ export interface ITerminalTab {
focusNextPane(): void;
resizePane(direction: Direction): void;
setActiveInstanceByIndex(index: number): void;
// tslint:disable-next-line: no-dom-globals
attachToElement(element: HTMLElement): void;
setVisible(visible: boolean): void;
layout(width: number, height: number): void;
Expand Down Expand Up @@ -611,6 +614,7 @@ export interface ITerminalInstance {
*
* @param container The element to attach the terminal instance to.
*/
// tslint:disable-next-line: no-dom-globals
attachToElement(container: HTMLElement): void;

/**
Expand Down
2 changes: 2 additions & 0 deletions src/vs/workbench/contrib/terminal/common/terminalService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ export abstract class TerminalService implements ITerminalService {
protected abstract _showBackgroundTerminal(instance: ITerminalInstance): void;

public abstract createTerminal(shell?: IShellLaunchConfig, wasNewTerminalAction?: boolean): ITerminalInstance;
// tslint:disable-next-line: no-dom-globals
public abstract createInstance(container: HTMLElement, shellLaunchConfig: IShellLaunchConfig): ITerminalInstance;
// tslint:disable-next-line: no-dom-globals
public abstract setContainers(panelContainer: HTMLElement, terminalContainer: HTMLElement): void;

public getActiveOrCreateInstance(wasNewTerminalAction?: boolean): ITerminalInstance {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import { IWindowService } from 'vs/platform/windows/common/windows';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { MenuRegistry } from 'vs/platform/actions/common/actions';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
// tslint:disable-next-line: import-patterns
import { commandsExtensionPoint } from 'vs/workbench/api/common/menusExtensionPoint';
import { Disposable } from 'vs/base/common/lifecycle';
import { RunOnceScheduler } from 'vs/base/common/async';
Expand Down

0 comments on commit fa1fb02

Please sign in to comment.