Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pubx
delve
提交
16f30d07
D
delve
项目概览
pubx
/
delve
通知
0
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
delve
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
16f30d07
编写于
2月 27, 2016
作者:
D
Derek Parker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
terminal: Refactor Term/FakeTerm
上级
9e588fef
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
23 deletion
+27
-23
terminal/command_test.go
terminal/command_test.go
+15
-13
terminal/terminal.go
terminal/terminal.go
+12
-10
未找到文件。
terminal/command_test.go
浏览文件 @
16f30d07
...
...
@@ -16,19 +16,17 @@ import (
)
type
FakeTerminal
struct
{
t
testing
.
TB
client
service
.
Client
cmds
*
Commands
term
*
Term
*
Term
t
testing
.
TB
}
func
(
term
*
FakeTerminal
)
Exec
(
cmdstr
string
)
(
outstr
string
,
err
error
)
{
func
(
ft
*
FakeTerminal
)
Exec
(
cmdstr
string
)
(
outstr
string
,
err
error
)
{
cmdstr
,
args
:=
parseCommand
(
cmdstr
)
cmd
:=
term
.
cmds
.
Find
(
cmdstr
)
cmd
:=
ft
.
cmds
.
Find
(
cmdstr
)
outfh
,
err
:=
ioutil
.
TempFile
(
""
,
"cmdtestout"
)
if
err
!=
nil
{
term
.
t
.
Fatalf
(
"could not create temporary file: %v"
,
err
)
ft
.
t
.
Fatalf
(
"could not create temporary file: %v"
,
err
)
}
stdout
,
stderr
:=
os
.
Stdout
,
os
.
Stderr
...
...
@@ -38,19 +36,19 @@ func (term *FakeTerminal) Exec(cmdstr string) (outstr string, err error) {
outfh
.
Close
()
outbs
,
err1
:=
ioutil
.
ReadFile
(
outfh
.
Name
())
if
err1
!=
nil
{
term
.
t
.
Fatalf
(
"could not read temporary output file: %v"
,
err
)
ft
.
t
.
Fatalf
(
"could not read temporary output file: %v"
,
err
)
}
outstr
=
string
(
outbs
)
os
.
Remove
(
outfh
.
Name
())
}()
err
=
cmd
(
term
.
t
erm
,
args
)
err
=
cmd
(
ft
.
T
erm
,
args
)
return
}
func
(
term
*
FakeTerminal
)
MustExec
(
cmdstr
string
)
string
{
outstr
,
err
:=
term
.
Exec
(
cmdstr
)
func
(
ft
*
FakeTerminal
)
MustExec
(
cmdstr
string
)
string
{
outstr
,
err
:=
ft
.
Exec
(
cmdstr
)
if
err
!=
nil
{
term
.
t
.
Fatalf
(
"Error executing <%s>: %v"
,
cmdstr
,
err
)
ft
.
t
.
Fatalf
(
"Error executing <%s>: %v"
,
cmdstr
,
err
)
}
return
outstr
}
...
...
@@ -72,7 +70,11 @@ func withTestTerminal(name string, t testing.TB, fn func(*FakeTerminal)) {
defer
func
()
{
client
.
Detach
(
true
)
}()
fn
(
&
FakeTerminal
{
t
,
client
,
DebugCommands
(
client
),
New
(
client
,
nil
)})
ft
:=
&
FakeTerminal
{
t
:
t
,
Term
:
New
(
client
,
nil
),
}
fn
(
ft
)
}
func
TestCommandDefault
(
t
*
testing
.
T
)
{
...
...
terminal/terminal.go
浏览文件 @
16f30d07
...
...
@@ -7,9 +7,10 @@ import (
"os/signal"
"strings"
"github.com/peterh/liner"
"syscall"
"github.com/peterh/liner"
"github.com/derekparker/delve/config"
"github.com/derekparker/delve/service"
)
...
...
@@ -25,22 +26,27 @@ type Term struct {
client
service
.
Client
prompt
string
line
*
liner
.
State
c
onf
*
config
.
Config
c
mds
*
Commands
dumb
bool
InitFile
string
}
// New returns a new Term.
func
New
(
client
service
.
Client
,
conf
*
config
.
Config
)
*
Term
{
cmds
:=
DebugCommands
(
client
)
if
conf
!=
nil
&&
conf
.
Aliases
!=
nil
{
cmds
.
Merge
(
conf
.
Aliases
)
}
return
&
Term
{
prompt
:
"(dlv) "
,
line
:
liner
.
NewLiner
(),
client
:
client
,
c
onf
:
conf
,
c
mds
:
cmds
,
dumb
:
strings
.
ToLower
(
os
.
Getenv
(
"TERM"
))
==
"dumb"
,
}
}
// Close returns the terminal to its previous mode.
func
(
t
*
Term
)
Close
()
{
t
.
line
.
Close
()
}
...
...
@@ -61,12 +67,8 @@ func (t *Term) Run() (int, error) {
}
}()
cmds
:=
DebugCommands
(
t
.
client
)
if
t
.
conf
!=
nil
&&
t
.
conf
.
Aliases
!=
nil
{
cmds
.
Merge
(
t
.
conf
.
Aliases
)
}
t
.
line
.
SetCompleter
(
func
(
line
string
)
(
c
[]
string
)
{
for
_
,
cmd
:=
range
cmds
.
cmds
{
for
_
,
cmd
:=
range
t
.
cmds
.
cmds
{
for
_
,
alias
:=
range
cmd
.
aliases
{
if
strings
.
HasPrefix
(
alias
,
strings
.
ToLower
(
line
))
{
c
=
append
(
c
,
alias
)
...
...
@@ -94,7 +96,7 @@ func (t *Term) Run() (int, error) {
fmt
.
Println
(
"Type 'help' for list of commands."
)
if
t
.
InitFile
!=
""
{
err
:=
cmds
.
executeFile
(
t
,
t
.
InitFile
)
err
:=
t
.
cmds
.
executeFile
(
t
,
t
.
InitFile
)
if
err
!=
nil
{
fmt
.
Fprintf
(
os
.
Stderr
,
"Error executing init file: %s
\n
"
,
err
)
}
...
...
@@ -113,7 +115,7 @@ func (t *Term) Run() (int, error) {
}
cmdstr
,
args
:=
parseCommand
(
cmdstr
)
cmd
:=
cmds
.
Find
(
cmdstr
)
cmd
:=
t
.
cmds
.
Find
(
cmdstr
)
if
err
:=
cmd
(
t
,
args
);
err
!=
nil
{
if
_
,
ok
:=
err
.
(
ExitRequestError
);
ok
{
return
t
.
handleExit
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录