Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
67924dec
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,发现更多精彩内容 >>
提交
67924dec
编写于
2月 28, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
only apply editor settings that changed (for #21487)
上级
a74e4fe3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
117 addition
and
5 deletion
+117
-5
src/vs/base/common/objects.ts
src/vs/base/common/objects.ts
+30
-0
src/vs/base/test/common/objects.test.ts
src/vs/base/test/common/objects.test.ts
+77
-0
src/vs/workbench/browser/parts/editor/textEditor.ts
src/vs/workbench/browser/parts/editor/textEditor.ts
+10
-5
未找到文件。
src/vs/base/common/objects.ts
浏览文件 @
67924dec
...
...
@@ -291,4 +291,34 @@ export function safeStringify(obj: any): string {
export
function
getOrDefault
<
T
,
R
>
(
obj
:
T
,
fn
:
(
obj
:
T
)
=>
R
,
defaultValue
:
R
=
null
):
R
{
const
result
=
fn
(
obj
);
return
typeof
result
===
'
undefined
'
?
defaultValue
:
result
;
}
/**
* Returns an object that has keys for each value that is different in the base object. Keys
* that do not exist in the target but in the base object are not considered.
*
* Note: This is not a deep-diffing method, so the values are strictly taken into the resulting
* object if they differ.
*
* @param base the object to diff against
* @param obj the object to use for diffing
*/
export
function
distinct
<
T
>
(
base
:
object
,
target
:
object
):
object
{
const
result
=
Object
.
create
(
null
);
if
(
!
base
||
!
target
)
{
return
result
;
}
const
targetKeys
=
Object
.
keys
(
target
);
targetKeys
.
forEach
(
k
=>
{
const
baseValue
=
base
[
k
];
const
targetValue
=
target
[
k
];
if
(
!
equals
(
baseValue
,
targetValue
))
{
result
[
k
]
=
targetValue
;
}
});
return
result
;
}
\ No newline at end of file
src/vs/base/test/common/objects.test.ts
浏览文件 @
67924dec
...
...
@@ -173,4 +173,81 @@ suite('Objects', () => {
someValue
=
4
;
assert
.
strictEqual
(
child
.
getter
,
4
);
});
test
(
'
distinct
'
,
function
()
{
let
base
=
{
one
:
'
one
'
,
two
:
2
,
three
:
{
3
:
true
},
four
:
false
};
let
diff
=
objects
.
distinct
(
base
,
base
);
assert
.
deepEqual
(
diff
,
{});
let
obj
=
{};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
{});
obj
=
{
one
:
'
one
'
,
two
:
2
};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
{});
obj
=
{
three
:
{
3
:
true
},
four
:
false
};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
{});
obj
=
{
one
:
'
two
'
,
two
:
2
,
three
:
{
3
:
true
},
four
:
true
};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
{
one
:
'
two
'
,
four
:
true
});
obj
=
{
one
:
null
,
two
:
2
,
three
:
{
3
:
true
},
four
:
void
0
};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
{
one
:
null
,
four
:
void
0
});
obj
=
{
one
:
'
two
'
,
two
:
3
,
three
:
{
3
:
false
},
four
:
true
};
diff
=
objects
.
distinct
(
base
,
obj
);
assert
.
deepEqual
(
diff
,
obj
);
});
});
\ No newline at end of file
src/vs/workbench/browser/parts/editor/textEditor.ts
浏览文件 @
67924dec
...
...
@@ -302,12 +302,17 @@ export abstract class BaseTextEditor extends BaseEditor {
const
editorConfiguration
=
this
.
computeConfiguration
(
configuration
);
// Apply to control if it changed. We do not want to call updateOptions() with the same options
// because it could be that from some other place editor options where changed dynamically (e.g.
// word wrapping) and configurations can change as a matter of many things, not all editor related
if
(
!
this
.
lastAppliedEditorOptions
||
!
objects
.
equals
(
editorConfiguration
,
this
.
lastAppliedEditorOptions
))
{
// Try to figure out the actual editor options that changed from the last time we updated the editor.
// We do this so that we are not overwriting some dynamic editor settings (e.g. word wrap) that might
// have been applied to the editor directly.
let
editorSettingsToApply
=
editorConfiguration
;
if
(
this
.
lastAppliedEditorOptions
)
{
editorSettingsToApply
=
objects
.
distinct
(
this
.
lastAppliedEditorOptions
,
editorSettingsToApply
);
}
if
(
Object
.
keys
(
editorSettingsToApply
).
length
>
0
)
{
this
.
lastAppliedEditorOptions
=
editorConfiguration
;
this
.
editorControl
.
updateOptions
(
editor
Configuration
);
this
.
editorControl
.
updateOptions
(
editor
SettingsToApply
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录