ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge vscode source through 1.62 release (#19981)

Browse Source 
* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check
This commit is contained in:
Karl Burtram
2022-07-11 14:09:32 -07:00
committed by GitHub
parent fa0fcef303
commit 26455e9113
1876 changed files with 72050 additions and 37997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
View File

@@ -35,7 +35,6 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IModelService } from 'vs/editor/common/services/modelService';
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
import Constants from 'vs/workbench/contrib/markers/browser/constants';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
@@ -83,6 +82,7 @@ import { ThemeIcon } from 'vs/platform/theme/common/themeService';
import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from 'vs/platform/workspace/common/workspaceTrust';
import { VirtualWorkspaceContext } from 'vs/workbench/browser/contextkeys';
import { Schemas } from 'vs/base/common/network';
import { IPaneCompositePartService } from 'vs/workbench/services/panecomposite/browser/panecomposite';
// {{SQL CARBON EDIT}}
// integration with tasks view panel
@@ -247,7 +247,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
@IConfigurationService private readonly configurationService: IConfigurationService,
@IMarkerService protected readonly markerService: IMarkerService,
@IOutputService protected readonly outputService: IOutputService,
@IPanelService private readonly panelService: IPanelService,
@IPaneCompositePartService private readonly paneCompositeService: IPaneCompositePartService,
@IViewsService private readonly viewsService: IViewsService,
@ICommandService private readonly commandService: ICommandService,
@IEditorService private readonly editorService: IEditorService,
@@ -935,15 +935,16 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
throw new TaskError(Severity.Info, nls.localize('TaskServer.noTask', 'Task to execute is undefined'), TaskErrors.TaskNotFound);
}
return new Promise<ITaskSummary | undefined>(async (resolve) => {
return new Promise<ITaskSummary | undefined>((resolve) => {
let resolver = this.createResolver();
if (options && options.attachProblemMatcher && this.shouldAttachProblemMatcher(task) && !InMemoryTask.is(task)) {
const toExecute = await this.attachProblemMatcher(task);
if (toExecute) {
resolve(this.executeTask(toExecute, resolver, runSource));
} else {
resolve(undefined);
}
this.attachProblemMatcher(task).then(toExecute => {
if (toExecute) {
resolve(this.executeTask(toExecute, resolver, runSource));
} else {
resolve(undefined);
}
});
} else {
resolve(this.executeTask(task, resolver, runSource));
}
@@ -1673,7 +1674,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
protected createTerminalTaskSystem(): ITaskSystem {
return new TerminalTaskSystem(
this.terminalService, this.terminalGroupService, this.outputService, this.panelService, this.viewsService, this.markerService,
this.terminalService, this.terminalGroupService, this.outputService, this.paneCompositeService, this.viewsService, this.markerService,
this.modelService, this.configurationResolverService, this.telemetryService,
this.contextService, this.environmentService,
AbstractTaskService.OutputChannelId, this.fileService, this.terminalProfileResolverService,
@@ -2400,9 +2401,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
}
});
const timeout: boolean = await Promise.race([new Promise<boolean>(async (resolve) => {
await _createEntries;
resolve(false);
const timeout: boolean = await Promise.race([new Promise<boolean>((resolve) => {
_createEntries.then(() => resolve(false));
}), new Promise<boolean>((resolve) => {
const timer = setTimeout(() => {
clearTimeout(timer);
@@ -3081,9 +3081,8 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
});
});
const timeout: boolean = await Promise.race([new Promise<boolean>(async (resolve) => {
await entries;
resolve(false);
const timeout: boolean = await Promise.race([new Promise<boolean>((resolve) => {
entries.then(() => resolve(false));
}), new Promise<boolean>((resolve) => {
const timer = setTimeout(() => {
clearTimeout(timer);