Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c3edc23c
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,发现更多精彩内容 >>
提交
c3edc23c
编写于
10月 17, 2019
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
f901a471
dc50ec98
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
25 addition
and
11 deletion
+25
-11
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
+11
-2
src/vs/workbench/browser/parts/editor/editorStatus.ts
src/vs/workbench/browser/parts/editor/editorStatus.ts
+14
-9
未找到文件。
src/vs/editor/contrib/bracketMatching/bracketMatching.ts
浏览文件 @
c3edc23c
...
...
@@ -281,6 +281,14 @@ export class BracketMatchingController extends Disposable implements editorCommo
return
;
}
const
selections
=
this
.
_editor
.
getSelections
();
if
(
selections
.
length
>
100
)
{
// no bracket matching for high numbers of selections
this
.
_lastBracketsData
=
[];
this
.
_lastVersionId
=
0
;
return
;
}
const
model
=
this
.
_editor
.
getModel
();
const
versionId
=
model
.
getVersionId
();
let
previousData
:
BracketsData
[]
=
[];
...
...
@@ -289,8 +297,6 @@ export class BracketMatchingController extends Disposable implements editorCommo
previousData
=
this
.
_lastBracketsData
;
}
const
selections
=
this
.
_editor
.
getSelections
();
let
positions
:
Position
[]
=
[],
positionsLen
=
0
;
for
(
let
i
=
0
,
len
=
selections
.
length
;
i
<
len
;
i
++
)
{
let
selection
=
selections
[
i
];
...
...
@@ -319,6 +325,9 @@ export class BracketMatchingController extends Disposable implements editorCommo
newData
[
newDataLen
++
]
=
previousData
[
previousIndex
];
}
else
{
let
brackets
=
model
.
matchBracket
(
position
);
if
(
!
brackets
)
{
brackets
=
model
.
findEnclosingBrackets
(
position
);
}
newData
[
newDataLen
++
]
=
new
BracketsData
(
position
,
brackets
);
}
}
...
...
src/vs/workbench/browser/parts/editor/editorStatus.ts
浏览文件 @
c3edc23c
...
...
@@ -363,7 +363,7 @@ export class EditorStatus extends Disposable implements IWorkbenchContribution {
return
{
id
:
a
.
id
,
label
:
a
.
label
,
detail
:
Language
.
isDefaultVariant
(
)
?
undefined
:
a
.
alias
,
detail
:
(
Language
.
isDefaultVariant
()
||
a
.
label
===
a
.
alias
)
?
undefined
:
a
.
alias
,
run
:
()
=>
{
activeTextEditorWidget
.
focus
();
a
.
run
();
...
...
@@ -1133,14 +1133,19 @@ export class ChangeEncodingAction extends Action {
return
this
.
quickInputService
.
pick
([{
label
:
nls
.
localize
(
'
noFileEditor
'
,
"
No file active at this time
"
)
}]);
}
let
saveWithEncodingPick
:
IQuickPickItem
;
let
reopenWithEncodingPick
:
IQuickPickItem
;
if
(
Language
.
isDefaultVariant
())
{
saveWithEncodingPick
=
{
label
:
nls
.
localize
(
'
saveWithEncoding
'
,
"
Save with Encoding
"
)
};
reopenWithEncodingPick
=
{
label
:
nls
.
localize
(
'
reopenWithEncoding
'
,
"
Reopen with Encoding
"
)
};
}
else
{
saveWithEncodingPick
=
{
label
:
nls
.
localize
(
'
saveWithEncoding
'
,
"
Save with Encoding
"
),
detail
:
'
Save with Encoding
'
,
};
reopenWithEncodingPick
=
{
label
:
nls
.
localize
(
'
reopenWithEncoding
'
,
"
Reopen with Encoding
"
),
detail
:
'
Reopen with Encoding
'
};
const
saveWithEncodingPick
:
IQuickPickItem
=
{
label
:
nls
.
localize
(
'
saveWithEncoding
'
,
"
Save with Encoding
"
)
};
const
reopenWithEncodingPick
:
IQuickPickItem
=
{
label
:
nls
.
localize
(
'
reopenWithEncoding
'
,
"
Reopen with Encoding
"
)
};
if
(
!
Language
.
isDefaultVariant
())
{
const
saveWithEncodingAlias
=
'
Save with Encoding
'
;
if
(
saveWithEncodingAlias
!==
saveWithEncodingPick
.
label
)
{
saveWithEncodingPick
.
detail
=
saveWithEncodingAlias
;
}
const
reopenWithEncodingAlias
=
'
Reopen with Encoding
'
;
if
(
reopenWithEncodingAlias
!==
reopenWithEncodingPick
.
label
)
{
reopenWithEncodingPick
.
detail
=
reopenWithEncodingAlias
;
}
}
let
action
:
IQuickPickItem
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录