Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
034871d8
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,发现更多精彩内容 >>
提交
034871d8
编写于
4月 27, 2018
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #41825: Special handling of quotes in surround selection
上级
f251d22e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
51 addition
and
3 deletion
+51
-3
src/vs/editor/common/controller/cursorTypeOperations.ts
src/vs/editor/common/controller/cursorTypeOperations.ts
+11
-0
src/vs/editor/test/browser/controller/cursor.test.ts
src/vs/editor/test/browser/controller/cursor.test.ts
+40
-3
未找到文件。
src/vs/editor/common/controller/cursorTypeOperations.ts
浏览文件 @
034871d8
...
...
@@ -579,6 +579,8 @@ export class TypeOperations {
return
false
;
}
const
isTypingAQuoteCharacter
=
(
ch
===
'
\'
'
||
ch
===
'
"
'
);
for
(
let
i
=
0
,
len
=
selections
.
length
;
i
<
len
;
i
++
)
{
const
selection
=
selections
[
i
];
...
...
@@ -603,6 +605,15 @@ export class TypeOperations {
if
(
selectionContainsOnlyWhitespace
)
{
return
false
;
}
if
(
isTypingAQuoteCharacter
&&
selection
.
startLineNumber
===
selection
.
endLineNumber
&&
selection
.
startColumn
+
1
===
selection
.
endColumn
)
{
const
selectionText
=
model
.
getValueInRange
(
selection
);
if
((
selectionText
===
'
\'
'
||
selectionText
===
'
"
'
))
{
// Typing a quote character on top of another quote character
// => disable surround selection type
return
false
;
}
}
}
return
true
;
...
...
src/vs/editor/test/browser/controller/cursor.test.ts
浏览文件 @
034871d8
...
...
@@ -1220,7 +1220,7 @@ suite('Editor Controller - Regression tests', () => {
constructor
()
{
super
(
languageId
);
this
.
_register
(
LanguageConfigurationRegistry
.
register
(
this
.
getLanguageIdentifier
(),
{
surroundingPairs
:
[{
open
:
'
"
'
,
close
:
'
"
'
}]
surroundingPairs
:
[{
open
:
'
%
'
,
close
:
'
%
'
}]
}));
}
}
...
...
@@ -1231,8 +1231,8 @@ suite('Editor Controller - Regression tests', () => {
withTestCodeEditor
(
null
,
{
model
:
model
},
(
editor
,
cursor
)
=>
{
editor
.
setSelection
(
new
Selection
(
1
,
1
,
1
,
2
));
cursorCommand
(
cursor
,
H
.
Type
,
{
text
:
'
"
'
},
'
keyboard
'
);
assert
.
equal
(
model
.
getValue
(
EndOfLinePreference
.
LF
),
'
"
\'
"
👁
\'
'
,
'
assert1
'
);
cursorCommand
(
cursor
,
H
.
Type
,
{
text
:
'
%
'
},
'
keyboard
'
);
assert
.
equal
(
model
.
getValue
(
EndOfLinePreference
.
LF
),
'
%
\'
%
👁
\'
'
,
'
assert1
'
);
cursorCommand
(
cursor
,
H
.
Undo
,
{});
assert
.
equal
(
model
.
getValue
(
EndOfLinePreference
.
LF
),
'
\'
👁
\'
'
,
'
assert2
'
);
...
...
@@ -4159,6 +4159,43 @@ suite('autoClosingPairs', () => {
mode
.
dispose
();
});
test
(
'
issue #41825: Special handling of quotes in surrounding pairs
'
,
()
=>
{
const
languageId
=
new
LanguageIdentifier
(
'
myMode
'
,
3
);
class
MyMode
extends
MockMode
{
constructor
()
{
super
(
languageId
);
this
.
_register
(
LanguageConfigurationRegistry
.
register
(
this
.
getLanguageIdentifier
(),
{
surroundingPairs
:
[
{
open
:
'
"
'
,
close
:
'
"
'
},
{
open
:
'
\'
'
,
close
:
'
\'
'
},
]
}));
}
}
const
mode
=
new
MyMode
();
const
model
=
createTextModel
(
'
var x =
\'
hi
\'
;
'
,
undefined
,
languageId
);
withTestCodeEditor
(
null
,
{
model
:
model
},
(
editor
,
cursor
)
=>
{
editor
.
setSelections
([
new
Selection
(
1
,
9
,
1
,
10
),
new
Selection
(
1
,
12
,
1
,
13
)
]);
cursorCommand
(
cursor
,
H
.
Type
,
{
text
:
'
"
'
},
'
keyboard
'
);
assert
.
equal
(
model
.
getValue
(
EndOfLinePreference
.
LF
),
'
var x = "hi";
'
,
'
assert1
'
);
editor
.
setSelections
([
new
Selection
(
1
,
9
,
1
,
10
),
new
Selection
(
1
,
12
,
1
,
13
)
]);
cursorCommand
(
cursor
,
H
.
Type
,
{
text
:
'
\'
'
},
'
keyboard
'
);
assert
.
equal
(
model
.
getValue
(
EndOfLinePreference
.
LF
),
'
var x =
\'
hi
\'
;
'
,
'
assert2
'
);
});
model
.
dispose
();
mode
.
dispose
();
});
test
(
'
All cursors should do the same thing when deleting left
'
,
()
=>
{
let
mode
=
new
AutoClosingMode
();
let
model
=
createTextModel
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录