Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7803b68c
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,发现更多精彩内容 >>
提交
7803b68c
编写于
8月 04, 2016
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
wip: send openUrl only to the active window
上级
2f4aa9de
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
9 deletion
+12
-9
src/vs/base/parts/ipc/common/ipc.ts
src/vs/base/parts/ipc/common/ipc.ts
+2
-2
src/vs/code/electron-main/main.ts
src/vs/code/electron-main/main.ts
+4
-1
src/vs/platform/url/common/urlIpc.ts
src/vs/platform/url/common/urlIpc.ts
+5
-5
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+1
-1
未找到文件。
src/vs/base/parts/ipc/common/ipc.ts
浏览文件 @
7803b68c
...
...
@@ -319,12 +319,12 @@ export function eventToCall(event: Event<any>): TPromise<any> {
);
}
export
function
eventFromCall
<
T
>
(
channel
:
IChannel
,
name
:
string
):
Event
<
T
>
{
export
function
eventFromCall
<
T
>
(
channel
:
IChannel
,
name
:
string
,
arg
:
any
=
null
):
Event
<
T
>
{
let
promise
:
Promise
;
const
emitter
=
new
Emitter
<
any
>
({
onFirstListenerAdd
:
()
=>
{
promise
=
channel
.
call
(
name
,
null
).
then
(
null
,
err
=>
null
,
e
=>
emitter
.
fire
(
e
));
promise
=
channel
.
call
(
name
,
arg
).
then
(
null
,
err
=>
null
,
e
=>
emitter
.
fire
(
e
));
},
onLastListenerRemove
:
()
=>
{
promise
.
cancel
();
...
...
src/vs/code/electron-main/main.ts
浏览文件 @
7803b68c
...
...
@@ -110,7 +110,10 @@ function main(accessor: ServicesAccessor, mainIpcServer: Server, userEnv: IProce
// Register Electron IPC services
const
urlService
=
instantiationService
.
createInstance
(
URLService
);
const
urlChannel
=
new
URLChannel
(
urlService
);
const
urlChannel
=
new
URLChannel
(
urlService
,
id
=>
{
const
window
=
windowsService
.
getFocusedWindow
()
||
windowsService
.
getLastActiveWindow
();
return
window
?
window
.
id
===
id
:
false
;
});
electronIpcServer
.
registerChannel
(
'
url
'
,
urlChannel
);
// Used by sub processes to communicate back to the main instance
...
...
src/vs/platform/url/common/urlIpc.ts
浏览文件 @
7803b68c
...
...
@@ -8,7 +8,7 @@
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IChannel
,
eventToCall
,
eventFromCall
}
from
'
vs/base/parts/ipc/common/ipc
'
;
import
{
IURLService
}
from
'
./url
'
;
import
Event
from
'
vs/base/common/event
'
;
import
Event
,
{
filterEvent
}
from
'
vs/base/common/event
'
;
export
interface
IURLChannel
extends
IChannel
{
call
(
command
:
'
event:onOpenURL
'
):
TPromise
<
void
>
;
...
...
@@ -17,11 +17,11 @@ export interface IURLChannel extends IChannel {
export
class
URLChannel
implements
IURLChannel
{
constructor
(
private
service
:
IURLService
)
{
}
constructor
(
private
service
:
IURLService
,
private
eventScope
:
(
id
:
number
)
=>
boolean
)
{
}
call
(
command
:
string
,
arg
:
any
):
TPromise
<
any
>
{
switch
(
command
)
{
case
'
event:onOpenURL
'
:
return
eventToCall
(
this
.
service
.
onOpenURL
);
case
'
event:onOpenURL
'
:
return
eventToCall
(
filterEvent
(
this
.
service
.
onOpenURL
,
()
=>
this
.
eventScope
(
arg
as
number
))
);
}
}
}
...
...
@@ -30,8 +30,8 @@ export class URLChannelClient implements IURLService {
_serviceBrand
:
any
;
constructor
(
private
channel
:
IChannel
)
{
}
constructor
(
private
channel
:
IChannel
,
private
id
:
number
)
{
}
private
_onOpenURL
=
eventFromCall
<
string
>
(
this
.
channel
,
'
event:onOpenURL
'
);
private
_onOpenURL
=
eventFromCall
<
string
>
(
this
.
channel
,
'
event:onOpenURL
'
,
this
.
id
);
get
onOpenURL
():
Event
<
string
>
{
return
this
.
_onOpenURL
;
}
}
\ No newline at end of file
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
7803b68c
...
...
@@ -323,7 +323,7 @@ export class WorkbenchShell {
serviceCollection
.
set
(
IExtensionManagementService
,
extensionManagementChannelClient
);
const
urlChannel
=
mainProcessClient
.
getChannel
(
'
url
'
);
const
urlChannelClient
=
instantiationService
.
createInstance
(
URLChannelClient
,
urlChannel
);
const
urlChannelClient
=
instantiationService
.
createInstance
(
URLChannelClient
,
urlChannel
,
this
.
windowService
.
getWindowId
()
);
serviceCollection
.
set
(
IURLService
,
urlChannelClient
);
return
[
instantiationService
,
serviceCollection
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录