ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 01:28:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463 (#7206)

Browse Source 
* Merge from vscode 64980ea1f3f532c82bb6c28d27bba9ef2c5b4463

* fix config changes

* fix strictnull checks
This commit is contained in:
Anthony Dresser
2019-09-15 22:38:26 -07:00
committed by GitHub
parent fa6c52699e
commit ea0f9e6ce9
1226 changed files with 21541 additions and 17633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/extensionManagement/common/extensionGalleryService.ts
View File

@@ -375,7 +375,7 @@ interface IRawExtensionsReport {
export class ExtensionGalleryService implements IExtensionGalleryService {
_serviceBrand: any;
_serviceBrand: undefined;
private extensionsGalleryUrl: string | undefined;
private extensionsControlUrl: string | undefined;

4
src/vs/platform/extensionManagement/common/extensionManagement.ts
View File

@@ -150,7 +150,7 @@ export interface ITranslation {
}
export interface IExtensionGalleryService {
_serviceBrand: any;
_serviceBrand: undefined;
isEnabled(): boolean;
query(token: CancellationToken): Promise<IPager<IGalleryExtension>>;
query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>>;
@@ -190,7 +190,7 @@ export const INSTALL_ERROR_MALICIOUS = 'malicious';
export const INSTALL_ERROR_INCOMPATIBLE = 'incompatible';
export interface IExtensionManagementService {
_serviceBrand: any;
_serviceBrand: undefined;
onInstallExtension: Event<InstallExtensionEvent>;
onDidInstallExtension: Event<DidInstallExtensionEvent>;

2
src/vs/platform/extensionManagement/common/extensionManagementIpc.ts
View File

@@ -77,7 +77,7 @@ export class ExtensionManagementChannel implements IServerChannel {
export class ExtensionManagementChannelClient implements IExtensionManagementService {
_serviceBrand: any;
_serviceBrand: undefined;
constructor(
private readonly channel: IChannel,

2
src/vs/platform/extensionManagement/node/extensionManagementService.ts
View File

@@ -104,7 +104,7 @@ interface InstallableExtension {
export class ExtensionManagementService extends Disposable implements IExtensionManagementService {
_serviceBrand: any;
_serviceBrand: undefined;
private systemExtensionsPath: string;
private extensionsPath: string;

5
src/vs/platform/extensionManagement/test/node/extensionGalleryService.test.ts
View File

@@ -6,7 +6,7 @@
import * as assert from 'assert';
import * as os from 'os';
import { EnvironmentService } from 'vs/platform/environment/node/environmentService';
import { parseArgs } from 'vs/platform/environment/node/argv';
import { parseArgs, OPTIONS } from 'vs/platform/environment/node/argv';
import { getRandomTestPath } from 'vs/base/test/node/testUtils';
import { join } from 'vs/base/common/path';
import { mkdirp, RimRafMode, rimraf } from 'vs/base/node/pfs';
@@ -51,7 +51,7 @@ suite('Extension Gallery Service', () => {
test('marketplace machine id', () => {
const args = ['--user-data-dir', marketplaceHome];
const environmentService = new EnvironmentService(parseArgs(args), process.execPath);
const environmentService = new EnvironmentService(parseArgs(args, OPTIONS), process.execPath);
return resolveMarketplaceHeaders(pkg.version, environmentService, fileService).then(headers => {
assert.ok(isUUID(headers['X-Market-User-Id']));
@@ -61,7 +61,6 @@ suite('Extension Gallery Service', () => {
});
});
});
test('sortByField', () => { // {{SQL CARBON EDIT}} add test
let a: {
extensionId: string | undefined;