Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
507ce72a
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
507ce72a
编写于
6月 17, 2021
作者:
S
Sandeep Somavarapu
提交者:
GitHub
6月 17, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #126577 from microsoft/sandy081/recovery/fix125970
Improve migrating old editorAssociations setting format
上级
08bca485
3f4baf46
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
16 deletion
+41
-16
src/vs/workbench/services/editor/browser/editorOverrideService.ts
...orkbench/services/editor/browser/editorOverrideService.ts
+41
-16
未找到文件。
src/vs/workbench/services/editor/browser/editorOverrideService.ts
浏览文件 @
507ce72a
...
...
@@ -22,6 +22,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import
{
registerSingleton
}
from
'
vs/platform/instantiation/common/extensions
'
;
import
{
IStorageService
,
StorageScope
,
StorageTarget
}
from
'
vs/platform/storage/common/storage
'
;
import
{
IExtensionService
}
from
'
vs/workbench/services/extensions/common/extensions
'
;
import
{
IHostService
}
from
'
vs/workbench/services/host/browser/host
'
;
import
{
ILogService
}
from
'
vs/platform/log/common/log
'
;
interface
IContributedEditorInput
extends
IEditorInput
{
viewType
?:
string
;
...
...
@@ -56,7 +58,9 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
@
INotificationService
private
readonly
notificationService
:
INotificationService
,
@
ITelemetryService
private
readonly
telemetryService
:
ITelemetryService
,
@
IStorageService
private
readonly
storageService
:
IStorageService
,
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
@
IExtensionService
private
readonly
extensionService
:
IExtensionService
,
@
IHostService
private
readonly
hostService
:
IHostService
,
@
ILogService
private
readonly
logService
:
ILogService
,
)
{
super
();
// Read in the cache on statup
...
...
@@ -75,8 +79,10 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
});
// When the setting changes we want to ensure that it is properly converted
this
.
_register
(
this
.
configurationService
.
onDidChangeConfiguration
(()
=>
{
this
.
convertOldAssociationFormat
();
this
.
_register
(
this
.
configurationService
.
onDidChangeConfiguration
((
e
)
=>
{
if
(
e
.
affectsConfiguration
(
editorsAssociationsSettingId
))
{
this
.
convertOldAssociationFormat
();
}
}));
}
...
...
@@ -177,23 +183,42 @@ export class EditorOverrideService extends Disposable implements IEditorOverride
}
private
convertOldAssociationFormat
():
void
{
const
rawAssociations
=
this
.
configurationService
.
getValue
<
EditorAssociations
|
{
[
fileNamePattern
:
string
]:
string
}
>
(
editorsAssociationsSettingId
)
||
[];
// If it's not an array, then it's the new format
if
(
!
Array
.
isArray
(
rawAssociations
))
{
return
;
}
let
newSettingObject
=
Object
.
create
(
null
);
// Make the correctly formatted object from the array and then set that object
for
(
const
association
of
rawAssociations
)
{
if
(
association
.
filenamePattern
)
{
newSettingObject
[
association
.
filenamePattern
]
=
association
.
viewType
;
this
.
hostService
.
hadLastFocus
().
then
(
hadLastFocus
=>
{
if
(
!
hadLastFocus
)
{
return
;
}
}
this
.
configurationService
.
updateValue
(
editorsAssociationsSettingId
,
newSettingObject
);
const
rawAssociations
=
this
.
configurationService
.
getValue
<
EditorAssociations
|
{
[
fileNamePattern
:
string
]:
string
}
>
(
editorsAssociationsSettingId
)
||
{};
// If it's not an array, then it's the new format
if
(
!
Array
.
isArray
(
rawAssociations
))
{
return
;
}
let
newSettingObject
=
Object
.
create
(
null
);
// Make the correctly formatted object from the array and then set that object
for
(
const
association
of
rawAssociations
)
{
if
(
association
.
filenamePattern
)
{
newSettingObject
[
association
.
filenamePattern
]
=
association
.
viewType
;
}
}
this
.
logService
.
info
(
`Migrating
${
editorsAssociationsSettingId
}
`
);
this
.
configurationService
.
updateValue
(
editorsAssociationsSettingId
,
newSettingObject
);
});
}
private
getAllUserAssociations
():
EditorAssociations
{
const
rawAssociations
=
this
.
configurationService
.
getValue
<
{
[
fileNamePattern
:
string
]:
string
}
>
(
editorsAssociationsSettingId
)
||
[];
let
rawAssociations
=
this
.
configurationService
.
getValue
<
EditorAssociations
|
{
[
fileNamePattern
:
string
]:
string
}
>
(
editorsAssociationsSettingId
)
||
{};
// If it's an array then it is old format
if
(
Array
.
isArray
(
rawAssociations
))
{
// Make the correctly formatted object
const
newValue
=
Object
.
create
(
null
);
for
(
const
association
of
rawAssociations
)
{
if
(
association
.
filenamePattern
)
{
newValue
[
association
.
filenamePattern
]
=
association
.
viewType
;
}
}
rawAssociations
=
newValue
;
}
let
associations
=
[];
for
(
const
[
key
,
value
]
of
Object
.
entries
(
rawAssociations
))
{
const
association
:
EditorAssociation
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录