Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
5a698788
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,发现更多精彩内容 >>
提交
5a698788
编写于
3月 01, 2017
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement terminal link validation
Fixes #21226
上级
9e8f96c5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
54 addition
and
33 deletion
+54
-33
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
...workbench/parts/terminal/electron-browser/media/xterm.css
+5
-0
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
...bench/parts/terminal/electron-browser/terminalInstance.ts
+1
-1
src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
...ch/parts/terminal/electron-browser/terminalLinkHandler.ts
+40
-30
src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
...erminal/test/electron-browser/terminalLinkHandler.test.ts
+8
-2
未找到文件。
src/vs/workbench/parts/terminal/electron-browser/media/xterm.css
浏览文件 @
5a698788
...
...
@@ -60,6 +60,11 @@
text-decoration
:
underline
;
}
.monaco-workbench
.panel.integrated-terminal
.xterm
a
.xterm-invalid-link
:hover
{
cursor
:
text
;
text-decoration
:
none
;
}
.monaco-workbench
.panel.integrated-terminal
.xterm
:not
(
.xterm-cursor-style-underline
)
:not
(
.xterm-cursor-style-bar
)
.focus
.reverse-video
,
.monaco-workbench
.panel.integrated-terminal
.xterm
:not
(
.xterm-cursor-style-underline
)
:not
(
.xterm-cursor-style-bar
)
:focus
.reverse-video
{
color
:
#CCC
;
}
.vs-dark
.monaco-workbench
.panel.integrated-terminal
.xterm
:not
(
.xterm-cursor-style-underline
)
:not
(
.xterm-cursor-style-bar
)
.focus
.reverse-video
,
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalInstance.ts
浏览文件 @
5a698788
...
...
@@ -196,7 +196,7 @@ export class TerminalInstance implements ITerminalInstance {
this
.
_xtermElement
=
document
.
createElement
(
'
div
'
);
this
.
_xterm
.
open
(
this
.
_xtermElement
);
this
.
_
xterm
.
registerLinkMatcher
(
this
.
_linkHandler
.
localLinkRegex
,
(
url
)
=>
this
.
_linkHandler
.
handleLocalLink
(
url
),
1
);
this
.
_
linkHandler
.
registerLocalLinkHandler
(
this
.
_xterm
);
this
.
_xterm
.
attachCustomKeydownHandler
((
event
:
KeyboardEvent
)
=>
{
// Disable all input if the terminal is exiting
if
(
this
.
_isExiting
)
{
...
...
src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts
浏览文件 @
5a698788
...
...
@@ -32,43 +32,56 @@ export class TerminalLinkHandler {
)
{
}
public
get
localLinkRegex
():
RegExp
{
public
registerLocalLinkHandler
(
xterm
:
any
)
{
xterm
.
registerLinkMatcher
(
this
.
_localLinkRegex
,
(
url
)
=>
this
.
_handleLocalLink
(
url
),
{
matchIndex
:
1
,
validationCallback
:
(
link
:
string
,
callback
:
(
isValid
:
boolean
)
=>
void
)
=>
this
.
_validateLocalLink
(
link
,
callback
)
});
}
protected
get
_localLinkRegex
():
RegExp
{
if
(
this
.
_platform
===
Platform
.
Windows
)
{
return
WINDOWS_LOCAL_LINK_REGEX
;
}
return
UNIX_LIKE_LOCAL_LINK_REGEX
;
}
public
handleLocalLink
(
link
:
string
):
TPromise
<
void
>
{
if
(
this
.
_platform
===
Platform
.
Windows
)
{
return
this
.
_handleWindowsLocalLink
(
link
);
}
return
this
.
_handleUnixLikeLocalLink
(
link
);
private
_handleLocalLink
(
link
:
string
):
TPromise
<
void
>
{
return
this
.
_resolvePath
(
link
).
then
(
resolvedLink
=>
{
if
(
!
resolvedLink
)
{
return
void
0
;
}
const
resource
=
Uri
.
file
(
path
.
normalize
(
path
.
resolve
(
resolvedLink
)));
return
this
.
_editorService
.
openEditor
({
resource
}).
then
(()
=>
void
0
);
});
}
private
_handleUnixLikeLocalLink
(
link
:
string
):
TPromise
<
void
>
{
// Resolve ~ -> $HOME
if
(
link
.
charAt
(
0
)
===
'
~
'
)
{
if
(
!
process
.
env
.
HOME
)
{
return
TPromise
.
as
(
void
0
);
}
link
=
process
.
env
.
HOME
+
link
.
substring
(
1
);
}
return
this
.
_handleCommonLocalLink
(
link
);
private
_validateLocalLink
(
link
:
string
,
callback
:
(
isValid
:
boolean
)
=>
void
):
void
{
console
.
log
(
'
validate
'
);
this
.
_resolvePath
(
link
).
then
(
resolvedLink
=>
{
callback
(
!!
resolvedLink
);
});
}
private
_handleWindowsLocalLink
(
link
:
string
):
TPromise
<
void
>
{
// Resolve ~ -> %HOMEDRIVE%\%HOMEPATH%
if
(
link
.
charAt
(
0
)
===
'
~
'
)
{
if
(
!
process
.
env
.
HOMEDRIVE
||
!
process
.
env
.
HOMEPATH
)
{
return
TPromise
.
as
(
void
0
);
private
_resolvePath
(
link
:
string
):
TPromise
<
string
>
{
if
(
this
.
_platform
===
Platform
.
Windows
)
{
// Resolve ~ -> %HOMEDRIVE%\%HOMEPATH%
if
(
link
.
charAt
(
0
)
===
'
~
'
)
{
if
(
!
process
.
env
.
HOMEDRIVE
||
!
process
.
env
.
HOMEPATH
)
{
return
TPromise
.
as
(
void
0
);
}
link
=
`
${
process
.
env
.
HOMEDRIVE
}
\
\$
{process.env.HOMEPATH + link.substring(1)}`
;
}
}
else
{
// Resolve workspace path . / .. -> <path>/. / <path/..
if
(
link
.
charAt
(
0
)
===
'
.
'
)
{
if
(
!
this
.
_contextService
.
hasWorkspace
)
{
// Abort if no workspace is open
return
TPromise
.
as
(
void
0
);
}
link
=
path
.
join
(
this
.
_contextService
.
getWorkspace
().
resource
.
fsPath
,
link
);
}
link
=
`
${
process
.
env
.
HOMEDRIVE
}
\
\$
{process.env.HOMEPATH + link.substring(1)}`
;
}
return
this
.
_handleCommonLocalLink
(
link
);
}
private
_handleCommonLocalLink
(
link
:
string
):
TPromise
<
void
>
{
// Resolve workspace path . / .. -> <path>/. / <path/..
if
(
link
.
charAt
(
0
)
===
'
.
'
)
{
if
(
!
this
.
_contextService
.
hasWorkspace
)
{
...
...
@@ -78,15 +91,12 @@ export class TerminalLinkHandler {
link
=
path
.
join
(
this
.
_contextService
.
getWorkspace
().
resource
.
fsPath
,
link
);
}
// Clean up the path
const
resource
=
Uri
.
file
(
path
.
normalize
(
path
.
resolve
(
link
)));
// Open an editor if the path exists
return
pfs
.
fileExists
(
link
).
then
(
isFile
=>
{
if
(
!
isFile
)
{
return
void
0
;
return
null
;
}
return
this
.
_editorService
.
openEditor
({
resource
}).
then
(()
=>
void
0
)
;
return
link
;
});
}
}
src/vs/workbench/parts/terminal/test/electron-browser/terminalLinkHandler.test.ts
浏览文件 @
5a698788
...
...
@@ -9,10 +9,16 @@ import * as assert from 'assert';
import
{
Platform
}
from
'
vs/base/common/platform
'
;
import
{
TerminalLinkHandler
}
from
'
vs/workbench/parts/terminal/electron-browser/terminalLinkHandler
'
;
class
TestTerminalLinkHandler
extends
TerminalLinkHandler
{
public
get
localLinkRegex
():
RegExp
{
return
this
.
_localLinkRegex
;
}
}
suite
(
'
Workbench - TerminalLinkHandler
'
,
()
=>
{
suite
(
'
localLinkRegex
'
,
()
=>
{
test
(
'
Windows
'
,
()
=>
{
const
regex
=
new
TerminalLinkHandler
(
Platform
.
Windows
,
null
,
null
).
localLinkRegex
;
const
regex
=
new
Te
stTe
rminalLinkHandler
(
Platform
.
Windows
,
null
,
null
).
localLinkRegex
;
function
testLink
(
link
:
string
)
{
assert
.
equal
(
`
${
link
}
`
.
match
(
regex
)[
1
],
link
);
assert
.
equal
(
`:
${
link
}
:`
.
match
(
regex
)[
1
],
link
);
...
...
@@ -33,7 +39,7 @@ suite('Workbench - TerminalLinkHandler', () => {
});
test
(
'
Linux
'
,
()
=>
{
const
regex
=
new
TerminalLinkHandler
(
Platform
.
Linux
,
null
,
null
).
localLinkRegex
;
const
regex
=
new
Te
stTe
rminalLinkHandler
(
Platform
.
Linux
,
null
,
null
).
localLinkRegex
;
function
testLink
(
link
:
string
)
{
assert
.
equal
(
`
${
link
}
`
.
match
(
regex
)[
1
],
link
);
assert
.
equal
(
`:
${
link
}
:`
.
match
(
regex
)[
1
],
link
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录