Skip to content

[cursor-info] Wrap @escaping/@autoclosure in attribute.builtin tags #4523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2016
Merged

[cursor-info] Wrap @escaping/@autoclosure in attribute.builtin tags #4523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions include/swift/AST/ASTPrinter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,20 +175,26 @@ class ASTPrinter {

ASTPrinter &operator<<(DeclName name);

void printKeyword(StringRef Name) {
void printKeyword(StringRef name) {
callPrintNamePre(PrintNameContext::Keyword);
*this << Name;
*this << name;
printNamePost(PrintNameContext::Keyword);
}

void printAttrName(StringRef Name, bool needAt = false) {
void printAttrName(StringRef name, bool needAt = false) {
callPrintNamePre(PrintNameContext::Attribute);
if (needAt)
*this << "@";
*this << Name;
*this << name;
printNamePost(PrintNameContext::Attribute);
}

void printSimpleAttr(StringRef name, bool needAt = false) {
callPrintStructurePre(PrintStructureKind::BuiltinAttribute);
printAttrName(name, needAt);
printStructurePost(PrintStructureKind::BuiltinAttribute);
}

void printName(Identifier Name,
PrintNameContext Context = PrintNameContext::Normal);

Expand Down
4 changes: 2 additions & 2 deletions lib/AST/ASTPrinter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3791,12 +3791,12 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
return;

if (info.isAutoClosure() && !Options.excludeAttrKind(TAK_autoclosure)) {
Printer.printAttrName("@autoclosure");
Printer.printSimpleAttr("@autoclosure");
Printer << " ";
}
if (inParameterPrinting && !info.isNoEscape() &&
!Options.excludeAttrKind(TAK_escaping)) {
Printer.printAttrName("@escaping");
Printer.printSimpleAttr("@escaping");
Printer << " ";
}

Expand Down
4 changes: 1 addition & 3 deletions lib/AST/Attr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options)
if (DeclAttribute::isDeclModifier(getKind())) {
Printer.printKeyword(getAttrName());
} else {
Printer.callPrintStructurePre(PrintStructureKind::BuiltinAttribute);
Printer.printAttrName(getAttrName(), /*needAt=*/true);
Printer.printStructurePost(PrintStructureKind::BuiltinAttribute);
Printer.printSimpleAttr(getAttrName(), /*needAt=*/true);
}
return true;

Expand Down
10 changes: 6 additions & 4 deletions lib/AST/TypeRepr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,25 +284,27 @@ void AttributedTypeRepr::printAttrs(ASTPrinter &Printer,
};

if (hasAttr(TAK_autoclosure)) {
Printer.printAttrName("@autoclosure");
Printer.printSimpleAttr("@autoclosure");
Printer << " ";
}
if (hasAttr(TAK_escaping)) {
Printer.printAttrName("@escaping");
Printer.printSimpleAttr("@escaping");
Printer << " ";
}

if (hasAttr(TAK_thin)) {
Printer.printAttrName("@thin");
Printer.printSimpleAttr("@thin");
Printer << " ";
}
if (hasAttr(TAK_thick)) {
Printer.printAttrName("@thick");
Printer.printSimpleAttr("@thick");
Printer << " ";
}
if (hasAttr(TAK_convention) && Attrs.convention.hasValue()) {
Printer.callPrintStructurePre(PrintStructureKind::BuiltinAttribute);
Printer.printAttrName("@convention");
Printer << "(" << Attrs.convention.getValue() << ") ";
Printer.printStructurePost(PrintStructureKind::BuiltinAttribute);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/SourceKit/CursorInfo/cursor_info.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,10 +612,10 @@ func rethrowingFunction1(_: (Int) throws -> Void) rethrows -> Void {}
// CHECK70: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>paramAutoclosureNoescape1</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>msg</decl.var.parameter.name>: <decl.var.parameter.type>() -&gt; <decl.function.returntype><ref.struct usr="s:SS">String</ref.struct></decl.function.returntype></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>

// RUN: %sourcekitd-test -req=cursor -pos=156:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK71
// CHECK71: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>paramAutoclosureNoescape2</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>msg</decl.var.parameter.name>: <decl.var.parameter.type><syntaxtype.attribute.name>@autoclosure</syntaxtype.attribute.name> () -&gt; <decl.function.returntype><ref.struct usr="s:SS">String</ref.struct></decl.function.returntype></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>
// CHECK71: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>paramAutoclosureNoescape2</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>msg</decl.var.parameter.name>: <decl.var.parameter.type><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@autoclosure</syntaxtype.attribute.name></syntaxtype.attribute.builtin> () -&gt; <decl.function.returntype><ref.struct usr="s:SS">String</ref.struct></decl.function.returntype></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>

// RUN: %sourcekitd-test -req=cursor -pos=157:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK72
// CHECK72: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>paramAutoclosureNoescape3</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>msg</decl.var.parameter.name>: <decl.var.parameter.type><syntaxtype.attribute.name>@autoclosure</syntaxtype.attribute.name> <syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name> () -&gt; <decl.function.returntype><ref.struct usr="s:SS">String</ref.struct></decl.function.returntype></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>
// CHECK72: <decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>paramAutoclosureNoescape3</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>msg</decl.var.parameter.name>: <decl.var.parameter.type><syntaxtype.attribute.builtin><syntaxtype.attribute.name>@autoclosure</syntaxtype.attribute.name></syntaxtype.attribute.builtin> <syntaxtype.attribute.builtin><syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name></syntaxtype.attribute.builtin> () -&gt; <decl.function.returntype><ref.struct usr="s:SS">String</ref.struct></decl.function.returntype></decl.var.parameter.type></decl.var.parameter>)</decl.function.free>

// RUN: %sourcekitd-test -req=cursor -pos=159:6 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK73
// CHECK73: <decl.function.free>
Expand Down
4 changes: 2 additions & 2 deletions test/SourceKit/DocSupport/doc_clang_module.swift.response
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6126,7 +6126,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.usr: "c:@F@fooFuncWithBlock",
key.offset: 3739,
key.length: 59,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithBlock</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>blk</decl.var.parameter.name>: <decl.var.parameter.type>(<syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name> (<ref.struct usr=\"s:Sf\">Float</ref.struct>) -&gt; <decl.function.returntype><ref.struct usr=\"s:Vs5Int32\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithBlock</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>blk</decl.var.parameter.name>: <decl.var.parameter.type>(<syntaxtype.attribute.builtin><syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name></syntaxtype.attribute.builtin> (<ref.struct usr=\"s:Sf\">Float</ref.struct>) -&gt; <decl.function.returntype><ref.struct usr=\"s:Vs5Int32\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
Expand All @@ -6143,7 +6143,7 @@ var FooSubUnnamedEnumeratorA1: Int { get }
key.usr: "c:@F@fooFuncWithFunctionPointer",
key.offset: 3799,
key.length: 70,
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithFunctionPointer</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>fptr</decl.var.parameter.name>: <decl.var.parameter.type>(<syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name> (<ref.struct usr=\"s:Sf\">Float</ref.struct>) -&gt; <decl.function.returntype><ref.struct usr=\"s:Vs5Int32\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.fully_annotated_decl: "<decl.function.free><syntaxtype.keyword>func</syntaxtype.keyword> <decl.name>fooFuncWithFunctionPointer</decl.name>(<decl.var.parameter><decl.var.parameter.argument_label>_</decl.var.parameter.argument_label> <decl.var.parameter.name>fptr</decl.var.parameter.name>: <decl.var.parameter.type>(<syntaxtype.attribute.builtin><syntaxtype.attribute.name>@escaping</syntaxtype.attribute.name></syntaxtype.attribute.builtin> (<ref.struct usr=\"s:Sf\">Float</ref.struct>) -&gt; <decl.function.returntype><ref.struct usr=\"s:Vs5Int32\">Int32</ref.struct></decl.function.returntype>)!</decl.var.parameter.type></decl.var.parameter>)</decl.function.free>",
key.entities: [
{
key.kind: source.lang.swift.decl.var.local,
Expand Down