Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2e85ce75
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,发现更多精彩内容 >>
提交
2e85ce75
编写于
6月 13, 2019
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
web - wire in userDataPath properly
上级
dc4a864a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
2 deletion
+8
-2
src/vs/code/browser/workbench/workbench.html
src/vs/code/browser/workbench/workbench.html
+1
-0
src/vs/workbench/browser/web.main.ts
src/vs/workbench/browser/web.main.ts
+7
-2
未找到文件。
src/vs/code/browser/workbench/workbench.html
浏览文件 @
2e85ce75
...
...
@@ -19,6 +19,7 @@
keybindingsPath
:
'
{{KEYBINDINGS}}
'
,
folderPath
:
'
{{FOLDER}}
'
,
workspacePath
:
'
{{WORKSPACE}}
'
,
userDataPath
:
'
{{USER_DATA}}
'
}
</script>
...
...
src/vs/workbench/browser/web.main.ts
浏览文件 @
2e85ce75
...
...
@@ -33,8 +33,10 @@ import { WebResources } from 'vs/workbench/browser/web.resources';
import
{
ISignService
}
from
'
vs/platform/sign/common/sign
'
;
import
{
SignService
}
from
'
vs/platform/sign/browser/signService
'
;
import
{
hash
}
from
'
vs/base/common/hash
'
;
import
{
joinPath
}
from
'
vs/base/common/resources
'
;
interface
IWindowConfiguration
{
userDataUri
:
URI
;
settingsUri
:
URI
;
keybindingsUri
:
URI
;
remoteAuthority
:
string
;
...
...
@@ -140,7 +142,7 @@ class CodeRendererMain extends Disposable {
const
environmentService
=
new
SimpleWorkbenchEnvironmentService
();
environmentService
.
appRoot
=
'
/web/
'
;
environmentService
.
args
=
{
_
:
[]
};
environmentService
.
appSettingsHome
=
toResource
(
'
/web/settings
'
);
environmentService
.
appSettingsHome
=
joinPath
(
this
.
configuration
.
userDataUri
,
'
User
'
);
environmentService
.
settingsResource
=
this
.
configuration
.
settingsUri
;
environmentService
.
keybindingsResource
=
this
.
configuration
.
keybindingsUri
;
environmentService
.
logsPath
=
'
/web/logs
'
;
...
...
@@ -148,11 +150,11 @@ class CodeRendererMain extends Disposable {
port
:
null
,
break
:
false
};
return
environmentService
;
}
private
async
createWorkspaceService
(
payload
:
IWorkspaceInitializationPayload
,
fileService
:
FileService
,
remoteAgentService
:
IRemoteAgentService
,
logService
:
ILogService
):
Promise
<
WorkspaceService
>
{
const
workspaceService
=
new
WorkspaceService
({
userSettingsResource
:
this
.
configuration
.
settingsUri
,
remoteAuthority
:
this
.
configuration
.
remoteAuthority
,
configurationCache
:
new
ConfigurationCache
()
},
new
ConfigurationFileService
(
fileService
),
remoteAgentService
);
try
{
...
...
@@ -184,6 +186,7 @@ class CodeRendererMain extends Disposable {
}
export
interface
IWindowConfigurationContents
{
userDataPath
:
string
;
settingsPath
:
string
;
keybindingsPath
:
string
;
folderPath
?:
string
;
...
...
@@ -192,12 +195,14 @@ export interface IWindowConfigurationContents {
export
function
main
(
windowConfigurationContents
:
IWindowConfigurationContents
):
Promise
<
void
>
{
const
windowConfiguration
:
IWindowConfiguration
=
{
userDataUri
:
toResource
(
windowConfigurationContents
.
userDataPath
),
settingsUri
:
toResource
(
windowConfigurationContents
.
settingsPath
),
keybindingsUri
:
toResource
(
windowConfigurationContents
.
keybindingsPath
),
folderUri
:
windowConfigurationContents
.
folderPath
?
toResource
(
windowConfigurationContents
.
folderPath
)
:
undefined
,
workspaceUri
:
windowConfigurationContents
.
workspacePath
?
toResource
(
windowConfigurationContents
.
workspacePath
)
:
undefined
,
remoteAuthority
:
document
.
location
.
host
};
const
renderer
=
new
CodeRendererMain
(
windowConfiguration
);
return
renderer
.
open
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录