Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
404f6cd5
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,体验更适合开发者的 AI 搜索 >>
提交
404f6cd5
编写于
10月 22, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
storage - use more logging service
上级
095ec774
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
16 deletion
+10
-16
src/vs/workbench/electron-browser/main.ts
src/vs/workbench/electron-browser/main.ts
+10
-16
未找到文件。
src/vs/workbench/electron-browser/main.ts
浏览文件 @
404f6cd5
...
...
@@ -8,7 +8,7 @@ import * as perf from 'vs/base/common/performance';
import
{
WorkbenchShell
}
from
'
vs/workbench/electron-browser/shell
'
;
import
*
as
browser
from
'
vs/base/browser/browser
'
;
import
{
domContentLoaded
}
from
'
vs/base/browser/dom
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
import
*
as
comparer
from
'
vs/base/common/comparers
'
;
import
*
as
platform
from
'
vs/base/common/platform
'
;
import
{
URI
as
uri
}
from
'
vs/base/common/uri
'
;
...
...
@@ -110,7 +110,7 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
return
Promise
.
all
([
// Create and initialize workspace/configuration service
createWorkspaceService
(
payload
,
environmentService
),
createWorkspaceService
(
payload
,
environmentService
,
logService
),
// Create and initialize storage service
createStorageService
(
workspaceStoragePath
,
payload
,
environmentService
,
logService
)
...
...
@@ -167,7 +167,7 @@ function createWorkspaceInitializationPayload(configuration: IWindowConfiguratio
// Single-folder workspace
let
workspaceInitializationPayload
:
Promise
<
IWorkspaceInitializationPayload
>
=
Promise
.
resolve
(
void
0
);
if
(
configuration
.
folderUri
)
{
workspaceInitializationPayload
=
resolveSingleFolderWorkspaceInitializationPayload
(
configuration
.
folderUri
,
configuration
.
verbose
);
workspaceInitializationPayload
=
resolveSingleFolderWorkspaceInitializationPayload
(
configuration
.
folderUri
);
}
return
workspaceInitializationPayload
.
then
(
payload
=>
{
...
...
@@ -190,7 +190,7 @@ function createWorkspaceInitializationPayload(configuration: IWindowConfiguratio
});
}
function
resolveSingleFolderWorkspaceInitializationPayload
(
folderUri
:
ISingleFolderWorkspaceIdentifier
,
verbose
:
boolean
):
Promise
<
ISingleFolderWorkspaceInitializationPayload
>
{
function
resolveSingleFolderWorkspaceInitializationPayload
(
folderUri
:
ISingleFolderWorkspaceIdentifier
):
Promise
<
ISingleFolderWorkspaceInitializationPayload
>
{
// Return early the folder is not local
if
(
folderUri
.
scheme
!==
Schemas
.
file
)
{
...
...
@@ -224,14 +224,7 @@ function resolveSingleFolderWorkspaceInitializationPayload(folderUri: ISingleFol
id
:
computeLocalDiskFolderId
(
sanitizedFolderUri
,
stat
),
folder
:
sanitizedFolderUri
}
as
ISingleFolderWorkspaceInitializationPayload
;
},
error
=>
{
if
(
verbose
)
{
errors
.
onUnexpectedError
(
error
);
}
// Do not bubble up the error
return
void
0
;
});
},
error
=>
onUnexpectedError
(
error
));
}
function
prepareWorkspaceStorageFolder
(
payload
:
IWorkspaceInitializationPayload
,
environmentService
:
IEnvironmentService
):
Thenable
<
string
>
{
...
...
@@ -265,14 +258,15 @@ function ensureWorkspaceStorageFolderMeta(workspaceStoragePath: string, workspac
configuration
:
workspace
.
configuration
?
uri
.
revive
(
workspace
.
configuration
).
toString
()
:
void
0
,
folder
:
state
===
WorkbenchState
.
FOLDER
?
uri
.
revive
(
workspace
.
folders
[
0
].
uri
).
toString
()
:
void
0
},
undefined
,
2
));
}).
then
(
null
,
error
=>
errors
.
onUnexpectedError
(
error
));
}).
then
(
null
,
error
=>
onUnexpectedError
(
error
));
}
function
createWorkspaceService
(
payload
:
IWorkspaceInitializationPayload
,
environmentService
:
IEnvironmentService
):
Promise
<
WorkspaceService
>
{
function
createWorkspaceService
(
payload
:
IWorkspaceInitializationPayload
,
environmentService
:
IEnvironmentService
,
logService
:
ILogService
):
Promise
<
WorkspaceService
>
{
const
workspaceService
=
new
WorkspaceService
(
environmentService
);
return
workspaceService
.
initialize
(
payload
).
then
(()
=>
workspaceService
,
error
=>
{
errors
.
onUnexpectedError
(
error
);
onUnexpectedError
(
error
);
logService
.
error
(
error
);
return
workspaceService
;
});
...
...
@@ -383,7 +377,7 @@ function createStorageService(workspaceStorageFolder: string, payload: IWorkspac
});
}
}
catch
(
error
)
{
errors
.
onUnexpectedError
(
error
);
onUnexpectedError
(
error
);
logService
.
error
(
error
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录