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

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Conflicts:
	src/plugins/webassembly/webassemblyrunconfiguration.cpp
	src/tools/processlauncher/launchersockethandler.cpp

Change-Id: Iab052af98013aa59282c16f22ae6e9ecb32f50c4
This commit is contained in:
Eike Ziller
2022-04-20 16:12:41 +02:00
parent 80d4c54d2a d0a192064e
commit 3b2134711b
99 changed files with 1785 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/plugins/clangcodemodel/clangdclient.cpp
View File

@@ -677,6 +677,7 @@ public:
void update();
void finalize();
void resetData(bool resetFollowSymbolData);
private:
IAssistProposal *perform(const AssistInterface *) override
@@ -689,8 +690,6 @@ private:
return createProposal(false);
}
void resetData();
IAssistProposal *immediateProposalImpl() const;
IAssistProposal *createProposal(bool final) const;
CppEditor::VirtualFunctionProposalItem *createEntry(const QString &name,
@@ -726,7 +725,7 @@ public:
{
closeTempDocuments();
if (virtualFuncAssistProcessor)
virtualFuncAssistProcessor->cancel();
virtualFuncAssistProcessor->resetData(false);
for (const MessageId &id : qAsConst(pendingSymbolInfoRequests))
q->cancelRequest(id);
for (const MessageId &id : qAsConst(pendingGotoImplRequests))
@@ -2715,6 +2714,7 @@ private:
const AstNode &m_ast;
const QTextDocument * const m_doc;
const QString &m_docContent;
AstNode::FileStatus m_currentFileStatus = AstNode::FileStatus::Unknown;
};
// clangd reports also the #ifs, #elses and #endifs around the disabled code as disabled,
@@ -2839,11 +2839,16 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
return true;
if (it->kind() == "Call") {
// In class templates, member calls can result in "Call" nodes rather than
// "CXXMemberCall". We try to detect this by checking for a certain kind of
// child node.
// The first child is e.g. a called lambda or an object on which
// the call happens, and should not be highlighted as an output argument.
// If the call is not fully resolved (as in templates), we don't
// know whether the argument is passed as const or not.
if (it->arcanaContains("dependent type"))
return false;
const QList<AstNode> children = it->children().value_or(QList<AstNode>());
return children.isEmpty() || children.first().kind() != "CXXDependentScopeMember";
return children.isEmpty()
|| (children.first().range() != (it - 1)->range()
&& children.first().kind() != "UnresolvedLookup");
}
// The token should get marked for e.g. lambdas, but not for assignment operators,
@@ -2863,7 +2868,7 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
// The callable is never displayed as an output parameter.
// TODO: A good argument can be made to display objects on which a non-const
// operator or function is called as output parameters.
if (children.at(1).range() == range)
if (children.at(1).range().contains(range))
return false;
QList<AstNode> firstChildTree{children.first()};
@@ -2883,6 +2888,8 @@ static void semanticHighlighter(QFutureInterface<HighlightingResult> &future,
if (it->kind() == "Lambda")
return false;
if (it->kind() == "BinaryOperator")
return false;
if (it->hasConstType())
return false;
@@ -3110,7 +3117,7 @@ void ClangdClient::Private::handleSemanticTokens(TextDocument *doc,
void ClangdClient::VirtualFunctionAssistProcessor::cancel()
{
resetData();
resetData(true);
}
void ClangdClient::VirtualFunctionAssistProcessor::update()
@@ -3132,15 +3139,16 @@ void ClangdClient::VirtualFunctionAssistProcessor::finalize()
} else {
setAsyncProposalAvailable(proposal);
}
resetData();
resetData(true);
}
void ClangdClient::VirtualFunctionAssistProcessor::resetData()
void ClangdClient::VirtualFunctionAssistProcessor::resetData(bool resetFollowSymbolData)
{
if (!m_data)
return;
m_data->followSymbolData->virtualFuncAssistProcessor = nullptr;
m_data->followSymbolData.reset();
if (resetFollowSymbolData)
m_data->followSymbolData.reset();
m_data = nullptr;
}
@@ -3503,6 +3511,8 @@ QIcon ClangdCompletionItem::icon() const
case SpecialQtType::None:
break;
}
if (item().kind().value_or(CompletionItemKind::Text) == CompletionItemKind::Property)
return Utils::CodeModelIcon::iconForType(Utils::CodeModelIcon::VarPublicStatic);
return LanguageClientCompletionItem::icon();
}
@@ -4080,7 +4090,13 @@ void ExtraHighlightingResultsCollector::visitNode(const AstNode &node)
{
if (m_future.isCanceled())
return;
switch (node.fileStatus(m_filePath)) {
const AstNode::FileStatus prevFileStatus = m_currentFileStatus;
m_currentFileStatus = node.fileStatus(m_filePath);
if (m_currentFileStatus == AstNode::FileStatus::Unknown
&& prevFileStatus != AstNode::FileStatus::Ours) {
m_currentFileStatus = prevFileStatus;
}
switch (m_currentFileStatus) {
case AstNode::FileStatus::Ours:
case AstNode::FileStatus::Unknown:
collectFromNode(node);
@@ -4095,6 +4111,7 @@ void ExtraHighlightingResultsCollector::visitNode(const AstNode &node)
break;
}
}
m_currentFileStatus = prevFileStatus;
}
bool ClangdClient::FollowSymbolData::defLinkIsAmbiguous() const

3
src/plugins/clangcodemodel/test/clangautomationutils.h
View File

@@ -27,8 +27,9 @@
#include <texteditor/codeassist/iassistproposalmodel.h>
#include <QString>
#include <QList>
#include <QSharedPointer>
#include <QString>
namespace TextEditor { class BaseTextEditor; }

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

@@ -1321,6 +1321,14 @@ void ClangdTestHighlighting::test_data()
<< QList<int>{C_FIELD} << 0;
QTest::newRow("member call on dependent (3)") << 999 << 9 << 999 << 12
<< QList<int>{C_LOCAL} << 0;
QTest::newRow("member access via operator->") << 1009 << 7 << 1009 << 21
<< QList<int>{C_FIELD} << 0;
QTest::newRow("lambda call in member") << 1023 << 9 << 1023 << 15
<< QList<int>{C_LOCAL} << 0;
QTest::newRow("call on inherited member") << 1024 << 9 << 1024 << 12
<< QList<int>{C_FIELD} << 0;
QTest::newRow("pass inherited member by value") << 1038 << 21 << 1038 << 26
<< QList<int>{C_FIELD} << 0;
}
void ClangdTestHighlighting::test()
@@ -1423,12 +1431,12 @@ void ClangdTestHighlighting::test()
void ClangdTestHighlighting::testIfdefedOutBlocks()
{
QCOMPARE(m_ifdefedOutBlocks.size(), 3);
QCOMPARE(m_ifdefedOutBlocks.at(0).first(), 12033);
QCOMPARE(m_ifdefedOutBlocks.at(0).last(), 12050);
QCOMPARE(m_ifdefedOutBlocks.at(1).first(), 13351);
QCOMPARE(m_ifdefedOutBlocks.at(1).last(), 13364);
QCOMPARE(m_ifdefedOutBlocks.at(2).first(), 13390);
QCOMPARE(m_ifdefedOutBlocks.at(2).last(), 13402);
QCOMPARE(m_ifdefedOutBlocks.at(0).first(), 12056);
QCOMPARE(m_ifdefedOutBlocks.at(0).last(), 12073);
QCOMPARE(m_ifdefedOutBlocks.at(1).first(), 13374);
QCOMPARE(m_ifdefedOutBlocks.at(1).last(), 13387);
QCOMPARE(m_ifdefedOutBlocks.at(2).first(), 13413);
QCOMPARE(m_ifdefedOutBlocks.at(2).last(), 13425);
}

43
src/plugins/clangcodemodel/test/data/highlighting/highlighting.cpp
View File

@@ -5,7 +5,7 @@ auto *rawVariable = R"(Vari
auto Character = 'c';
namespace std {
template<typename T> class vector {};
template<typename T> class vector { public: void clear(); };
template<typename T, typename U> class pair {};
}
@@ -999,3 +999,44 @@ public:
ptr->bar();
}
};
namespace std { template<typename T> struct optional { T* operator->(); }; }
struct structWithData { int value; };
struct structWithOptional { std::optional<structWithData> opt_my_struct1; };
void foo(structWithOptional & s)
{
s.opt_my_struct1->value = 5;
}
class BaseWithMember
{
protected:
std::vector<unsigned char> vec;
};
template<typename T> class Derived : public BaseWithMember
{
void foo()
{
auto lambda = [&] {};
lambda();
vec.clear();
}
};
static bool testVal(int val);
class BaseWithMember2
{
protected:
int value;
};
template<typename T> class Derived2 : public BaseWithMember2
{
bool foo()
{
if (testVal(value))
return true;
return false;
}
};