mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #4681 from ethereum/var-suggestion-crash
Fix declaration suggestion for var with different number of components
This commit is contained in:
@@ -1034,7 +1034,10 @@ string createTupleDecl(vector<ASTPointer<VariableDeclaration>> const& _decls)
|
||||
vector<string> components;
|
||||
for (ASTPointer<VariableDeclaration> const& decl: _decls)
|
||||
if (decl)
|
||||
{
|
||||
solAssert(decl->annotation().type, "");
|
||||
components.emplace_back(decl->annotation().type->toString(false) + " " + decl->name());
|
||||
}
|
||||
else
|
||||
components.emplace_back();
|
||||
|
||||
@@ -1052,6 +1055,9 @@ bool typeCanBeExpressed(vector<ASTPointer<VariableDeclaration>> const& decls)
|
||||
if (!decl)
|
||||
continue;
|
||||
|
||||
if (!decl->annotation().type)
|
||||
return false;
|
||||
|
||||
if (auto functionType = dynamic_cast<FunctionType const*>(decl->annotation().type.get()))
|
||||
if (
|
||||
functionType->kind() != FunctionType::Kind::Internal &&
|
||||
|
||||
Reference in New Issue
Block a user