From fb632068d10f06cad2e1681448d5607763cb60bc Mon Sep 17 00:00:00 2001 From: Ivan Basov Date: Tue, 29 Oct 2019 15:58:35 -0700 Subject: [PATCH] rename CoolParameter -> ParameterBase -> Parameter --- .../AbstractChangeSignatureService.cs | 2 +- .../{ParameterBase.cs => Parameter.cs} | 6 ++-- .../ChangeSignature/ParameterConfiguration.cs | 29 +++++++++---------- .../ChangeSignatureDialogViewModel.cs | 8 ++--- .../ChangeSignatureViewModelTests.vb | 2 +- 5 files changed, 23 insertions(+), 24 deletions(-) rename src/Features/Core/Portable/ChangeSignature/{ParameterBase.cs => Parameter.cs} (89%) diff --git a/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs b/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs index 77ab2d6a7de..326ecdafa97 100644 --- a/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs +++ b/src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs @@ -136,7 +136,7 @@ internal ChangeSignatureResult ChangeSignature(Document document, int position, return new ChangeSignatureAnalyzedContext(CannotChangeSignatureReason.IncorrectKind); } - var parameterConfiguration = ParameterConfiguration.Create(symbol.GetParameters().Select(p => new ExistingParameter(p)).ToList(), symbol is IMethodSymbol && (symbol as IMethodSymbol).IsExtensionMethod, selectedIndex); + var parameterConfiguration = ParameterConfiguration.Create(symbol.GetParameters().Select(p => new ExistingParameter(p)).ToList(), symbol is IMethodSymbol && (symbol as IMethodSymbol).IsExtensionMethod, selectedIndex); if (!parameterConfiguration.IsChangeable()) { return new ChangeSignatureAnalyzedContext(CannotChangeSignatureReason.InsufficientParameters); diff --git a/src/Features/Core/Portable/ChangeSignature/ParameterBase.cs b/src/Features/Core/Portable/ChangeSignature/Parameter.cs similarity index 89% rename from src/Features/Core/Portable/ChangeSignature/ParameterBase.cs rename to src/Features/Core/Portable/ChangeSignature/Parameter.cs index b32ffb85ed7..c668c012b6a 100644 --- a/src/Features/Core/Portable/ChangeSignature/ParameterBase.cs +++ b/src/Features/Core/Portable/ChangeSignature/Parameter.cs @@ -2,14 +2,14 @@ namespace Microsoft.CodeAnalysis.ChangeSignature { - internal abstract class ParameterBase + internal abstract class Parameter { public abstract bool HasExplicitDefaultValue { get; } public abstract string Name { get; } public abstract IParameterSymbol Symbol { get; } } - internal class ExistingParameter : ParameterBase + internal class ExistingParameter : Parameter { public override IParameterSymbol Symbol { get; } @@ -22,7 +22,7 @@ public ExistingParameter(IParameterSymbol param) public override string Name => Symbol.Name; } - internal class AddedParameter : ParameterBase + internal class AddedParameter : Parameter { public AddedParameter(string type, string parameter, string callsite) { diff --git a/src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs b/src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs index cb34f797f1e..2ae3f902e87 100644 --- a/src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs +++ b/src/Features/Core/Portable/ChangeSignature/ParameterConfiguration.cs @@ -1,6 +1,5 @@ // Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System; using System.Collections.Generic; using System.Linq; @@ -8,13 +7,13 @@ namespace Microsoft.CodeAnalysis.ChangeSignature { internal sealed class ParameterConfiguration { - public readonly ParameterBase ThisParameter; - public readonly List ParametersWithoutDefaultValues; - public readonly List RemainingEditableParameters; - public readonly ParameterBase ParamsParameter; + public readonly Parameter ThisParameter; + public readonly List ParametersWithoutDefaultValues; + public readonly List RemainingEditableParameters; + public readonly Parameter ParamsParameter; public readonly int SelectedIndex; - public ParameterConfiguration(ParameterBase thisParameter, List parametersWithoutDefaultValues, List remainingEditableParameters, ParameterBase paramsParameter, int selectedIndex) + public ParameterConfiguration(Parameter thisParameter, List parametersWithoutDefaultValues, List remainingEditableParameters, Parameter paramsParameter, int selectedIndex) { ThisParameter = thisParameter; ParametersWithoutDefaultValues = parametersWithoutDefaultValues; @@ -23,12 +22,12 @@ public ParameterConfiguration(ParameterBase thisParameter, List p SelectedIndex = selectedIndex; } - public static ParameterConfiguration Create(List parameters, bool isExtensionMethod, int selectedIndex) + public static ParameterConfiguration Create(List parameters, bool isExtensionMethod, int selectedIndex) { - ParameterBase thisParameter = null; - var parametersWithoutDefaultValues = new List(); - var remainingReorderableParameters = new List(); - ParameterBase paramsParameter = null; + Parameter thisParameter = null; + var parametersWithoutDefaultValues = new List(); + var remainingReorderableParameters = new List(); + Parameter paramsParameter = null; if (parameters.Count > 0 && isExtensionMethod) { @@ -58,12 +57,12 @@ public static ParameterConfiguration Create(List parameters, bool internal ParameterConfiguration WithoutAddedParameters() { - return Create(ToListOfParameters().OfType().ToList(), ThisParameter != null, selectedIndex: 0); + return Create(ToListOfParameters().OfType().ToList(), ThisParameter != null, selectedIndex: 0); } - public List ToListOfParameters() + public List ToListOfParameters() { - var list = new List(); + var list = new List(); if (ThisParameter != null) { @@ -81,7 +80,7 @@ public List ToListOfParameters() return list; } - // TODO probably remove thiis check. It was created when we didn't support Add Parameters to parameterless methods. + // TODO probably remove this check. It was created when we didn't support Add Parameters to parameterless methods. public bool IsChangeable() { return true; diff --git a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs index 3a2c199e1f7..b495f925f33 100644 --- a/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs +++ b/src/VisualStudio/Core/Def/Implementation/ChangeSignature/ChangeSignatureDialogViewModel.cs @@ -523,7 +523,7 @@ public ParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDialogVi this.changeSignatureDialogViewModel = changeSignatureDialogViewModel; } - internal abstract ParameterBase CreateParameter(); + internal abstract Parameter CreateParameter(); public abstract string InitialIndex { get; } } @@ -548,7 +548,7 @@ public AddedParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDia public override bool IsDisabled => false; public override string Callsite => _addParameterViewModel.CallsiteValue; - internal override ParameterBase CreateParameter() + internal override Parameter CreateParameter() => new AddedParameter(Type, Parameter, Callsite); public override string InitialIndex => "NEW"; @@ -558,14 +558,14 @@ public class ExistingParameterViewModel : ParameterViewModel { public IParameterSymbol ParameterSymbol { get; } - public ExistingParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDialogViewModel, ParameterBase parameter, int initialIndex) + public ExistingParameterViewModel(ChangeSignatureDialogViewModel changeSignatureDialogViewModel, Parameter parameter, int initialIndex) : base(changeSignatureDialogViewModel) { ParameterSymbol = (parameter as ExistingParameter).Symbol; InitialIndex = initialIndex.ToString(); } - internal override ParameterBase CreateParameter() + internal override Parameter CreateParameter() { return new ExistingParameter(ParameterSymbol); } diff --git a/src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb b/src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb index dc4ba3b19e3..d0e423f38ad 100644 --- a/src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb +++ b/src/VisualStudio/Core/Test/ChangeSignature/ChangeSignatureViewModelTests.vb @@ -436,7 +436,7 @@ class MyClass Dim viewModel = New ChangeSignatureDialogViewModel( New TestNotificationService(), - ParameterConfiguration.Create(symbol.GetParameters().Select(Function(p) DirectCast(New ExistingParameter(p), ParameterBase)).ToList(), symbol.IsExtensionMethod(), selectedIndex:=0), + ParameterConfiguration.Create(symbol.GetParameters().Select(Function(p) DirectCast(New ExistingParameter(p), Parameter)).ToList(), symbol.IsExtensionMethod(), selectedIndex:=0), symbol, workspace.ExportProvider.GetExportedValue(Of IClassificationFormatMapService)().GetClassificationFormatMap("text"), workspace.ExportProvider.GetExportedValue(Of ClassificationTypeMap)()) -- GitLab