github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-28 10:15:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bump-tree-sitter' into environment-scoping

Browse Source
This commit is contained in:
Timothy Clem 2018-03-06 16:04:16 -08:00
commit c509d33ff9
35 changed files with 371 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

230
.stylish-haskell.yaml Normal file
View File

@ -0,0 +1,230 @@
# stylish-haskell configuration file
# ==================================
# The stylish-haskell tool is mainly configured by specifying steps. These steps
# are a list, so they have an order, and one specific step may appear more than
# once (if needed). Each file is processed by these steps in the given order.
steps:
# Convert some ASCII sequences to their Unicode equivalents. This is disabled
# by default.
# - unicode_syntax:
# # In order to make this work, we also need to insert the UnicodeSyntax
# # language pragma. If this flag is set to true, we insert it when it's
# # not already present. You may want to disable it if you configure
# # language extensions using some other method than pragmas. Default:
# # true.
# add_language_pragma: true
# Align the right hand side of some elements. This is quite conservative
# and only applies to statements where each element occupies a single
# line.
- simple_align:
cases: true
top_level_patterns: true
records: true
# Import cleanup
- imports:
# There are different ways we can align names and lists.
#
# - global: Align the import names and import list throughout the entire
# file.
#
# - file: Like global, but don't add padding when there are no qualified
# imports in the file.
#
# - group: Only align the imports per group (a group is formed by adjacent
# import lines).
#
# - none: Do not perform any alignment.
#
# Default: global.
align: group
# The following options affect only import list alignment.
#
# List align has following options:
#
# - after_alias: Import list is aligned with end of import including
# 'as' and 'hiding' keywords.
#
# > import qualified Data.List as List (concat, foldl, foldr, head,
# > init, last, length)
#
# - with_alias: Import list is aligned with start of alias or hiding.
#
# > import qualified Data.List as List (concat, foldl, foldr, head,
# > init, last, length)
#
# - new_line: Import list starts always on new line.
#
# > import qualified Data.List as List
# > (concat, foldl, foldr, head, init, last, length)
#
# Default: after_alias
list_align: after_alias
# Right-pad the module names to align imports in a group:
#
# - true: a little more readable
#
# > import qualified Data.List as List (concat, foldl, foldr,
# > init, last, length)
# > import qualified Data.List.Extra as List (concat, foldl, foldr,
# > init, last, length)
#
# - false: diff-safe
#
# > import qualified Data.List as List (concat, foldl, foldr, init,
# > last, length)
# > import qualified Data.List.Extra as List (concat, foldl, foldr,
# > init, last, length)
#
# Default: true
pad_module_names: false
# Long list align style takes effect when import is too long. This is
# determined by 'columns' setting.
#
# - inline: This option will put as much specs on same line as possible.
#
# - new_line: Import list will start on new line.
#
# - new_line_multiline: Import list will start on new line when it's
# short enough to fit to single line. Otherwise it'll be multiline.
#
# - multiline: One line per import list entry.
# Type with constructor list acts like single import.
#
# > import qualified Data.Map as M
# > ( empty
# > , singleton
# > , ...
# > , delete
# > )
#
# Default: inline
long_list_align: new_line_multiline
# Align empty list (importing instances)
#
# Empty list align has following options
#
# - inherit: inherit list_align setting
#
# - right_after: () is right after the module name:
#
# > import Vector.Instances ()
#
# Default: inherit
empty_list_align: inherit
# List padding determines indentation of import list on lines after import.
# This option affects 'long_list_align'.
#
# - <integer>: constant value
#
# - module_name: align under start of module name.
# Useful for 'file' and 'group' align settings.
list_padding: 4
# Separate lists option affects formatting of import list for type
# or class. The only difference is single space between type and list
# of constructors, selectors and class functions.
#
# - true: There is single space between Foldable type and list of it's
# functions.
#
# > import Data.Foldable (Foldable (fold, foldl, foldMap))
#
# - false: There is no space between Foldable type and list of it's
# functions.
#
# > import Data.Foldable (Foldable(fold, foldl, foldMap))
#
# Default: true
separate_lists: true
# Space surround option affects formatting of import lists on a single
# line. The only difference is single space after the initial
# parenthesis and a single space before the terminal parenthesis.
#
# - true: There is single space associated with the enclosing
# parenthesis.
#
# > import Data.Foo ( foo )
#
# - false: There is no space associated with the enclosing parenthesis
#
# > import Data.Foo (foo)
#
# Default: false
space_surround: false
# Language pragmas
- language_pragmas:
# We can generate different styles of language pragma lists.
#
# - vertical: Vertical-spaced language pragmas, one per line.
#
# - compact: A more compact style.
#
# - compact_line: Similar to compact, but wrap each line with
# `{-#LANGUAGE #-}'.
#
# Default: vertical.
style: compact
# Align affects alignment of closing pragma brackets.
#
# - true: Brackets are aligned in same column.
#
# - false: Brackets are not aligned together. There is only one space
# between actual import and closing bracket.
#
# Default: true
align: true
# stylish-haskell can detect redundancy of some language pragmas. If this
# is set to true, it will remove those redundant pragmas. Default: true.
remove_redundant: true
# Replace tabs by spaces. This is disabled by default.
# - tabs:
# # Number of spaces to use for each tab. Default: 8, as specified by the
# # Haskell report.
# spaces: 8
# Remove trailing whitespace
- trailing_whitespace: {}
# A common setting is the number of columns (parts of) code will be wrapped
# to. Different steps take this into account. Default: 80.
columns: 120
# By default, line endings are converted according to the OS. You can override
# preferred format here.
#
# - native: Native newline format. CRLF on Windows, LF on other OSes.
#
# - lf: Convert to LF ("\n").
#
# - crlf: Convert to CRLF ("\r\n").
#
# Default: native.
newline: native
# Sometimes, language extensions are specified in a cabal file or from the
# command line instead of using language pragmas in the file. stylish-haskell
# needs to be aware of these, so it can parse the file correctly.
language_extensions:
- DeriveFoldable
- DeriveFunctor
- DeriveGeneric
- DeriveTraversable
- FlexibleContexts
- FlexibleInstances
- MultiParamTypeClasses
- OverloadedStrings
- RecordWildCards
- StrictData

16
src/Language/Go/Assignment.hs
View File

@ -389,24 +389,12 @@ importDeclaration = makeTerm'' <$> symbol ImportDeclaration <*> children (manyTe
<|> makeTerm <$> symbol ImportSpec <*> children namedImport
<|> makeTerm <$> symbol ImportSpec <*> children plainImport
dotImport = symbol Dot *> (Declaration.WildcardImport <$> expression <*> emptyTerm)
-- nonQualifiedImport = inj <$> (symbol PackageIdentifier >>= \loc -> do
-- s <- source
-- guard (s == ".")
-- let sym = makeTerm loc (Syntax.Identifier s)
-- Declaration.WildcardImport <$> expression <*> pure sym)
sideEffectImport = symbol BlankIdentifier *> (Declaration.Import <$> expression <*> pure [])
-- sideEffectImport = symbol PackageIdentifier *> do
-- s <- source
-- guard (s == "_")
-- Declaration.Import <$> expression <*> pure []
dotImport = symbol Dot *> source *> (Declaration.WildcardImport <$> expression <*> emptyTerm)
sideEffectImport = symbol BlankIdentifier *> source *> (Declaration.Import <$> expression <*> pure [])
namedImport = symbol PackageIdentifier >>= \loc -> do
s <- source
let alias = makeTerm loc (Syntax.Identifier s)
Declaration.QualifiedImport <$> expression <*> pure alias <*> pure []
plainImport = symbol InterpretedStringLiteral >>= \loc -> do
s <- source
let from = makeTerm loc (Literal.TextElement s)

10
test/fixtures/go/function-declarations.diffA-B.txt vendored
View File

@ -20,9 +20,9 @@
(
(Identifier)
(Identifier))
(Identifier)
(Identifier)
(
(Identifier)
(Identifier)
(Identifier)
(Identifier)))
([]))
@ -32,8 +32,10 @@
->(Identifier) }
([])
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
([]))
(Function
(Empty)

10
test/fixtures/go/function-declarations.diffB-A.txt vendored
View File

@ -20,9 +20,9 @@
(
(Identifier)
(Identifier))
(Identifier)
(Identifier)
(
(Identifier)
(Identifier)
(Identifier)
(Identifier)))
([]))
@ -32,8 +32,10 @@
->(Identifier) }
([])
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
([]))
(Function
(Empty)

10
test/fixtures/go/function-declarations.parseA.txt vendored
View File

@ -18,9 +18,9 @@
(
(Identifier)
(Identifier))
(Identifier)
(Identifier)
(
(Identifier)
(Identifier)
(Identifier)
(Identifier)))
([]))
@ -29,8 +29,10 @@
(Identifier)
([])
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
([]))
(Function
(Empty)

10
test/fixtures/go/function-declarations.parseB.txt vendored
View File

@ -18,9 +18,9 @@
(
(Identifier)
(Identifier))
(Identifier)
(Identifier)
(
(Identifier)
(Identifier)
(Identifier)
(Identifier)))
([]))
@ -29,8 +29,10 @@
(Identifier)
([])
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
([]))
(Function
(Empty)

10
test/fixtures/go/function-literals.diffA-B.txt vendored
View File

@ -16,10 +16,12 @@
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) }))
(Return
(
(Integer)

10
test/fixtures/go/function-literals.diffB-A.txt vendored
View File

@ -16,10 +16,12 @@
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) }
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) })
(
{ (Identifier)
->(Identifier) }))
(Return
(
(Integer)

6
test/fixtures/go/function-literals.parseA.txt vendored
View File

@ -14,8 +14,10 @@
(Identifier)
(Identifier))
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
(Return
(
(Integer)

6
test/fixtures/go/function-literals.parseB.txt vendored
View File

@ -14,8 +14,10 @@
(Identifier)
(Identifier))
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
(Return
(
(Integer)

23
test/fixtures/go/function-types.diffA-B.txt vendored
View File

@ -10,8 +10,9 @@
{ (Identifier)
->(Identifier) }
(Function
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))
(Type
@ -19,13 +20,17 @@
->(Identifier) }
(Function
(
{-(Identifier)-}
(Identifier)
{+(Identifier)+})
(
{-(
{-(Identifier)-})-}
(
(Identifier))
{+(
{+(Identifier)+})+})
(
(
{+(BidirectionalChannel
{+(Identifier)+})+})+}
{-(Identifier)-}
(Identifier))
{+(Identifier)+})+}
{-(Identifier)-})
(
(Identifier)))
(Empty))))))

23
test/fixtures/go/function-types.diffB-A.txt vendored
View File

@ -10,8 +10,9 @@
{ (Identifier)
->(Identifier) }
(Function
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) })
{ (Identifier)
->(Identifier) }))
(Type
@ -19,13 +20,17 @@
->(Identifier) }
(Function
(
{-(Identifier)-}
(Identifier)
{+(Identifier)+})
(
{+(Identifier)+}
{-(
{-(Identifier)-})-}
(
(Identifier))
{+(
{+(Identifier)+})+})
(
(
{+(Identifier)+}
{-(BidirectionalChannel
{-(Identifier)-})-})-}
(Identifier))
{-(Identifier)-})-})
(
(Identifier)))
(Empty))))))

15
test/fixtures/go/function-types.parseA.txt vendored
View File

@ -9,15 +9,20 @@
(Type
(Identifier)
(Function
(Identifier)
(
(Identifier))
(Identifier)))
(Type
(Identifier)
(Function
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
(Empty))))))

12
test/fixtures/go/function-types.parseB.txt vendored
View File

@ -9,17 +9,21 @@
(Type
(Identifier)
(Function
(Identifier)
(
(Identifier))
(Identifier)))
(Type
(Identifier)
(Function
(
(Identifier)
(Identifier))
(
(Identifier))
(
(Identifier)))
(
(
(BidirectionalChannel
(Identifier)))
(Identifier))
(
(Identifier)))
(Empty))))))

2
test/fixtures/go/grouped-import-declarations.diffA-B.txt vendored
View File

@ -9,7 +9,7 @@
(Import
{ (TextElement)
->(TextElement) }
(Empty))
(Identifier))
(Import
{ (TextElement)
->(TextElement) }

2
test/fixtures/go/grouped-import-declarations.diffB-A.txt vendored
View File

@ -9,7 +9,7 @@
(Import
{ (TextElement)
->(TextElement) }
(Empty))
(Identifier))
(Import
{ (TextElement)
->(TextElement) }

2
test/fixtures/go/grouped-import-declarations.parseA.txt vendored
View File

@ -7,7 +7,7 @@
(Empty))
(Import
(TextElement)
(Empty))
(Identifier))
(Import
(TextElement)
(Identifier)))

2
test/fixtures/go/grouped-import-declarations.parseB.txt vendored
View File

@ -7,7 +7,7 @@
(Empty))
(Import
(TextElement)
(Empty))
(Identifier))
(Import
(TextElement)
(Identifier)))

7
test/fixtures/go/method-declarations.diffA-B.txt vendored
View File

@ -127,8 +127,7 @@
(
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) }
(Identifier)))
{ (Identifier)
->(Identifier) }
(Identifier))
([])))

7
test/fixtures/go/method-declarations.diffB-A.txt vendored
View File

@ -127,8 +127,7 @@
(
{ (Identifier)
->(Identifier) }
(
{ (Identifier)
->(Identifier) }
(Identifier)))
{ (Identifier)
->(Identifier) }
(Identifier))
([])))

5
test/fixtures/go/method-declarations.parseA.txt vendored
View File

@ -92,7 +92,6 @@
(Identifier)
(
(Identifier)
(
(Identifier)
(Identifier)))
(Identifier)
(Identifier))
([])))

5
test/fixtures/go/method-declarations.parseB.txt vendored
View File

@ -106,7 +106,6 @@
(Identifier)
(
(Identifier)
(
(Identifier)
(Identifier)))
(Identifier)
(Identifier))
([])))

2
test/fixtures/go/single-import-declarations.diffA-B.txt vendored
View File

@ -8,7 +8,7 @@
(Import
{ (TextElement)
->(TextElement) }
(Empty))
(Identifier))
(Import
{ (TextElement)
->(TextElement) }

2
test/fixtures/go/single-import-declarations.diffB-A.txt vendored
View File

@ -8,7 +8,7 @@
(Import
{ (TextElement)
->(TextElement) }
(Empty))
(Identifier))
(Import
{ (TextElement)
->(TextElement) }

2
test/fixtures/go/single-import-declarations.parseA.txt vendored
View File

@ -6,7 +6,7 @@
(Empty))
(Import
(TextElement)
(Empty))
(Identifier))
(Import
(TextElement)
(Identifier))

2
test/fixtures/go/single-import-declarations.parseB.txt vendored
View File

@ -6,7 +6,7 @@
(Empty))
(Import
(TextElement)
(Empty))
(Identifier))
(Import
(TextElement)
(Identifier))

11
test/fixtures/go/type-conversion-expressions.diffA-B.txt vendored
View File

@ -6,11 +6,12 @@
(Identifier)
([])
(
(TypeConversion
(Pointer
(Identifier))
{ (Identifier)
->(Identifier) })
(Pointer
(Call
(Identifier)
{ (Identifier)
->(Identifier) }
(Empty)))
(Call
(Pointer
(Identifier))

11
test/fixtures/go/type-conversion-expressions.diffB-A.txt vendored
View File

@ -6,11 +6,12 @@
(Identifier)
([])
(
(TypeConversion
(Pointer
(Identifier))
{ (Identifier)
->(Identifier) })
(Pointer
(Call
(Identifier)
{ (Identifier)
->(Identifier) }
(Empty)))
(Call
(Pointer
(Identifier))

9
test/fixtures/go/type-conversion-expressions.parseA.txt vendored
View File

@ -6,10 +6,11 @@
(Identifier)
([])
(
(TypeConversion
(Pointer
(Identifier))
(Identifier))
(Pointer
(Call
(Identifier)
(Identifier)
(Empty)))
(Call
(Pointer
(Identifier))

9
test/fixtures/go/type-conversion-expressions.parseB.txt vendored
View File

@ -6,10 +6,11 @@
(Identifier)
([])
(
(TypeConversion
(Pointer
(Identifier))
(Identifier))
(Pointer
(Call
(Identifier)
(Identifier)
(Empty)))
(Call
(Pointer
(Identifier))

3
test/fixtures/go/variadic-function-declarations.diffA-B.txt vendored
View File

@ -28,7 +28,8 @@
{ (Identifier)
->(Identifier) }
(
(Identifier)
(
(Identifier))
(Variadic
(Identifier)
(Empty)))

3
test/fixtures/go/variadic-function-declarations.diffB-A.txt vendored
View File

@ -28,7 +28,8 @@
{ (Identifier)
->(Identifier) }
(
(Identifier)
(
(Identifier))
(Variadic
(Identifier)
(Empty)))

3
test/fixtures/go/variadic-function-declarations.parseA.txt vendored
View File

@ -25,7 +25,8 @@
(Empty)
(Identifier)
(
(Identifier)
(
(Identifier))
(Variadic
(Identifier)
(Empty)))

3
test/fixtures/go/variadic-function-declarations.parseB.txt vendored
View File

@ -25,7 +25,8 @@
(Empty)
(Identifier)
(
(Identifier)
(
(Identifier))
(Variadic
(Identifier)
(Empty)))

2
vendor/haskell-tree-sitter vendored

@ -1 +1 @@
Subproject commit a7c77ef5459e4f610bd82ce203984f408bc106c2
Subproject commit 19fd8594796a26b26c0545897fd46f547f316be8