From 343d03e2516792500c804efefb0a87ef84a63b1a Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Mon, 30 Sep 2019 15:16:45 +0300
Subject: [PATCH] [search] ScopedMarkTokens before emit unclassified result.

---
 search/geocoder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/search/geocoder.cpp b/search/geocoder.cpp
index a2836467e1..084d8099c8 100644
--- a/search/geocoder.cpp
+++ b/search/geocoder.cpp
@@ -1510,7 +1510,9 @@ void Geocoder::MatchUnclassified(BaseContext & ctx, size_t curToken)
       return;
     if (type == Model::TYPE_UNCLASSIFIED)
     {
-      EmitResult(ctx, m_context->GetId(), featureId, type, TokenRange(startToken, curToken),
+      auto const tokenRange = TokenRange(startToken, curToken);
+      ScopedMarkTokens mark(ctx.m_tokens, BaseContext::TOKEN_TYPE_UNCLASSIFIED, tokenRange);
+      EmitResult(ctx, m_context->GetId(), featureId, type, tokenRange,
                  nullptr /* geoParts */, true /* allTokensUsed */, exactMatch);
     }
   };