Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c84a7156
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c84a7156
编写于
4月 18, 2016
作者:
P
pflannery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Response to ALL_CAPS_NAMING and code org.
上级
aa3f8d74
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
12 deletion
+12
-12
src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts
...parts/execution/electron-browser/terminal.contribution.ts
+3
-3
src/vs/workbench/parts/execution/electron-browser/terminal.ts
...vs/workbench/parts/execution/electron-browser/terminal.ts
+3
-3
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
...bench/parts/execution/electron-browser/terminalService.ts
+3
-3
src/vs/workbench/parts/execution/test/browser/terminalService.test.ts
...ench/parts/execution/test/browser/terminalService.test.ts
+3
-3
未找到文件。
src/vs/workbench/parts/execution/electron-browser/terminal.contribution.ts
浏览文件 @
c84a7156
...
@@ -20,7 +20,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
...
@@ -20,7 +20,7 @@ import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
KeyMod
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
KeyMod
,
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
Extensions
,
IConfigurationRegistry
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
Extensions
,
IConfigurationRegistry
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
defaultWindowsTerm
,
defaultLinuxTerm
}
from
'
vs/workbench/parts/execution/common
/terminal
'
;
import
{
DEFAILT_WINDOWS_TERM
,
DEFAULT_LINUX_TERM
}
from
'
vs/workbench/parts/execution/electron-browser
/terminal
'
;
let
configurationRegistry
=
<
IConfigurationRegistry
>
Registry
.
as
(
Extensions
.
Configuration
);
let
configurationRegistry
=
<
IConfigurationRegistry
>
Registry
.
as
(
Extensions
.
Configuration
);
configurationRegistry
.
registerConfiguration
({
configurationRegistry
.
registerConfiguration
({
...
@@ -36,7 +36,7 @@ configurationRegistry.registerConfiguration({
...
@@ -36,7 +36,7 @@ configurationRegistry.registerConfiguration({
'
exec
'
:
{
'
exec
'
:
{
'
type
'
:
'
string
'
,
'
type
'
:
'
string
'
,
'
description
'
:
nls
.
localize
(
'
terminal.windows.exec
'
,
"
Customizes which terminal to run.
"
),
'
description
'
:
nls
.
localize
(
'
terminal.windows.exec
'
,
"
Customizes which terminal to run.
"
),
'
default
'
:
defaultWindowsTerm
'
default
'
:
DEFAILT_WINDOWS_TERM
}
}
}
}
},
},
...
@@ -47,7 +47,7 @@ configurationRegistry.registerConfiguration({
...
@@ -47,7 +47,7 @@ configurationRegistry.registerConfiguration({
'
exec
'
:
{
'
exec
'
:
{
'
type
'
:
'
string
'
,
'
type
'
:
'
string
'
,
'
description
'
:
nls
.
localize
(
'
terminal.linux.exec
'
,
"
Customizes which terminal to run.
"
),
'
description
'
:
nls
.
localize
(
'
terminal.linux.exec
'
,
"
Customizes which terminal to run.
"
),
'
default
'
:
defaultLinuxTerm
'
default
'
:
DEFAULT_LINUX_TERM
}
}
}
}
}
}
...
...
src/vs/workbench/parts/execution/
common
/terminal.ts
→
src/vs/workbench/parts/execution/
electron-browser
/terminal.ts
浏览文件 @
c84a7156
...
@@ -5,14 +5,14 @@
...
@@ -5,14 +5,14 @@
import
fs
=
require
(
'
fs
'
);
import
fs
=
require
(
'
fs
'
);
import
env
=
require
(
'
vs/base/common/platform
'
);
import
env
=
require
(
'
vs/base/common/platform
'
);
export
let
defaultLinuxTerm
=
'
x-terminal-emulator
'
;
export
let
DEFAULT_LINUX_TERM
=
'
x-terminal-emulator
'
;
// if we're not on debian and using gnome then
// if we're not on debian and using gnome then
// set default to gnome-terminal
// set default to gnome-terminal
if
(
env
.
isLinux
if
(
env
.
isLinux
&&
fs
.
existsSync
(
'
/etc/debian_version
'
)
===
false
&&
fs
.
existsSync
(
'
/etc/debian_version
'
)
===
false
&&
process
.
env
.
DESKTOP_SESSION
===
'
gnome
'
)
{
&&
process
.
env
.
DESKTOP_SESSION
===
'
gnome
'
)
{
defaultLinuxTerm
=
'
gnome-terminal
'
;
DEFAULT_LINUX_TERM
=
'
gnome-terminal
'
;
}
}
export
const
defaultWindowsTerm
=
'
cmd
'
;
export
const
DEFAILT_WINDOWS_TERM
=
'
cmd
'
;
\ No newline at end of file
\ No newline at end of file
src/vs/workbench/parts/execution/electron-browser/terminalService.ts
浏览文件 @
c84a7156
...
@@ -9,7 +9,7 @@ import uri from 'vs/base/common/uri';
...
@@ -9,7 +9,7 @@ import uri from 'vs/base/common/uri';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
ITerminalService
}
from
'
vs/workbench/parts/execution/common/execution
'
;
import
{
ITerminalService
}
from
'
vs/workbench/parts/execution/common/execution
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
defaultWindowsTerm
,
defaultLinuxTerm
}
from
'
vs/workbench/parts/execution/common
/terminal
'
;
import
{
DEFAILT_WINDOWS_TERM
,
DEFAULT_LINUX_TERM
}
from
'
vs/workbench/parts/execution/electron-browser
/terminal
'
;
import
cp
=
require
(
'
child_process
'
);
import
cp
=
require
(
'
child_process
'
);
import
processes
=
require
(
'
vs/base/node/processes
'
);
import
processes
=
require
(
'
vs/base/node/processes
'
);
...
@@ -42,7 +42,7 @@ export class WinTerminalService implements ITerminalService {
...
@@ -42,7 +42,7 @@ export class WinTerminalService implements ITerminalService {
private
spawnTerminal
(
spawner
,
configuration
,
command
:
string
,
path
:
string
,
onExit
,
onError
)
{
private
spawnTerminal
(
spawner
,
configuration
,
command
:
string
,
path
:
string
,
onExit
,
onError
)
{
let
terminalConfig
=
configuration
.
terminal
;
let
terminalConfig
=
configuration
.
terminal
;
let
exec
=
terminalConfig
.
windows
.
exec
||
defaultWindowsTerm
;
let
exec
=
terminalConfig
.
windows
.
exec
||
DEFAILT_WINDOWS_TERM
;
let
cmdArgs
=
[
'
/c
'
,
'
start
'
,
'
/wait
'
,
exec
];
let
cmdArgs
=
[
'
/c
'
,
'
start
'
,
'
/wait
'
,
exec
];
let
child
=
spawner
.
spawn
(
command
,
cmdArgs
,
{
cwd
:
path
});
let
child
=
spawner
.
spawn
(
command
,
cmdArgs
,
{
cwd
:
path
});
...
@@ -103,7 +103,7 @@ export class LinuxTerminalService implements ITerminalService {
...
@@ -103,7 +103,7 @@ export class LinuxTerminalService implements ITerminalService {
private
spawnTerminal
(
spawner
,
configuration
,
path
:
string
,
onExit
,
onError
)
{
private
spawnTerminal
(
spawner
,
configuration
,
path
:
string
,
onExit
,
onError
)
{
let
terminalConfig
=
configuration
.
terminal
;
let
terminalConfig
=
configuration
.
terminal
;
let
exec
=
terminalConfig
.
linux
.
exec
||
defaultLinuxTerm
;
let
exec
=
terminalConfig
.
linux
.
exec
||
DEFAULT_LINUX_TERM
;
const
child
=
spawner
.
spawn
(
exec
,
[],
{
cwd
:
path
});
const
child
=
spawner
.
spawn
(
exec
,
[],
{
cwd
:
path
});
child
.
on
(
'
error
'
,
onError
);
child
.
on
(
'
error
'
,
onError
);
child
.
on
(
'
exit
'
,
onExit
);
child
.
on
(
'
exit
'
,
onExit
);
...
...
src/vs/workbench/parts/execution/test/browser/terminalService.test.ts
浏览文件 @
c84a7156
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
import
{
equal
}
from
'
assert
'
;
import
{
equal
}
from
'
assert
'
;
import
{
WinTerminalService
,
LinuxTerminalService
}
from
'
vs/workbench/parts/execution/electron-browser/terminalService
'
;
import
{
WinTerminalService
,
LinuxTerminalService
}
from
'
vs/workbench/parts/execution/electron-browser/terminalService
'
;
import
{
defaultWindowsTerm
,
defaultLinuxTerm
}
from
'
vs/workbench/parts/execution/common
/terminal
'
;
import
{
DEFAILT_WINDOWS_TERM
,
DEFAULT_LINUX_TERM
}
from
'
vs/workbench/parts/execution/electron-browser
/terminal
'
;
suite
(
'
Execution - TerminalService
'
,
()
=>
{
suite
(
'
Execution - TerminalService
'
,
()
=>
{
let
mockOnExit
;
let
mockOnExit
;
...
@@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => {
...
@@ -61,7 +61,7 @@ suite('Execution - TerminalService', () => {
let
mockSpawner
=
{
let
mockSpawner
=
{
spawn
:
(
command
,
args
,
opts
)
=>
{
spawn
:
(
command
,
args
,
opts
)
=>
{
// assert
// assert
equal
(
args
[
args
.
length
-
1
],
defaultWindowsTerm
,
'
terminal should equal expected
'
)
equal
(
args
[
args
.
length
-
1
],
DEFAILT_WINDOWS_TERM
,
'
terminal should equal expected
'
)
done
();
done
();
return
{
return
{
on
:
(
evt
)
=>
evt
on
:
(
evt
)
=>
evt
...
@@ -108,7 +108,7 @@ suite('Execution - TerminalService', () => {
...
@@ -108,7 +108,7 @@ suite('Execution - TerminalService', () => {
let
mockSpawner
=
{
let
mockSpawner
=
{
spawn
:
(
command
,
args
,
opts
)
=>
{
spawn
:
(
command
,
args
,
opts
)
=>
{
// assert
// assert
equal
(
command
,
defaultLinuxTerm
,
'
terminal should equal expected
'
)
equal
(
command
,
DEFAULT_LINUX_TERM
,
'
terminal should equal expected
'
)
done
();
done
();
return
{
return
{
on
:
(
evt
)
=>
evt
on
:
(
evt
)
=>
evt
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录