Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
423cd0e5
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,发现更多精彩内容 >>
提交
423cd0e5
编写于
6月 18, 2018
作者:
M
Matt Bierner
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More robust workaround for path preservation
上级
08bfe785
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
24 addition
and
7 deletion
+24
-7
extensions/typescript-language-features/src/features/updatePathsOnRename.ts
...ipt-language-features/src/features/updatePathsOnRename.ts
+24
-7
未找到文件。
extensions/typescript-language-features/src/features/updatePathsOnRename.ts
浏览文件 @
423cd0e5
...
@@ -14,6 +14,7 @@ import * as languageIds from '../utils/languageModeIds';
...
@@ -14,6 +14,7 @@ import * as languageIds from '../utils/languageModeIds';
import
*
as
typeConverters
from
'
../utils/typeConverters
'
;
import
*
as
typeConverters
from
'
../utils/typeConverters
'
;
import
FileConfigurationManager
from
'
./fileConfigurationManager
'
;
import
FileConfigurationManager
from
'
./fileConfigurationManager
'
;
import
*
as
fileSchemes
from
'
../utils/fileSchemes
'
;
import
*
as
fileSchemes
from
'
../utils/fileSchemes
'
;
import
{
escapeRegExp
}
from
'
../utils/regexp
'
;
const
localize
=
nls
.
loadMessageBundle
();
const
localize
=
nls
.
loadMessageBundle
();
...
@@ -222,29 +223,45 @@ export class UpdateImportsOnFileRenameHandler {
...
@@ -222,29 +223,45 @@ export class UpdateImportsOnFileRenameHandler {
return
;
return
;
}
}
return
typeConverters
.
WorkspaceEdit
.
fromFromFileCodeEdits
(
this
.
client
,
response
.
body
.
map
((
edit
:
Proto
.
FileCodeEdits
)
=>
this
.
fixEdit
(
edit
,
isDirectoryRename
)));
const
edits
:
Proto
.
FileCodeEdits
[]
=
[];
for
(
const
edit
of
response
.
body
)
{
edits
.
push
(
await
this
.
fixEdit
(
edit
,
isDirectoryRename
,
oldFile
,
newFile
));
}
return
typeConverters
.
WorkspaceEdit
.
fromFromFileCodeEdits
(
this
.
client
,
edits
);
}
}
private
fixEdit
(
private
async
fixEdit
(
edit
:
Proto
.
FileCodeEdits
,
edit
:
Proto
.
FileCodeEdits
,
isDirectoryRename
:
boolean
isDirectoryRename
:
boolean
,
):
Proto
.
FileCodeEdits
{
oldFile
:
string
,
newFile
:
string
,
):
Promise
<
Proto
.
FileCodeEdits
>
{
if
(
!
isDirectoryRename
||
this
.
client
.
apiVersion
.
gte
(
API
.
v300
))
{
if
(
!
isDirectoryRename
||
this
.
client
.
apiVersion
.
gte
(
API
.
v300
))
{
return
edit
;
return
edit
;
}
}
const
document
=
await
vscode
.
workspace
.
openTextDocument
(
edit
.
fileName
);
const
oldFileRe
=
new
RegExp
(
'
/
'
+
escapeRegExp
(
path
.
basename
(
oldFile
))
+
'
/
'
);
// Workaround for https://github.com/Microsoft/TypeScript/issues/24968
// Workaround for https://github.com/Microsoft/TypeScript/issues/24968
const
textChanges
=
edit
.
textChanges
.
map
((
change
):
Proto
.
CodeEdit
=>
{
const
textChanges
=
edit
.
textChanges
.
map
((
change
):
Proto
.
CodeEdit
=>
{
const
match
=
change
.
newText
.
match
(
/
\w\/[^\/]
+$/g
);
const
existingText
=
document
.
getText
(
typeConverters
.
Range
.
fromTextSpan
(
change
));
const
existingMatch
=
existingText
.
match
(
oldFileRe
);
if
(
!
existingMatch
)
{
return
change
;
}
const
match
=
new
RegExp
(
'
/
'
+
escapeRegExp
(
path
.
basename
(
newFile
))
+
'
/(.+)$
'
,
'
g
'
).
exec
(
change
.
newText
);
if
(
!
match
)
{
if
(
!
match
)
{
return
change
;
return
change
;
}
}
return
{
return
{
newText
:
change
.
newText
.
slice
(
0
,
-
match
[
0
].
length
),
newText
:
change
.
newText
.
slice
(
0
,
-
match
[
1
].
length
),
start
:
change
.
start
,
start
:
change
.
start
,
end
:
{
end
:
{
line
:
change
.
end
.
line
,
line
:
change
.
end
.
line
,
offset
:
change
.
end
.
offset
-
match
[
0
].
length
offset
:
change
.
end
.
offset
-
match
[
1
].
length
}
}
};
};
});
});
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录