Skip to content
Snippets Groups Projects
Commit 302d3f35 authored by Jonas Leder's avatar Jonas Leder
Browse files

fix indent sometimes wrong

parent aec5bf5c
Branches
No related tags found
No related merge requests found
......@@ -19,7 +19,7 @@ while (emptyLines < 2)
input += line;
}
string ParseJsonArray(JArray json, int indent = 0)
string ParseJsonArray(JArray json, int indent = 1)
{
string childDoc = "";
if (json.Count > 0)
......@@ -37,10 +37,10 @@ string ParseJsonArray(JArray json, int indent = 0)
childDoc = GenerateIndent() + "type=\"boolean\",\n" + GenerateIndent() + "example=\"" + firstElement.ToString().ToLower() + "\"\n";
break;
case "Object":
childDoc = GenerateIndent() + "type=\"object\",\n"+ GenerateIndent() + ParseJsonObject((JObject) firstElement, indent + 1) + "\n";
childDoc = GenerateIndent() + "type=\"object\",\n"+ ParseJsonObject((JObject) firstElement) + "\n";
break;
case "Array":
childDoc = GenerateIndent() + "type=\"array\",\n" + GenerateIndent() + ParseJsonArray((JArray) firstElement, indent + 1) + "\n";
childDoc = GenerateIndent() + "type=\"array\",\n" + ParseJsonArray((JArray) firstElement) + "\n";
break;
}
}
......@@ -49,7 +49,7 @@ string ParseJsonArray(JArray json, int indent = 0)
return IndentString(apiDocs, indent);
}
string ParseJsonObject(JObject json, int indent = 0)
string ParseJsonObject(JObject json, int indent = 1)
{
string apiDocs = "";
foreach (JProperty token in json.Children())
......@@ -69,10 +69,10 @@ string ParseJsonObject(JObject json, int indent = 0)
childDoc = GenerateIndent() + "type=\"boolean\",\n" + GenerateIndent() + "example=\"" + value.ToString().ToLower() + "\"\n";
break;
case "Object":
childDoc = GenerateIndent() + "type=\"object\",\n"+ GenerateIndent() + ParseJsonObject((JObject) value, indent + 1) + "\n";
childDoc = GenerateIndent() + "type=\"object\",\n"+ ParseJsonObject((JObject) value) + "\n";
break;
case "Array":
childDoc = GenerateIndent() + "type=\"array\",\n" + GenerateIndent() + ParseJsonArray((JArray) value, indent + 1) + "\n";
childDoc = GenerateIndent() + "type=\"array\",\n" + ParseJsonArray((JArray) value) + "\n";
break;
}
......@@ -87,10 +87,10 @@ string ParseJson(string json, int indent = 0)
if (Regex.IsMatch(json, @"^\s\["))
{
JArray jsonArr = JArray.Parse(json);
return "OA\\JsonContent(\n type=\"array\",\n" + ParseJsonArray(jsonArr, indent + 1) + "),";
return "OA\\JsonContent(\n type=\"array\",\n" + ParseJsonArray(jsonArr) + "),";
}
JObject jsonObj = JObject.Parse(json);
return "OA\\JsonContent(\n type=\"object\",\n" + ParseJsonObject(jsonObj, indent + 1) + "),";
return "OA\\JsonContent(\n type=\"object\",\n" + ParseJsonObject(jsonObj) + "),";
}
string IndentString(string stringToIndent, int indent)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment