Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c79caf02
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,发现更多精彩内容 >>
提交
c79caf02
编写于
10月 11, 2018
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
sqlite - renames
上级
5afd0089
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
56 addition
and
30 deletion
+56
-30
src/vs/platform/storage2/common/storage2.ts
src/vs/platform/storage2/common/storage2.ts
+29
-3
src/vs/platform/storage2/node/nextStorage2Service.ts
src/vs/platform/storage2/node/nextStorage2Service.ts
+11
-11
src/vs/workbench/electron-browser/main.ts
src/vs/workbench/electron-browser/main.ts
+11
-11
src/vs/workbench/electron-browser/shell.ts
src/vs/workbench/electron-browser/shell.ts
+5
-5
未找到文件。
src/vs/platform/storage2/common/storage2.ts
浏览文件 @
c79caf02
...
...
@@ -6,9 +6,9 @@
import
{
createDecorator
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
export
const
INextStorage
Service
=
createDecorator
<
INextStorageService
>
(
'
nextStorage
Service
'
);
export
const
INextStorage
2Service
=
createDecorator
<
INextStorage2Service
>
(
'
nextStorage2
Service
'
);
export
interface
INextStorageService
{
export
interface
INextStorage
2
Service
{
_serviceBrand
:
any
;
/**
...
...
@@ -79,4 +79,30 @@ export const enum StorageScope {
export
interface
IWorkspaceStorageChangeEvent
{
key
:
string
;
scope
:
StorageScope
;
}
\ No newline at end of file
}
export
const
NullNextStorage2Service
:
INextStorage2Service
=
{
_serviceBrand
:
undefined
,
onDidChangeStorage
:
Event
.
None
,
get
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
string
):
string
{
return
fallbackValue
;
},
getBoolean
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
boolean
):
boolean
{
return
fallbackValue
;
},
getInteger
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
number
):
number
{
return
fallbackValue
;
},
set
(
key
:
string
,
value
:
any
,
scope
:
StorageScope
):
Promise
<
void
>
{
return
Promise
.
resolve
();
},
delete
(
key
:
string
,
scope
:
StorageScope
):
Promise
<
void
>
{
return
Promise
.
resolve
();
}
};
\ No newline at end of file
src/vs/platform/storage2/node/nextStorageService.ts
→
src/vs/platform/storage2/node/nextStorage
2
Service.ts
浏览文件 @
c79caf02
...
...
@@ -7,11 +7,11 @@ import { Disposable } from 'vs/base/common/lifecycle';
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
IEnvironmentService
}
from
'
vs/platform/environment/common/environment
'
;
import
{
IWorkspaceStorageChangeEvent
,
INextStorageService
,
StorageScope
}
from
'
vs/platform/storage2/common/storage2
'
;
import
{
IWorkspaceStorageChangeEvent
,
INextStorage
2
Service
,
StorageScope
}
from
'
vs/platform/storage2/common/storage2
'
;
import
{
Storage
,
IStorageLoggingOptions
}
from
'
vs/base/node/storage
'
;
import
{
IStorageService
,
StorageScope
as
LocalStorageScope
}
from
'
vs/platform/storage/common/storage
'
;
export
class
NextStorage
Service
extends
Disposable
implements
INextStorage
Service
{
export
class
NextStorage
2Service
extends
Disposable
implements
INextStorage2
Service
{
_serviceBrand
:
any
;
private
_onDidChangeStorage
:
Emitter
<
IWorkspaceStorageChangeEvent
>
=
this
.
_register
(
new
Emitter
<
IWorkspaceStorageChangeEvent
>
());
...
...
@@ -84,25 +84,25 @@ export class NextStorageService extends Disposable implements INextStorageServic
}
}
export
class
NextDelegatingStorageService
extends
Disposable
implements
INextStorageService
{
export
class
NextDelegatingStorageService
extends
Disposable
implements
INextStorage
2
Service
{
_serviceBrand
:
any
;
private
_onDidChangeStorage
:
Emitter
<
IWorkspaceStorageChangeEvent
>
=
this
.
_register
(
new
Emitter
<
IWorkspaceStorageChangeEvent
>
());
get
onDidChangeStorage
():
Event
<
IWorkspaceStorageChangeEvent
>
{
return
this
.
_onDidChangeStorage
.
event
;
}
constructor
(
@
INextStorage
Service
private
nextStorageService
:
NextStorage
Service
,
@
INextStorage
2Service
private
nextStorage2Service
:
NextStorage2
Service
,
@
IStorageService
private
storageService
:
IStorageService
,
@
ILogService
private
logService
:
ILogService
,
@
IEnvironmentService
environmentService
:
IEnvironmentService
)
{
super
();
this
.
_register
(
this
.
nextStorageService
.
onDidChangeStorage
(
e
=>
this
.
_onDidChangeStorage
.
fire
(
e
)));
this
.
_register
(
this
.
nextStorage
2
Service
.
onDidChangeStorage
(
e
=>
this
.
_onDidChangeStorage
.
fire
(
e
)));
}
get
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
any
):
string
{
const
dbValue
=
this
.
nextStorageService
.
get
(
key
,
scope
,
fallbackValue
);
const
dbValue
=
this
.
nextStorage
2
Service
.
get
(
key
,
scope
,
fallbackValue
);
const
localStorageValue
=
this
.
storageService
.
get
(
key
,
this
.
convertScope
(
scope
),
fallbackValue
);
this
.
assertStorageValue
(
key
,
scope
,
dbValue
,
localStorageValue
);
...
...
@@ -111,7 +111,7 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
}
getBoolean
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
boolean
):
boolean
{
const
dbValue
=
this
.
nextStorageService
.
getBoolean
(
key
,
scope
,
fallbackValue
);
const
dbValue
=
this
.
nextStorage
2
Service
.
getBoolean
(
key
,
scope
,
fallbackValue
);
const
localStorageValue
=
this
.
storageService
.
getBoolean
(
key
,
this
.
convertScope
(
scope
),
fallbackValue
);
this
.
assertStorageValue
(
key
,
scope
,
dbValue
,
localStorageValue
);
...
...
@@ -120,7 +120,7 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
}
getInteger
(
key
:
string
,
scope
:
StorageScope
,
fallbackValue
?:
number
):
number
{
const
dbValue
=
this
.
nextStorageService
.
getInteger
(
key
,
scope
,
fallbackValue
);
const
dbValue
=
this
.
nextStorage
2
Service
.
getInteger
(
key
,
scope
,
fallbackValue
);
const
localStorageValue
=
this
.
storageService
.
getInteger
(
key
,
this
.
convertScope
(
scope
),
fallbackValue
);
this
.
assertStorageValue
(
key
,
scope
,
dbValue
,
localStorageValue
);
...
...
@@ -137,17 +137,17 @@ export class NextDelegatingStorageService extends Disposable implements INextSto
set
(
key
:
string
,
value
:
any
,
scope
:
StorageScope
):
Promise
<
void
>
{
this
.
storageService
.
store
(
key
,
value
,
this
.
convertScope
(
scope
));
return
this
.
nextStorageService
.
set
(
key
,
value
,
scope
);
return
this
.
nextStorage
2
Service
.
set
(
key
,
value
,
scope
);
}
delete
(
key
:
string
,
scope
:
StorageScope
):
Promise
<
void
>
{
this
.
storageService
.
remove
(
key
,
this
.
convertScope
(
scope
));
return
this
.
nextStorageService
.
delete
(
key
,
scope
);
return
this
.
nextStorage
2
Service
.
delete
(
key
,
scope
);
}
close
():
Promise
<
void
>
{
return
this
.
nextStorageService
.
close
();
return
this
.
nextStorage
2
Service
.
close
();
}
private
convertScope
(
scope
:
StorageScope
):
LocalStorageScope
{
...
...
src/vs/workbench/electron-browser/main.ts
浏览文件 @
c79caf02
...
...
@@ -36,7 +36,7 @@ import { IWorkspacesService, ISingleFolderWorkspaceIdentifier } from 'vs/platfor
import
{
createSpdLogService
}
from
'
vs/platform/log/node/spdlogService
'
;
import
*
as
fs
from
'
fs
'
;
import
{
ConsoleLogService
,
MultiplexLogService
,
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
NextStorage
Service
,
NextDelegatingStorageService
}
from
'
vs/platform/storage2/node/nextStorage
Service
'
;
import
{
NextStorage
2Service
,
NextDelegatingStorageService
}
from
'
vs/platform/storage2/node/nextStorage2
Service
'
;
import
{
IssueChannelClient
}
from
'
vs/platform/issue/node/issueIpc
'
;
import
{
IIssueService
}
from
'
vs/platform/issue/common/issue
'
;
import
{
LogLevelSetterChannelClient
,
FollowerLogService
}
from
'
vs/platform/log/node/logIpc
'
;
...
...
@@ -100,11 +100,11 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
return
Promise
.
all
([
createAndInitializeWorkspaceService
(
configuration
,
environmentService
),
createNextStorageService
(
environmentService
,
logService
)
createNextStorage
2
Service
(
environmentService
,
logService
)
]).
then
(
services
=>
{
const
workspaceService
=
services
[
0
];
const
storageService
=
createStorageService
(
workspaceService
,
environmentService
);
const
nextStorageService
=
new
NextDelegatingStorageService
(
services
[
1
],
storageService
,
logService
,
environmentService
);
const
nextStorage
2
Service
=
new
NextDelegatingStorageService
(
services
[
1
],
storageService
,
logService
,
environmentService
);
return
domContentLoaded
().
then
(()
=>
{
perf
.
mark
(
'
willStartWorkbench
'
);
...
...
@@ -116,12 +116,12 @@ function openWorkbench(configuration: IWindowConfiguration): Promise<void> {
environmentService
,
logService
,
storageService
,
nextStorageService
nextStorage
2
Service
},
mainServices
,
mainProcessClient
,
configuration
);
// Gracefully Shutdown Storage
shell
.
onShutdown
(
event
=>
{
event
.
join
(
nextStorageService
.
close
());
event
.
join
(
nextStorage
2
Service
.
close
());
});
// Open Shell
...
...
@@ -166,15 +166,15 @@ function validateFolderUri(folderUri: ISingleFolderWorkspaceIdentifier, verbose:
});
}
function
createNextStorage
Service
(
environmentService
:
IEnvironmentService
,
logService
:
ILogService
):
Promise
<
NextStorage
Service
>
{
perf
.
mark
(
'
willCreateNextStorageService
'
);
function
createNextStorage
2Service
(
environmentService
:
IEnvironmentService
,
logService
:
ILogService
):
Promise
<
NextStorage2
Service
>
{
perf
.
mark
(
'
willCreateNextStorage
2
Service
'
);
const
nextStorage
Service
=
new
NextStorage
Service
(
'
:memory:
'
,
logService
,
environmentService
);
const
nextStorage
2Service
=
new
NextStorage2
Service
(
'
:memory:
'
,
logService
,
environmentService
);
return
nextStorageService
.
init
().
then
(()
=>
{
perf
.
mark
(
'
didCreateNextStorageService
'
);
return
nextStorage
2
Service
.
init
().
then
(()
=>
{
perf
.
mark
(
'
didCreateNextStorage
2
Service
'
);
return
nextStorageService
;
return
nextStorage
2
Service
;
});
}
...
...
src/vs/workbench/electron-browser/shell.ts
浏览文件 @
c79caf02
...
...
@@ -75,7 +75,7 @@ import { IBroadcastService, BroadcastService } from 'vs/platform/broadcast/elect
import
{
HashService
}
from
'
vs/workbench/services/hash/node/hashService
'
;
import
{
IHashService
}
from
'
vs/workbench/services/hash/common/hashService
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
import
{
INextStorageService
}
from
'
vs/platform/storage2/common/storage2
'
;
import
{
INextStorage
2
Service
}
from
'
vs/platform/storage2/common/storage2
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
WORKBENCH_BACKGROUND
}
from
'
vs/workbench/common/theme
'
;
import
{
stat
}
from
'
fs
'
;
...
...
@@ -110,7 +110,7 @@ export interface ICoreServices {
environmentService
:
IEnvironmentService
;
logService
:
ILogService
;
storageService
:
IStorageService
;
nextStorage
Service
:
INextStorage
Service
;
nextStorage
2Service
:
INextStorage2
Service
;
}
/**
...
...
@@ -123,7 +123,7 @@ export class WorkbenchShell extends Disposable {
get
onShutdown
():
Event
<
ShutdownEvent
>
{
return
this
.
_onShutdown
.
event
;
}
private
storageService
:
IStorageService
;
private
nextStorage
Service
:
INextStorage
Service
;
private
nextStorage
2Service
:
INextStorage2
Service
;
private
environmentService
:
IEnvironmentService
;
private
logService
:
ILogService
;
private
configurationService
:
IConfigurationService
;
...
...
@@ -154,7 +154,7 @@ export class WorkbenchShell extends Disposable {
this
.
environmentService
=
coreServices
.
environmentService
;
this
.
logService
=
coreServices
.
logService
;
this
.
storageService
=
coreServices
.
storageService
;
this
.
nextStorage
Service
=
coreServices
.
nextStorage
Service
;
this
.
nextStorage
2Service
=
coreServices
.
nextStorage2
Service
;
this
.
mainProcessServices
=
mainProcessServices
;
...
...
@@ -335,7 +335,7 @@ export class WorkbenchShell extends Disposable {
serviceCollection
.
set
(
ILabelService
,
new
SyncDescriptor
(
LabelService
));
serviceCollection
.
set
(
ILogService
,
this
.
_register
(
this
.
logService
));
serviceCollection
.
set
(
IStorageService
,
this
.
storageService
);
serviceCollection
.
set
(
INextStorage
Service
,
this
.
nextStorage
Service
);
serviceCollection
.
set
(
INextStorage
2Service
,
this
.
nextStorage2
Service
);
this
.
mainProcessServices
.
forEach
((
serviceIdentifier
,
serviceInstance
)
=>
{
serviceCollection
.
set
(
serviceIdentifier
,
serviceInstance
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录