Clang: Workaround dot detection for arrow correction

...by explicitly checking for the dot in the source.

Task-number: QTCREATORBUG-15654
Change-Id: I4172e88a7fbb3015ef391daf13ded1f0002aab9c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>

3 files changed, 52 insertions, 0 deletions

diff --git a/tests/unit/unittest/codecompletiontest.cpp b/tests/unit/unittest/codecompletiontest.cpp
index d7a6cba623..3b2eff7d82 100644
--- a/tests/unit/unittest/codecompletiontest.cpp
+++ b/tests/unit/unittest/codecompletiontest.cpp
@@ -148,6 +148,12 @@ protected:
         readFileContent(QStringLiteral("/complete_withNoDotArrowCorrectionForOnlyDot.cpp")),
         true
     };
+    ClangBackEnd::FileContainer noDotArrowCorrectionForColonColonFileContainer{
+        Utf8StringLiteral(TESTDATA_DIR"/complete_withNoDotArrowCorrectionForColonColon.cpp"),
+        projectPart.projectPartId(),
+        readFileContent(QStringLiteral("/complete_withNoDotArrowCorrectionForColonColon.cpp")),
+        true
+    };
 };
 
 Utf8String CodeCompleter::readFileContent(const QString &fileName)
@@ -295,6 +301,22 @@ TEST_F(CodeCompleter, ArrowCompletion)
                 ClangBackEnd::CompletionCorrection::NoCorrection);
 }
 
+TEST_F(CodeCompleter, HasDotAt)
+{
+    auto myCompleter = setupCompleter(dotArrowCorrectionForPointerFileContainer);
+
+    ASSERT_TRUE(myCompleter.hasDotAt(5, 8));
+}
+
+TEST_F(CodeCompleter, HasNoDotAtDueToMissingUnsavedFile)
+{
+    const ClangBackEnd::FileContainer fileContainer = dotArrowCorrectionForPointerFileContainer;
+    translationUnits.create({fileContainer});
+    ClangBackEnd::CodeCompleter myCompleter(translationUnits.translationUnit(fileContainer));
+
+    ASSERT_FALSE(myCompleter.hasDotAt(5, 8));
+}
+
 TEST_F(CodeCompleter, DotToArrowCompletionForPointer)
 {
     auto myCompleter = setupCompleter(dotArrowCorrectionForPointerFileContainer);
@@ -374,6 +396,14 @@ TEST_F(CodeCompleter, NoDotArrowCorrectionForOnlyDot)
     ASSERT_THAT(myCompleter.neededCorrection(), ClangBackEnd::CompletionCorrection::NoCorrection);
 }
 
+TEST_F(CodeCompleter, NoDotArrowCorrectionForColonColon)
+{
+    auto myCompleter = setupCompleter(noDotArrowCorrectionForColonColonFileContainer);
+    const ClangBackEnd::CodeCompletions completions = myCompleter.complete(1, 7);
+
+    ASSERT_THAT(myCompleter.neededCorrection(), ClangBackEnd::CompletionCorrection::NoCorrection);
+}
+
 ClangBackEnd::CodeCompleter CodeCompleter::setupCompleter(
         const ClangBackEnd::FileContainer &fileContainer)
 {
diff --git a/tests/unit/unittest/data/complete_withNoDotArrowCorrectionForColonColon.cpp b/tests/unit/unittest/data/complete_withNoDotArrowCorrectionForColonColon.cpp
new file mode 100644
index 0000000000..62af4343c1
--- /dev/null
+++ b/tests/unit/unittest/data/complete_withNoDotArrowCorrectionForColonColon.cpp
@@ -0,0 +1 @@
+Blah::
diff --git a/tests/unit/unittest/unsavedfiletest.cpp b/tests/unit/unittest/unsavedfiletest.cpp
index aa54550f2d..80f22ded35 100644
--- a/tests/unit/unittest/unsavedfiletest.cpp
+++ b/tests/unit/unittest/unsavedfiletest.cpp
@@ -150,4 +150,25 @@ TEST_F(UnsavedFile, Replace)
     ASSERT_THAT(unsavedFile, IsUnsavedFile(filePath, expectedContent, expectedContent.byteSize()));
 }
 
+TEST_F(UnsavedFile, HasNoCharacterForTooBigOffset)
+{
+    ::UnsavedFile unsavedFile(filePath, fileContent);
+
+    ASSERT_FALSE(unsavedFile.hasCharacterAt(100, 'x'));
+}
+
+TEST_F(UnsavedFile, HasNoCharacterForWrongOffset)
+{
+    ::UnsavedFile unsavedFile(filePath, fileContent);
+
+    ASSERT_FALSE(unsavedFile.hasCharacterAt(0, 'x'));
+}
+
+TEST_F(UnsavedFile, HasCharacterForCorrectOffset)
+{
+    ::UnsavedFile unsavedFile(filePath, fileContent);
+
+    ASSERT_TRUE(unsavedFile.hasCharacterAt(0, 'c'));
+}
+
 } // anonymous namespace