Merge pull request #271 from UnityTech/yczhang1.5.4

zhuxingwei · web-flow · commit bffd0b4df9d3 · 2019-08-14T14:08:54.000+08:00
[Align 1.5.4] Finish foundation part.
diff --git a/Runtime/foundation/diagnostics.cs b/Runtime/foundation/diagnostics.cs
@@ -1421,7 +1421,13 @@ public override string ToString() {
         }
 
         public virtual string toString(DiagnosticLevel minLevel = DiagnosticLevel.debug) {
-            return this.toDiagnosticsNode(style: DiagnosticsTreeStyle.singleLine).toString(minLevel: minLevel);
+            string fullString = null;
+            D.assert(() => {
+                fullString = this.toDiagnosticsNode(style: DiagnosticsTreeStyle.singleLine)
+                    .toString(minLevel: minLevel);
+                return true;
+            });
+            return fullString ?? this.toStringShort();
         }
 
         public virtual DiagnosticsNode toDiagnosticsNode(

Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,13 @@ public override string ToString() {`
`1421`	`1421`	`}`
`1422`	`1422`
`1423`	`1423`	`public virtual string toString(DiagnosticLevel minLevel = DiagnosticLevel.debug) {`
`1424`		`- return this.toDiagnosticsNode(style: DiagnosticsTreeStyle.singleLine).toString(minLevel: minLevel);`
	`1424`	`+ string fullString = null;`
	`1425`	`+ D.assert(() => {`
	`1426`	`+ fullString = this.toDiagnosticsNode(style: DiagnosticsTreeStyle.singleLine)`
	`1427`	`+ .toString(minLevel: minLevel);`
	`1428`	`+ return true;`
	`1429`	`+ });`
	`1430`	`+ return fullString ?? this.toStringShort();`
`1425`	`1431`	`}`
`1426`	`1432`
`1427`	`1433`	`public virtual DiagnosticsNode toDiagnosticsNode(`