Merge branch 'Treno1-6.x' into 6.x

Author: russcam

src/Nest/Search/Suggesters/SuggestOption.cs

@@ -25,7 +25,7 @@ public class SuggestOption<TDocument> where TDocument : class
 		public long Frequency { get; set; }
 
 		/// <summary>
-		/// Phrase suggester only, higlighted version of text
+		/// Phrase suggester only, highlighted version of text
 		/// </summary>
 		[JsonProperty("highlighted")]
 		public string Highlighted { get; internal set; }
@@ -66,5 +66,8 @@ public class SuggestOption<TDocument> where TDocument : class
 
 		[JsonProperty("score")]
 		internal double? SuggestScore { get; set; }
+		
+		[JsonProperty("fields")]
+		public FieldValues Fields { get; internal set; }
 	}
 }

src/Tests/Tests/Search/Request/SuggestUsageTests.cs

@@ -25,6 +25,7 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 			new
 			{
 				query = ProjectFilterExpectedJson,
+				docvalue_fields = new [] { "state" },
 				suggest = new Dictionary<string, object>
 				{
 					{
@@ -110,6 +111,9 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 
 		protected override Func<SearchDescriptor<Project>, ISearchRequest> Fluent => s => s
 			.Query(q => ProjectFilter)
+			.DocValueFields(d => d
+				.Field(f => f.State)
+			)
 			.Suggest(ss => ss
 				.Term("my-term-suggest", t => t
 					.MaxEdits(1)
@@ -168,6 +172,7 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 			new SearchRequest<Project>
 			{
 				Query = ProjectFilter,
+				DocValueFields = Fields<Project>(f => f.State),
 				Suggest = new SuggestContainer
 				{
 					{
@@ -269,6 +274,8 @@ protected override void ExpectResponse(ISearchResponse<Project> response)
 			option.Source.Name.Should().NotBeNullOrWhiteSpace();
 			option.Source.ShouldAdhereToSourceSerializerWhenSet();
 			option.Score.Should().BeGreaterThan(0);
+			option.Fields.Should().NotBeNull().And.NotBeEmpty();
+			option.Fields.Should().ContainKey("state");
 			option.Contexts.Should().NotBeNull().And.NotBeEmpty();
 			option.Contexts.Should().ContainKey("color");
 			var colorContexts = option.Contexts["color"];