Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
b4f4f55f
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,发现更多精彩内容 >>
提交
b4f4f55f
编写于
9月 26, 2018
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return void instead of comment from editComment, fixes #59460
上级
9906ecc7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
13 addition
and
11 deletion
+13
-11
src/vs/editor/common/modes.ts
src/vs/editor/common/modes.ts
+1
-1
src/vs/vscode.proposed.d.ts
src/vs/vscode.proposed.d.ts
+1
-1
src/vs/workbench/api/node/extHost.protocol.ts
src/vs/workbench/api/node/extHost.protocol.ts
+1
-1
src/vs/workbench/api/node/extHostComments.ts
src/vs/workbench/api/node/extHostComments.ts
+2
-2
src/vs/workbench/parts/comments/electron-browser/commentNode.ts
.../workbench/parts/comments/electron-browser/commentNode.ts
+6
-4
src/vs/workbench/parts/comments/electron-browser/commentService.ts
...rkbench/parts/comments/electron-browser/commentService.ts
+2
-2
未找到文件。
src/vs/editor/common/modes.ts
浏览文件 @
b4f4f55f
...
...
@@ -1117,7 +1117,7 @@ export interface DocumentCommentProvider {
provideDocumentComments
(
resource
:
URI
,
token
:
CancellationToken
):
Promise
<
CommentInfo
>
;
createNewCommentThread
(
resource
:
URI
,
range
:
Range
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
CommentThread
>
;
replyToCommentThread
(
resource
:
URI
,
range
:
Range
,
thread
:
CommentThread
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
CommentThread
>
;
editComment
(
resource
:
URI
,
comment
:
Comment
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
Comment
>
;
editComment
(
resource
:
URI
,
comment
:
Comment
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
void
>
;
deleteComment
(
resource
:
URI
,
comment
:
Comment
,
token
:
CancellationToken
):
Promise
<
void
>
;
onDidChangeCommentThreads
():
Event
<
CommentThreadChangedEvent
>
;
}
...
...
src/vs/vscode.proposed.d.ts
浏览文件 @
b4f4f55f
...
...
@@ -813,7 +813,7 @@ declare module 'vscode' {
/**
* Called when a user edits the comment body to the be new text text.
*/
editComment
?(
document
:
TextDocument
,
comment
:
Comment
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
Comment
>
;
editComment
?(
document
:
TextDocument
,
comment
:
Comment
,
text
:
string
,
token
:
CancellationToken
):
Promise
<
void
>
;
/**
* Called when a user deletes the comment.
...
...
src/vs/workbench/api/node/extHost.protocol.ts
浏览文件 @
b4f4f55f
...
...
@@ -1002,7 +1002,7 @@ export interface ExtHostCommentsShape {
$provideDocumentComments
(
handle
:
number
,
document
:
UriComponents
):
Thenable
<
modes
.
CommentInfo
>
;
$createNewCommentThread
(
handle
:
number
,
document
:
UriComponents
,
range
:
IRange
,
text
:
string
):
Thenable
<
modes
.
CommentThread
>
;
$replyToCommentThread
(
handle
:
number
,
document
:
UriComponents
,
range
:
IRange
,
commentThread
:
modes
.
CommentThread
,
text
:
string
):
Thenable
<
modes
.
CommentThread
>
;
$editComment
(
handle
:
number
,
document
:
UriComponents
,
comment
:
modes
.
Comment
,
text
:
string
):
Thenable
<
modes
.
Comment
>
;
$editComment
(
handle
:
number
,
document
:
UriComponents
,
comment
:
modes
.
Comment
,
text
:
string
):
Thenable
<
void
>
;
$deleteComment
(
handle
:
number
,
document
:
UriComponents
,
comment
:
modes
.
Comment
):
Thenable
<
void
>
;
$provideWorkspaceComments
(
handle
:
number
):
Thenable
<
modes
.
CommentThread
[]
>
;
}
...
...
src/vs/workbench/api/node/extHostComments.ts
浏览文件 @
b4f4f55f
...
...
@@ -93,7 +93,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
}).
then
(
commentThread
=>
commentThread
?
convertToCommentThread
(
provider
,
commentThread
,
this
.
_commandsConverter
)
:
null
);
}
$editComment
(
handle
:
number
,
uri
:
UriComponents
,
comment
:
modes
.
Comment
,
text
:
string
):
Thenable
<
modes
.
Comment
>
{
$editComment
(
handle
:
number
,
uri
:
UriComponents
,
comment
:
modes
.
Comment
,
text
:
string
):
Thenable
<
void
>
{
const
data
=
this
.
_documents
.
getDocumentData
(
URI
.
revive
(
uri
));
if
(
!
data
||
!
data
.
document
)
{
...
...
@@ -103,7 +103,7 @@ export class ExtHostComments implements ExtHostCommentsShape {
const
provider
=
this
.
_documentProviders
.
get
(
handle
);
return
asThenable
(()
=>
{
return
provider
.
editComment
(
data
.
document
,
convertFromComment
(
comment
),
text
,
CancellationToken
.
None
);
})
.
then
(
comment
=>
convertToComment
(
provider
,
comment
,
this
.
_commandsConverter
))
;
});
}
$deleteComment
(
handle
:
number
,
uri
:
UriComponents
,
comment
:
modes
.
Comment
):
Thenable
<
void
>
{
...
...
src/vs/workbench/parts/comments/electron-browser/commentNode.ts
浏览文件 @
b4f4f55f
...
...
@@ -29,6 +29,8 @@ import { Selection } from 'vs/editor/common/core/selection';
import
{
IDialogService
}
from
'
vs/platform/dialogs/common/dialogs
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
assign
}
from
'
vs/base/common/objects
'
;
import
{
MarkdownString
}
from
'
vs/base/common/htmlContent
'
;
const
UPDATE_COMMENT_LABEL
=
nls
.
localize
(
'
label.updateComment
'
,
"
Update comment
"
);
const
UPDATE_IN_PROGRESS_LABEL
=
nls
.
localize
(
'
label.updatingComment
'
,
"
Updating comment...
"
);
...
...
@@ -159,14 +161,14 @@ export class CommentNode extends Disposable {
this
.
_updateCommentButton
.
label
=
UPDATE_IN_PROGRESS_LABEL
;
try
{
const
editedComment
=
await
this
.
commentService
.
editComment
(
this
.
owner
,
this
.
resource
,
this
.
comment
,
this
.
_commentEditor
.
getValue
());
if
(
!
(
editedComment
instanceof
Comment
))
{
throw
Error
();
}
const
newBody
=
this
.
_commentEditor
.
getValue
();
await
this
.
commentService
.
editComment
(
this
.
owner
,
this
.
resource
,
this
.
comment
,
newBody
);
this
.
_updateCommentButton
.
enabled
=
true
;
this
.
_updateCommentButton
.
label
=
UPDATE_COMMENT_LABEL
;
this
.
_commentEditor
.
getDomNode
().
style
.
outline
=
''
;
this
.
removeCommentEditor
();
const
editedComment
=
assign
({},
this
.
comment
,
{
body
:
new
MarkdownString
(
newBody
)
});
this
.
update
(
editedComment
);
}
catch
(
e
)
{
this
.
_updateCommentButton
.
enabled
=
true
;
...
...
src/vs/workbench/parts/comments/electron-browser/commentService.ts
浏览文件 @
b4f4f55f
...
...
@@ -41,7 +41,7 @@ export interface ICommentService {
updateComments
(
event
:
CommentThreadChangedEvent
):
void
;
createNewCommentThread
(
owner
:
number
,
resource
:
URI
,
range
:
Range
,
text
:
string
):
Promise
<
CommentThread
>
;
replyToCommentThread
(
owner
:
number
,
resource
:
URI
,
range
:
Range
,
thread
:
CommentThread
,
text
:
string
):
Promise
<
CommentThread
>
;
editComment
(
owner
:
number
,
resource
:
URI
,
comment
:
Comment
,
text
:
string
):
Promise
<
Comment
>
;
editComment
(
owner
:
number
,
resource
:
URI
,
comment
:
Comment
,
text
:
string
):
Promise
<
void
>
;
deleteComment
(
owner
:
number
,
resource
:
URI
,
comment
:
Comment
):
Promise
<
boolean
>
;
getComments
(
resource
:
URI
):
Promise
<
CommentInfo
[]
>
;
}
...
...
@@ -116,7 +116,7 @@ export class CommentService extends Disposable implements ICommentService {
return
null
;
}
editComment
(
owner
:
number
,
resource
:
URI
,
comment
:
Comment
,
text
:
string
):
Promise
<
Comment
>
{
editComment
(
owner
:
number
,
resource
:
URI
,
comment
:
Comment
,
text
:
string
):
Promise
<
void
>
{
const
commentProvider
=
this
.
_commentProviders
.
get
(
owner
);
if
(
commentProvider
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录