ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

removing string.Format redundancy to WriteLine calls (#1612)

Browse Source
This commit is contained in:
Jordan Hays
2022-07-30 03:27:33 -04:00
committed by GitHub
parent fd00114a0e
commit be37dba620
2 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoQueryModel.tt
View File

@@ -46,8 +46,8 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
string queryBaseClass = "SmoQuerier"; string queryBaseClass = "SmoQuerier";
PushIndent(indent); PushIndent(indent);
WriteLine(""); WriteLine("");
WriteLine(string.Format("[Export(typeof({0}))]", queryBaseClass)); WriteLine("[Export(typeof({0}))]", queryBaseClass);
WriteLine(string.Format("internal partial class {0}Querier: {1}", nodeName, queryBaseClass)); WriteLine("internal partial class {0}Querier: {1}", nodeName, queryBaseClass);
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
@@ -56,7 +56,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (!string.IsNullOrWhiteSpace(validFor)) if (!string.IsNullOrWhiteSpace(validFor))
{ {
WriteLine(""); WriteLine("");
WriteLine(string.Format("public override ValidForFlag ValidFor {{ get {{ return {0}; }} }}", GetValidForFlags(validFor))); WriteLine("public override ValidForFlag ValidFor {{ get {{ return {0}; }} }}", GetValidForFlags(validFor));
WriteLine(""); WriteLine("");
} }
@@ -68,13 +68,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
WriteLine("public override IEnumerable<SqlSmoObject> Query(SmoQueryContext context, string filter, bool refresh, IEnumerable<string> extraProperties)"); WriteLine("public override IEnumerable<SqlSmoObject> Query(SmoQueryContext context, string filter, bool refresh, IEnumerable<string> extraProperties)");
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
WriteLine(string.Format("Logger.Verbose(\"Begin query {0}\");", nodeType)); WriteLine("Logger.Verbose(\"Begin query {0}\");", nodeType);
// TODO Allow override of the navigation path // TODO Allow override of the navigation path
foreach(var parentType in parents) foreach(var parentType in parents)
{ {
string parentVar = string.Format("parent{0}", parentType); string parentVar = string.Format("parent{0}", parentType);
WriteLine(string.Format("{0} {1} = context.Parent as {0};", parentType, parentVar)); WriteLine("{0} {1} = context.Parent as {0};", parentType, parentVar);
WriteLine(string.Format("if ({0} != null)", parentVar)); WriteLine("if ({0} != null)", parentVar);
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
@@ -84,7 +84,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
string fieldType = GetNavPathAttribute(navPathElement, "FieldType"); string fieldType = GetNavPathAttribute(navPathElement, "FieldType");
WriteLine(string.Format("var retValue = {0}.{1};", parentVar, navigationPath)); WriteLine("var retValue = {0}.{1};", parentVar, navigationPath);
WriteLine("if (retValue != null)"); WriteLine("if (retValue != null)");
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
@@ -92,30 +92,30 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (IsCollection(nodeElement)) if (IsCollection(nodeElement))
{ {
WriteLine(string.Format("retValue.ClearAndInitialize(filter, extraProperties);")); WriteLine("retValue.ClearAndInitialize(filter, extraProperties);");
if (string.IsNullOrEmpty(subField) ) if (string.IsNullOrEmpty(subField) )
{ {
WriteLine(string.Format("var ret = new SmoCollectionWrapper<{0}>(retValue).Where(c => PassesFinalFilters({1}, c));", nodeType, parentVar)); WriteLine("var ret = new SmoCollectionWrapper<{0}>(retValue).Where(c => PassesFinalFilters({1}, c));", nodeType, parentVar);
WriteLine(string.Format("Logger.Verbose(\"End query {0}\");", nodeType)); WriteLine("Logger.Verbose(\"End query {0}\");", nodeType);
WriteLine("return ret;"); WriteLine("return ret;");
} }
else else
{ {
WriteLine(string.Format("List<{0}> subFieldResult = new List<{0}>();", nodeType)); WriteLine("List<{0}> subFieldResult = new List<{0}>();", nodeType);
WriteLine(string.Format("foreach({0} field in retValue)", fieldType)); WriteLine("foreach({0} field in retValue)", fieldType);
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
WriteLine(string.Format("{0} subField = field.{1};", nodeType, subField)); WriteLine("{0} subField = field.{1};", nodeType, subField);
WriteLine(string.Format("if (subField != null)")); WriteLine("if (subField != null)");
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
WriteLine(string.Format("subFieldResult.Add(subField);")); WriteLine("subFieldResult.Add(subField);");
PopIndent(); PopIndent();
WriteLine("}"); WriteLine("}");
PopIndent(); PopIndent();
WriteLine("}"); WriteLine("}");
WriteLine(string.Format("var ret = subFieldResult.Where(c => PassesFinalFilters({1}, c));", nodeType, parentVar)); WriteLine("var ret = subFieldResult.Where(c => PassesFinalFilters({1}, c));", nodeType, parentVar);
WriteLine(string.Format("Logger.Verbose(\"End query {0}\");", nodeType)); WriteLine("Logger.Verbose(\"End query {0}\");", nodeType);
WriteLine("return ret;"); WriteLine("return ret;");
} }
} }
@@ -124,7 +124,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
WriteLine("if (refresh)"); WriteLine("if (refresh)");
WriteLine("{"); WriteLine("{");
PushIndent(indent); PushIndent(indent);
WriteLine(string.Format("{0}.{1}.Refresh();", parentVar, navigationPath)); WriteLine("{0}.{1}.Refresh();", parentVar, navigationPath);
PopIndent(); PopIndent();
WriteLine("}"); WriteLine("}");
WriteLine("return new SqlSmoObject[] { retValue };"); WriteLine("return new SqlSmoObject[] { retValue };");

38
src/Microsoft.SqlTools.ServiceLayer/ObjectExplorer/SmoModel/SmoTreeNodes.tt
View File

@@ -71,13 +71,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
foreach (var TreeNode in allTreeNodes) foreach (var TreeNode in allTreeNodes)
{ {
var name = TreeNode.GetAttribute("Name"); var name = TreeNode.GetAttribute("Name");
WriteLine(string.Format(" internal sealed partial class {0} : SmoTreeNode", name)); WriteLine(" internal sealed partial class {0} : SmoTreeNode", name);
WriteLine(" {"); WriteLine(" {");
WriteLine(string.Format(" public {0}() : base()", name)); WriteLine(" public {0}() : base()", name);
WriteLine(" {"); WriteLine(" {");
WriteLine(" NodeValue = string.Empty;"); WriteLine(" NodeValue = string.Empty;");
WriteLine(string.Format(" this.NodeType = \"{0}\";", name.Replace("TreeNode", string.Empty))); WriteLine(" this.NodeType = \"{0}\";", name.Replace("TreeNode", string.Empty));
WriteLine(string.Format(" this.NodeTypeId = NodeTypes.{0};", name.Replace("TreeNode", string.Empty))); WriteLine(" this.NodeTypeId = NodeTypes.{0};", name.Replace("TreeNode", string.Empty));
WriteLine(" OnInitialize();"); WriteLine(" OnInitialize();");
WriteLine(" }"); WriteLine(" }");
WriteLine(" }"); WriteLine(" }");
@@ -110,10 +110,10 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
WriteLine(" [Export(typeof(ChildFactory))]"); WriteLine(" [Export(typeof(ChildFactory))]");
WriteLine(" [Shared]"); WriteLine(" [Shared]");
WriteLine(string.Format(" internal partial class {0}ChildFactory : {1}", type, childFactoryBaseClass)); WriteLine(" internal partial class {0}ChildFactory : {1}", type, childFactoryBaseClass);
WriteLine(" {"); WriteLine(" {");
WriteLine(string.Format(" public override IEnumerable<string> ApplicableParents() {{ return new[] {{ \"{0}\" }}; }}", type)); WriteLine(" public override IEnumerable<string> ApplicableParents() {{ return new[] {{ \"{0}\" }}; }}", type);
List<XmlElement> children = GetChildren(xmlFile, type); List<XmlElement> children = GetChildren(xmlFile, type);
List<XmlElement> smoProperties = GetNodeSmoProperties(xmlFile, type); List<XmlElement> smoProperties = GetNodeSmoProperties(xmlFile, type);
@@ -220,11 +220,11 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
WriteLine(" properties.Add(new NodeSmoProperty"); WriteLine(" properties.Add(new NodeSmoProperty");
WriteLine(" {"); WriteLine(" {");
WriteLine(string.Format(" Name = \"{0}\",", propertyName)); WriteLine(" Name = \"{0}\",", propertyName);
if (!string.IsNullOrWhiteSpace(validFor)) if (!string.IsNullOrWhiteSpace(validFor))
{ {
WriteLine(string.Format(" ValidFor = {0}", GetValidForFlags(validFor))); WriteLine(" ValidFor = {0}", GetValidForFlags(validFor));
} }
WriteLine(" });"); WriteLine(" });");
} }
@@ -253,15 +253,15 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (TreeNodeExists(xmlFile, child.GetAttribute("Name") + "TreeNode")) if (TreeNodeExists(xmlFile, child.GetAttribute("Name") + "TreeNode"))
{ {
WriteLine(string.Format(" currentChildren.Add(new {0}TreeNode {{ SortPriority = SmoTreeNode.NextSortPriority }} );", child.GetAttribute("Name"))); WriteLine(" currentChildren.Add(new {0}TreeNode {{ SortPriority = SmoTreeNode.NextSortPriority }} );", child.GetAttribute("Name"));
} }
else else
{ {
WriteLine(" currentChildren.Add(new FolderNode {"); WriteLine(" currentChildren.Add(new FolderNode {");
WriteLine(string.Format(" NodeValue = {0},", childAsXmlElement.GetAttribute("LocLabel"))); WriteLine(" NodeValue = {0},", childAsXmlElement.GetAttribute("LocLabel"));
WriteLine(string.Format(" NodeType = \"{0}\",", "Folder")); WriteLine(" NodeType = \"{0}\",", "Folder");
WriteLine(string.Format(" NodeTypeId = NodeTypes.{0},", child.GetAttribute("Name"))); WriteLine(" NodeTypeId = NodeTypes.{0},", child.GetAttribute("Name"));
WriteLine(string.Format(" IsSystemObject = {0},", child.GetAttribute("IsSystemObject") == "1" ? "true" : "false")); WriteLine(" IsSystemObject = {0},", child.GetAttribute("IsSystemObject") == "1" ? "true" : "false");
if (msShippedOwned != null) if (msShippedOwned != null)
{ {
@@ -269,7 +269,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
} }
if (!string.IsNullOrWhiteSpace(validFor)) if (!string.IsNullOrWhiteSpace(validFor))
{ {
WriteLine(string.Format(" ValidFor = {0},", GetValidForFlags(validFor))); WriteLine(" ValidFor = {0},", GetValidForFlags(validFor));
} }
WriteLine(" SortPriority = SmoTreeNode.NextSortPriority,"); WriteLine(" SortPriority = SmoTreeNode.NextSortPriority,");
WriteLine(" });"); WriteLine(" });");
@@ -291,7 +291,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
Write(" return new [] {"); Write(" return new [] {");
foreach (var typeToRe in allTypes) foreach (var typeToRe in allTypes)
{ {
Write(string.Format(" typeof({0}Querier),", typeToRe)); Write(" typeof({0}Querier),", typeToRe);
} }
WriteLine(" };"); WriteLine(" };");
} }
@@ -313,15 +313,13 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
if (!string.IsNullOrEmpty(nodeType)) if (!string.IsNullOrEmpty(nodeType))
{ {
WriteLine(" child.NodeType = \"{0}\";", nodeType);
WriteLine(string.Format(" child.NodeType = \"{0}\";", nodeType));
} }
} }
else else
{ {
var modelNodeChildren = GetNodeElement(xmlFile, TreeNode.Replace("TreeNode",string.Empty)); var modelNodeChildren = GetNodeElement(xmlFile, TreeNode.Replace("TreeNode",string.Empty));
WriteLine(string.Format(" var child = new {0}();", TreeNode)); WriteLine(" var child = new {0}();", TreeNode);
if (modelNodeChildren.ChildNodes.Count == 0) if (modelNodeChildren.ChildNodes.Count == 0)
{ {
WriteLine(" child.IsAlwaysLeaf = true;"); WriteLine(" child.IsAlwaysLeaf = true;");
@@ -332,8 +330,6 @@ namespace Microsoft.SqlTools.ServiceLayer.ObjectExplorer.SmoModel
WriteLine(" child.SortPriority = SmoTreeNode.NextSortPriority;"); WriteLine(" child.SortPriority = SmoTreeNode.NextSortPriority;");
} }
WriteLine(" InitializeChild(parent, child, context);"); WriteLine(" InitializeChild(parent, child, context);");
WriteLine(" return child;"); WriteLine(" return child;");
WriteLine(" }"); WriteLine(" }");
} }