From 712a1dcecd64ee89d3fd63f08cb1610b8aa08178 Mon Sep 17 00:00:00 2001 From: Renze Yu Date: Fri, 13 May 2016 10:44:16 +0800 Subject: [PATCH] fix error when loop cref #289 --- .../BuildOutputs/ApiCrefInfoBuildOutput.cs | 10 +++++----- .../BuildOutputs/ApiParameterBuildOutput.cs | 6 +++--- .../BuildOutputs/ApiReferenceBuildOutput.cs | 6 +++--- .../BuildOutputs/ApiSyntaxBuildOutput.cs | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiCrefInfoBuildOutput.cs b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiCrefInfoBuildOutput.cs index e995d91b31a..00468301ea0 100644 --- a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiCrefInfoBuildOutput.cs +++ b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiCrefInfoBuildOutput.cs @@ -15,14 +15,14 @@ namespace Microsoft.DocAsCode.Build.ManagedReference.BuildOutputs public class ApiCrefInfoBuildOutput { [YamlMember(Alias = "type")] - [JsonProperty("type")] + [JsonProperty("type", IsReference = true)] public ApiReferenceBuildOutput Type { get; set; } [YamlMember(Alias = "description")] [JsonProperty("description")] public string Description { get; set; } - private bool _isExpanded = false; + private bool _needExpand = true; public static ApiCrefInfoBuildOutput FromModel(CrefInfo model) { @@ -43,16 +43,16 @@ public static ApiCrefInfoBuildOutput FromModel(CrefInfo model, Dictionary references, string[] supportedLanguages) { - if (!_isExpanded) + if (_needExpand) { + _needExpand = false; Type = ApiBuildOutputUtility.GetReferenceViewModel(Type?.Uid, references, supportedLanguages); - _isExpanded = true; } } } diff --git a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiParameterBuildOutput.cs b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiParameterBuildOutput.cs index 9eb79cd2e34..9f2a1272697 100644 --- a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiParameterBuildOutput.cs +++ b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiParameterBuildOutput.cs @@ -26,7 +26,7 @@ public class ApiParameterBuildOutput [JsonProperty("description")] public string Description { get; set; } - private bool _isExpanded = false; + private bool _needExpand = true; public static ApiParameterBuildOutput FromModel(ApiParameter model, Dictionary references, string[] supportedLanguages) { @@ -54,10 +54,10 @@ public static ApiParameterBuildOutput FromModel(ApiParameter model) public void Expand(Dictionary references, string[] supportedLanguages) { - if (!_isExpanded) + if (_needExpand) { + _needExpand = false; Type = ApiBuildOutputUtility.GetReferenceViewModel(Type?.Uid, references, supportedLanguages); - _isExpanded = true; } } } diff --git a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiReferenceBuildOutput.cs b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiReferenceBuildOutput.cs index 03a759eff4e..4e38f9cbcae 100644 --- a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiReferenceBuildOutput.cs +++ b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiReferenceBuildOutput.cs @@ -151,7 +151,7 @@ public Dictionary MetadataJson set { } } - private bool _isExpanded = false; + private bool _needExpand = true; public static ApiReferenceBuildOutput FromUid(string uid) { @@ -231,14 +231,14 @@ public static ApiReferenceBuildOutput FromModel(ItemViewModel vm) public void Expand(Dictionary references, string[] supportedLanguages) { - if (!_isExpanded) + if (_needExpand) { + _needExpand = false; Inheritance = Inheritance?.Select(i => ApiBuildOutputUtility.GetReferenceViewModel(i.Uid, references, supportedLanguages)).ToList(); Syntax?.Expand(references, supportedLanguages); SeeAlsos?.ForEach(e => e.Expand(references, supportedLanguages)); Sees?.ForEach(e => e.Expand(references, supportedLanguages)); Exceptions?.ForEach(e => e.Expand(references, supportedLanguages)); - _isExpanded = true; } } diff --git a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiSyntaxBuildOutput.cs b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiSyntaxBuildOutput.cs index 7c6de5a9724..a594b9c527b 100644 --- a/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiSyntaxBuildOutput.cs +++ b/src/Microsoft.DocAsCode.Build.ManagedReference/BuildOutputs/ApiSyntaxBuildOutput.cs @@ -31,7 +31,7 @@ public class ApiSyntaxBuildOutput [JsonProperty("return")] public ApiParameterBuildOutput Return { get; set; } - private bool _isExpanded = false; + private bool _needExpand = true; public static ApiSyntaxBuildOutput FromModel(SyntaxDetailViewModel model, Dictionary references, string[] supportedLanguages) { @@ -43,7 +43,7 @@ public static ApiSyntaxBuildOutput FromModel(SyntaxDetailViewModel model, Dictio Parameters = model.Parameters?.Select(s => ApiParameterBuildOutput.FromModel(s, references, supportedLanguages)).ToList(), TypeParameters = model.TypeParameters?.Select(s => ApiParameterBuildOutput.FromModel(s)).ToList(), Return = ApiParameterBuildOutput.FromModel(model.Return, references, supportedLanguages), - _isExpanded = true, + _needExpand = false, }; } @@ -63,12 +63,12 @@ public static ApiSyntaxBuildOutput FromModel(SyntaxDetailViewModel model, string public void Expand(Dictionary references, string[] supportedLanguages) { - if (!_isExpanded) + if (_needExpand) { + _needExpand = false; Parameters?.ForEach(p => p.Expand(references, supportedLanguages)); TypeParameters?.ForEach(t => t.Expand(references, supportedLanguages)); Return?.Expand(references, supportedLanguages); - _isExpanded = true; } }