Skip to content

Fixes to shell detection #5923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Don Jayamanne (DonJayamanne) merged 2 commits into from
Jun 5, 2019
Merged

Fixes to shell detection #5923

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10ee3b
Fixes to shell detection
DonJayamanne Jun 5, 2019
4856fed
Fixes to injection
DonJayamanne Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixes to injection
  • Loading branch information
@DonJayamanne
DonJayamanne committed Jun 5, 2019
commit 4856fed125cccf67af172bc81ac9dfdd03474557
2 changes: 1 addition & 1 deletion src/client/common/terminal/helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class TerminalHelper implements ITerminalHelper {
@inject(ITerminalActivationCommandProvider) @named(TerminalActivationProviders.commandPromptAndPowerShell) private readonly commandPromptAndPowerShell: ITerminalActivationCommandProvider,
@inject(ITerminalActivationCommandProvider) @named(TerminalActivationProviders.pyenv) private readonly pyenv: ITerminalActivationCommandProvider,
@inject(ITerminalActivationCommandProvider) @named(TerminalActivationProviders.pipenv) private readonly pipenv: ITerminalActivationCommandProvider,
@inject(IConfigurationService) private readonly currentProcess: ICurrentProcess,
@inject(ICurrentProcess) private readonly currentProcess: ICurrentProcess,
@inject(IWorkspaceService) private readonly workspace: IWorkspaceService
) {
this.shellDetector = new ShellDetector(this.platform, this.currentProcess, this.workspace);
Expand Down
4 changes: 2 additions & 2 deletions src/client/common/terminal/shellDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { IWorkspaceService } from '../application/types';
import '../extensions';
import { traceVerbose } from '../logger';
import { IPlatformService } from '../platform/types';
import { IConfigurationService, ICurrentProcess } from '../types';
import { ICurrentProcess } from '../types';
import { OSType } from '../utils/platform';
import { TerminalShellType } from './types';

Expand Down Expand Up @@ -59,7 +59,7 @@ detectableShells.set(TerminalShellType.xonsh, IS_XONSH);
@injectable()
export class ShellDetector {
constructor(@inject(IPlatformService) private readonly platform: IPlatformService,
@inject(IConfigurationService) private readonly currentProcess: ICurrentProcess,
@inject(ICurrentProcess) private readonly currentProcess: ICurrentProcess,
@inject(IWorkspaceService) private readonly workspace: IWorkspaceService
) { }
/**
Expand Down