diff options
| author | Christian Kandeler <[email protected]> | 2022-07-20 18:04:02 +0200 |
|---|---|---|
| committer | Christian Kandeler <[email protected]> | 2022-12-13 09:38:34 +0000 |
| commit | 8d17762bb0fbcc12e20603e3daea29697c52cb57 (patch) | |
| tree | 6787c384f54c9cf2bd07f07bd0f4843cb8125f65 /src/plugins/clangcodemodel/test | |
| parent | 3e49961ae7f4f2b59390a29f4a4523ec33a684ee (diff) | |
ClangCodeModel: Use newly implemented clangd support for operators
We now get a semantic token "operator" from clangd;
see https://reviews.llvm.org/D136594.
As a side effect, this results in the following subtle changes in what
exactly gets highlighted, both of which make sense:
- The type part of a conversion operator is now highlighted as
a type, not an operator.
- We no longer add special highlighting for the brackets in
operator new[] and operator delete[].
Change-Id: Ic149487496768762728a712c9fbcde5c9516529c
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: <[email protected]>
Reviewed-by: David Schulz <[email protected]>
Diffstat (limited to 'src/plugins/clangcodemodel/test')
| -rw-r--r-- | src/plugins/clangcodemodel/test/clangdtests.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/plugins/clangcodemodel/test/clangdtests.cpp b/src/plugins/clangcodemodel/test/clangdtests.cpp index 746a4039f65..c175ac6a31e 100644 --- a/src/plugins/clangcodemodel/test/clangdtests.cpp +++ b/src/plugins/clangcodemodel/test/clangdtests.cpp @@ -719,9 +719,9 @@ void ClangdTestHighlighting::test_data() << QList<int>{C_FUNCTION} << 0; QTest::newRow("function call") << 64 << 5 << 64 << 13 << QList<int>{C_FUNCTION} << 0; QTest::newRow("type conversion function (struct)") << 68 << 14 << 68 << 17 - << QList<int>{C_TYPE, C_OPERATOR, C_DECLARATION} << 0; + << QList<int>{C_TYPE} << 0; QTest::newRow("type conversion function (built-in)") << 69 << 14 << 69 << 17 - << QList<int>{C_PRIMITIVE_TYPE, C_OPERATOR, C_DECLARATION} << 0; + << QList<int>{C_PRIMITIVE_TYPE} << 0; QTest::newRow("type reference") << 74 << 5 << 74 << 8 << QList<int>{C_TYPE} << 0; QTest::newRow("local variable declaration") << 79 << 9 << 79 << 12 << QList<int>{C_LOCAL, C_DECLARATION} << 0; @@ -836,34 +836,16 @@ void ClangdTestHighlighting::test_data() << QList<int>{C_LOCAL} << 0; QTest::newRow("operator new[] member declaration (keyword)") << 623 << 20 << 623 << 23 << QList<int>{C_KEYWORD, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; - QTest::newRow("operator new[] member declaration (opening bracket)") << 623 << 23 << 623 << 24 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; - QTest::newRow("operator new[] member declaration (closing bracket)") << 623 << 24 << 623 << 25 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; QTest::newRow("operator new[] member call (keyword") << 637 << 19 << 637 << 22 << QList<int>{C_KEYWORD, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; QTest::newRow("operator new[] member call (type argument)") << 637 << 23 << 637 << 28 << QList<int>{C_TYPE} << 0; - QTest::newRow("operator new[] member call (opening bracket)") << 637 << 28 << 637 << 29 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; QTest::newRow("operator new[] member call (size argument)") << 637 << 29 << 637 << 31 << QList<int>{C_NUMBER} << 0; - QTest::newRow("operator new[] member call (closing bracket)") << 637 << 31 << 637 << 32 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; QTest::newRow("operator delete[] member declaration (keyword)") << 624 << 19 << 624 << 25 << QList<int>{C_KEYWORD, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; - QTest::newRow("operator delete[] member declaration (opening bracket)") - << 624 << 25 << 624 << 26 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; - QTest::newRow("operator delete[] member declaration (closing bracket)") - << 624 << 26 << 624 << 27 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR, C_DECLARATION} << 0; QTest::newRow("operator delete[] member call (keyword") << 638 << 5 << 638 << 11 << QList<int>{C_KEYWORD, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; - QTest::newRow("operator delete[] member call (opening bracket)") << 638 << 12 << 638 << 13 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; - QTest::newRow("operator delete[] member call (closing bracket)") << 638 << 13 << 638 << 14 - << QList<int>{C_PUNCTUATION, C_OPERATOR, C_OVERLOADED_OPERATOR} << 0; QTest::newRow("operator new built-in call") << 634 << 14 << 634 << 17 << QList<int>{C_KEYWORD, C_OPERATOR} << 0; QTest::newRow("operator() member declaration (opening paren") << 654 << 20 << 654 << 21 |