Skip to content

Exclude/include commandsToSkipShell instead of butchering user settings file #66179

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
Daniel Imms (Tyriar) merged 8 commits into from
Jan 8, 2019
Merged

Exclude/include commandsToSkipShell instead of butchering user settings file #66179

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db2c464
Exclude/include commandsToSkipShell instead of butchering user settin…
usernamehw Jan 7, 2019
3d3c517
1 source of truth
usernamehw Jan 7, 2019
3339315
Improve list format
Tyriar Jan 8, 2019
f399a8a
Merge remote-tracking branch 'origin/master' into pr/usernamehw/66179
Tyriar Jan 8, 2019
d9c0003
Move list into an exported const
Tyriar Jan 8, 2019
21ad2c8
Merge remote-tracking branch 'origin/master' into pr/usernamehw/66179
Tyriar Jan 8, 2019
58df288
Break terminal dependency on other components
Tyriar Jan 8, 2019
fb76a48
Merge branch 'master' into terminal_skip_lines
Tyriar Jan 8, 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
Merge branch 'master' into terminal_skip_lines
  • Loading branch information
@Tyriar
Tyriar authored Jan 8, 2019
commit fb76a4809f35f41eadf7de6a483889a20befc816
1 change: 1 addition & 0 deletions src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import { TerminalCommandTracker } from 'vs/workbench/parts/terminal/node/termina
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
import { execFile, exec } from 'child_process';
import { TERMINAL_COMMAND_ID } from 'vs/workbench/parts/terminal/common/terminalCommands';
import { TerminalProcessManager } from 'vs/workbench/parts/terminal/electron-browser/terminalProcessManager';

// How long in milliseconds should an average frame take to render for a notification to appear
// which suggests the fallback DOM-based renderer
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.