C++: Fix semantic highlighter and tests.

Fixed the chunk size calculation, made the sorting more stable, and
fixed the tests.

Change-Id: I81fcffbf2ce9b63dd81f1a0e251200a31220db88
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index d99e49934d..fbf2766606 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -285,7 +285,10 @@ protected:
 
 static bool sortByLinePredicate(const CheckSymbols::Use &lhs, const CheckSymbols::Use &rhs)
 {
-    return lhs.line < rhs.line;
+    if (lhs.line == rhs.line)
+        return lhs.column < rhs.column;
+    else
+        return lhs.line < rhs.line;
 }
 
 
@@ -325,7 +328,7 @@ CheckSymbols::CheckSymbols(Document::Ptr doc, const LookupContext &context, cons
 
     unsigned line = 0;
     getTokenEndPosition(translationUnit()->ast()->lastToken(), &line, 0);
-    _chunkSize = qMin(50U, line / 200);
+    _chunkSize = qMax(50U, line / 200);
     _usages.reserve(_chunkSize);
 
     _astStack.reserve(200);