ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-19 01:25:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/sql/platform/query/common/queryManagement.ts
View File

@@ -8,7 +8,6 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
import { IDisposable } from 'vs/base/common/lifecycle';
import * as azdata from 'azdata';
import { TPromise } from 'vs/base/common/winjs.base';
import * as TelemetryKeys from 'sql/common/telemetryKeys';
import * as TelemetryUtils from 'sql/common/telemetryUtilities';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -179,13 +178,13 @@ export class QueryManagementService implements IQueryManagementService {
let providerId: string = this._connectionService.getProviderIdFromUri(uri);
if (!providerId) {
return TPromise.wrapError(new Error('Connection is required in order to interact with queries'));
return Promise.reject(new Error('Connection is required in order to interact with queries'));
}
let handler = this._requestHandlers.get(providerId);
if (handler) {
return action(handler);
} else {
return TPromise.wrapError(new Error('No Handler Registered'));
return Promise.reject(new Error('No Handler Registered'));
}
}

15
src/sql/platform/query/common/queryModelService.ts
View File

@@ -23,7 +23,6 @@ import * as statusbar from 'vs/workbench/browser/parts/statusbar/statusbar';
import * as platform from 'vs/platform/registry/common/platform';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { Event, Emitter } from 'vs/base/common/event';
import { TPromise } from 'vs/base/common/winjs.base';
import * as strings from 'vs/base/common/strings';
import * as types from 'vs/base/common/types';
import { INotificationService } from 'vs/platform/notification/common/notification';
@@ -460,7 +459,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.disposeEdit(ownerUri);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public updateCell(ownerUri: string, rowId: number, columnId: number, newValue: string): Thenable<azdata.EditUpdateCellResult> {
@@ -475,7 +474,7 @@ export class QueryModelService implements IQueryModelService {
return Promise.reject(error);
});
}
return TPromise.as(null);
return Promise.resolve(null);
}
public commitEdit(ownerUri): Thenable<void> {
@@ -490,7 +489,7 @@ export class QueryModelService implements IQueryModelService {
return Promise.reject(error);
});
}
return TPromise.as(null);
return Promise.resolve(null);
}
public createRow(ownerUri: string): Thenable<azdata.EditCreateRowResult> {
@@ -499,7 +498,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.createRow(ownerUri);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public deleteRow(ownerUri: string, rowId: number): Thenable<void> {
@@ -508,7 +507,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.deleteRow(ownerUri, rowId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public revertCell(ownerUri: string, rowId: number, columnId: number): Thenable<azdata.EditRevertCellResult> {
@@ -517,7 +516,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.revertCell(ownerUri, rowId, columnId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public revertRow(ownerUri: string, rowId: number): Thenable<void> {
@@ -526,7 +525,7 @@ export class QueryModelService implements IQueryModelService {
if (queryRunner) {
return queryRunner.revertRow(ownerUri, rowId);
}
return TPromise.as(null);
return Promise.resolve(null);
}
public getQueryRunner(ownerUri): QueryRunner {

3
src/sql/platform/query/common/queryRunner.ts
View File

@@ -24,7 +24,6 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
import { Emitter, Event } from 'vs/base/common/event';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ResultSerializer } from 'sql/platform/node/resultSerializer';
import { TPromise } from 'vs/base/common/winjs.base';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { URI } from 'vs/base/common/uri';
@@ -187,7 +186,7 @@ export default class QueryRunner extends Disposable {
private doRunQuery(input: azdata.ISelectionData, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void>;
private doRunQuery(input, runCurrentStatement: boolean, runOptions?: azdata.ExecutionPlanOptions): Thenable<void> {
if (this.isExecuting) {
return TPromise.as(undefined);
return Promise.resolve(undefined);
}
this._planXml = new Deferred<string>();
this._batchSets = [];