Skip to content

Commit

Permalink
Fix rebase screw-up
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Mäder <[email protected]>
  • Loading branch information
tsmaeder committed Jan 12, 2023
1 parent 68b95a3 commit be25212
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/terminal/src/browser/terminal-widget-impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { Terminal, RendererType } from 'xterm';
import { FitAddon } from 'xterm-addon-fit';
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
import { ContributionProvider, Disposable, Event, Emitter, ILogger, DisposableCollection, Channel } from '@theia/core';
import { ContributionProvider, Disposable, Event, Emitter, ILogger, DisposableCollection, Channel, OS } from '@theia/core';
import { Widget, Message, WebSocketConnectionProvider, StatefulWidget, isFirefox, MessageLoop, KeyCode, codicon, ExtractableWidget } from '@theia/core/lib/browser';
import { isOSX } from '@theia/core/lib/common';
import { WorkspaceService } from '@theia/workspace/lib/browser';
Expand Down Expand Up @@ -487,8 +487,8 @@ export class TerminalWidgetImpl extends TerminalWidget implements StatefulWidget
const { cols, rows } = this.term;

const terminalId = await this.shellTerminalServer.create({
shell: this.options.shellPath || this.shellPreferences.shell,
args: this.options.shellArgs || this.shellPreferences.shellArgs,
shell: this.options.shellPath || this.shellPreferences.shell[OS.type()],
args: this.options.shellArgs || this.shellPreferences.shellArgs[OS.type()],
env: this.options.env,
strictEnv: this.options.strictEnv,
isPseudo: this.options.isPseudoTerminal,
Expand Down

0 comments on commit be25212

Please sign in to comment.