Rename CodeString to clearer name

Vogel612 · Vogel612 · commit 765f931298fb · 2019-04-25T21:02:55.000+02:00
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();
         }

Original file line number	Diff line number	Diff line change
`@@ -90,43 +90,43 @@ public string SignaturePreview`
`90`	`90`
`91`	`91`	`private string GetSignature(SubroutineDeclaration member)`
`92`	`92`	`{`
`93`		`- var access = member.Accessibility.CodeString();`
	`93`	`+ var access = member.Accessibility.TokenString();`
`94`	`94`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);`
`95`	`95`	`return $"{access} Sub {member.IdentifierName}({string.Join(", ", selectedParams)})";`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`private string GetSignature(FunctionDeclaration member)`
`99`	`99`	`{`
`100`		`- var access = member.Accessibility.CodeString();`
	`100`	`+ var access = member.Accessibility.TokenString();`
`101`	`101`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);`
`102`	`102`	`return $"{access} Function {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private string GetSignature(EventDeclaration member)`
`106`	`106`	`{`
`107`		`- var access = member.Accessibility.CodeString();`
	`107`	`+ var access = member.Accessibility.TokenString();`
`108`	`108`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);`
`109`	`109`	`return $"{access} Event {member.IdentifierName}({string.Join(", ", selectedParams)})";`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`private string GetSignature(PropertyGetDeclaration member)`
`113`	`113`	`{`
`114`		`- var access = member.Accessibility.CodeString();`
	`114`	`+ var access = member.Accessibility.TokenString();`
`115`	`115`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name);`
`116`	`116`	`return $"{access} Property Get {member.IdentifierName}({string.Join(", ", selectedParams)}) As {member.AsTypeName}";`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private string GetSignature(PropertyLetDeclaration member)`
`120`	`120`	`{`
`121`		`- var access = member.Accessibility.CodeString();`
	`121`	`+ var access = member.Accessibility.TokenString();`
`122`	`122`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();`
`123`	`123`	`selectedParams.Add(new Parameter(member.Parameters.Last()).Name);`
`124`	`124`	`return $"{access} Property Let {member.IdentifierName}({string.Join(", ", selectedParams)})";`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`private string GetSignature(PropertySetDeclaration member)`
`128`	`128`	`{`
`129`		`- var access = member.Accessibility.CodeString();`
	`129`	`+ var access = member.Accessibility.TokenString();`
`130`	`130`	`var selectedParams = Parameters.Where(p => !p.IsRemoved).Select(s => s.Name).ToList();`
`131`	`131`	`selectedParams.Add(new Parameter(member.Parameters.Last()).Name);`
`132`	`132`	`return $"{access} Property Set {member.IdentifierName}({string.Join(", ", selectedParams)})";`
Original file line number	Diff line number	Diff line change
`@@ -93,35 +93,35 @@ public string SignaturePreview`
`93`	`93`
`94`	`94`	`private string GetSignature(SubroutineDeclaration member)`
`95`	`95`	`{`
`96`		`- var accessibility = member.Accessibility.CodeString();`
	`96`	`+ var accessibility = member.Accessibility.TokenString();`
`97`	`97`	`var parameterList = string.Join(", ", Parameters.Select(p => p.Name));`
`98`	`98`	`return $"{accessibility} Sub {member.IdentifierName}({parameterList})";`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`private string GetSignature(FunctionDeclaration member)`
`102`	`102`	`{`
`103`		`- var accessibility = member.Accessibility.CodeString();`
	`103`	`+ var accessibility = member.Accessibility.TokenString();`
`104`	`104`	`var parameterList = string.Join(", ", Parameters.Select(p => p.Name));`
`105`	`105`	`return $"{accessibility} Function {member.IdentifierName}({parameterList}) As {member.AsTypeName}";`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`private string GetSignature(EventDeclaration member)`
`109`	`109`	`{`
`110`		`- var access = member.Accessibility.CodeString();`
	`110`	`+ var access = member.Accessibility.TokenString();`
`111`	`111`	`var parameters = string.Join(", ", Parameters.Select(p => p.Name));`
`112`	`112`	`return $"{access} Event {member.IdentifierName}({parameters})";`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private string GetSignature(PropertyGetDeclaration member)`
`116`	`116`	`{`
`117`		`- var access = member.Accessibility.CodeString();`
	`117`	`+ var access = member.Accessibility.TokenString();`
`118`	`118`	`var parameters = string.Join(", ", Parameters.Select(p => p.Name));`
`119`	`119`	`return $"{access} Property Get {member.IdentifierName}({parameters}) As {member.AsTypeName}";`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`private string GetSignature(PropertyLetDeclaration member)`
`123`	`123`	`{`
`124`		`- var access = member.Accessibility.CodeString();`
	`124`	`+ var access = member.Accessibility.TokenString();`
`125`	`125`	`var selectedParams = Parameters.Select(s => s.Name).ToList();`
`126`	`126`	`selectedParams.Add(new Parameter(member.Parameters.Last(), -1).Name);`
`127`	`127`	`var parameters = string.Join(", ", selectedParams);`
`@@ -130,7 +130,7 @@ private string GetSignature(PropertyLetDeclaration member)`
`130`	`130`
`131`	`131`	`private string GetSignature(PropertySetDeclaration member)`
`132`	`132`	`{`
`133`		`- var access = member.Accessibility.CodeString();`
	`133`	`+ var access = member.Accessibility.TokenString();`
`134`	`134`	`var selectedParams = Parameters.Select(s => s.Name).ToList();`
`135`	`135`	`selectedParams.Add(new Parameter(member.Parameters.Last(), -1).Name);`
`136`	`136`	`var parameters = string.Join(", ", selectedParams);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static class AccessibilityExtensions`
`16`	`16`	`/// Gets the string/token representation of an accessibility specifier.`
`17`	`17`	`/// </summary>`
`18`	`18`	`/// <remarks>Implicit accessibility being unspecified, yields an empty string.</remarks>`
`19`		`- public static string CodeString(this Accessibility access)`
	`19`	`+ public static string TokenString(this Accessibility access)`
`20`	`20`	`{`
`21`	`21`	`return access == Accessibility.Implicit ? string.Empty : access.ToString();`
`22`	`22`	`}`