Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
71d01b1e
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,发现更多精彩内容 >>
提交
71d01b1e
编写于
8月 14, 2017
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #21564. Enter should not force tokenization till current position.
上级
e97e8ec6
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
35 addition
and
6 deletion
+35
-6
src/vs/editor/common/controller/cursorTypeOperations.ts
src/vs/editor/common/controller/cursorTypeOperations.ts
+35
-6
未找到文件。
src/vs/editor/common/controller/cursorTypeOperations.ts
浏览文件 @
71d01b1e
...
...
@@ -286,6 +286,12 @@ export class TypeOperations {
}
private
static
_enter
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
keepPosition
:
boolean
,
range
:
Range
):
ICommand
{
if
(
model
.
getFirstInvalidLineNumber
()
<
range
.
getStartPosition
().
lineNumber
)
{
let
lineText
=
model
.
getLineContent
(
range
.
startLineNumber
);
let
indentation
=
strings
.
getLeadingWhitespace
(
lineText
).
substring
(
0
,
range
.
startColumn
-
1
);
return
TypeOperations
.
_typeCommand
(
range
,
'
\n
'
+
config
.
normalizeIndentation
(
indentation
),
keepPosition
);
}
let
r
=
LanguageConfigurationRegistry
.
getEnterAction
(
model
,
range
);
if
(
r
)
{
let
enterAction
=
r
.
enterAction
;
...
...
@@ -369,6 +375,21 @@ export class TypeOperations {
}
}
private
static
_isAutoIndentType
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
selections
:
Selection
[]):
boolean
{
if
(
!
config
.
autoIndent
)
{
return
false
;
}
let
firstInvalidLineNumber
=
model
.
getFirstInvalidLineNumber
();
for
(
let
i
=
0
,
len
=
selections
.
length
;
i
<
len
;
i
++
)
{
if
(
firstInvalidLineNumber
<
selections
[
i
].
getEndPosition
().
lineNumber
)
{
return
false
;
}
}
return
true
;
}
private
static
_runAutoIndentType
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
range
:
Range
,
ch
:
string
):
ICommand
{
let
currentIndentation
=
LanguageConfigurationRegistry
.
getIndentationAtPosition
(
model
,
range
.
startLineNumber
,
range
.
startColumn
);
let
actualIndentation
=
LanguageConfigurationRegistry
.
getIndentActionForType
(
model
,
range
,
ch
,
{
...
...
@@ -585,12 +606,20 @@ export class TypeOperations {
});
}
private
static
_typeInterceptorElectricChar
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
selections
:
Selection
,
ch
:
string
):
EditOperationResult
{
if
(
!
config
.
electricChars
.
hasOwnProperty
(
ch
)
||
!
selections
.
isEmpty
())
{
private
static
_isTypeInterceptorElectricChar
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
selections
:
Selection
[])
{
let
firstInvalidLineNumber
=
model
.
getFirstInvalidLineNumber
();
if
(
selections
.
length
===
1
&&
firstInvalidLineNumber
>=
selections
[
0
].
getEndPosition
().
lineNumber
)
{
return
true
;
}
return
false
;
}
private
static
_typeInterceptorElectricChar
(
config
:
CursorConfiguration
,
model
:
ITokenizedModel
,
selection
:
Selection
,
ch
:
string
):
EditOperationResult
{
if
(
!
config
.
electricChars
.
hasOwnProperty
(
ch
)
||
!
selection
.
isEmpty
())
{
return
null
;
}
let
position
=
selection
s
.
getPosition
();
let
position
=
selection
.
getPosition
();
model
.
forceTokenization
(
position
.
lineNumber
);
let
lineTokens
=
model
.
getLineTokens
(
position
.
lineNumber
);
...
...
@@ -606,7 +635,7 @@ export class TypeOperations {
}
if
(
electricAction
.
appendText
)
{
const
command
=
new
ReplaceCommandWithOffsetCursorState
(
selection
s
,
ch
+
electricAction
.
appendText
,
0
,
-
electricAction
.
appendText
.
length
);
const
command
=
new
ReplaceCommandWithOffsetCursorState
(
selection
,
ch
+
electricAction
.
appendText
,
0
,
-
electricAction
.
appendText
.
length
);
return
new
EditOperationResult
([
command
],
{
shouldPushStackElementBefore
:
false
,
shouldPushStackElementAfter
:
true
...
...
@@ -661,7 +690,7 @@ export class TypeOperations {
});
}
if
(
config
.
autoIndent
)
{
if
(
this
.
_isAutoIndentType
(
config
,
model
,
selections
)
)
{
let
indentCommand
=
this
.
_runAutoIndentType
(
config
,
model
,
selections
[
0
],
ch
);
if
(
indentCommand
)
{
return
new
EditOperationResult
([
indentCommand
],
{
...
...
@@ -685,7 +714,7 @@ export class TypeOperations {
// Electric characters make sense only when dealing with a single cursor,
// as multiple cursors typing brackets for example would interfer with bracket matching
if
(
selections
.
length
===
1
)
{
if
(
this
.
_isTypeInterceptorElectricChar
(
config
,
model
,
selections
)
)
{
const
r
=
this
.
_typeInterceptorElectricChar
(
config
,
model
,
selections
[
0
],
ch
);
if
(
r
)
{
return
r
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录