diff --git a/build/gulpfile.vscode.web.js b/build/gulpfile.vscode.web.js index bb67d883253..1765a6509a7 100644 --- a/build/gulpfile.vscode.web.js +++ b/build/gulpfile.vscode.web.js @@ -116,7 +116,7 @@ const createVSCodeWebBuiltinExtensionsPatcher = (extensionsRoot) => { // (2) Patch builtin extensions if (path.endsWith('vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.js')) { const builtinExtensions = JSON.stringify(extensions.scanBuiltinExtensions(extensionsRoot)); - return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/); + return content.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', () => builtinExtensions.substr(1, builtinExtensions.length - 2) /* without [ and ]*/); } return content; diff --git a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts index 9d8760e2145..d96b9c0ee58 100644 --- a/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts +++ b/src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts @@ -298,11 +298,11 @@ export class ExtensionTipsService extends BaseExtensionTipsService { const exePaths: string[] = []; if (isWindows) { if (extensionTip.windowsPath) { - exePaths.push(extensionTip.windowsPath.replace('%USERPROFILE%', env['USERPROFILE']!) - .replace('%ProgramFiles(x86)%', env['ProgramFiles(x86)']!) - .replace('%ProgramFiles%', env['ProgramFiles']!) - .replace('%APPDATA%', env['APPDATA']!) - .replace('%WINDIR%', env['WINDIR']!)); + exePaths.push(extensionTip.windowsPath.replace('%USERPROFILE%', () => env['USERPROFILE']!) + .replace('%ProgramFiles(x86)%', () => env['ProgramFiles(x86)']!) + .replace('%ProgramFiles%', () => env['ProgramFiles']!) + .replace('%APPDATA%', () => env['APPDATA']!) + .replace('%WINDIR%', () => env['WINDIR']!)); } } else { exePaths.push(join('/usr/local/bin', exeName)); diff --git a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts index 57b4387c1c7..5dc23e11fba 100644 --- a/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts +++ b/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts @@ -275,7 +275,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations { } const treatmentMessage = await this.tasExperimentService.getTreatment('languageRecommendationMessage'); - const message = treatmentMessage ? treatmentMessage.replace('{0}', name) : localize('reallyRecommended', "Do you want to install the recommended extensions for {0}?", name); + const message = treatmentMessage ? treatmentMessage.replace('{0}', () => name) : localize('reallyRecommended', "Do you want to install the recommended extensions for {0}?", name); this.extensionRecommendationNotificationService.promptImportantExtensionsInstallNotification([extensionId], message, `@id:${extensionId}`, RecommendationSource.FILE) .then(result => {