Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
a24ae698
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,发现更多精彩内容 >>
提交
a24ae698
编写于
9月 27, 2017
作者:
R
Ramya Achutha Rao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Show std err msg for rename errs not from extension #35177
上级
281c9386
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
19 deletion
+13
-19
src/vs/editor/contrib/rename/browser/rename.ts
src/vs/editor/contrib/rename/browser/rename.ts
+13
-19
未找到文件。
src/vs/editor/contrib/rename/browser/rename.ts
浏览文件 @
a24ae698
...
...
@@ -18,7 +18,7 @@ import { editorAction, ServicesAccessor, EditorAction, EditorCommand, CommonEdit
import
{
editorContribution
}
from
'
vs/editor/browser/editorBrowserExtensions
'
;
import
{
ICommonCodeEditor
,
IEditorContribution
,
IReadOnlyModel
}
from
'
vs/editor/common/editorCommon
'
;
import
{
EditorContextKeys
}
from
'
vs/editor/common/editorContextKeys
'
;
import
{
BulkEdit
,
createBulkEdit
}
from
'
vs/editor/common/services/bulkEdit
'
;
import
{
createBulkEdit
}
from
'
vs/editor/common/services/bulkEdit
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
RenameInputField
from
'
./renameInputField
'
;
import
{
ITextModelService
}
from
'
vs/editor/common/services/resolverService
'
;
...
...
@@ -148,7 +148,16 @@ class RenameController implements IEditorContribution {
this
.
_renameInputVisible
.
reset
();
this
.
editor
.
focus
();
const
renameOperation
=
this
.
_prepareRename
(
newName
).
then
(
edit
=>
{
// start recording of file changes so that we can figure out if a file that
// is to be renamed conflicts with another (concurrent) modification
let
edit
=
createBulkEdit
(
this
.
_textModelResolverService
,
<
ICodeEditor
>
this
.
editor
,
this
.
_fileService
);
const
renameOperation
=
rename
(
this
.
editor
.
getModel
(),
this
.
editor
.
getPosition
(),
newName
).
then
(
result
=>
{
if
(
result
.
rejectReason
)
{
this
.
_messageService
.
show
(
Severity
.
Error
,
result
.
rejectReason
);
return
undefined
;
}
edit
.
add
(
result
.
edits
);
return
edit
.
finish
().
then
(
selection
=>
{
if
(
selection
)
{
...
...
@@ -159,8 +168,8 @@ class RenameController implements IEditorContribution {
});
},
err
=>
{
this
.
_messageService
.
show
(
Severity
.
Error
,
err
);
return
undefined
;
this
.
_messageService
.
show
(
Severity
.
Error
,
nls
.
localize
(
'
rename.failed
'
,
"
Sorry, rename failed to execute.
"
)
);
return
TPromise
.
wrapError
(
err
)
;
});
this
.
_progressService
.
showWhile
(
renameOperation
,
250
);
...
...
@@ -184,21 +193,6 @@ class RenameController implements IEditorContribution {
public
cancelRenameInput
():
void
{
this
.
_renameInputField
.
cancelInput
();
}
private
_prepareRename
(
newName
:
string
):
TPromise
<
BulkEdit
>
{
// start recording of file changes so that we can figure out if a file that
// is to be renamed conflicts with another (concurrent) modification
let
edit
=
createBulkEdit
(
this
.
_textModelResolverService
,
<
ICodeEditor
>
this
.
editor
,
this
.
_fileService
);
return
rename
(
this
.
editor
.
getModel
(),
this
.
editor
.
getPosition
(),
newName
).
then
(
result
=>
{
if
(
result
.
rejectReason
)
{
return
TPromise
.
wrapError
<
BulkEdit
>
(
new
Error
(
result
.
rejectReason
));
}
edit
.
add
(
result
.
edits
);
return
edit
;
});
}
}
// ---- action implementation
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录