Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
71ba241f
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,发现更多精彩内容 >>
未验证
提交
71ba241f
编写于
12月 08, 2020
作者:
A
Alexandru Dima
提交者:
GitHub
12月 08, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #111897 from microsoft/alex/111128
Do not touch current line's indentation when pressing Enter
上级
2ef8227a
b8aa4141
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
9 deletion
+14
-9
src/vs/editor/common/controller/cursorTypeOperations.ts
src/vs/editor/common/controller/cursorTypeOperations.ts
+2
-9
src/vs/editor/test/browser/controller/cursor.test.ts
src/vs/editor/test/browser/controller/cursor.test.ts
+12
-0
未找到文件。
src/vs/editor/common/controller/cursorTypeOperations.ts
浏览文件 @
71ba241f
...
@@ -351,13 +351,6 @@ export class TypeOperations {
...
@@ -351,13 +351,6 @@ export class TypeOperations {
if
(
ir
)
{
if
(
ir
)
{
let
oldEndViewColumn
=
CursorColumns
.
visibleColumnFromColumn2
(
config
,
model
,
range
.
getEndPosition
());
let
oldEndViewColumn
=
CursorColumns
.
visibleColumnFromColumn2
(
config
,
model
,
range
.
getEndPosition
());
const
oldEndColumn
=
range
.
endColumn
;
const
oldEndColumn
=
range
.
endColumn
;
let
beforeText
=
'
\n
'
;
if
(
indentation
!==
config
.
normalizeIndentation
(
ir
.
beforeEnter
))
{
beforeText
=
config
.
normalizeIndentation
(
ir
.
beforeEnter
)
+
lineText
.
substring
(
indentation
.
length
,
range
.
startColumn
-
1
)
+
'
\n
'
;
range
=
new
Range
(
range
.
startLineNumber
,
1
,
range
.
endLineNumber
,
range
.
endColumn
);
}
const
newLineContent
=
model
.
getLineContent
(
range
.
endLineNumber
);
const
newLineContent
=
model
.
getLineContent
(
range
.
endLineNumber
);
const
firstNonWhitespace
=
strings
.
firstNonWhitespaceIndex
(
newLineContent
);
const
firstNonWhitespace
=
strings
.
firstNonWhitespaceIndex
(
newLineContent
);
if
(
firstNonWhitespace
>=
0
)
{
if
(
firstNonWhitespace
>=
0
)
{
...
@@ -367,7 +360,7 @@ export class TypeOperations {
...
@@ -367,7 +360,7 @@ export class TypeOperations {
}
}
if
(
keepPosition
)
{
if
(
keepPosition
)
{
return
new
ReplaceCommandWithoutChangingPosition
(
range
,
beforeText
+
config
.
normalizeIndentation
(
ir
.
afterEnter
),
true
);
return
new
ReplaceCommandWithoutChangingPosition
(
range
,
'
\n
'
+
config
.
normalizeIndentation
(
ir
.
afterEnter
),
true
);
}
else
{
}
else
{
let
offset
=
0
;
let
offset
=
0
;
if
(
oldEndColumn
<=
firstNonWhitespace
+
1
)
{
if
(
oldEndColumn
<=
firstNonWhitespace
+
1
)
{
...
@@ -376,7 +369,7 @@ export class TypeOperations {
...
@@ -376,7 +369,7 @@ export class TypeOperations {
}
}
offset
=
Math
.
min
(
oldEndViewColumn
+
1
-
config
.
normalizeIndentation
(
ir
.
afterEnter
).
length
-
1
,
0
);
offset
=
Math
.
min
(
oldEndViewColumn
+
1
-
config
.
normalizeIndentation
(
ir
.
afterEnter
).
length
-
1
,
0
);
}
}
return
new
ReplaceCommandWithOffsetCursorState
(
range
,
beforeText
+
config
.
normalizeIndentation
(
ir
.
afterEnter
),
0
,
offset
,
true
);
return
new
ReplaceCommandWithOffsetCursorState
(
range
,
'
\n
'
+
config
.
normalizeIndentation
(
ir
.
afterEnter
),
0
,
offset
,
true
);
}
}
}
}
}
}
...
...
src/vs/editor/test/browser/controller/cursor.test.ts
浏览文件 @
71ba241f
...
@@ -4169,6 +4169,18 @@ suite('Editor Controller - Indentation Rules', () => {
...
@@ -4169,6 +4169,18 @@ suite('Editor Controller - Indentation Rules', () => {
model
.
dispose
();
model
.
dispose
();
mode
.
dispose
();
mode
.
dispose
();
});
});
test
(
'
issue #111128: Multicursor `Enter` issue with indentation
'
,
()
=>
{
const
model
=
createTextModel
(
'
let a, b, c;
'
,
{
detectIndentation
:
false
,
insertSpaces
:
false
,
tabSize
:
4
},
mode
.
getLanguageIdentifier
());
withTestCodeEditor
(
null
,
{
model
:
model
},
(
editor
,
viewModel
)
=>
{
editor
.
setSelections
([
new
Selection
(
1
,
11
,
1
,
11
),
new
Selection
(
1
,
14
,
1
,
14
),
]);
viewModel
.
type
(
'
\n
'
,
'
keyboard
'
);
assert
.
equal
(
model
.
getValue
(),
'
let a,
\n\t
b,
\n\t
c;
'
);
});
});
});
});
interface
ICursorOpts
{
interface
ICursorOpts
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录