提交 7d7c27cf 编写于 作者: J Johannes Rieken

less strict checking of rename locations, #58907

上级 856a0daa
...@@ -38,11 +38,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider { ...@@ -38,11 +38,6 @@ class TypeScriptRenameProvider implements vscode.RenameProvider {
const triggerSpan = renameInfo.triggerSpan; const triggerSpan = renameInfo.triggerSpan;
if (triggerSpan) { if (triggerSpan) {
const range = typeConverters.Range.fromTextSpan(triggerSpan); const range = typeConverters.Range.fromTextSpan(triggerSpan);
// Until https://github.com/Microsoft/vscode/issues/58907 is fixed, the returned range must include the
// rename trigger position.
if (!range.contains(position)) {
return Promise.reject<vscode.Range>(localize('cannotRename', "You cannot rename this element"));
}
return range; return range;
} }
} }
......
...@@ -524,9 +524,8 @@ class RenameAdapter { ...@@ -524,9 +524,8 @@ class RenameAdapter {
if (!range) { if (!range) {
return undefined; return undefined;
} }
if (range.start.line > pos.line || range.end.line < pos.line) {
if (!range.contains(pos)) { console.warn('INVALID rename location: position line must be within range start/end lines');
console.warn('INVALID rename location: range must contain position');
return undefined; return undefined;
} }
return { range: typeConvert.Range.from(range), text }; return { range: typeConvert.Range.from(range), text };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册