Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
be0aca71
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,发现更多精彩内容 >>
提交
be0aca71
编写于
1月 31, 2020
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:microsoft/vscode
上级
9749840f
5eeab37a
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
11 addition
and
9 deletion
+11
-9
extensions/html-language-features/server/src/test/selectionRanges.test.ts
...language-features/server/src/test/selectionRanges.test.ts
+1
-0
src/vs/editor/browser/controller/textAreaHandler.ts
src/vs/editor/browser/controller/textAreaHandler.ts
+3
-2
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
...editor/browser/viewParts/contentWidgets/contentWidgets.ts
+1
-1
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
...nch/contrib/extensions/browser/extensions.contribution.ts
+1
-1
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
+5
-5
未找到文件。
extensions/html-language-features/server/src/test/selectionRanges.test.ts
浏览文件 @
be0aca71
...
...
@@ -56,6 +56,7 @@ suite('HTML SelectionRange', () => {
[
34
,
'
none
'
],
[
25
,
'
display: none
'
],
[
24
,
'
display: none;
'
],
[
23
,
'
{ display: none; }
'
],
[
19
,
'
foo { display: none; }
'
],
[
19
,
'
foo { display: none; }
'
],
[
12
,
'
<style>foo { display: none; } </style>
'
],
...
...
src/vs/editor/browser/controller/textAreaHandler.ts
浏览文件 @
be0aca71
...
...
@@ -357,8 +357,9 @@ export class TextAreaHandler extends ViewPart {
this
.
_accessibilitySupport
=
options
.
get
(
EditorOption
.
accessibilitySupport
);
const
accessibilityPageSize
=
options
.
get
(
EditorOption
.
accessibilityPageSize
);
if
(
this
.
_accessibilitySupport
===
AccessibilitySupport
.
Enabled
&&
accessibilityPageSize
===
EditorOptions
.
accessibilityPageSize
.
defaultValue
)
{
// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 1000 for a better experience
this
.
_accessibilityPageSize
=
1000
;
// If a screen reader is attached and the default value is not set we shuold automatically increase the page size to 160 for a better experience
// If we put more than 160 lines the nvda can not handle this https://github.com/microsoft/vscode/issues/89717
this
.
_accessibilityPageSize
=
160
;
}
else
{
this
.
_accessibilityPageSize
=
accessibilityPageSize
;
}
...
...
src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.ts
浏览文件 @
be0aca71
...
...
@@ -334,7 +334,7 @@ class Widget {
if
(
MIN_LIMIT
<
0
)
{
// And we need to make sure we haven't expanded them before the page
const
delta3
=
MIN_LIMIT
;
const
delta3
=
-
MIN_LIMIT
;
MIN_LIMIT
+=
delta3
;
MAX_LIMIT
+=
delta3
;
}
...
...
src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
浏览文件 @
be0aca71
...
...
@@ -396,7 +396,7 @@ registerAction2(class extends Action2 {
constructor
()
{
super
({
id
:
'
workbench.extensions.action.configure
'
,
title
:
{
value
:
localize
(
'
workbench.extensions.action.configure
'
,
"
Configure...
"
),
original
:
'
Configure...
'
},
title
:
{
value
:
localize
(
'
workbench.extensions.action.configure
'
,
"
Extension Settings
"
),
original
:
'
Extension Settings
'
},
menu
:
{
id
:
MenuId
.
ExtensionContext
,
group
:
'
2_configure
'
,
...
...
src/vs/workbench/services/bulkEdit/browser/conflicts.ts
浏览文件 @
be0aca71
...
...
@@ -113,11 +113,11 @@ export class ConflictDetector {
list
():
URI
[]
{
const
result
:
URI
[]
=
this
.
_conflicts
.
keys
();
this
.
_changes
.
forEach
((
_value
,
key
)
=>
{
if
(
!
this
.
_conflicts
.
has
(
key
))
{
result
.
push
(
key
);
}
});
//
this._changes.forEach((_value, key) => {
//
if (!this._conflicts.has(key)) {
//
result.push(key);
//
}
//
});
return
result
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录