Skip to content

Added support for multiline types, ellipsis parameter and type switch #57

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

Open
Evgenus wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added support for multiline types, ellipsis parameter and type switch #57

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be56b04
added multiline type definitions
Evgenus Dec 20, 2020
18c4792
added ellipsis for function parameters
Evgenus Dec 20, 2020
1f5a72a
type switch support
Evgenus Dec 20, 2020
bf8db1e
remove print
Evgenus Dec 20, 2020
4f41d33
remove print
Evgenus Dec 20, 2020
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
25 changes: 18 additions & 7 deletions goblin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ func AttemptExprAsType(e ast.Expr, fset *token.FileSet) map[string]interface{} {
}
}

if n, ok := e.(*ast.Ellipsis); ok {
return map[string]interface{}{
"kind": "type",
"type": "ellipsis",
"element": DumpExprAsType(n.Elt, fset),
"position": DumpPosition(fset.Position(e.Pos())),
}
}
if n, ok := e.(*ast.InterfaceType); ok {
return map[string]interface{}{
"kind": "type",
Expand Down Expand Up @@ -371,11 +379,15 @@ func DumpExpr(e ast.Expr, fset *token.FileSet) map[string]interface{} {
}

if n, ok := e.(*ast.TypeAssertExpr); ok {
var asserted interface{} = nil
if n.Type != nil {
asserted = DumpExprAsType(n.Type, fset)
}
return map[string]interface{}{
"kind": "expression",
"type": "type-assert",
"target": DumpExpr(n.X, fset),
"asserted": DumpExprAsType(n.Type, fset),
"asserted": asserted,
"position": DumpPosition(fset.Position(e.Pos())),
}
}
Expand Down Expand Up @@ -610,13 +622,12 @@ func DumpGenDecl(decl *ast.GenDecl, fset *token.FileSet) map[string]interface{}
results := make([]interface{}, len(decl.Specs))
switch decl.Tok {
case token.TYPE:
if len(decl.Specs) != 1 {
pos := fset.PositionFor(decl.Pos(), true)
Perish(pos, "syntax_error", "unexpected number of tokens ("+string(len(decl.Specs))+") in type alias (expected 1)")
if len(decl.Specs) == 1 {
return DumpTypeAlias(decl.Specs[0].(*ast.TypeSpec), fset)
}
for i, v := range decl.Specs {
results[i] = DumpTypeAlias(v.(*ast.TypeSpec), fset)
}
// EARLY RETURN
return DumpTypeAlias(decl.Specs[0].(*ast.TypeSpec), fset)

case token.IMPORT:
prettyToken = "import"
for i, v := range decl.Specs {
Expand Down