Skip to content

Expose "unparse", FormatNode and RawAST #710

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
sparkprime merged 3 commits into from
Jun 14, 2023
Merged

Expose "unparse", FormatNode and RawAST #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39a8a10
Export FormatNode so external users can pretty print an AST
tomwilkie May 6, 2021
1945af3
Expose RawAST function.
tomwilkie May 6, 2021
3ed30fb
Add comment
tomwilkie May 7, 2021
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
17 changes: 16 additions & 1 deletion formatter/formatter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
// customized using formatter.Options.
package formatter

import "github.com/google/go-jsonnet/internal/formatter"
import (
"github.com/google/go-jsonnet/ast"
"github.com/google/go-jsonnet/internal/formatter"
"github.com/google/go-jsonnet/internal/parser"
)

// StringStyle controls how the reformatter rewrites string literals.
// Strings that contain a ' or a " use the optimal syntax to avoid escaping
Expand Down Expand Up @@ -46,3 +50,14 @@ func DefaultOptions() Options {
func Format(filename string, input string, options Options) (string, error) {
return formatter.Format(filename, input, options)
}

// FormatNode returns code that is equivalent to its input but better formatted
// according to the given options.
func FormatNode(node ast.Node, finalFodder ast.Fodder, options Options) (string, error) {
return formatter.FormatNode(node, finalFodder, options)
}

// SnippetToRawAST parses a snippet and returns the resulting AST.
func SnippetToRawAST(filename string, snippet string) (ast.Node, ast.Fodder, error) {
return parser.SnippetToRawAST(ast.DiagnosticFileName(filename), "", snippet)
}
6 changes: 6 additions & 0 deletions internal/formatter/jsonnetfmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,12 @@ func Format(filename string, input string, options Options) (string, error) {
return "", err
}

return FormatNode(node, finalFodder, options)
}

// FormatNode returns code that is equivalent to its input but better formatted
// according to the given options.
func FormatNode(node ast.Node, finalFodder ast.Fodder, options Options) (string, error) {
// Passes to enforce style on the AST.
if options.SortImports {
SortImports(&node)
Expand Down