ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-27 17:23:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

normalize sql carbon tag (#14445)

Browse Source
This commit is contained in:
Aditya Bist
2021-02-25 13:32:12 -08:00
committed by GitHub
parent b28e845506
commit 2a125ee43b
35 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/platform/contextkey/common/contextkey.ts
View File

@@ -59,7 +59,7 @@ export interface IContextKeyExpression {
export type ContextKeyExpression = (
ContextKeyFalseExpr | ContextKeyTrueExpr | ContextKeyDefinedExpr | ContextKeyNotExpr
| ContextKeyEqualsExpr | ContextKeyNotEqualsExpr | ContextKeyRegexExpr
| ContextKeyNotRegexExpr | ContextKeyAndExpr | ContextKeyOrExpr | ContextKeyInExpr | ContextKeyNotInExpr | ContextKeyGreaterThanEqualsExpr | ContextKeyLessThanEqualsExpr // {{ SQL CARBON EDIT }}
| ContextKeyNotRegexExpr | ContextKeyAndExpr | ContextKeyOrExpr | ContextKeyInExpr | ContextKeyNotInExpr | ContextKeyGreaterThanEqualsExpr | ContextKeyLessThanEqualsExpr // {{SQL CARBON EDIT}}
);
export abstract class ContextKeyExpr {

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

@@ -572,7 +572,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
return galleryExtensions.map((e, index) => toExtension(e, e.versions[0], index, nextPageQuery, options.source));
};
// {{ SQL CARBON EDIT }}
// {{SQL CARBON EDIT}}
return { firstPage: extensions, total, pageSize: extensions.length, getPage } as IPager<IGalleryExtension>;
}

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

@@ -161,7 +161,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
const manifest = await getManifest(zipPath);
const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
// let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }}
// {{ SQL CARBON EDIT }}
// {{SQL CARBON EDIT}}
if (manifest.engines?.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) {
throw new Error(nls.localize('incompatible', "Unable to install extension '{0}' as it is not compatible with the current VS Code engine version '{1}'.", identifier.id, product.vscodeVersion));
}
@@ -213,7 +213,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
},
error => { this._onDidInstallExtension.fire({ identifier, zipPath, error, operation: InstallOperation.Install }); return Promise.reject(error); }
);
// {{ SQL CARBON EDIT }}
// {{SQL CARBON EDIT}}
// let metadata: IGalleryMetadata | undefined;
// try {
// metadata = await this.getGalleryMetadata(getGalleryExtensionId(manifest.publisher, manifest.name));
@@ -242,7 +242,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
return downloadedLocation;
}
// {{ SQL CARBON EDIT }}
// {{SQL CARBON EDIT}}
/*private async installFromZipPath(identifierWithVersion: ExtensionIdentifierWithVersion, zipPath: string, metadata: IMetadata | undefined, operation: InstallOperation, token: CancellationToken): Promise<ILocalExtension> {
try {
const local = await this.installExtension({ zipPath, identifierWithVersion, metadata }, token);
@@ -521,7 +521,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
return local;
}
// {{ SQL CARBON EDIT }}
// {{SQL CARBON EDIT}}
/*private async getGalleryMetadata(extensionName: string): Promise<IGalleryMetadata | undefined> {
const galleryExtension = await this.findGalleryExtensionByName(extensionName);
return galleryExtension ? <IGalleryMetadata>{ id: galleryExtension.identifier.uuid, publisherDisplayName: galleryExtension.publisherDisplayName, publisherId: galleryExtension.publisherId } : undefined;

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

@@ -181,7 +181,7 @@ export interface IExtensionManifest {
readonly publisher: string;
readonly version: string;
readonly engines: { vscode: string; azdata?: string }; // {{SQL CARBON EDIT}} add field
readonly forceReload?: boolean; // {{ SQL CARBON EDIT }} add field
readonly forceReload?: boolean; // {{SQL CARBON EDIT}} add field
readonly description?: string;
readonly main?: string;
readonly browser?: string;
@@ -278,7 +278,7 @@ export interface IExtensionDescription extends IExtensionManifest {
readonly isUnderDevelopment: boolean;
readonly extensionLocation: URI;
enableProposedApi?: boolean;
readonly forceReload?: boolean; // {{ SQL CARBON EDIT }}
readonly forceReload?: boolean; // {{SQL CARBON EDIT}}
}
export function isLanguagePackExtension(manifest: IExtensionManifest): boolean {