Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1114cfef
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,发现更多精彩内容 >>
提交
1114cfef
编写于
9月 25, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #34618: Recover from wrong fix for #30358 (
5c58b8cb
)
上级
51de5e57
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
55 addition
and
18 deletion
+55
-18
src/vs/editor/contrib/comment/common/blockCommentCommand.ts
src/vs/editor/contrib/comment/common/blockCommentCommand.ts
+42
-18
src/vs/editor/contrib/comment/test/common/blockCommentCommand.test.ts
...r/contrib/comment/test/common/blockCommentCommand.test.ts
+13
-0
未找到文件。
src/vs/editor/contrib/comment/common/blockCommentCommand.ts
浏览文件 @
1114cfef
...
...
@@ -45,34 +45,58 @@ export class BlockCommentCommand implements editorCommon.ICommand {
const
endLineNumber
=
selection
.
endLineNumber
;
const
endColumn
=
selection
.
endColumn
;
const
startLineText
=
model
.
getLineContent
(
startLineNumber
);
const
endLineText
=
model
.
getLineContent
(
endLineNumber
);
let
startToken
=
config
.
blockCommentStartToken
;
let
endToken
=
config
.
blockCommentEndToken
;
const
startTokenIndex
=
model
.
getLineContent
(
startLineNumber
).
lastIndexOf
(
startToken
,
startColumn
-
1
+
startToken
.
length
);
let
endTokenIndex
=
model
.
getLineContent
(
endLineNumber
).
indexOf
(
endToken
,
endColumn
-
1
-
endToken
.
length
);
let
startTokenIndex
=
startLineText
.
lastIndexOf
(
startToken
,
startColumn
-
1
+
startToken
.
length
);
let
endTokenIndex
=
endLineText
.
indexOf
(
endToken
,
endColumn
-
1
-
endToken
.
length
);
if
(
startTokenIndex
!==
-
1
&&
endTokenIndex
!==
-
1
)
{
if
(
startLineNumber
===
endLineNumber
)
{
const
lineBetweenTokens
=
startLineText
.
substring
(
startTokenIndex
+
startToken
.
length
,
endTokenIndex
);
if
(
lineBetweenTokens
.
indexOf
(
endToken
)
>=
0
)
{
// force to add a block comment
startTokenIndex
=
-
1
;
endTokenIndex
=
-
1
;
}
}
else
{
const
startLineAfterStartToken
=
startLineText
.
substring
(
startTokenIndex
+
startToken
.
length
);
const
endLineBeforeEndToken
=
endLineText
.
substring
(
0
,
endTokenIndex
);
if
(
startLineAfterStartToken
.
indexOf
(
endToken
)
>=
0
||
endLineBeforeEndToken
.
indexOf
(
endToken
)
>=
0
)
{
// force to add a block comment
startTokenIndex
=
-
1
;
endTokenIndex
=
-
1
;
}
}
}
let
ops
:
editorCommon
.
IIdentifiedSingleEditOperation
[];
if
(
startTokenIndex
!==
-
1
&&
endTokenIndex
!==
-
1
)
{
const
endTokenBeforeCursorIndex
=
model
.
getLineContent
(
startLineNumber
).
lastIndexOf
(
endToken
,
startColumn
-
1
+
endToken
.
length
);
if
(
endTokenBeforeCursorIndex
>
startTokenIndex
+
startToken
.
length
-
1
)
{
ops
=
BlockCommentCommand
.
_createAddBlockCommentOperations
(
selection
,
startToken
,
endToken
);
this
.
_usedEndToken
=
ops
.
length
===
1
?
endToken
:
null
;
}
else
{
// We have to adjust to possible inner white space
// For Space after startToken, add Space to startToken - range math will work out
if
(
model
.
getLineContent
(
startLineNumber
).
charCodeAt
(
startTokenIndex
+
startToken
.
length
)
===
CharCode
.
Space
)
{
startToken
+=
'
'
;
// Consider spaces as part of the comment tokens
if
(
startTokenIndex
+
startToken
.
length
<
startLineText
.
length
)
{
if
(
startLineText
.
charCodeAt
(
startTokenIndex
+
startToken
.
length
)
===
CharCode
.
Space
)
{
// Pretend the start token contains a trailing space
startToken
=
startToken
+
'
'
;
}
// For Space before endToken, add Space before endToken and shift index one left
if
(
model
.
getLineContent
(
endLineNumber
).
charCodeAt
(
endTokenIndex
-
1
)
===
CharCode
.
Space
)
{
}
if
(
endTokenIndex
>
0
)
{
if
(
endLineText
.
charCodeAt
(
endTokenIndex
-
1
)
===
CharCode
.
Space
)
{
// Pretend the end token contains a leading space
endToken
=
'
'
+
endToken
;
endTokenIndex
-=
1
;
}
ops
=
BlockCommentCommand
.
_createRemoveBlockCommentOperations
(
new
Range
(
startLineNumber
,
startTokenIndex
+
1
+
startToken
.
length
,
endLineNumber
,
endTokenIndex
+
1
),
startToken
,
endToken
);
}
ops
=
BlockCommentCommand
.
_createRemoveBlockCommentOperations
(
new
Range
(
startLineNumber
,
startTokenIndex
+
startToken
.
length
+
1
,
endLineNumber
,
endTokenIndex
+
1
),
startToken
,
endToken
);
}
else
{
ops
=
BlockCommentCommand
.
_createAddBlockCommentOperations
(
selection
,
startToken
,
endToken
);
this
.
_usedEndToken
=
ops
.
length
===
1
?
endToken
:
null
;
...
...
@@ -134,8 +158,8 @@ export class BlockCommentCommand implements editorCommon.ICommand {
const
startColumn
=
this
.
_selection
.
startColumn
;
model
.
tokenizeIfCheap
(
startLineNumber
);
le
t
languageId
=
model
.
getLanguageIdAtPosition
(
startLineNumber
,
startColumn
);
le
t
config
=
LanguageConfigurationRegistry
.
getComments
(
languageId
);
cons
t
languageId
=
model
.
getLanguageIdAtPosition
(
startLineNumber
,
startColumn
);
cons
t
config
=
LanguageConfigurationRegistry
.
getComments
(
languageId
);
if
(
!
config
||
!
config
.
blockCommentStartToken
||
!
config
.
blockCommentEndToken
)
{
// Mode does not support block comments
return
;
...
...
src/vs/editor/contrib/comment/test/common/blockCommentCommand.test.ts
浏览文件 @
1114cfef
...
...
@@ -457,4 +457,17 @@ suite('Editor Contrib - Block Comment Command', () => {
new
Selection
(
1
,
16
,
1
,
22
)
);
});
test
(
'
issue #34618
'
,
function
()
{
testBlockCommentCommand
(
[
'
<0 0> middle end
'
,
],
new
Selection
(
1
,
4
,
1
,
4
),
[
'
middle end
'
],
new
Selection
(
1
,
1
,
1
,
1
)
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录