Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fe948046
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,发现更多精彩内容 >>
提交
fe948046
编写于
7月 07, 2020
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bootstrap - use preload script to access Electron IPC
上级
c7fe3b41
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
26 addition
and
13 deletion
+26
-13
src/bootstrap-window.js
src/bootstrap-window.js
+16
-5
src/vs/code/electron-browser/workbench/workbench.js
src/vs/code/electron-browser/workbench/workbench.js
+10
-8
未找到文件。
src/bootstrap-window.js
浏览文件 @
fe948046
...
...
@@ -22,7 +22,6 @@
}
}(
this
,
function
()
{
const
path
=
require
.
__$__nodeRequire
(
'
path
'
);
const
ipc
=
require
.
__$__nodeRequire
(
'
electron
'
).
ipcRenderer
;
const
bootstrap
=
globalThis
.
MonacoBootstrap
;
/**
...
...
@@ -151,6 +150,8 @@
* @returns {() => void}
*/
function
registerDeveloperKeybindings
(
disallowReloadKeybinding
)
{
const
ipcRenderer
=
globals
().
ipcRenderer
;
const
extractKey
=
function
(
e
)
{
return
[
e
.
ctrlKey
?
'
ctrl-
'
:
''
,
...
...
@@ -169,9 +170,9 @@
let
listener
=
function
(
e
)
{
const
key
=
extractKey
(
e
);
if
(
key
===
TOGGLE_DEV_TOOLS_KB
||
key
===
TOGGLE_DEV_TOOLS_KB_ALT
)
{
ipc
.
send
(
'
vscode:toggleDevTools
'
);
ipc
Renderer
.
send
(
'
vscode:toggleDevTools
'
);
}
else
if
(
key
===
RELOAD_KB
&&
!
disallowReloadKeybinding
)
{
ipc
.
send
(
'
vscode:reloadWindow
'
);
ipc
Renderer
.
send
(
'
vscode:reloadWindow
'
);
}
};
...
...
@@ -191,7 +192,8 @@
*/
function
onUnexpectedError
(
error
,
enableDeveloperTools
)
{
if
(
enableDeveloperTools
)
{
ipc
.
send
(
'
vscode:openDevTools
'
);
const
ipcRenderer
=
globals
().
ipcRenderer
;
ipcRenderer
.
send
(
'
vscode:openDevTools
'
);
}
console
.
error
(
`[uncaught exception]:
${
error
}
`
);
...
...
@@ -201,7 +203,16 @@
}
}
/**
* @return {typeof import('./vs/base/parts/sandbox/electron-sandbox/globals')}
*/
function
globals
()
{
// @ts-ignore (defined in globals.js)
return
window
.
vscode
;
}
return
{
load
load
,
globals
};
}));
src/vs/code/electron-browser/workbench/workbench.js
浏览文件 @
fe948046
...
...
@@ -33,17 +33,20 @@ const perf = (function () {
perf
.
mark
(
'
renderer/started
'
);
// Setup shell environment
process
[
'
lazyEnv
'
]
=
getLazyEnv
();
/**
* @type {{ load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown }}
* @type {{
* load: (modules: string[], resultCallback: (result, configuration: object) => any, options: object) => unknown,
* globals: () => typeof import('../../../base/parts/sandbox/electron-sandbox/globals')
* }}
*/
const
bootstrapWindow
=
(()
=>
{
// @ts-ignore (defined in bootstrap-window.js)
return
window
.
MonacoBootstrapWindow
;
})();
// Setup shell environment
process
[
'
lazyEnv
'
]
=
getLazyEnv
();
// Load workbench main JS, CSS and NLS all in parallel. This is an
// optimization to prevent a waterfall of loading to happen, because
// we know for a fact that workbench.desktop.main will depend on
...
...
@@ -184,8 +187,7 @@ function showPartsSplash(configuration) {
* @returns {Promise<void>}
*/
function
getLazyEnv
()
{
const
ipc
=
require
.
__$__nodeRequire
(
'
electron
'
).
ipcRenderer
;
const
ipcRenderer
=
bootstrapWindow
.
globals
().
ipcRenderer
;
return
new
Promise
(
function
(
resolve
)
{
const
handle
=
setTimeout
(
function
()
{
...
...
@@ -193,13 +195,13 @@ function getLazyEnv() {
console
.
warn
(
'
renderer did not receive lazyEnv in time
'
);
},
10000
);
ipc
.
once
(
'
vscode:acceptShellEnv
'
,
function
(
event
,
shellEnv
)
{
ipc
Renderer
.
once
(
'
vscode:acceptShellEnv
'
,
function
(
event
,
shellEnv
)
{
clearTimeout
(
handle
);
Object
.
assign
(
process
.
env
,
shellEnv
);
// @ts-ignore
resolve
(
process
.
env
);
});
ipc
.
send
(
'
vscode:fetchShellEnv
'
);
ipc
Renderer
.
send
(
'
vscode:fetchShellEnv
'
);
});
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录