diff --git a/src/vs/platform/extensionManagement/node/extensionManagementService.ts b/src/vs/platform/extensionManagement/node/extensionManagementService.ts index 2ac79a863a..477b8850ed 100644 --- a/src/vs/platform/extensionManagement/node/extensionManagementService.ts +++ b/src/vs/platform/extensionManagement/node/extensionManagementService.ts @@ -160,7 +160,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 }} + // let operation: InstallOperation = InstallOperation.Install; {{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)); @@ -175,7 +175,7 @@ export class ExtensionManagementService extends Disposable implements IExtension if (existing) { options.isMachineScoped = options.isMachineScoped || existing.isMachineScoped; 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))) { try { await this.extensionsScanner.removeExtension(existing, 'existing'); diff --git a/src/vs/workbench/api/common/extHostLanguageFeatures.ts b/src/vs/workbench/api/common/extHostLanguageFeatures.ts index b8d23e26c9..f7f5a6f32e 100644 --- a/src/vs/workbench/api/common/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/common/extHostLanguageFeatures.ts @@ -456,7 +456,7 @@ class CodeActionAdapter { return undefined; // code actions only! } 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; return resolvedItem?.edit diff --git a/src/vs/workbench/api/node/extHostTask.ts b/src/vs/workbench/api/node/extHostTask.ts index 7302e9d7a6..7a8a317757 100644 --- a/src/vs/workbench/api/node/extHostTask.ts +++ b/src/vs/workbench/api/node/extHostTask.ts @@ -24,7 +24,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IExtHostApiDeprecationService } from 'vs/workbench/api/common/extHostApiDeprecationService'; export class ExtHostTask extends ExtHostTaskBase { - // private _variableResolver: ExtHostVariableResolverService | undefined; {{ SQL CARBON EDIT }} + // private _variableResolver: ExtHostVariableResolverService | undefined; {{SQL CARBON EDIT}} constructor( @IExtHostRpcService extHostRpc: IExtHostRpcService, @@ -122,7 +122,7 @@ export class ExtHostTask extends ExtHostTaskBase { // this._variableResolver = new ExtHostVariableResolverService(workspaceFolders, this._editorService, configProvider, process.env as IProcessEnvironment); // } // 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; } }> { /*const uri: URI = URI.revive(uriComponents);