Added fields block (docvalue_fields) to SuggestOption #4148

Copied from Hit.cs

(cherry picked from commit 45c4d60)

Author: russcam

src/Nest/Search/Suggesters/SuggestOption.cs

@@ -14,108 +14,116 @@ public interface ISuggestOption<out TDocument> where TDocument : class
 		/// <summary>
 		/// Phrase suggestions only, true if matching documents for the collate query were found,
 		/// </summary>
-		[DataMember(Name ="collate_match")]
+		[DataMember(Name = "collate_match")]
 		bool CollateMatch { get; }
 
 		/// <summary>
 		/// Completion suggester only, the contexts associated with the completed document
 		/// </summary>
-		[DataMember(Name ="contexts")]
+		[DataMember(Name = "contexts")]
 		IDictionary<string, IEnumerable<Context>> Contexts { get; }
 
+		// TODO this should be reported to elastic/elasticsearch
+		[DataMember(Name = "_score")]
+		double? DocumentScore { get; }
+
+		/// <inheritdoc />
+		[DataMember(Name = "fields")]
+		FieldValues Fields { get; }
+
 		/// <summary>
 		/// Term suggester only
 		/// </summary>
-		[DataMember(Name ="freq")]
+		[DataMember(Name = "freq")]
 		long Frequency { get; set; }
 
 		/// <summary>
 		/// Phrase suggester only, highlighted version of text
 		/// </summary>
-		[DataMember(Name ="highlighted")]
+		[DataMember(Name = "highlighted")]
 		string Highlighted { get; }
 
 		/// <summary>
 		/// Completion suggester only, the id of the completed document
 		/// </summary>
-		[DataMember(Name ="_id")]
+		[DataMember(Name = "_id")]
 		string Id { get; }
 
 		/// <summary>
 		/// Completion suggester only, the index of the completed document
 		/// </summary>
-		[DataMember(Name ="_index")]
+		[DataMember(Name = "_index")]
 		IndexName Index { get; }
 
-		/// <summary> Either the <see cref="DocumentScore"/> or the <see cref="SuggestScore"/></summary>
+		/// <summary> Either the <see cref="DocumentScore" /> or the <see cref="SuggestScore" /></summary>
 		[IgnoreDataMember]
 		double Score { get; }
 
 		/// <summary>
 		/// Completion suggester only, the source of the completed document
 		/// </summary>
-		[DataMember(Name ="_source")]
+		[DataMember(Name = "_source")]
 		[JsonFormatter(typeof(SourceFormatter<>))]
 		TDocument Source { get; }
 
-		[DataMember(Name ="text")]
-		string Text { get; }
-
-		// TODO this should be reported to elastic/elasticsearch
-		[DataMember(Name = "_score")]
-		double? DocumentScore { get; }
-
-		[DataMember(Name ="score")]
+		[DataMember(Name = "score")]
 		double? SuggestScore { get; }
+
+		[DataMember(Name = "text")]
+		string Text { get; }
 	}
 
 	/// <inheritdoc />
 	public class SuggestOption<TDocument> : ISuggestOption<TDocument>
 		where TDocument : class
 	{
 		/// <inheritdoc />
-		[DataMember(Name ="collate_match")]
+		[DataMember(Name = "collate_match")]
 		public bool CollateMatch { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="contexts")]
+		[DataMember(Name = "contexts")]
 		public IDictionary<string, IEnumerable<Context>> Contexts { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="freq")]
+		[DataMember(Name = "_score")]
+		public double? DocumentScore { get; internal set; }
+
+		/// <inheritdoc />
+		[DataMember(Name = "fields")]
+		public FieldValues Fields { get; internal set; }
+
+		/// <inheritdoc />
+		[DataMember(Name = "freq")]
 		public long Frequency { get; set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="highlighted")]
+		[DataMember(Name = "highlighted")]
 		public string Highlighted { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="_id")]
+		[DataMember(Name = "_id")]
 		public string Id { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="_index")]
+		[DataMember(Name = "_index")]
 		public IndexName Index { get; internal set; }
 
 		/// <inheritdoc />
 		[IgnoreDataMember]
 		public double Score => DocumentScore ?? SuggestScore ?? 0;
 
 		/// <inheritdoc />
-		[DataMember(Name ="_source")]
+		[DataMember(Name = "_source")]
 		[JsonFormatter(typeof(SourceFormatter<>))]
 		public TDocument Source { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="text")]
-		public string Text { get; internal set; }
-
-		/// <inheritdoc />
-		[DataMember(Name = "_score")]
-		public double? DocumentScore { get; internal set; }
+		[DataMember(Name = "score")]
+		public double? SuggestScore { get; internal set; }
 
 		/// <inheritdoc />
-		[DataMember(Name ="score")]
-		public double? SuggestScore { get; internal set; }
+		[DataMember(Name = "text")]
+		public string Text { get; internal set; }
 	}
 }