Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5f5df7cb
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5f5df7cb
编写于
5月 14, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add commands to control workspace shell settings
Fixes #23362
上级
81fc317d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
51 addition
and
2 deletion
+51
-2
src/vs/workbench/parts/terminal/common/terminal.ts
src/vs/workbench/parts/terminal/common/terminal.ts
+3
-0
src/vs/workbench/parts/terminal/common/terminalService.ts
src/vs/workbench/parts/terminal/common/terminalService.ts
+4
-0
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
.../parts/terminal/electron-browser/terminal.contribution.ts
+3
-1
src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
...kbench/parts/terminal/electron-browser/terminalActions.ts
+37
-1
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
...h/parts/terminal/electron-browser/terminalConfigHelper.ts
+4
-0
未找到文件。
src/vs/workbench/parts/terminal/common/terminal.ts
浏览文件 @
5f5df7cb
...
...
@@ -71,6 +71,8 @@ export interface ITerminalConfigHelper {
* Merges the default shell path and args into the provided launch configuration
*/
mergeDefaultShellPathAndArgs
(
shell
:
IShellLaunchConfig
):
void
;
/** Sets whether a workspace shell configuration is allowed or not */
setWorkspaceShellAllowed
(
isAllowed
:
boolean
):
void
;
}
export
interface
ITerminalFont
{
...
...
@@ -146,6 +148,7 @@ export interface ITerminalService {
setContainers
(
panelContainer
:
HTMLElement
,
terminalContainer
:
HTMLElement
):
void
;
updateConfig
():
void
;
selectDefaultWindowsShell
():
TPromise
<
string
>
;
setWorkspaceShellAllowed
(
isAllowed
:
boolean
):
void
;
}
export
interface
ITerminalInstance
{
...
...
src/vs/workbench/parts/terminal/common/terminalService.ts
浏览文件 @
5f5df7cb
...
...
@@ -210,4 +210,8 @@ export abstract class TerminalService implements ITerminalService {
public
updateConfig
():
void
{
this
.
terminalInstances
.
forEach
(
instance
=>
instance
.
updateConfig
());
}
public
setWorkspaceShellAllowed
(
isAllowed
:
boolean
):
void
{
this
.
configHelper
.
setWorkspaceShellAllowed
(
isAllowed
);
}
}
src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts
浏览文件 @
5f5df7cb
...
...
@@ -17,7 +17,7 @@ import { TERMINAL_DEFAULT_SHELL_LINUX, TERMINAL_DEFAULT_SHELL_OSX, TERMINAL_DEFA
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actionRegistry
'
;
import
{
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
KillTerminalAction
,
CopyTerminalSelectionAction
,
CreateNewTerminalAction
,
FocusActiveTerminalAction
,
FocusNextTerminalAction
,
FocusPreviousTerminalAction
,
FocusTerminalAtIndexAction
,
SelectDefaultShellWindowsTerminalAction
,
RunSelectedTextInTerminalAction
,
RunActiveFileInTerminalAction
,
ScrollDownTerminalAction
,
ScrollDownPageTerminalAction
,
ScrollToBottomTerminalAction
,
ScrollUpTerminalAction
,
ScrollUpPageTerminalAction
,
ScrollToTopTerminalAction
,
TerminalPasteAction
,
ToggleTerminalAction
,
ClearTerminalAction
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalActions
'
;
import
{
KillTerminalAction
,
CopyTerminalSelectionAction
,
CreateNewTerminalAction
,
FocusActiveTerminalAction
,
FocusNextTerminalAction
,
FocusPreviousTerminalAction
,
FocusTerminalAtIndexAction
,
SelectDefaultShellWindowsTerminalAction
,
RunSelectedTextInTerminalAction
,
RunActiveFileInTerminalAction
,
ScrollDownTerminalAction
,
ScrollDownPageTerminalAction
,
ScrollToBottomTerminalAction
,
ScrollUpTerminalAction
,
ScrollUpPageTerminalAction
,
ScrollToTopTerminalAction
,
TerminalPasteAction
,
ToggleTerminalAction
,
ClearTerminalAction
,
AllowWorkspaceShellTerminalCommand
,
DisallowWorkspaceShellTerminalCommand
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalActions
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
ShowAllCommandsAction
}
from
'
vs/workbench/parts/quickopen/browser/commandsHandler
'
;
import
{
SyncActionDescriptor
}
from
'
vs/platform/actions/common/actions
'
;
...
...
@@ -266,5 +266,7 @@ actionRegistry.registerWorkbenchAction(new SyncActionDescriptor(ClearTerminalAct
if
(
platform
.
isWindows
)
{
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
SelectDefaultShellWindowsTerminalAction
,
SelectDefaultShellWindowsTerminalAction
.
ID
,
SelectDefaultShellWindowsTerminalAction
.
LABEL
),
'
Terminal: Select Default Shell
'
,
category
);
}
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
AllowWorkspaceShellTerminalCommand
,
AllowWorkspaceShellTerminalCommand
.
ID
,
AllowWorkspaceShellTerminalCommand
.
LABEL
),
'
Terminal: Allow Workspace Shell Configuration
'
,
category
);
actionRegistry
.
registerWorkbenchAction
(
new
SyncActionDescriptor
(
DisallowWorkspaceShellTerminalCommand
,
DisallowWorkspaceShellTerminalCommand
.
ID
,
DisallowWorkspaceShellTerminalCommand
.
LABEL
),
'
Terminal: Disallow Workspace Shell Configuration
'
,
category
);
registerColors
();
src/vs/workbench/parts/terminal/electron-browser/terminalActions.ts
浏览文件 @
5f5df7cb
...
...
@@ -496,4 +496,40 @@ export class ClearTerminalAction extends Action {
}
return
TPromise
.
as
(
void
0
);
}
}
\ No newline at end of file
}
export
class
AllowWorkspaceShellTerminalCommand
extends
Action
{
public
static
ID
=
'
workbench.action.terminal.allowWorkspaceShell
'
;
public
static
LABEL
=
nls
.
localize
(
'
workbench.action.terminal.allowWorkspaceShell
'
,
"
Allow Workspace Shell Configuration
"
);
constructor
(
id
:
string
,
label
:
string
,
@
ITerminalService
private
terminalService
:
ITerminalService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
any
>
{
this
.
terminalService
.
setWorkspaceShellAllowed
(
true
);
return
TPromise
.
as
(
void
0
);
}
}
export
class
DisallowWorkspaceShellTerminalCommand
extends
Action
{
public
static
ID
=
'
workbench.action.terminal.disallowWorkspaceShell
'
;
public
static
LABEL
=
nls
.
localize
(
'
workbench.action.terminal.disallowWorkspaceShell
'
,
"
Disallow Workspace Shell Configuration
"
);
constructor
(
id
:
string
,
label
:
string
,
@
ITerminalService
private
terminalService
:
ITerminalService
)
{
super
(
id
,
label
);
}
public
run
(
event
?:
any
):
TPromise
<
any
>
{
this
.
terminalService
.
setWorkspaceShellAllowed
(
false
);
return
TPromise
.
as
(
void
0
);
}
}
src/vs/workbench/parts/terminal/electron-browser/terminalConfigHelper.ts
浏览文件 @
5f5df7cb
...
...
@@ -100,6 +100,10 @@ export class TerminalConfigHelper implements ITerminalConfigHelper {
return
this
.
_measureFont
(
fontFamily
,
fontSize
,
lineHeight
);
}
public
setWorkspaceShellAllowed
(
isAllowed
:
boolean
):
void
{
this
.
_storageService
.
store
(
IS_WORKSPACE_SHELL_ALLOWED_STORAGE_KEY
,
isAllowed
,
StorageScope
.
WORKSPACE
);
}
public
mergeDefaultShellPathAndArgs
(
shell
:
IShellLaunchConfig
):
void
{
// Check whether there is a workspace setting
const
platformKey
=
platform
.
isWindows
?
'
windows
'
:
platform
.
isMacintosh
?
'
osx
'
:
'
linux
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录