提交 e590b319 编写于 作者: H HeeJae Chang

Merge branch 'partial_load' of https://github.com/dibarbet/roslyn into partial_load_hechang

......@@ -49,13 +49,13 @@ public bool ExecuteCommand(RenameCommandArgs args, CommandExecutionContext conte
{
using (context.OperationContext.AddScope(allowCancellation: true, EditorFeaturesResources.Finding_token_to_rename))
{
ExecuteRenameWorker(args, context.OperationContext.UserCancellationToken);
ExecuteRenameWorker(args, context);
}
return true;
}
private void ExecuteRenameWorker(RenameCommandArgs args, CancellationToken cancellationToken)
private void ExecuteRenameWorker(RenameCommandArgs args, CommandExecutionContext context)
{
var snapshot = args.SubjectBuffer.CurrentSnapshot;
if (!Workspace.TryGetWorkspace(snapshot.AsText().Container, out var workspace))
......@@ -89,7 +89,9 @@ private void ExecuteRenameWorker(RenameCommandArgs args, CancellationToken cance
}
var position = caretPoint.Value;
var document = args.SubjectBuffer.CurrentSnapshot.GetOpenDocumentInCurrentContextWithChanges();
var cancellationToken = context.OperationContext.UserCancellationToken;
var document = args.SubjectBuffer.CurrentSnapshot.GetFullyLoadedOpenDocumentInCurrentContextWithChangesAsync(
context.OperationContext).WaitAndGetResult(cancellationToken);
if (document == null)
{
ShowErrorDialog(workspace, EditorFeaturesResources.You_must_rename_an_identifier);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册