提交 f411f667 编写于 作者: D Daniel Imms

Scope new variable to a string

上级 db836839
...@@ -208,33 +208,33 @@ export function getDefaultShell( ...@@ -208,33 +208,33 @@ export function getDefaultShell(
if (!maybeExecutable) { if (!maybeExecutable) {
maybeExecutable = getShellSetting(fetchSetting, isWorkspaceShellAllowed, 'shell', platformOverride); maybeExecutable = getShellSetting(fetchSetting, isWorkspaceShellAllowed, 'shell', platformOverride);
} }
maybeExecutable = maybeExecutable || defaultShell; let executable: string = maybeExecutable || defaultShell;
// Change Sysnative to System32 if the OS is Windows but NOT WoW64. It's // Change Sysnative to System32 if the OS is Windows but NOT WoW64. It's
// safe to assume that this was used by accident as Sysnative does not // safe to assume that this was used by accident as Sysnative does not
// exist and will break the terminal in non-WoW64 environments. // exist and will break the terminal in non-WoW64 environments.
if ((platformOverride === platform.Platform.Windows) && !isWoW64 && windir) { if ((platformOverride === platform.Platform.Windows) && !isWoW64 && windir) {
const sysnativePath = path.join(windir, 'Sysnative').replace(/\//g, '\\').toLowerCase(); const sysnativePath = path.join(windir, 'Sysnative').replace(/\//g, '\\').toLowerCase();
if (maybeExecutable && maybeExecutable.toLowerCase().indexOf(sysnativePath) === 0) { if (executable && executable.toLowerCase().indexOf(sysnativePath) === 0) {
maybeExecutable = path.join(windir, 'System32', maybeExecutable.substr(sysnativePath.length + 1)); executable = path.join(windir, 'System32', executable.substr(sysnativePath.length + 1));
} }
} }
// Convert / to \ on Windows for convenience // Convert / to \ on Windows for convenience
if (maybeExecutable && platformOverride === platform.Platform.Windows) { if (executable && platformOverride === platform.Platform.Windows) {
maybeExecutable = maybeExecutable.replace(/\//g, '\\'); executable = executable.replace(/\//g, '\\');
} }
if (configurationResolverService) { if (configurationResolverService) {
try { try {
maybeExecutable = configurationResolverService.resolve(lastActiveWorkspace, maybeExecutable); executable = configurationResolverService.resolve(lastActiveWorkspace, executable);
} catch (e) { } catch (e) {
logService.error(`Could not resolve shell`, e); logService.error(`Could not resolve shell`, e);
maybeExecutable = maybeExecutable; executable = executable;
} }
} }
return maybeExecutable; return executable;
} }
export function getDefaultShellArgs( export function getDefaultShellArgs(
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册