Skip to content

[SymbolGraph] Output custom attributes #61838

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
Nov 1, 2022
Merged

[SymbolGraph] Output custom attributes #61838

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
4 changes: 1 addition & 3 deletions lib/SymbolGraphGen/SymbolGraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,6 @@ PrintOptions SymbolGraph::getDeclarationFragmentsPrintOptions() const {

llvm::StringMap<AnyAttrKind> ExcludeAttrs;

#define DECL_ATTR(SPELLING, CLASS, OPTIONS, CODE) \
if (StringRef(#SPELLING).startswith("_")) \
ExcludeAttrs.insert(std::make_pair("DAK_" #CLASS, DAK_##CLASS));
#define TYPE_ATTR(X) ExcludeAttrs.insert(std::make_pair("TAK_" #X, TAK_##X));
#include "swift/AST/Attr.def"

Expand All @@ -98,6 +95,7 @@ PrintOptions SymbolGraph::getDeclarationFragmentsPrintOptions() const {
// In "emit modules separately" jobs, access modifiers show up as attributes,
// but we don't want them to be printed in declarations
ExcludeAttrs.insert(std::make_pair("DAK_AccessControl", DAK_AccessControl));
ExcludeAttrs.insert(std::make_pair("DAK_SetterAccess", DAK_SetterAccess));

for (const auto &Entry : ExcludeAttrs) {
Opts.ExcludeAttrList.push_back(Entry.getValue());
Expand Down
6 changes: 6 additions & 0 deletions test/IDE/print_set_accessor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
public struct SomeType {
public private(set) var privateSetter: Int
}
// CHECK: public private(set) var privateSetter: Int

// RUN: %target-swift-ide-test -print-swift-file-interface -source-filename %s | %FileCheck %s
63 changes: 63 additions & 0 deletions test/SymbolGraph/Symbols/Mixins/DeclarationFragments/Full/CustomAttr.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// RUN: %empty-directory(%t)
// RUN: %target-build-swift %s -module-name CustomAttr -emit-module -emit-module-path %t/
// RUN: %target-swift-symbolgraph-extract -module-name CustomAttr -I %t -pretty-print -output-dir %t
// RUN: %FileCheck %s --input-file %t/CustomAttr.symbols.json

@propertyWrapper
public struct SomeWrapper {
public var wrappedValue: Int { 0 }
public init(wrappedValue: Int) {}
}

public func wrapped(@SomeWrapper arg: Int) {}

// CHECK-LABEL: "precise": "s:10CustomAttr7wrapped3argySi_tF"
// CHECK: "declarationFragments": [
// CHECK: "declarationFragments": [
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "keyword",
// CHECK-NEXT: "spelling": "func"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "text",
// CHECK-NEXT: "spelling": " "
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "identifier",
// CHECK-NEXT: "spelling": "wrapped"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "text",
// CHECK-NEXT: "spelling": "("
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "attribute",
// CHECK-NEXT: "spelling": "@"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "typeIdentifier",
// CHECK-NEXT: "spelling": "SomeWrapper",
// CHECK-NEXT: "preciseIdentifier": "s:10CustomAttr11SomeWrapperV"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "text",
// CHECK-NEXT: "spelling": " "
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "externalParam",
// CHECK-NEXT: "spelling": "arg"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "text",
// CHECK-NEXT: "spelling": ": "
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "typeIdentifier",
// CHECK-NEXT: "spelling": "Int",
// CHECK-NEXT: "preciseIdentifier": "s:Si"
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "kind": "text",
// CHECK-NEXT: "spelling": ")"
// CHECK-NEXT: }
// CHECK-NEXT:]