feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: I552d201d09d62d21655176467088c6e48b8a2fe2
This commit is contained in:
Eike Ziller
2022-06-29 15:29:49 +02:00
parent 75b5d1baf1 56faa204bd
commit 6c98721efc
99 changed files with 1318 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/clangcodemodel/clangdsemantichighlighting.cpp
View File

@@ -342,7 +342,7 @@ void doSemanticHighlighting(
} else if (token.type == "parameter") {
styles.mainStyle = C_PARAMETER;
} else if (token.type == "macro") {
styles.mainStyle = C_PREPROCESSOR;
styles.mainStyle = C_MACRO;
} else if (token.type == "type") {
styles.mainStyle = C_TYPE;
} else if (token.type == "typeParameter") {
@@ -406,7 +406,7 @@ void ExtraHighlightingResultsCollector::collect()
{
for (int i = 0; i < m_results.length(); ++i) {
const HighlightingResult res = m_results.at(i);
if (res.textStyles.mainStyle != C_PREPROCESSOR || res.length != 10)
if (res.textStyles.mainStyle != TextEditor::C_MACRO || res.length != 10)
continue;
const int pos = Utils::Text::positionInText(m_doc, res.line, res.column);
if (subViewLen(m_docContent, pos, 10) != QLatin1String("Q_PROPERTY"))
@@ -478,7 +478,7 @@ void ExtraHighlightingResultsCollector::insertResult(const HighlightingResult &r
// location, so it should occur right before the insertion position.
if (it > m_results.begin() && (it - 1)->line == result.line
&& (it - 1)->column == result.column
&& (it - 1)->textStyles.mainStyle == C_PREPROCESSOR) {
&& (it - 1)->textStyles.mainStyle == C_MACRO) {
return;
}
@@ -589,7 +589,7 @@ void ExtraHighlightingResultsCollector::collectFromNode(const ClangdAstNode &nod
const bool isExpression = node.role() == "expression";
if (isExpression && node.kind() == "Predefined") {
insertResult(node, C_PREPROCESSOR);
insertResult(node, C_MACRO);
return;
}

24
src/plugins/clangcodemodel/test/clangdtests.cpp
View File

@@ -889,11 +889,11 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("closing angle bracket in class template declaration") << 261 << 18 << 261 << 19
<< QList<int>{C_PUNCTUATION} << int(CppEditor::SemanticHighlighter::AngleBracketClose);
QTest::newRow("macro definition") << 231 << 9 << 231 << 31
<< QList<int>{C_PREPROCESSOR, C_DECLARATION} << 0;
<< QList<int>{C_MACRO, C_DECLARATION} << 0;
QTest::newRow("function-like macro definition") << 232 << 9 << 232 << 24
<< QList<int>{C_PREPROCESSOR, C_DECLARATION} << 0;
<< QList<int>{C_MACRO, C_DECLARATION} << 0;
QTest::newRow("function-like macro call") << 236 << 5 << 236 << 20
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("function-like macro call argument 1") << 236 << 21 << 236 << 22
<< QList<int>{C_NUMBER} << 0;
QTest::newRow("function-like macro call argument 2") << 236 << 24 << 236 << 25
@@ -1054,7 +1054,7 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("using declaration for function template") << 584 << 10 << 584 << 16
<< QList<int>{C_FUNCTION} << 0;
QTest::newRow("Q_PROPERTY (macro name)") << 599 << 5 << 599 << 15
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("Q_PROPERTY (property name)") << 599 << 52 << 599 << 56
<< QList<int>{C_FIELD} << 0;
QTest::newRow("Q_PROPERTY (READ keyword)") << 599 << 57 << 599 << 61
@@ -1078,7 +1078,7 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("Q_PROPERTY (REVISION keyword [new])") << 600 << 46 << 600 << 54
<< QList<int>{C_KEYWORD} << 0;
QTest::newRow("multi-line Q_PROPERTY (macro name)") << 704 << 5 << 704 << 15
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("multi-line Q_PROPERTY (property name)") << 718 << 13 << 718 << 17
<< QList<int>{C_FIELD} << 0;
QTest::newRow("multi-line Q_PROPERTY (getter)") << 722 << 13 << 722 << 20
@@ -1086,19 +1086,19 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("multi-line Q_PROPERTY (notifier)") << 730 << 13 << 730 << 24
<< QList<int>{C_FUNCTION} << 0;
QTest::newRow("old-style signal (macro)") << 672 << 5 << 672 << 11
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("old-style signal (signal)") << 672 << 12 << 672 << 21
<< QList<int>{C_FUNCTION} << 0;
QTest::newRow("old-style signal (signal parameter)") << 672 << 22 << 672 << 29
<< QList<int>{C_TYPE} << 0;
QTest::newRow("old-style slot (macro)") << 673 << 5 << 673 << 9
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("old-style slot (slot)") << 673 << 10 << 673 << 19
<< QList<int>{C_FUNCTION} << 0;
QTest::newRow("old-style slot (slot parameter)") << 673 << 20 << 673 << 27
<< QList<int>{C_TYPE} << 0;
QTest::newRow("old-style signal with complex parameter (macro)") << 674 << 5 << 674 << 11
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("old-style signal with complex parameter (signal)") << 674 << 12 << 674 << 21
<< QList<int>{C_FUNCTION} << 0;
QTest::newRow("old-style signal with complex parameter (signal parameter part 1)")
@@ -1246,7 +1246,7 @@ void ClangdTestHighlighting::test_data()
<< QList<int>{C_PUNCTUATION} << int(CppEditor::SemanticHighlighter::AngleBracketClose);
QTest::newRow("cyrillic string") << 792 << 24 << 792 << 27 << QList<int>{C_STRING} << 0;
QTest::newRow("macro in struct") << 795 << 9 << 795 << 14
<< QList<int>{C_PREPROCESSOR, C_DECLARATION} << 0;
<< QList<int>{C_MACRO, C_DECLARATION} << 0;
QTest::newRow("#ifdef'ed out code") << 800 << 1 << 800 << 17
<< QList<int>{C_DISABLED_CODE} << 0;
QTest::newRow("static function call (object)") << 819 << 5 << 819 << 6
@@ -1298,11 +1298,11 @@ void ClangdTestHighlighting::test_data()
QTest::newRow("output arg") << 945 << 20 << 945 << 23
<< QList<int>{C_LOCAL, C_OUTPUT_ARGUMENT} << 0;
QTest::newRow("built-in define 1") << 950 << 21 << 950 << 29
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("built-in define 2") << 951 << 21 << 951 << 33
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("built-in define 3") << 952 << 21 << 952 << 40
<< QList<int>{C_PREPROCESSOR} << 0;
<< QList<int>{C_MACRO} << 0;
QTest::newRow("deref operator (object)") << 960 << 10 << 960 << 11 << QList<int>{C_LOCAL} << 0;
QTest::newRow("deref operator (member)") << 960 << 12 << 960 << 13 << QList<int>{C_FIELD} << 0;
QTest::newRow("nested call") << 979 << 20 << 979 << 21 << QList<int>{C_LOCAL} << 0;