From 9ffab0edfc0a51becc8c6b97c3e1249c6502b813 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 09:41:54 -0700 Subject: [PATCH 1/6] Don't combine 'this.' with underscore named fields --- .../MakeFieldReadonlyTests.cs | 20 +++++++++---------- .../RemoveUnusedMembersTests.cs | 2 +- .../EventHookup/EventHookupSessionManager.cs | 2 +- .../ExtractMethodTests.LanguageInteraction.cs | 4 ++-- .../GenerateConstructorTests.cs | 2 +- .../GenerateConstructorFromMembersTests.cs | 2 +- .../AddConstructorParameterIntentTests.cs | 2 +- .../AbstractExtractInterfaceCommandHandler.cs | 2 +- .../Core/Tagging/TaggerContext.cs | 2 +- .../ValueTracking/CSharpValueTrackingTests.cs | 6 +++--- .../Formatting/CoreFormatterTestsBase.cs | 2 +- .../BoundNodeClassWriter.cs | 4 ++-- ...bstractTableDataSourceFindUsagesContext.cs | 2 +- .../FindReferences/TableEntriesSnapshot.cs | 2 +- ...AlwaysActiveLanguageClientEventListener.cs | 2 +- .../LocalUserRegistryOptionPersister.cs | 8 ++++---- .../VisualStudioProjectOptionsProcessor.cs | 2 +- .../VisualStudioWorkspaceImpl.cs | 2 +- .../AbstractSnippetExpansionClient.cs | 6 +++--- .../PackageInstallerServiceFactory.cs | 2 +- .../Storage/CloudCachePersistentStorage.cs | 4 ++-- .../AbstractDelayStartedService.cs | 4 ++-- .../Def/Utilities/ProjectPropertyStorage.cs | 4 ++-- .../SourceGeneratedFileItem.BrowseObject.cs | 2 +- .../Test.Next/Services/LspDiagnosticsTests.cs | 8 ++++---- .../RoslynRemoteProjectInfoProvider.cs | 2 +- .../CSharpSimplificationService.Expander.cs | 2 +- .../Symbols/CodeGenerationPropertySymbol.cs | 8 ++++---- .../FindSymbols/SymbolTree/SymbolTreeInfo.cs | 4 ++-- .../MutableConflictResolution.cs | 6 +++--- ...eneratorDriverTranslationAction_Actions.cs | 8 ++++---- ...SyntaxNodeExtensions.SingleLineRewriter.cs | 2 +- 32 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs b/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs index 811f51493f746..bc36caeab4bbb 100644 --- a/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs +++ b/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs @@ -235,7 +235,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E = x => this._goo = 0; + this.E = x => _goo = 0; } public Action E; @@ -251,7 +251,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E += (_, __) => this._goo = 0; + this.E += (_, __) => _goo = 0; } public event EventHandler E; @@ -267,7 +267,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E += (_, __) => { this._goo = 0; } + this.E += (_, __) => { _goo = 0; } } public event EventHandler E; @@ -283,7 +283,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E = delegate { this._goo = 0; }; + this.E = delegate { _goo = 0; }; } public Action E; @@ -299,7 +299,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - void LocalFunction() => this._goo = 0; + void LocalFunction() => _goo = 0; } }"); } @@ -313,7 +313,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - void LocalFunction() { this._goo = 0; } + void LocalFunction() { _goo = 0; } } }"); } @@ -356,7 +356,7 @@ await TestInRegularAndScript1Async( private int [|_goo|]; MyClass() { - this._goo = 0; + _goo = 0; } }", @"class MyClass @@ -364,7 +364,7 @@ await TestInRegularAndScript1Async( private readonly int _goo; MyClass() { - this._goo = 0; + _goo = 0; } }"); } @@ -1459,7 +1459,7 @@ await TestInRegularAndScript1Async( private int [|_goo|]; MyClass() { - (this._goo) = 0; + (_goo) = 0; } }", @"class MyClass @@ -1467,7 +1467,7 @@ await TestInRegularAndScript1Async( private readonly int _goo; MyClass() { - (this._goo) = 0; + (_goo) = 0; } }"); } diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs index 9be849a27443f..965ad43e6d54e 100644 --- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs +++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs @@ -862,7 +862,7 @@ public async Task FieldIsRead_ThisInstance() var code = @"class MyClass { private int _goo; - public int M() => this._goo; + public int M() => _goo; }"; await VerifyCS.VerifyCodeFixAsync(code, code); diff --git a/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager.cs b/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager.cs index 4d23e9461929d..570b58457add4 100644 --- a/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager.cs +++ b/src/EditorFeatures/CSharp/EventHookup/EventHookupSessionManager.cs @@ -53,7 +53,7 @@ internal void EventHookupFoundInSession(EventHookupSession analyzedSession) analyzedSession.TrackingSpan.GetSpan(CurrentSession.TextView.TextSnapshot).Contains(caretPoint.Value)) { // Create a tooltip presenter that stays alive, even when the user types, without tracking the mouse. - _toolTipPresenter = this._toolTipService.CreatePresenter(analyzedSession.TextView, + _toolTipPresenter = _toolTipService.CreatePresenter(analyzedSession.TextView, new ToolTipParameters(trackMouse: false, ignoreBufferChange: true)); // tooltips text is: Program_MyEvents; (Press TAB to insert) diff --git a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs index 3b72a0ce3dcbe..90f54e4429fd1 100644 --- a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs +++ b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs @@ -1851,7 +1851,7 @@ public class Test { protected class Node { - internal Node(T item) { this._item = item; } + internal Node(T item) { _item = item; } internal T _item; } protected Node _current = null; @@ -1873,7 +1873,7 @@ public class Test { protected class Node { - internal Node(T item) { this._item = item; } + internal Node(T item) { _item = item; } internal T _item; } protected Node _current = null; diff --git a/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs b/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs index 064307be06e10..3537c793743ae 100644 --- a/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs @@ -3301,7 +3301,7 @@ class D public D(int _) { - this._ = _; + _ = _; } }"); } diff --git a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs index f8c888d8a08e2..d5a8b4572821e 100644 --- a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs @@ -813,7 +813,7 @@ await TestInRegularAndScriptAsync( public Program(int field{|Navigation:)|} { - this._field = field; + _field = field; } }", options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.TrueWithSuggestionEnforcement)); diff --git a/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs b/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs index 348eb69da703b..b18a313f7c594 100644 --- a/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs +++ b/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs @@ -153,7 +153,7 @@ public C({|typed:int som|}) public C(int someInt) { - this._someInt = someInt; + _someInt = someInt; } }"; await VerifyExpectedTextAsync(WellKnownIntents.AddConstructorParameter, initialText, expectedText, diff --git a/src/EditorFeatures/Core/Implementation/ExtractInterface/AbstractExtractInterfaceCommandHandler.cs b/src/EditorFeatures/Core/Implementation/ExtractInterface/AbstractExtractInterfaceCommandHandler.cs index 7705f8b99999a..f2eb91e950422 100644 --- a/src/EditorFeatures/Core/Implementation/ExtractInterface/AbstractExtractInterfaceCommandHandler.cs +++ b/src/EditorFeatures/Core/Implementation/ExtractInterface/AbstractExtractInterfaceCommandHandler.cs @@ -23,7 +23,7 @@ internal abstract class AbstractExtractInterfaceCommandHandler : ICommandHandler private readonly IThreadingContext _threadingContext; protected AbstractExtractInterfaceCommandHandler(IThreadingContext threadingContext) - => this._threadingContext = threadingContext; + => _threadingContext = threadingContext; public string DisplayName => EditorFeaturesResources.Extract_Interface; diff --git a/src/EditorFeatures/Core/Tagging/TaggerContext.cs b/src/EditorFeatures/Core/Tagging/TaggerContext.cs index 93f00d807545a..7a4131b4e6648 100644 --- a/src/EditorFeatures/Core/Tagging/TaggerContext.cs +++ b/src/EditorFeatures/Core/Tagging/TaggerContext.cs @@ -88,7 +88,7 @@ public void ClearTags() /// tags from before and after the sub-span and merge them with the newly produced tags. /// public void SetSpansTagged(IEnumerable spansTagged) - => this._spansTagged = spansTagged ?? throw new ArgumentNullException(nameof(spansTagged)); + => _spansTagged = spansTagged ?? throw new ArgumentNullException(nameof(spansTagged)); public IEnumerable> GetExistingContainingTags(SnapshotPoint point) { diff --git a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs index a738d4c001c52..89dce0801b8d3 100644 --- a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs +++ b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs @@ -131,17 +131,17 @@ class C public void SetS(string s) { - this._s = s; + _s = s; } - public string GetS() => this._s; + public string GetS() => _s; }"; using var workspace = CreateWorkspace(code, testHost); var initialItems = await GetTrackedItemsAsync(workspace); // // field _s - // |> this._s = s [Code.cs:7] + // |> _s = s [Code.cs:7] // |> string _s = "" [Code.cs:3] // await ValidateItemsAsync( diff --git a/src/EditorFeatures/TestUtilities/Formatting/CoreFormatterTestsBase.cs b/src/EditorFeatures/TestUtilities/Formatting/CoreFormatterTestsBase.cs index b6416e3f62735..1437707b5a6b4 100644 --- a/src/EditorFeatures/TestUtilities/Formatting/CoreFormatterTestsBase.cs +++ b/src/EditorFeatures/TestUtilities/Formatting/CoreFormatterTestsBase.cs @@ -40,7 +40,7 @@ public abstract class CoreFormatterTestsBase private readonly ITestOutputHelper _output; protected CoreFormatterTestsBase(ITestOutputHelper output) - => this._output = output; + => _output = output; protected abstract string GetLanguageName(); protected abstract SyntaxNode ParseCompilationUnit(string expected); diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs index 582b93e9d7cc4..f922b54e68b89 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs +++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs @@ -464,7 +464,7 @@ private void WriteConstructorWithHasErrors(TreeType node, bool isPublic, bool ha { if (IsPropertyOverrides(field)) { - WriteLine("this._{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); + WriteLine("_{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); } else { @@ -591,7 +591,7 @@ private void WriteConstructorWithoutHasErrors(TreeType node, bool isPublic) { if (IsPropertyOverrides(field)) { - WriteLine("this._{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); + WriteLine("_{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); } else { diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs index c2f51fd3e1b48..7a9fcfc453ff0 100644 --- a/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs +++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/Contexts/AbstractTableDataSourceFindUsagesContext.cs @@ -250,7 +250,7 @@ public void Clear() this.CancelSearch(); // Clear the title of the window. It will go back to the default editor title. - this._findReferencesWindow.Title = null; + _findReferencesWindow.Title = null; lock (Gate) { diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/TableEntriesSnapshot.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/TableEntriesSnapshot.cs index 42d148632d633..5ce160bfb4066 100644 --- a/src/VisualStudio/Core/Def/Implementation/FindReferences/TableEntriesSnapshot.cs +++ b/src/VisualStudio/Core/Def/Implementation/FindReferences/TableEntriesSnapshot.cs @@ -54,7 +54,7 @@ public override bool TryGetValue(int index, string keyName, out object? content) public override bool TryCreateColumnContent( int index, string columnName, bool singleColumnView, [NotNullWhen(true)] out FrameworkElement? content) { - return this._entries[index].TryCreateColumnContent(columnName, out content); + return _entries[index].TryCreateColumnContent(columnName, out content); } } } diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActiveLanguageClientEventListener.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActiveLanguageClientEventListener.cs index ef98fdd74f2c6..aa30e97a5e71f 100644 --- a/src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActiveLanguageClientEventListener.cs +++ b/src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActiveLanguageClientEventListener.cs @@ -57,7 +57,7 @@ private async Task LoadAsync() { try { - using var token = this._asynchronousOperationListener.BeginAsyncOperation(nameof(LoadAsync)); + using var token = _asynchronousOperationListener.BeginAsyncOperation(nameof(LoadAsync)); // Explicitly switch to the bg so that if this causes any expensive work (like mef loads) it // doesn't block the UI thread. diff --git a/src/VisualStudio/Core/Def/Implementation/Options/LocalUserRegistryOptionPersister.cs b/src/VisualStudio/Core/Def/Implementation/Options/LocalUserRegistryOptionPersister.cs index e1582bef9a6e9..49b0d96451763 100644 --- a/src/VisualStudio/Core/Def/Implementation/Options/LocalUserRegistryOptionPersister.cs +++ b/src/VisualStudio/Core/Def/Implementation/Options/LocalUserRegistryOptionPersister.cs @@ -38,7 +38,7 @@ public LocalUserRegistryOptionPersister(IThreadingContext threadingContext, ISer // https://docs.microsoft.com/en-us/dotnet/api/microsoft.visualstudio.shell.interop.slocalregistry threadingContext.ThrowIfNotOnUIThread(); - this._registryKey = VSRegistry.RegistryRoot(serviceProvider, __VsLocalRegistryType.RegType_UserSettings, writable: true); + _registryKey = VSRegistry.RegistryRoot(serviceProvider, __VsLocalRegistryType.RegType_UserSettings, writable: true); } private static bool TryGetKeyPathAndName(IOption option, out string path, out string key) @@ -70,7 +70,7 @@ bool IOptionPersister.TryFetch(OptionKey optionKey, out object value) lock (_gate) { - using var subKey = this._registryKey.OpenSubKey(path); + using var subKey = _registryKey.OpenSubKey(path); if (subKey == null) { value = null; @@ -135,7 +135,7 @@ bool IOptionPersister.TryFetch(OptionKey optionKey, out object value) bool IOptionPersister.TryPersist(OptionKey optionKey, object value) { - if (this._registryKey == null) + if (_registryKey == null) { throw new InvalidOperationException(); } @@ -147,7 +147,7 @@ bool IOptionPersister.TryPersist(OptionKey optionKey, object value) lock (_gate) { - using var subKey = this._registryKey.CreateSubKey(path); + using var subKey = _registryKey.CreateSubKey(path); // Options that are of type bool have to be serialized as integers if (optionKey.Option.Type == typeof(bool)) { diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectOptionsProcessor.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectOptionsProcessor.cs index f7ba441d2e2e9..e96848163a431 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectOptionsProcessor.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioProjectOptionsProcessor.cs @@ -191,7 +191,7 @@ private void UpdateProjectOptions_NoLock() // We've computed what the base values should be; we now give an opportunity for any host-specific settings to be computed // before we apply them - compilationOptions = ComputeCompilationOptionsWithHostValues(compilationOptions, this._ruleSetFile?.Target.Value); + compilationOptions = ComputeCompilationOptionsWithHostValues(compilationOptions, _ruleSetFile?.Target.Value); parseOptions = ComputeParseOptionsWithHostValues(parseOptions); // For managed projects, AssemblyName has to be non-null, but the command line we get might be a partial command line diff --git a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs index 5c8b43b3f2553..132daedbcb7f6 100644 --- a/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs +++ b/src/VisualStudio/Core/Def/Implementation/ProjectSystem/VisualStudioWorkspaceImpl.cs @@ -417,7 +417,7 @@ internal bool IsPrimaryProject(ProjectId projectId) { lock (_gate) { - foreach (var (_, projects) in this._projectSystemNameToProjectsMap) + foreach (var (_, projects) in _projectSystemNameToProjectsMap) { foreach (var project in projects) { diff --git a/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs b/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs index 02b2b54c05b97..bf0860532b730 100644 --- a/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs +++ b/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs @@ -98,10 +98,10 @@ public AbstractSnippetExpansionClient( this.LanguageServiceGuid = languageServiceGuid; this.TextView = textView; this.SubjectBuffer = subjectBuffer; - this._signatureHelpControllerProvider = signatureHelpControllerProvider; - this._editorCommandHandlerServiceFactory = editorCommandHandlerServiceFactory; + _signatureHelpControllerProvider = signatureHelpControllerProvider; + _editorCommandHandlerServiceFactory = editorCommandHandlerServiceFactory; this.EditorAdaptersFactoryService = editorAdaptersFactoryService; - this._allArgumentProviders = argumentProviders; + _allArgumentProviders = argumentProviders; } /// diff --git a/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs b/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs index 0a8892990afed..0191e047e11c5 100644 --- a/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs +++ b/src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs @@ -646,7 +646,7 @@ public ImmutableArray GetProjectsWithInstalledPackage(Solution solution using var _ = ArrayBuilder.GetInstance(out var result); - foreach (var (projectId, state) in this._projectToInstalledPackageAndVersion) + foreach (var (projectId, state) in _projectToInstalledPackageAndVersion) { if (state.TryGetInstalledVersion(packageName, out var installedVersion) && installedVersion == version) diff --git a/src/VisualStudio/Core/Def/Storage/CloudCachePersistentStorage.cs b/src/VisualStudio/Core/Def/Storage/CloudCachePersistentStorage.cs index e91587331cae7..18dda9b34c9d7 100644 --- a/src/VisualStudio/Core/Def/Storage/CloudCachePersistentStorage.cs +++ b/src/VisualStudio/Core/Def/Storage/CloudCachePersistentStorage.cs @@ -64,11 +64,11 @@ public sealed override void Dispose() public sealed override ValueTask DisposeAsync() { - if (this._cacheService is IAsyncDisposable asyncDisposable) + if (_cacheService is IAsyncDisposable asyncDisposable) { return asyncDisposable.DisposeAsync(); } - else if (this._cacheService is IDisposable disposable) + else if (_cacheService is IDisposable disposable) { disposable.Dispose(); return ValueTaskFactory.CompletedTask; diff --git a/src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs b/src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs index 1967338574a8a..b51001da77763 100644 --- a/src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs +++ b/src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs @@ -68,8 +68,8 @@ internal void Connect(string languageName) return; } - this._registeredLanguageNames.Add(languageName); - if (this._registeredLanguageNames.Count == 1) + _registeredLanguageNames.Add(languageName); + if (_registeredLanguageNames.Count == 1) { // Register to hear about option changing. var optionsService = Workspace.Services.GetService(); diff --git a/src/VisualStudio/Core/Def/Utilities/ProjectPropertyStorage.cs b/src/VisualStudio/Core/Def/Utilities/ProjectPropertyStorage.cs index 40e703ab77dbc..fb75dc44b0092 100644 --- a/src/VisualStudio/Core/Def/Utilities/ProjectPropertyStorage.cs +++ b/src/VisualStudio/Core/Def/Utilities/ProjectPropertyStorage.cs @@ -48,7 +48,7 @@ private sealed class BuildPropertyStorage : ProjectPropertyStorage private readonly IVsBuildPropertyStorage _propertyStorage; public BuildPropertyStorage(IVsBuildPropertyStorage propertyStorage) - => this._propertyStorage = propertyStorage; + => _propertyStorage = propertyStorage; public override void SetProperty(string buildPropertyName, string configurationPropertyName, string value) => _propertyStorage.SetPropertyValue(buildPropertyName, null, (uint)_PersistStorageType.PST_PROJECT_FILE, value); @@ -59,7 +59,7 @@ private sealed class PerConfigurationPropertyStorage : ProjectPropertyStorage private readonly ConfigurationManager _configurationManager; public PerConfigurationPropertyStorage(ConfigurationManager configurationManager) - => this._configurationManager = configurationManager; + => _configurationManager = configurationManager; public override void SetProperty(string buildPropertyName, string configurationPropertyName, string value) { diff --git a/src/VisualStudio/Core/Impl/SolutionExplorer/SourceGeneratedFileItems/SourceGeneratedFileItem.BrowseObject.cs b/src/VisualStudio/Core/Impl/SolutionExplorer/SourceGeneratedFileItems/SourceGeneratedFileItem.BrowseObject.cs index 3082a72ef7e9d..e80acfad86622 100644 --- a/src/VisualStudio/Core/Impl/SolutionExplorer/SourceGeneratedFileItems/SourceGeneratedFileItem.BrowseObject.cs +++ b/src/VisualStudio/Core/Impl/SolutionExplorer/SourceGeneratedFileItems/SourceGeneratedFileItem.BrowseObject.cs @@ -12,7 +12,7 @@ private class BrowseObject : LocalizableProperties public BrowseObject(SourceGeneratedFileItem sourceGeneratedFileItem) { - this._sourceGeneratedFileItem = sourceGeneratedFileItem; + _sourceGeneratedFileItem = sourceGeneratedFileItem; } [BrowseObjectDisplayName(nameof(SolutionExplorerShim.Name))] diff --git a/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs b/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs index 636bbe37491eb..1bfe8cfd62a51 100644 --- a/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs @@ -512,7 +512,7 @@ public RpcOrderPreservingSynchronizationContext() this.ProcessQueueAsync().Forget(); } - public override void Post(SendOrPostCallback d, object? state) => this._queue.Enqueue((d, state)); + public override void Post(SendOrPostCallback d, object? state) => _queue.Enqueue((d, state)); public override void Send(SendOrPostCallback d, object? state) => throw new NotSupportedException(); @@ -522,7 +522,7 @@ public RpcOrderPreservingSynchronizationContext() /// Causes this to reject all future posted work and /// releases the queue processor when it is empty. /// - public void Dispose() => this._queue.Complete(); + public void Dispose() => _queue.Complete(); /// /// Executes queued work on the thread-pool, one at a time. @@ -530,9 +530,9 @@ public RpcOrderPreservingSynchronizationContext() /// private async Task ProcessQueueAsync() { - while (!this._queue.IsCompleted) + while (!_queue.IsCompleted) { - var work = await this._queue.DequeueAsync().ConfigureAwait(false); + var work = await _queue.DequeueAsync().ConfigureAwait(false); work.Item1(work.Item2); } } diff --git a/src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs b/src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs index df1e90b6d6eef..fd319980dbf00 100644 --- a/src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs +++ b/src/VisualStudio/LiveShare/Impl/Client/Projects/RoslynRemoteProjectInfoProvider.cs @@ -72,7 +72,7 @@ public async Task> GetRemoteProjectInfosAsync(Cancel // This is also the case for files for which TypeScript adds the generated TypeScript buffer to a different project. var filesTasks = project.SourceFiles .Where(f => f.Scheme != SystemUriSchemeExternal) - .Where(f => !this._secondaryBufferFileExtensions.Any(ext => f.LocalPath.EndsWith(ext))) + .Where(f => !_secondaryBufferFileExtensions.Any(ext => f.LocalPath.EndsWith(ext))) .Select(f => lspClient.ProtocolConverter.FromProtocolUriAsync(f, false, cancellationToken)); var files = await Task.WhenAll(filesTasks).ConfigureAwait(false); var projectInfo = CreateProjectInfo(project.Name, project.Language, files.Select(f => f.LocalPath).ToImmutableArray()); diff --git a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs index bf8c370f9fb1e..eb71fd4de21d9 100644 --- a/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs +++ b/src/Workspaces/CSharp/Portable/Simplification/CSharpSimplificationService.Expander.cs @@ -1041,7 +1041,7 @@ private bool IsTypeOfUnboundGenericType(SemanticModel semanticModel, TypeOfExpre public override SyntaxNode VisitInvocationExpression(InvocationExpressionSyntax originalNode) { - if (this._semanticModel.GetSymbolInfo(originalNode).Symbol.IsLocalFunction()) + if (_semanticModel.GetSymbolInfo(originalNode).Symbol.IsLocalFunction()) { return originalNode; } diff --git a/src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPropertySymbol.cs b/src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPropertySymbol.cs index 49b9774591c6c..7909d1f0a6ca4 100644 --- a/src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPropertySymbol.cs +++ b/src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationPropertySymbol.cs @@ -38,7 +38,7 @@ public CodeGenerationPropertySymbol( : base(containingType?.ContainingAssembly, containingType, attributes, declaredAccessibility, modifiers, name) { this.Type = type; - this._refKind = refKind; + _refKind = refKind; this.IsIndexer = isIndexer; this.Parameters = parametersOpt.NullToEmpty(); this.ExplicitInterfaceImplementations = explicitInterfaceImplementations.NullToEmpty(); @@ -75,11 +75,11 @@ public override TResult Accept(SymbolVisitor visitor) public new IPropertySymbol OriginalDefinition => this; - public RefKind RefKind => this._refKind; + public RefKind RefKind => _refKind; - public bool ReturnsByRef => this._refKind == RefKind.Ref; + public bool ReturnsByRef => _refKind == RefKind.Ref; - public bool ReturnsByRefReadonly => this._refKind == RefKind.RefReadOnly; + public bool ReturnsByRefReadonly => _refKind == RefKind.RefReadOnly; public IPropertySymbol OverriddenProperty => null; diff --git a/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.cs b/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.cs index a746ffdf67e2a..cfb3f8fb3b513 100644 --- a/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.cs +++ b/src/Workspaces/Core/Portable/FindSymbols/SymbolTree/SymbolTreeInfo.cs @@ -476,11 +476,11 @@ internal void AssertEquivalentTo(SymbolTreeInfo other) } Debug.Assert(_inheritanceMap.Keys.Count == other._inheritanceMap.Keys.Count); - var orderedKeys1 = this._inheritanceMap.Keys.Order().ToList(); + var orderedKeys1 = _inheritanceMap.Keys.Order().ToList(); for (var i = 0; i < orderedKeys1.Count; i++) { - var values1 = this._inheritanceMap[i]; + var values1 = _inheritanceMap[i]; var values2 = other._inheritanceMap[i]; Debug.Assert(values1.Length == values2.Length); diff --git a/src/Workspaces/Core/Portable/Rename/ConflictEngine/MutableConflictResolution.cs b/src/Workspaces/Core/Portable/Rename/ConflictEngine/MutableConflictResolution.cs index d166ab4b1b801..af027976b0e96 100644 --- a/src/Workspaces/Core/Portable/Rename/ConflictEngine/MutableConflictResolution.cs +++ b/src/Workspaces/Core/Portable/Rename/ConflictEngine/MutableConflictResolution.cs @@ -136,13 +136,13 @@ public ConflictResolution ToConflictResolution() if (ErrorMessage != null) return new ConflictResolution(ErrorMessage); - var documentIds = this._renamedSpansTracker.DocumentIds.Concat( + var documentIds = _renamedSpansTracker.DocumentIds.Concat( this.RelatedLocations.Select(l => l.DocumentId)).Distinct().ToImmutableArray(); var relatedLocations = this.RelatedLocations.ToImmutableArray(); - var documentToModifiedSpansMap = this._renamedSpansTracker.GetDocumentToModifiedSpansMap(); - var documentToComplexifiedSpansMap = this._renamedSpansTracker.GetDocumentToComplexifiedSpansMap(); + var documentToModifiedSpansMap = _renamedSpansTracker.GetDocumentToModifiedSpansMap(); + var documentToComplexifiedSpansMap = _renamedSpansTracker.GetDocumentToComplexifiedSpansMap(); var documentToRelatedLocationsMap = this.RelatedLocations.GroupBy(loc => loc.DocumentId).ToImmutableDictionary( g => g.Key, g => g.ToImmutableArray()); diff --git a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationAndGeneratorDriverTranslationAction_Actions.cs b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationAndGeneratorDriverTranslationAction_Actions.cs index c316cc133c361..e6504ebcc875b 100644 --- a/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationAndGeneratorDriverTranslationAction_Actions.cs +++ b/src/Workspaces/Core/Portable/Workspace/Solution/SolutionState.CompilationAndGeneratorDriverTranslationAction_Actions.cs @@ -42,9 +42,9 @@ public override Task TransformCompilationAsync(Compilation oldCompi public override CompilationAndGeneratorDriverTranslationAction? TryMergeWithPrior(CompilationAndGeneratorDriverTranslationAction priorAction) { if (priorAction is TouchDocumentAction priorTouchAction && - priorTouchAction._newState == this._oldState) + priorTouchAction._newState == _oldState) { - return new TouchDocumentAction(priorTouchAction._oldState, this._newState); + return new TouchDocumentAction(priorTouchAction._oldState, _newState); } return null; @@ -70,9 +70,9 @@ public TouchAdditionalDocumentAction(AdditionalDocumentState oldState, Additiona public override CompilationAndGeneratorDriverTranslationAction? TryMergeWithPrior(CompilationAndGeneratorDriverTranslationAction priorAction) { if (priorAction is TouchAdditionalDocumentAction priorTouchAction && - priorTouchAction._newState == this._oldState) + priorTouchAction._newState == _oldState) { - return new TouchAdditionalDocumentAction(priorTouchAction._oldState, this._newState); + return new TouchAdditionalDocumentAction(priorTouchAction._oldState, _newState); } return null; diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxNodeExtensions.SingleLineRewriter.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxNodeExtensions.SingleLineRewriter.cs index 04658854d0e4f..794ccb04d18ab 100644 --- a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxNodeExtensions.SingleLineRewriter.cs +++ b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxNodeExtensions.SingleLineRewriter.cs @@ -19,7 +19,7 @@ internal class SingleLineRewriter : CSharpSyntaxRewriter private bool _lastTokenEndedInWhitespace; public SingleLineRewriter(bool useElasticTrivia) - => this._useElasticTrivia = useElasticTrivia; + => _useElasticTrivia = useElasticTrivia; public override SyntaxToken VisitToken(SyntaxToken token) { From 9bcdee838c39cbb321641a662fea7c8f27e3b1f0 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 10:59:41 -0700 Subject: [PATCH 2/6] revert --- .../MakeFieldReadonlyTests.cs | 20 +++++++++---------- .../RemoveUnusedMembersTests.cs | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs b/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs index bc36caeab4bbb..811f51493f746 100644 --- a/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs +++ b/src/Analyzers/CSharp/Tests/MakeFieldReadonly/MakeFieldReadonlyTests.cs @@ -235,7 +235,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E = x => _goo = 0; + this.E = x => this._goo = 0; } public Action E; @@ -251,7 +251,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E += (_, __) => _goo = 0; + this.E += (_, __) => this._goo = 0; } public event EventHandler E; @@ -267,7 +267,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E += (_, __) => { _goo = 0; } + this.E += (_, __) => { this._goo = 0; } } public event EventHandler E; @@ -283,7 +283,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - this.E = delegate { _goo = 0; }; + this.E = delegate { this._goo = 0; }; } public Action E; @@ -299,7 +299,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - void LocalFunction() => _goo = 0; + void LocalFunction() => this._goo = 0; } }"); } @@ -313,7 +313,7 @@ await TestMissingInRegularAndScriptAsync( private int [|_goo|]; public MyClass() { - void LocalFunction() { _goo = 0; } + void LocalFunction() { this._goo = 0; } } }"); } @@ -356,7 +356,7 @@ await TestInRegularAndScript1Async( private int [|_goo|]; MyClass() { - _goo = 0; + this._goo = 0; } }", @"class MyClass @@ -364,7 +364,7 @@ await TestInRegularAndScript1Async( private readonly int _goo; MyClass() { - _goo = 0; + this._goo = 0; } }"); } @@ -1459,7 +1459,7 @@ await TestInRegularAndScript1Async( private int [|_goo|]; MyClass() { - (_goo) = 0; + (this._goo) = 0; } }", @"class MyClass @@ -1467,7 +1467,7 @@ await TestInRegularAndScript1Async( private readonly int _goo; MyClass() { - (_goo) = 0; + (this._goo) = 0; } }"); } diff --git a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs index 965ad43e6d54e..9be849a27443f 100644 --- a/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs +++ b/src/Analyzers/CSharp/Tests/RemoveUnusedMembers/RemoveUnusedMembersTests.cs @@ -862,7 +862,7 @@ public async Task FieldIsRead_ThisInstance() var code = @"class MyClass { private int _goo; - public int M() => _goo; + public int M() => this._goo; }"; await VerifyCS.VerifyCodeFixAsync(code, code); From 2c9d6c3a7529c44785f418824d80bad394a28e0c Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 11:00:05 -0700 Subject: [PATCH 3/6] revert --- .../ExtractMethod/ExtractMethodTests.LanguageInteraction.cs | 4 ++-- .../GenerateConstructor/GenerateConstructorTests.cs | 2 +- .../GenerateConstructorFromMembersTests.cs | 2 +- .../CSharpTest/Intents/AddConstructorParameterIntentTests.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs index 90f54e4429fd1..3b72a0ce3dcbe 100644 --- a/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs +++ b/src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.LanguageInteraction.cs @@ -1851,7 +1851,7 @@ public class Test { protected class Node { - internal Node(T item) { _item = item; } + internal Node(T item) { this._item = item; } internal T _item; } protected Node _current = null; @@ -1873,7 +1873,7 @@ public class Test { protected class Node { - internal Node(T item) { _item = item; } + internal Node(T item) { this._item = item; } internal T _item; } protected Node _current = null; diff --git a/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs b/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs index 3537c793743ae..064307be06e10 100644 --- a/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs @@ -3301,7 +3301,7 @@ class D public D(int _) { - _ = _; + this._ = _; } }"); } diff --git a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs index d5a8b4572821e..f8c888d8a08e2 100644 --- a/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs +++ b/src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs @@ -813,7 +813,7 @@ await TestInRegularAndScriptAsync( public Program(int field{|Navigation:)|} { - _field = field; + this._field = field; } }", options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOptions2.TrueWithSuggestionEnforcement)); diff --git a/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs b/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs index b18a313f7c594..348eb69da703b 100644 --- a/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs +++ b/src/EditorFeatures/CSharpTest/Intents/AddConstructorParameterIntentTests.cs @@ -153,7 +153,7 @@ public C({|typed:int som|}) public C(int someInt) { - _someInt = someInt; + this._someInt = someInt; } }"; await VerifyExpectedTextAsync(WellKnownIntents.AddConstructorParameter, initialText, expectedText, From 475c3370a2277decc69040aceb00691207b3b451 Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 11:00:37 -0700 Subject: [PATCH 4/6] REvert --- .../Test/ValueTracking/CSharpValueTrackingTests.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs index 89dce0801b8d3..a738d4c001c52 100644 --- a/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs +++ b/src/EditorFeatures/Test/ValueTracking/CSharpValueTrackingTests.cs @@ -131,17 +131,17 @@ class C public void SetS(string s) { - _s = s; + this._s = s; } - public string GetS() => _s; + public string GetS() => this._s; }"; using var workspace = CreateWorkspace(code, testHost); var initialItems = await GetTrackedItemsAsync(workspace); // // field _s - // |> _s = s [Code.cs:7] + // |> this._s = s [Code.cs:7] // |> string _s = "" [Code.cs:3] // await ValidateItemsAsync( From 2e22364c06554b26f34e2b0461eac67a7d4839dd Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 11:00:58 -0700 Subject: [PATCH 5/6] REvert --- .../Core/Test.Next/Services/LspDiagnosticsTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs b/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs index 1bfe8cfd62a51..636bbe37491eb 100644 --- a/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs +++ b/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs @@ -512,7 +512,7 @@ public RpcOrderPreservingSynchronizationContext() this.ProcessQueueAsync().Forget(); } - public override void Post(SendOrPostCallback d, object? state) => _queue.Enqueue((d, state)); + public override void Post(SendOrPostCallback d, object? state) => this._queue.Enqueue((d, state)); public override void Send(SendOrPostCallback d, object? state) => throw new NotSupportedException(); @@ -522,7 +522,7 @@ public RpcOrderPreservingSynchronizationContext() /// Causes this to reject all future posted work and /// releases the queue processor when it is empty. /// - public void Dispose() => _queue.Complete(); + public void Dispose() => this._queue.Complete(); /// /// Executes queued work on the thread-pool, one at a time. @@ -530,9 +530,9 @@ public RpcOrderPreservingSynchronizationContext() /// private async Task ProcessQueueAsync() { - while (!_queue.IsCompleted) + while (!this._queue.IsCompleted) { - var work = await _queue.DequeueAsync().ConfigureAwait(false); + var work = await this._queue.DequeueAsync().ConfigureAwait(false); work.Item1(work.Item2); } } From 3e65de76357ed42b01e88427fb872e24df7e3d3b Mon Sep 17 00:00:00 2001 From: Cyrus Najmabadi Date: Tue, 20 Jul 2021 11:01:24 -0700 Subject: [PATCH 6/6] REvert --- .../Source/BoundTreeGenerator/BoundNodeClassWriter.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs index f922b54e68b89..582b93e9d7cc4 100644 --- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs +++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/BoundNodeClassWriter.cs @@ -464,7 +464,7 @@ private void WriteConstructorWithHasErrors(TreeType node, bool isPublic, bool ha { if (IsPropertyOverrides(field)) { - WriteLine("_{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); + WriteLine("this._{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); } else { @@ -591,7 +591,7 @@ private void WriteConstructorWithoutHasErrors(TreeType node, bool isPublic) { if (IsPropertyOverrides(field)) { - WriteLine("_{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); + WriteLine("this._{0} = {1};", field.Name, FieldNullHandling(node, field.Name) == NullHandling.Always ? "null" : ToCamelCase(field.Name)); } else {