Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
05c87e71
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,发现更多精彩内容 >>
提交
05c87e71
编写于
5月 27, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #6862: Do not auto trim whitespace if edits are not near the cursors
上级
f22a2494
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
103 addition
and
33 deletion
+103
-33
src/vs/editor/common/model/editableTextModel.ts
src/vs/editor/common/model/editableTextModel.ts
+55
-32
src/vs/editor/test/common/controller/cursor.test.ts
src/vs/editor/test/common/controller/cursor.test.ts
+48
-1
未找到文件。
src/vs/editor/common/model/editableTextModel.ts
浏览文件 @
05c87e71
...
...
@@ -97,46 +97,69 @@ export class EditableTextModel extends TextModelWithDecorations implements edito
};
});
for
(
let
i
=
0
,
len
=
this
.
_trimAutoWhitespaceLines
.
length
;
i
<
len
;
i
++
)
{
let
trimLineNumber
=
this
.
_trimAutoWhitespaceLines
[
i
];
let
maxLineColumn
=
this
.
getLineMaxColumn
(
trimLineNumber
);
let
allowTrimLine
=
true
;
// Sometimes, auto-formatters change ranges automatically which can cause undesired auto whitespace trimming near the cursor
// We'll use the following heuristic: if the edits occur near the cursor, then it's ok to trim auto whitespace
let
editsAreNearCursors
=
true
;
for
(
let
i
=
0
,
len
=
beforeCursorState
.
length
;
i
<
len
;
i
++
)
{
let
sel
=
beforeCursorState
[
i
];
let
foundEditNearSel
=
false
;
for
(
let
j
=
0
,
lenJ
=
incomingEdits
.
length
;
j
<
lenJ
;
j
++
)
{
let
editRange
=
incomingEdits
[
j
].
range
;
let
editText
=
incomingEdits
[
j
].
text
;
if
(
trimLineNumber
<
editRange
.
startLineNumber
||
trimLineNumber
>
editRange
.
endLineNumber
)
{
// `trimLine` is completely outside this edit
continue
;
let
selIsAbove
=
editRange
.
startLineNumber
>
sel
.
endLineNumber
;
let
selIsBelow
=
sel
.
startLineNumber
>
editRange
.
endLineNumber
;
if
(
!
selIsAbove
&&
!
selIsBelow
)
{
foundEditNearSel
=
true
;
break
;
}
}
if
(
!
foundEditNearSel
)
{
editsAreNearCursors
=
false
;
break
;
}
}
// At this point:
// editRange.startLineNumber <= trimLine <= editRange.endLineNumber
if
(
trimLineNumber
===
editRange
.
startLineNumber
&&
editRange
.
startColumn
===
maxLineColumn
&&
editRange
.
isEmpty
()
&&
editText
&&
editText
.
length
>
0
&&
editText
.
charAt
(
0
)
===
'
\n
'
)
{
// This edit inserts a new line (and maybe other text) after `trimLine`
continue
;
if
(
editsAreNearCursors
)
{
for
(
let
i
=
0
,
len
=
this
.
_trimAutoWhitespaceLines
.
length
;
i
<
len
;
i
++
)
{
let
trimLineNumber
=
this
.
_trimAutoWhitespaceLines
[
i
];
let
maxLineColumn
=
this
.
getLineMaxColumn
(
trimLineNumber
);
let
allowTrimLine
=
true
;
for
(
let
j
=
0
,
lenJ
=
incomingEdits
.
length
;
j
<
lenJ
;
j
++
)
{
let
editRange
=
incomingEdits
[
j
].
range
;
let
editText
=
incomingEdits
[
j
].
text
;
if
(
trimLineNumber
<
editRange
.
startLineNumber
||
trimLineNumber
>
editRange
.
endLineNumber
)
{
// `trimLine` is completely outside this edit
continue
;
}
// At this point:
// editRange.startLineNumber <= trimLine <= editRange.endLineNumber
if
(
trimLineNumber
===
editRange
.
startLineNumber
&&
editRange
.
startColumn
===
maxLineColumn
&&
editRange
.
isEmpty
()
&&
editText
&&
editText
.
length
>
0
&&
editText
.
charAt
(
0
)
===
'
\n
'
)
{
// This edit inserts a new line (and maybe other text) after `trimLine`
continue
;
}
// Looks like we can't trim this line as it would interfere with an incoming edit
allowTrimLine
=
false
;
break
;
}
// Looks like we can't trim this line as it would interfere with an incoming edit
allowTrimLine
=
false
;
break
;
}
if
(
allowTrimLine
)
{
editOperations
.
push
({
identifier
:
null
,
range
:
new
Range
(
trimLineNumber
,
1
,
trimLineNumber
,
maxLineColumn
),
text
:
null
,
forceMoveMarkers
:
false
,
isAutoWhitespaceEdit
:
false
});
}
if
(
allowTrimLine
)
{
editOperations
.
push
({
identifier
:
null
,
range
:
new
Range
(
trimLineNumber
,
1
,
trimLineNumber
,
maxLineColumn
),
text
:
null
,
forceMoveMarkers
:
false
,
isAutoWhitespaceEdit
:
false
});
}
}
this
.
_trimAutoWhitespaceLines
=
null
;
...
...
src/vs/editor/test/common/controller/cursor.test.ts
浏览文件 @
05c87e71
...
...
@@ -10,7 +10,11 @@ import {EditOperation} from 'vs/editor/common/core/editOperation';
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
import
{
Selection
}
from
'
vs/editor/common/core/selection
'
;
import
{
EndOfLinePreference
,
EventType
,
Handler
,
IPosition
,
ISelection
,
IEditorOptions
,
DefaultEndOfLine
,
ITextModelCreationOptions
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EndOfLinePreference
,
EventType
,
Handler
,
IPosition
,
ISelection
,
IEditorOptions
,
DefaultEndOfLine
,
ITextModelCreationOptions
,
ICommand
,
ITokenizedModel
,
IEditOperationBuilder
,
ICursorStateComputerData
}
from
'
vs/editor/common/editorCommon
'
;
import
{
Model
}
from
'
vs/editor/common/model/model
'
;
import
{
IMode
,
IRichEditSupport
,
IndentAction
}
from
'
vs/editor/common/modes
'
;
import
{
RichEditSupport
}
from
'
vs/editor/common/modes/supports/richEditSupport
'
;
...
...
@@ -2184,6 +2188,49 @@ suite('Editor Controller - Cursor Configuration', () => {
});
});
test
(
'
issue #6862: Editor removes auto inserted indentation when formatting on type
'
,
()
=>
{
usingCursor
({
text
:
[
'
function foo (params: string) {}
'
],
modelOpts
:
{
insertSpaces
:
true
,
tabSize
:
4
,
detectIndentation
:
false
,
defaultEOL
:
DefaultEndOfLine
.
LF
,
trimAutoWhitespace
:
true
},
mode
:
new
OnEnterMode
(
IndentAction
.
IndentOutdent
),
},
(
model
,
cursor
)
=>
{
moveTo
(
cursor
,
1
,
32
);
cursorCommand
(
cursor
,
H
.
Type
,
{
text
:
'
\n
'
},
'
keyboard
'
);
assert
.
equal
(
model
.
getLineContent
(
1
),
'
function foo (params: string) {
'
);
assert
.
equal
(
model
.
getLineContent
(
2
),
'
'
);
assert
.
equal
(
model
.
getLineContent
(
3
),
'
}
'
);
class
TestCommand
implements
ICommand
{
private
_selectionId
:
string
=
null
;
public
getEditOperations
(
model
:
ITokenizedModel
,
builder
:
IEditOperationBuilder
):
void
{
builder
.
addEditOperation
(
new
Range
(
1
,
13
,
1
,
14
),
''
);
this
.
_selectionId
=
builder
.
trackSelection
(
cursor
.
getSelection
());
}
public
computeCursorState
(
model
:
ITokenizedModel
,
helper
:
ICursorStateComputerData
):
Selection
{
return
helper
.
getTrackedSelection
(
this
.
_selectionId
);
}
}
cursor
.
trigger
(
'
autoFormat
'
,
Handler
.
ExecuteCommand
,
new
TestCommand
());
assert
.
equal
(
model
.
getLineContent
(
1
),
'
function foo(params: string) {
'
);
assert
.
equal
(
model
.
getLineContent
(
2
),
'
'
);
assert
.
equal
(
model
.
getLineContent
(
3
),
'
}
'
);
});
});
test
(
'
removeAutoWhitespace on: removes only whitespace the cursor added 2
'
,
()
=>
{
usingCursor
({
text
:
[
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录