Fix warnings shown by MonoDevelop.Analyzers (#6657)

* [Core] Name is already localized

* Fix up invalid GettextCatalog.GetString calls or optimize them

* Optimize SignatureHelpParameterHintingData appends

* Fix extra allocatins in appends found by string append analyzer

8 files changed, 18 insertions, 11 deletions

diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
index 2caeb0f648..59c75a96bd 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
@@ -716,7 +716,8 @@ namespace MonoDevelop.CSharp.Refactoring
 						var name = Enum.GetName (p.ExplicitDefaultValue.GetType (), p.ExplicitDefaultValue);
 						if (name != null) {
 							AppendReturnType (result, options, p.Type);
-							result.Append ("." + name);
+							result.Append (".");
+							result.Append (name);
 						} else {
 							result.Append ("(");
 							AppendReturnType (result, options, p.Type);
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
index 8f0f0bb29e..f64f56e204 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp.Tooltips/QuickInfoProvider.cs
@@ -84,7 +84,9 @@ namespace MonoDevelop.SourceEditor
 
 			var formatter = ctx.RoslynWorkspace.Services.GetLanguageServices (model.Language).GetService<IDocumentationCommentFormattingService> ();
 			var documentation = symbol.GetDocumentationParts (model, caretOffset, formatter, cancellationToken);
-			sb.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+			sb.Append ("<span font='");
+			sb.Append (FontService.SansFontName);
+			sb.Append("' size='small'>");
 
 			if (documentation != null && documentation.Any ()) {
 				sb.AppendLine ();
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
index 9ef7ed1c24..3fc792ccb1 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.CSharp/SignatureMarkupCreator.cs
@@ -1844,7 +1844,7 @@ namespace MonoDevelop.CSharp
 				if (arrayType.Rank == 1)
 					result.Append ("index");
 				else
-					result.Append ("i").Append (i + 1);
+					result.Append ("i").Append ((i + 1).ToString ());
 				if (doHighightParameter)
 					result.Append ("</u>");
 			}
diff --git a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
index 233d6e4c35..dc90bb5ca3 100644
--- a/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
+++ b/main/src/addins/CSharpBinding/MonoDevelop.Ide.Completion.Presentation/MyRoslynCompletionData.cs
@@ -173,7 +173,9 @@ namespace MonoDevelop.Ide.Completion.Presentation
 			}

 			else {
 				markup.AppendTaggedText (theme, taggedParts.Take (i));
-				markup.Append ("<span font='" + FontService.SansFontName + "' size='small'>");
+				markup.Append ("<span font='");

+				markup.Append (FontService.SansFontName);

+				markup.Append ("' size='small'>");
 				markup.AppendLine ();
 				markup.AppendLine ();
 				markup.AppendTaggedText (theme, taggedParts.Skip (i + 1), 0, 50);
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
index a584b497be..2bc932d588 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/XmlDocIdLib/XmlDocIdGenerator.cs
@@ -395,10 +395,9 @@ namespace XmlDocIdLib
 
             if (tpType.GenericParameters.Count > 0)
             {
-                CurrPath.Append(
-                    tpType.Namespace +
-                    ((CanAppendSpecialExplicitChar() && ExplicitMode) ? "#" : ".") +
-                    StripGenericName(tpType.Name));
+                CurrPath.Append(tpType.Namespace)
+					.Append ((CanAppendSpecialExplicitChar () && ExplicitMode) ? "#" : ".")
+					.Append(StripGenericName(tpType.Name));
 
                 // list parameters or types
                 bool firstAppend = true;
diff --git a/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs b/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
index e61eb4635d..8fa40ae4cb 100644
--- a/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
+++ b/main/src/addins/MonoDevelop.Autotools/CustomMakefile.cs
@@ -117,7 +117,8 @@ namespace MonoDevelop.Autotools
 				foreach (string s in list)
 					sb.AppendFormat (" \\\n\t{0}", s);
 			} else if (list.Count == 1) {
-				sb.Append (" " + list [0]);
+				sb.Append (" ");
+				sb.Append (list [0]);
 			}
 
 			return sb.ToString ();
diff --git a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
index 1f91abddaf..d1e5822717 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
+++ b/main/src/addins/MonoDevelop.UnitTesting/Services/AbstractUnitTestEditorExtension.cs
@@ -325,7 +325,7 @@ namespace MonoDevelop.UnitTesting
 					if (foundTest != null)
 						RunTest (foundTest);
 					else
-						UnitTestService.ReportExecutionError (GettextCatalog.GetString ($"Unit test '{testCase}' could not be loaded."));
+						UnitTestService.ReportExecutionError (GettextCatalog.GetString ("Unit test '{0}' could not be loaded.", testCase));
 				}
 
 				internal void Select (object sender, EventArgs e)
diff --git a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
index acaa0eec15..14c9492527 100644
--- a/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
+++ b/main/src/addins/MonoDevelop.WebReferences/MonoDevelop.WebReferences/Library.cs
@@ -64,7 +64,9 @@ namespace MonoDevelop.WebReferences
 		/// <returns>An XmlDocument containing the generated xml for the specified discovery document.</returns>
 		public static void GenerateDiscoXml (StringBuilder text, DiscoveryDocument doc)
 		{
-			text.Append ("<big><b>" + GettextCatalog.GetString ("Web Service References") + "</b></big>\n\n");
+			text.Append ("<big><b>")
+				.Append (GettextCatalog.GetString ("Web Service References"))
+				.Append ("</b></big>\n\n");
 			foreach (object oref in doc.References)
 			{

 				var dref = oref as DiscoveryReference;