Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
9ef29de2
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,发现更多精彩内容 >>
提交
9ef29de2
编写于
7月 28, 2021
作者:
D
Daniel Imms
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix tests/http links
上级
5f0eaf63
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
5 deletion
+27
-5
src/vs/workbench/contrib/terminal/browser/links/terminalProtocolLinkProvider.ts
...ib/terminal/browser/links/terminalProtocolLinkProvider.ts
+22
-3
src/vs/workbench/contrib/terminal/test/browser/links/terminalProtocolLinkProvider.test.ts
...l/test/browser/links/terminalProtocolLinkProvider.test.ts
+5
-2
未找到文件。
src/vs/workbench/contrib/terminal/browser/links/terminalProtocolLinkProvider.ts
浏览文件 @
9ef29de2
...
...
@@ -15,6 +15,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import
{
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IHostService
}
from
'
vs/workbench/services/host/browser/host
'
;
import
{
IUriIdentityService
}
from
'
vs/workbench/services/uriIdentity/common/uriIdentity
'
;
import
{
Schemas
}
from
'
vs/base/common/network
'
;
export
class
TerminalProtocolLinkProvider
extends
TerminalBaseLinkProvider
{
private
_linkComputerTarget
:
ILinkComputerTarget
|
undefined
;
...
...
@@ -68,8 +69,26 @@ export class TerminalProtocolLinkProvider extends TerminalBaseLinkProvider {
continue
;
}
const
linkText
=
link
.
url
?.
toString
()
||
''
;
// Handle http links
if
(
uri
.
scheme
!==
Schemas
.
file
)
{
result
.
push
(
this
.
_instantiationService
.
createInstance
(
TerminalLink
,
this
.
_xterm
,
bufferRange
,
linkText
,
this
.
_xterm
.
buffer
.
active
.
viewportY
,
this
.
_activateCallback
,
this
.
_tooltipCallback
,
true
,
undefined
));
continue
;
}
// Handle files and folders
const
validatedLink
=
await
new
Promise
<
TerminalLink
|
undefined
>
(
r
=>
{
this
.
_validationCallback
(
uri
.
fsPath
,
(
result
)
=>
{
this
.
_validationCallback
(
linkText
,
(
result
)
=>
{
if
(
result
)
{
const
label
=
result
.
isDirectory
?
(
this
.
_isDirectoryInsideWorkspace
(
result
.
uri
)
?
FOLDER_IN_WORKSPACE_LABEL
:
FOLDER_NOT_IN_WORKSPACE_LABEL
)
...
...
@@ -78,14 +97,14 @@ export class TerminalProtocolLinkProvider extends TerminalBaseLinkProvider {
if
(
result
.
isDirectory
)
{
this
.
_handleLocalFolderLink
(
result
.
uri
);
}
else
{
this
.
_activateCallback
(
event
,
result
.
uri
.
path
);
this
.
_activateCallback
(
event
,
linkText
);
}
});
r
(
this
.
_instantiationService
.
createInstance
(
TerminalLink
,
this
.
_xterm
,
bufferRange
,
uri
.
fsPath
,
linkText
,
this
.
_xterm
.
buffer
.
active
.
viewportY
,
activateCallback
,
this
.
_tooltipCallback
,
...
...
src/vs/workbench/contrib/terminal/test/browser/links/terminalProtocolLinkProvider.test.ts
浏览文件 @
9ef29de2
...
...
@@ -9,8 +9,9 @@ import { Terminal, ILink } from 'xterm';
import
{
TestInstantiationService
}
from
'
vs/platform/instantiation/test/common/instantiationServiceMock
'
;
import
{
TestConfigurationService
}
from
'
vs/platform/configuration/test/common/testConfigurationService
'
;
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
URI
}
from
'
vs/base/common/uri
'
;
suite
(
'
Workbench - Terminal
Web
LinkProvider
'
,
()
=>
{
suite
(
'
Workbench - Terminal
Protocol
LinkProvider
'
,
()
=>
{
let
instantiationService
:
TestInstantiationService
;
setup
(()
=>
{
...
...
@@ -20,7 +21,9 @@ suite('Workbench - TerminalWebLinkProvider', () => {
async
function
assertLink
(
text
:
string
,
expected
:
{
text
:
string
,
range
:
[
number
,
number
][]
}[])
{
const
xterm
=
new
Terminal
();
const
provider
=
instantiationService
.
createInstance
(
TerminalProtocolLinkProvider
,
xterm
,
()
=>
{
},
()
=>
{
});
const
provider
=
instantiationService
.
createInstance
(
TerminalProtocolLinkProvider
,
xterm
,
()
=>
{
},
()
=>
{
},
()
=>
{
},
(
text
:
string
,
cb
:
(
result
:
{
uri
:
URI
,
isDirectory
:
boolean
}
|
undefined
)
=>
void
)
=>
{
cb
({
uri
:
URI
.
parse
(
text
),
isDirectory
:
false
});
});
// Write the text and wait for the parser to finish
await
new
Promise
<
void
>
(
r
=>
xterm
.
write
(
text
,
r
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录