From 4b5344d2d9ccb1d9dec3fe08c7e98f99e4cb381d Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Mon, 4 Jan 2021 14:54:48 -0800 Subject: [PATCH 1/4] Add a working internal progress system for codeactions --- .../SuggestedActions/SuggestedAction.cs | 34 +++++++---- ...UIThreadOperationContextProgressTracker.cs | 61 +++++++++++++++++++ .../AbstractDocumentBasedFixAllProvider.cs | 13 +--- .../Core/WorkspaceExtensionsResources.resx | 9 --- .../xlf/WorkspaceExtensionsResources.cs.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.de.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.es.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.fr.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.it.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.ja.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.ko.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.pl.xlf | 15 ----- .../WorkspaceExtensionsResources.pt-BR.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.ru.xlf | 15 ----- .../xlf/WorkspaceExtensionsResources.tr.xlf | 15 ----- .../WorkspaceExtensionsResources.zh-Hans.xlf | 15 ----- .../WorkspaceExtensionsResources.zh-Hant.xlf | 15 ----- 17 files changed, 86 insertions(+), 226 deletions(-) create mode 100644 src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs index fe4e2b4a51e6a..73ad122401b91 100644 --- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs +++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs @@ -21,6 +21,7 @@ using Microsoft.VisualStudio.Language.Intellisense; using Microsoft.VisualStudio.Text; using Microsoft.VisualStudio.Threading; +using Microsoft.VisualStudio.Utilities; using Roslyn.Utilities; namespace Microsoft.CodeAnalysis.Editor.Implementation.Suggestions @@ -28,7 +29,7 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.Suggestions /// /// Base class for all Roslyn light bulb menu items. /// - internal abstract partial class SuggestedAction : ForegroundThreadAffinitizedObject, ISuggestedAction, IEquatable + internal abstract partial class SuggestedAction : ForegroundThreadAffinitizedObject, ISuggestedAction3, IEquatable { protected readonly SuggestedActionsSourceProvider SourceProvider; @@ -93,6 +94,21 @@ protected Task> GetPreviewOperationsAsync(Ca } public void Invoke(CancellationToken cancellationToken) + { + SourceProvider.WaitIndicator.Wait(CodeAction.Title, CodeAction.Message, allowCancel: true, showProgress: true, action: waitContext => + { + using var combinedCancellationToken = cancellationToken.CombineWith(waitContext.CancellationToken); + Invoke(waitContext.ProgressTracker, combinedCancellationToken.Token); + }); + } + + public void Invoke(IUIThreadOperationContext context) + { + using var scope = context.AddScope(allowCancellation: true, CodeAction.Message); + this.Invoke(new UIThreadOperationContextProgressTracker(scope), context.UserCancellationToken); + } + + private void Invoke(IProgressTracker progressTracker, CancellationToken cancellationToken) { // While we're not technically doing anything async here, we need to let the // integration test harness know that it should not proceed until all this @@ -102,17 +118,9 @@ public void Invoke(CancellationToken cancellationToken) // to the UI thread as well. using (SourceProvider.OperationListener.BeginAsyncOperation($"{nameof(SuggestedAction)}.{nameof(Invoke)}")) { - // WaitIndicator cannot be used with async/await. Even though we call async methods - // later in this call chain, do not await them. - SourceProvider.WaitIndicator.Wait(CodeAction.Title, CodeAction.Message, allowCancel: true, showProgress: true, action: waitContext => - { - using var combinedCancellationToken = cancellationToken.CombineWith(waitContext.CancellationToken); - InnerInvoke(waitContext.ProgressTracker, combinedCancellationToken.Token); - foreach (var actionCallback in SourceProvider.ActionCallbacks) - { - actionCallback.Value.OnSuggestedActionExecuted(this); - } - }); + InnerInvoke(progressTracker, cancellationToken); + foreach (var actionCallback in SourceProvider.ActionCallbacks) + actionCallback.Value.OnSuggestedActionExecuted(this); } } @@ -212,6 +220,8 @@ public string DisplayText } } + public string DisplayTextSuffix => ""; + protected async Task GetPreviewResultAsync(CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs new file mode 100644 index 0000000000000..aab9d24b0a5e2 --- /dev/null +++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs @@ -0,0 +1,61 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + +using Microsoft.CodeAnalysis.Shared.Utilities; +using Microsoft.VisualStudio.Utilities; + +namespace Microsoft.CodeAnalysis.Editor.Implementation.Suggestions +{ + internal class UIThreadOperationContextProgressTracker : IProgressTracker + { + private readonly IUIThreadOperationScope _scope; + + private readonly object _gate = new(); + + public UIThreadOperationContextProgressTracker(IUIThreadOperationScope scope) + => _scope = scope; + + public string Description { get => _scope.Description; set => _scope.Description = value; } + + public int CompletedItems { get; private set; } + + public int TotalItems { get; private set; } + + public void AddItems(int count) + { + ProgressInfo progressInfo; + lock (_gate) + { + TotalItems += count; + progressInfo = new ProgressInfo(CompletedItems, TotalItems); + } + + _scope.Progress.Report(progressInfo); + } + + public void ItemCompleted() + { + ProgressInfo progressInfo; + lock (_gate) + { + CompletedItems++; + progressInfo = new ProgressInfo(CompletedItems, TotalItems); + } + + _scope.Progress.Report(progressInfo); + } + + public void Clear() + { + lock (_gate) + { + CompletedItems = 0; + TotalItems = 0; + } + + _scope.Progress.Report(new ProgressInfo()); + + } + } +} diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/AbstractDocumentBasedFixAllProvider.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/AbstractDocumentBasedFixAllProvider.cs index 7490643bdbce4..ec67062fe1205 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/AbstractDocumentBasedFixAllProvider.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/AbstractDocumentBasedFixAllProvider.cs @@ -125,15 +125,12 @@ private async Task FixSingleContextAsync(Solution currentSolution, Fix return currentSolution; } - private static string GetName(FixAllContext fixAllContext) - => fixAllContext.Document?.Name ?? fixAllContext.Project.Name; - /// /// Determines all the diagnostics we should be fixing for the given . /// private static async Task> DetermineDiagnosticsAsync(FixAllContext fixAllContext, IProgressTracker progressTracker) { - using var _ = progressTracker.ItemCompletedScope(string.Format(WorkspaceExtensionsResources._0_Computing_diagnostics, GetName(fixAllContext))); + using var _ = progressTracker.ItemCompletedScope(); return fixAllContext.Document != null ? await fixAllContext.GetDocumentDiagnosticsAsync(fixAllContext.Document).ConfigureAwait(false) @@ -151,7 +148,7 @@ private static async Task> DetermineDiagnosticsAsync( { var cancellationToken = fixAllContext.CancellationToken; - using var _1 = progressTracker.ItemCompletedScope(string.Format(WorkspaceExtensionsResources._0_Computing_fixes_for_1_diagnostics, GetName(fixAllContext), diagnostics.Length)); + using var _1 = progressTracker.ItemCompletedScope(); using var _2 = ArrayBuilder>.GetInstance(out var tasks); var docIdToNewRootOrText = new Dictionary(); @@ -209,11 +206,7 @@ private static async Task CleanupAndApplyChangesAsync( { var cancellationToken = fixAllContext.CancellationToken; - var description = fixAllContext.Document != null - ? string.Format(WorkspaceExtensionsResources._0_Applying_fixes, GetName(fixAllContext)) - : string.Format(WorkspaceExtensionsResources._0_Applying_fixes_to_1_documents, GetName(fixAllContext), docIdToNewRootOrText.Count); - - using var _1 = progressTracker.ItemCompletedScope(description); + using var _1 = progressTracker.ItemCompletedScope(); if (docIdToNewRootOrText.Count > 0) { diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx index eb7a2e710cd9d..1e4da40fd97bd 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx @@ -147,15 +147,6 @@ Applying 'fix all' - - {0}: Applying fixes to {1} document(s) - - - {0}: Computing diagnostics - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Applying fixes diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf index b8cd353aaa20b..7cd0263c68447 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf index b9c95d3fc7794..6696ad0c4e4d4 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf index f888fe6b66f70..765568ff365ac 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf index 2fda002310568..f0d2bbd5c8847 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf index 5bf947acf4a9a..f6853a569da92 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf index 2339a5fba342a..87cea19e2f070 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf index ca9a89bdb39a6..d1217d4c3cb23 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf index 8bfdea48d3952..c000cac61653a 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf index 5f0837f669471..1e0d0f6e40255 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf index fd78110919d9b..f32c083abc1b5 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf index 7e1a5b9f7c884..9233a1a77f88d 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf index 97103b04484cf..1fe359f13de09 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf index 93523dbfa63b9..f63bc955e97f8 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf @@ -57,21 +57,6 @@ {0}: Applying fixes - - {0}: Applying fixes to {1} document(s) - {0}: Applying fixes to {1} document(s) - - - - {0}: Computing diagnostics - {0}: Computing diagnostics - - - - {0}: Computing fixes for {1} diagnostic(s) - {0}: Computing fixes for {1} diagnostic(s) - - \ No newline at end of file From b1b7a3b3b389d30874664986487e44dbeab214d0 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Mon, 4 Jan 2021 14:57:12 -0800 Subject: [PATCH 2/4] Remove --- .../Workspace/Core/WorkspaceExtensionsResources.resx | 3 --- .../Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf | 5 ----- .../Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf | 5 ----- .../Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf | 5 ----- .../Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf | 5 ----- .../Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf | 5 ----- 14 files changed, 68 deletions(-) diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx index 1e4da40fd97bd..5347cfd0f41c6 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/WorkspaceExtensionsResources.resx @@ -147,7 +147,4 @@ Applying 'fix all' - - {0}: Applying fixes - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf index 7cd0263c68447..fc91ed38801a3 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.cs.xlf @@ -52,11 +52,6 @@ Upozornění: Deklarace mění rozsah a může změnit význam. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf index 6696ad0c4e4d4..fbb75f0cb6a6a 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.de.xlf @@ -52,11 +52,6 @@ Warnung: Die Deklaration ändert den Bereich und möglicherweise die Bedeutung. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf index 765568ff365ac..61d54034c0d70 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.es.xlf @@ -52,11 +52,6 @@ Advertencia: La declaración cambia el ámbito y puede cambiar el significado. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf index f0d2bbd5c8847..12d0b3cf81408 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.fr.xlf @@ -52,11 +52,6 @@ Avertissement : La déclaration change la portée et éventuellement la signification. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf index f6853a569da92..a41b7c1af5589 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.it.xlf @@ -52,11 +52,6 @@ Avviso: la dichiarazione implica la modifica dell'ambito e potrebbe modificare il significato. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf index 87cea19e2f070..2717adb8c79ec 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ja.xlf @@ -52,11 +52,6 @@ 警告: 宣言によりスコープが変更され、意味が変わる可能性があります。 - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf index d1217d4c3cb23..a4f9c1c25365a 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ko.xlf @@ -52,11 +52,6 @@ 경고: 선언 시 범위가 변경되고 의미가 변경될 수 있습니다. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf index c000cac61653a..24e7f3613f75e 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pl.xlf @@ -52,11 +52,6 @@ Ostrzeżenie: deklaracja zmienia zakres i może zmienić znaczenie. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf index 1e0d0f6e40255..c4fb0b4d42178 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.pt-BR.xlf @@ -52,11 +52,6 @@ Aviso: a declaração altera e escopo e pode alterar o significado. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf index f32c083abc1b5..0e4e4d29c65bf 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.ru.xlf @@ -52,11 +52,6 @@ Предупреждение. Объявление изменяет область и может изменить значение. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf index 9233a1a77f88d..0396886fe7e95 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.tr.xlf @@ -52,11 +52,6 @@ Uyarı: Bildirim, kapsamı değiştiriyor ve anlamı da değiştirebilir. - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf index 1fe359f13de09..baaa046efea34 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hans.xlf @@ -52,11 +52,6 @@ 警告: 声明更改了作用域,并且可能更改含义。 - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf index f63bc955e97f8..015cbd567adcf 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/xlf/WorkspaceExtensionsResources.zh-Hant.xlf @@ -52,11 +52,6 @@ 警告: 宣告會變更範圍,且可能會變更意義。 - - {0}: Applying fixes - {0}: Applying fixes - - \ No newline at end of file From 283e1266e0a0f40a3a3f7c93919e193ed0e4b062 Mon Sep 17 00:00:00 2001 From: CyrusNajmabadi Date: Mon, 4 Jan 2021 14:59:25 -0800 Subject: [PATCH 3/4] Update src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs --- .../SuggestedActions/UIThreadOperationContextProgressTracker.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs index aab9d24b0a5e2..98a52697f91d9 100644 --- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs +++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs @@ -55,7 +55,6 @@ public void Clear() } _scope.Progress.Report(new ProgressInfo()); - } } } From 84ecb45e52f16dfcc5304c751a4523b147ef765d Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Mon, 4 Jan 2021 16:07:27 -0800 Subject: [PATCH 4/4] NRT --- .../SuggestedActions/UIThreadOperationContextProgressTracker.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs index 98a52697f91d9..b6ccff47eb66a 100644 --- a/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs +++ b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/UIThreadOperationContextProgressTracker.cs @@ -16,7 +16,7 @@ internal class UIThreadOperationContextProgressTracker : IProgressTracker public UIThreadOperationContextProgressTracker(IUIThreadOperationScope scope) => _scope = scope; - public string Description { get => _scope.Description; set => _scope.Description = value; } + public string? Description { get => _scope.Description; set => _scope.Description = value; } public int CompletedItems { get; private set; }