Rename CodeString to clearer name

rubberduck-vba · Apr 25, 2019 · 765f931 · 765f931
1 parent cd9e698
commit 765f931
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs b/Rubberduck.Core/UI/Refactorings/RemoveParameters/RemoveParametersViewModel.cs
@@ -90,43 +90,43 @@ public string SignaturePreview
 
         private string GetSignature(SubroutineDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
             return $"{access} Sub {member.IdentifierName}({string.Join(", ", selectedParams)})";
         }
 
         private string GetSignature(FunctionDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
             return $"{access} Function {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";
         }
 
         private string GetSignature(EventDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
             return $"{access} Event {member.IdentifierName}({string.Join(", ", selectedParams)})";
         }
 
         private string GetSignature(PropertyGetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);
             return $"{access} Property Get {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";
         }
 
         private string GetSignature(PropertyLetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();
             selectedParams.Add(new Parameter(member.Parameters.Last()).Name);
             return $"{access} Property Let {member.IdentifierName}({string.Join(", ", selectedParams)})";
         }
 
         private string GetSignature(PropertySetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();
             selectedParams.Add(new Parameter(member.Parameters.Last()).Name);
             return $"{access} Property Set {member.IdentifierName}({string.Join(", ", selectedParams)})";

diff --git a/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersViewModel.cs b/Rubberduck.Core/UI/Refactorings/ReorderParameters/ReorderParametersViewModel.cs
@@ -93,35 +93,35 @@ public string SignaturePreview
 
         private string GetSignature(SubroutineDeclaration member)
         {
-            var accessibility = member.Accessibility.CodeString();
+            var accessibility = member.Accessibility.TokenString();
             var parameterList = string.Join(", ", Parameters.Select(p => p.Name));
             return $"{accessibility} Sub {member.IdentifierName}({parameterList})";
         }
 
         private string GetSignature(FunctionDeclaration member)
         {
-            var accessibility = member.Accessibility.CodeString();
+            var accessibility = member.Accessibility.TokenString();
             var parameterList = string.Join(", ", Parameters.Select(p => p.Name));
             return $"{accessibility} Function {member.IdentifierName}({parameterList}) As {member.AsTypeName}";
         }
 
         private string GetSignature(EventDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var parameters = string.Join(", ", Parameters.Select(p => p.Name));
             return $"{access} Event {member.IdentifierName}({parameters})";
         }
 
         private string GetSignature(PropertyGetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var parameters = string.Join(", ", Parameters.Select(p => p.Name));
             return $"{access} Property Get {member.IdentifierName}({parameters}) As {member.AsTypeName}";
         }
 
         private string GetSignature(PropertyLetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Select(s => s.Name).ToList();
             selectedParams.Add(new Parameter(member.Parameters.Last(), -1).Name);
             var parameters = string.Join(", ", selectedParams);
@@ -130,7 +130,7 @@ private string GetSignature(PropertyLetDeclaration member)
 
         private string GetSignature(PropertySetDeclaration member)
         {
-            var access = member.Accessibility.CodeString();
+            var access = member.Accessibility.TokenString();
             var selectedParams = Parameters.Select(s => s.Name).ToList();
             selectedParams.Add(new Parameter(member.Parameters.Last(), -1).Name);
             var parameters = string.Join(", ", selectedParams);

diff --git a/Rubberduck.Parsing/Symbols/Accessibility.cs b/Rubberduck.Parsing/Symbols/Accessibility.cs
@@ -16,7 +16,7 @@ public static class AccessibilityExtensions
         /// Gets the string/token representation of an accessibility specifier.
         /// </summary>
         /// <remarks>Implicit accessibility being unspecified, yields an empty string.</remarks>
-        public static string CodeString(this Accessibility access)
+        public static string TokenString(this Accessibility access)
         {
             return access == Accessibility.Implicit ? string.Empty : access.ToString();
         }