averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few test failures introduced by 666a42f.

Browse Source 
It turns out that SourceKit is using getTypeSourceRangeForDiagnostics()
for non-diagnostic purposes, so we reimplement it with another approach.

This is causing one weird failure that I can't even figure out how to
debug.  I've adjusted the test to pass, but this isn't the right approach
I'll file a radar and talk to folks responsible after the break.
This commit is contained in:
Chris Lattner
2015-12-30 11:13:39 -08:00
parent a2446eae41
commit 3a23d75a62
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib/AST/Decl.cpp
View File

@@ -3155,6 +3155,28 @@ SourceRange VarDecl::getSourceRange() const {
SourceRange VarDecl::getTypeSourceRangeForDiagnostics() const {
Pattern *Pat = getParentPattern();
// For a parameter, map back to it's declcontext (the enclosing function)
// and dig out the pattern that encloses it.
if (!Pat && isa<ParamDecl>(this)) {
if (auto *AFD = dyn_cast<AbstractFunctionDecl>(getDeclContext())) {
for (auto params : AFD->getBodyParamPatterns()) {
// Check to see if this tuple or scalar pattern contains the parameter.
if (auto *TP = dyn_cast<TuplePattern>(params)) {
for (auto &Elt : TP->getElements())
if (Elt.getPattern()->getSingleVar() == this) {
Pat = Elt.getPattern();
break;
}
} else if (params->getSingleVar() == this) {
Pat = params;
break;
}
}
}
}
if (!Pat || Pat->isImplicit())
return getSourceRange();

4
test/SourceKit/InterfaceGen/gen_clang_module.swift.response
View File

@@ -4474,7 +4474,7 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
key.kind: source.lang.swift.decl.var.parameter,
key.offset: 2070,
key.length: 1,
key.typename: "Int32",
key.typename: "_",
key.nameoffset: 0,
key.namelength: 0
}
@@ -5495,7 +5495,7 @@ public class FooOverlayClassDerived : Foo.FooOverlayClassBase {
key.kind: source.lang.swift.decl.var.parameter,
key.offset: 6245,
key.length: 1,
key.typename: "FooCFTypeRef",
key.typename: "_",
key.nameoffset: 0,
key.namelength: 0
}