development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix string.replace (#168169)

Browse source 
fix string.replace #167239
This commit is contained in:
Sandeep Somavarapu 2022-12-06 14:50:23 +01:00 committed by GitHub
parent a18f1c39ea
commit fac2283bf3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/gulpfile.vscode.web.js
View file

@ -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;

10
src/vs/platform/extensionManagement/electron-sandbox/extensionTipsService.ts
View file

@ -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));

2
src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.ts
View file

@ -275,7 +275,7 @@ export class FileBasedRecommendations extends ExtensionRecommendations {
}
const treatmentMessage = await this.tasExperimentService.getTreatment<string>('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 => {