Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions include/swift/Option/Options.td
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,14 @@ def emit_symbol_graph_dir : Separate<["-"], "emit-symbol-graph-dir">,
HelpText<"Emit a symbol graph to directory <dir>">,
MetaVarName<"<dir>">;

def symbol_graph_pretty_print: Flag<["-"], "symbol-graph-pretty-print">,
Flags<[FrontendOption, NoInteractiveOption, HelpHidden, SupplementaryOutput]>,
HelpText<"Pretty-print the output symbol graph JSON">;

def symbol_graph_skip_synthesized_members: Flag<["-"], "symbol-graph-skip-synthesized-members">,
Flags<[FrontendOption, NoInteractiveOption, HelpHidden, SupplementaryOutput]>,
HelpText<"Skip members inherited through classes or default implementations">;

def symbol_graph_minimum_access_level: Separate<["-"], "symbol-graph-minimum-access-level">,
Flags<[FrontendOption, NoInteractiveOption, SupplementaryOutput, HelpHidden]>,
HelpText<"Include symbols with this access level or more when emitting a symbol graph">,
Expand Down
2 changes: 2 additions & 0 deletions lib/Driver/ToolChains.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,8 @@ ToolChain::constructInvocation(const CompileJobAction &job,
context.Args.AddLastArg(Arguments, options::OPT_emit_extension_block_symbols,
options::OPT_omit_extension_block_symbols);
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_minimum_access_level);
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_skip_synthesized_members);
context.Args.AddLastArg(Arguments, options::OPT_symbol_graph_pretty_print);

return II;
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Frontend/CompilerInvocation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2283,8 +2283,8 @@ static void ParseSymbolGraphArgs(symbolgraphgen::SymbolGraphOptions &Opts,
}

// default values for generating symbol graphs during a build
Opts.PrettyPrint = false;
Opts.EmitSynthesizedMembers = true;
Opts.PrettyPrint = Args.hasArg(OPT_symbol_graph_pretty_print);
Opts.EmitSynthesizedMembers = !Args.hasArg(OPT_symbol_graph_skip_synthesized_members);
Opts.PrintMessages = false;
Opts.IncludeClangDocs = false;
}
Expand Down
10 changes: 10 additions & 0 deletions test/SymbolGraph/Symbols/SkipsSynthesizedMembers.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// RUN: %empty-directory(%t)
// RUN: %target-build-swift %s -module-name SkipsSynthesizedMembers -emit-module -emit-module-path %t/
// RUN: %target-swift-symbolgraph-extract -module-name SkipsSynthesizedMembers -I %t -pretty-print -skip-synthesized-members -output-dir %t
// RUN: %FileCheck %s --input-file %t/SkipsSynthesizedMembers.symbols.json

// CHECK-NOT: ::SYNTHESIZED

public struct ShouldAppear: Hashable {
public let foo: Int
}