mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-01 02:52:20 -05:00
fix #79454
This commit is contained in:
@@ -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) {
|
||||
|
||||
@@ -32,4 +32,4 @@ suite('Keytar', () => {
|
||||
}
|
||||
})().then(done, done);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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!);
|
||||
@@ -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);
|
||||
@@ -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.
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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';
|
||||
|
||||
Reference in New Issue
Block a user