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

fix a few more tags (#14648)

Browse Source
This commit is contained in:
Aditya Bist
2021-03-10 15:10:08 -08:00
committed by GitHub
parent e97429cb74
commit 46f805a8be
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
const manifest = await getManifest(zipPath); const manifest = await getManifest(zipPath);
const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) }; const identifier = { id: getGalleryExtensionId(manifest.publisher, manifest.name) };
// let operation: InstallOperation = InstallOperation.Install; {{ SQL CARBON EDIT }} // let operation: InstallOperation = InstallOperation.Install; {{SQL CARBON EDIT}}
// {{SQL CARBON EDIT}} // {{SQL CARBON EDIT}}
if (manifest.engines?.vscode && !isEngineValid(manifest.engines.vscode, product.vscodeVersion)) { 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)); 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));
@@ -175,7 +175,7 @@ export class ExtensionManagementService extends Disposable implements IExtension
if (existing) { if (existing) {
options.isMachineScoped = options.isMachineScoped || existing.isMachineScoped; options.isMachineScoped = options.isMachineScoped || existing.isMachineScoped;
options.isBuiltin = options.isBuiltin || existing.isBuiltin; options.isBuiltin = options.isBuiltin || existing.isBuiltin;
// operation = InstallOperation.Update; {{ SQL CARBON EDIT }} // operation = InstallOperation.Update; {{SQL CARBON EDIT}}
if (identifierWithVersion.equals(new ExtensionIdentifierWithVersion(existing.identifier, existing.manifest.version))) { if (identifierWithVersion.equals(new ExtensionIdentifierWithVersion(existing.identifier, existing.manifest.version))) {
try { try {
await this.extensionsScanner.removeExtension(existing, 'existing'); await this.extensionsScanner.removeExtension(existing, 'existing');

2
src/vs/workbench/api/common/extHostLanguageFeatures.ts
View File

@@ -456,7 +456,7 @@ class CodeActionAdapter {
return undefined; // code actions only! return undefined; // code actions only!
} }
if (!this._provider.resolveCodeAction) { if (!this._provider.resolveCodeAction) {
return undefined; // this should not happen... {{ SQL CARBON EDIT }} return undefined; // this should not happen... {{SQL CARBON EDIT}}
} }
const resolvedItem = (await this._provider.resolveCodeAction(item, token)) ?? item; const resolvedItem = (await this._provider.resolveCodeAction(item, token)) ?? item;
return resolvedItem?.edit return resolvedItem?.edit

4
src/vs/workbench/api/node/extHostTask.ts
View File

@@ -24,7 +24,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService'; import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService';
export class ExtHostTask extends ExtHostTaskBase { export class ExtHostTask extends ExtHostTaskBase {
// private _variableResolver: ExtHostVariableResolverService | undefined; {{ SQL CARBON EDIT }} // private _variableResolver: ExtHostVariableResolverService | undefined; {{SQL CARBON EDIT}}
constructor( constructor(
@IExtHostRpcService extHostRpc: IExtHostRpcService, @IExtHostRpcService extHostRpc: IExtHostRpcService,
@@ -122,7 +122,7 @@ export class ExtHostTask extends ExtHostTaskBase {
// this._variableResolver = new ExtHostVariableResolverService(workspaceFolders, this._editorService, configProvider, process.env as IProcessEnvironment); // this._variableResolver = new ExtHostVariableResolverService(workspaceFolders, this._editorService, configProvider, process.env as IProcessEnvironment);
// } // }
// return this._variableResolver; // return this._variableResolver;
// } {{ SQL CARBON EDIT }} // } {{SQL CARBON EDIT}}
public async $resolveVariables(uriComponents: UriComponents, toResolve: { process?: { name: string; cwd?: string; path?: string }, variables: string[] }): Promise<{ process?: string, variables: { [key: string]: string; } }> { public async $resolveVariables(uriComponents: UriComponents, toResolve: { process?: { name: string; cwd?: string; path?: string }, variables: string[] }): Promise<{ process?: string, variables: { [key: string]: string; } }> {
/*const uri: URI = URI.revive(uriComponents); /*const uri: URI = URI.revive(uriComponents);