github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-12-25 07:55:12 +03:00
Code Issues Projects Releases Wiki Activity

Assignment updates

Browse Source
This commit is contained in:
Timothy Clem 2020-01-13 15:19:00 -08:00
parent 74347f80e8
commit 17dd99aeac
16 changed files with 104 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/Examples.hs
View File

@ -51,8 +51,8 @@ le = LanguageExample
examples :: [LanguageExample]
examples =
-- [ le "go" "**/*.go" goFileSkips goDirSkips
-- [ le "python" "**/*.py" mempty mempty
[ le "ruby" "**/*.rb" rubySkips mempty
[ le "python" "**/*.py" mempty mempty
-- [ le "ruby" "**/*.rb" rubySkips mempty
-- , le "typescript" "**/*.[jt]s" typescriptSkips mempty
-- , le "typescript" "**/*.[jt]sx" tsxSkips mempty
]
@ -223,19 +223,22 @@ buildExamples session lang tsDir = do
-- lSpan = " [" <> show (startRow left) <> ", " <> show (left^.P.span^.start^.column) <> "]"
-- rSpan = " [" <> show (startRow right) <> ", " <> show (right^.P.span^.start^.column) <> "]"
HUnit.assertEqual (Text.unpack (x^.path) <> lineNo) (left^.symbol) (right^.symbol)
HUnit.assertEqual (Text.unpack (x^.path) <> lineNo) (left^.line) (right^.line)
-- HUnit.assertEqual (Text.unpack (x^.path) <> lineNo) (Text.unpack (left^.symbol) <> span left) (Text.unpack (right^.symbol) <> span right)
HUnit.assertEqual (Text.unpack (x^.path) <> lineNo) (Text.unpack (left^.symbol) <> span left) (Text.unpack (right^.symbol) <> span right)
if left^.kind == "Class"
then HUnit.assertEqual (Text.unpack (x^.path) <> lineNo) (left^.line) (right^.line)
-- then HUnit.assertBool (Text.unpack (x^.path) <> lineNo) (Text.isPrefixOf (left^.line) (right^.line))
else pure ()
_ -> HUnit.assertFailure "Expected 1 file in each response"
(Left e1, Left e2) -> HUnit.assertFailure ("Unable to parse (both)" <> show (displayException e1) <> show (displayException e2))
(_, Left e) -> HUnit.assertFailure ("Unable to parse (precise)" <> show (displayException e))
(Left e, _) -> HUnit.assertFailure ("Unable to parse (a la carte)" <> show (displayException e))
sSym x = SortableSymbol (x^.symbol) (x^.P.span^.start^.line)
-- span x = " [" <> show (x^.P.span^.start^.line) <> ", " <> show (x^.P.span^.start^.column) <>
-- " - " <> show (x^.P.span^.end^.line) <> ", " <> show (x^.P.span^.end^.column) <> "]"
sSym x = SortableSymbol (x^.symbol) (x^.P.span^.start^.line) (x^.P.span^.start^.column) (x^.P.span^.end^.line) (x^.P.span^.end^.column)
span x = " [" <> show (x^.P.span^.start^.line) <> ", " <> show (x^.P.span^.start^.column) <>
" - " <> show (x^.P.span^.end^.line) <> ", " <> show (x^.P.span^.end^.column) <> "]"
data SortableSymbol = SortableSymbol Text.Text Int32
data SortableSymbol = SortableSymbol Text.Text Int32 Int32 Int32 Int32
deriving (Eq, Show, Ord)

21
test/fixtures/python/corpus/decorated-definition.diffA-B.txt vendored
View File

@ -11,15 +11,16 @@
(Decorator
{ (Identifier)
->(Identifier) }
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
{-(Integer)-}
(Decorator
{ (Identifier)
->(Identifier) }
(Statements
{+(Identifier)+}
{-(Statements
{-(Integer)-}
{-(Integer)-})-}
{-(Integer)-})
(Decorator
(Identifier)
{+(Statements
@ -27,17 +28,21 @@
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
{+(Statements
{+(Identifier)+})+})+}
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{ (Decorator
{-(Identifier)-}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
{-(Decorator
{-(Identifier)-}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
{-(Decorator
{-(Identifier)-}
{-(Statements
@ -45,8 +50,10 @@
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
{-(Statements
{-(Identifier)-})-})-}
{-(Function
{-(Identifier)-}
{-(Statements

23
test/fixtures/python/corpus/decorated-definition.diffB-A.txt vendored
View File

@ -12,14 +12,15 @@
{ (Identifier)
->(Identifier) }
{+(Integer)+}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
(Decorator
{ (Identifier)
->(Identifier) }
{+(Statements
(Statements
{+(Integer)+}
{+(Integer)+})+}
{-(Identifier)-}
{+(Integer)+}
{-(Identifier)-})
(Decorator
(Identifier)
{+(Assignment
@ -30,18 +31,22 @@
{-(Assignment
{-(Identifier)-}
{-(Boolean)-})-}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
{-(Statements
{-(Identifier)-})-})-}
{ (Function
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-})
->(Decorator
{+(Identifier)+}
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
{+(Decorator
{+(Identifier)+}
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
{+(Decorator
{+(Identifier)+}
{+(Statements
@ -49,8 +54,10 @@
{+(Assignment
{+(Identifier)+}
{+(Boolean)+})+}
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
{+(Statements
{+(Identifier)+})+})+}
{+(Function
{+(Identifier)+}
{+(Statements

10
test/fixtures/python/corpus/decorated-definition.parseA.txt vendored
View File

@ -22,10 +22,12 @@
(Boolean))
(Decorator
(Identifier)
(Identifier)
(Statements
(Identifier))
(Decorator
(Identifier)
(Identifier)
(Statements
(Identifier))
(Decorator
(Identifier)
(Statements
@ -33,8 +35,10 @@
(Assignment
(Identifier)
(Boolean))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier)))
(Function
(Identifier)
(Statements

10
test/fixtures/python/corpus/decorated-definition.parseB.txt vendored
View File

@ -9,10 +9,12 @@
(Statements)
(Decorator
(Identifier)
(Identifier)
(Statements
(Identifier))
(Decorator
(Identifier)
(Identifier)
(Statements
(Identifier))
(Decorator
(Identifier)
(Statements
@ -20,8 +22,10 @@
(Assignment
(Identifier)
(Boolean))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier)))
(Function
(Identifier)
(Statements

6
test/fixtures/python/corpus/function-definition.diffA-B.txt vendored
View File

@ -14,8 +14,9 @@
(RequiredParameter
{ (Identifier)
->(Identifier) })
(Statements
{ (Identifier)
->(Identifier) }
->(Identifier) })
(Statements
{ (Identifier)
->(Identifier) }))
@ -43,7 +44,8 @@
->(Integer) })
{ (Identifier)
->(Identifier) })
(Statements
{ (Identifier)
->(Identifier) }
->(Identifier) })
(Statements
(Identifier))))

9
test/fixtures/python/corpus/function-definition.diffB-A.txt vendored
View File

@ -4,7 +4,8 @@
->(Identifier) }
{-(RequiredParameter
{-(Identifier)-})-}
{-(Identifier)-}
{-(Statements
{-(Identifier)-})-}
(Statements
{ (Identifier)
->(Identifier) }))
@ -21,7 +22,8 @@
(RequiredParameter
{ (Identifier)
->(Identifier) })
{+(Identifier)+}
{+(Statements
{+(Identifier)+})+}
(Statements
{ (Identifier)
->(Identifier) }))
@ -41,7 +43,8 @@
->(TextElement) })
{ (Identifier)
->(Identifier) })
(Statements
{ (Identifier)
->(Identifier) }
->(Identifier) })
(Statements
(Identifier))))

6
test/fixtures/python/corpus/function-definition.parseA.txt vendored
View File

@ -13,7 +13,8 @@
(Identifier)
(RequiredParameter
(Identifier))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier)))
(Function
@ -30,6 +31,7 @@
(Identifier)
(TextElement))
(Identifier))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier))))

6
test/fixtures/python/corpus/function-definition.parseB.txt vendored
View File

@ -3,7 +3,8 @@
(Identifier)
(RequiredParameter
(Identifier))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier)))
(Function
@ -23,6 +24,7 @@
(Identifier)
(Integer))
(Identifier))
(Identifier)
(Statements
(Identifier))
(Statements
(Identifier))))

6
test/fixtures/ruby/corpus/calls.parseA.txt vendored
View File

@ -27,7 +27,9 @@
(Identifier)))
(Send
(Identifier)
(Identifier))
(Send
(Identifier)))
(Send
(Identifier)
(Identifier)))
(Send
(Identifier))))

3
test/fixtures/ruby/corpus/method-calls.diffA-B.txt vendored
View File

@ -27,7 +27,8 @@
{-(KeyValue
{-(Array)-}
{-(Integer)-})-}
{-(Identifier)-}
{-(Send
{-(Identifier)-})-}
{-(Send
{-(Identifier)-})-}
{-(Function

3
test/fixtures/ruby/corpus/method-calls.diffB-A.txt vendored
View File

@ -27,7 +27,8 @@
{+(KeyValue
{+(Array)+}
{+(Integer)+})+}
{+(Identifier)+}
{+(Send
{+(Identifier)+})+}
{+(Send
{+(Identifier)+})+}
{+(Function

3
test/fixtures/ruby/corpus/method-calls.parseA.txt vendored
View File

@ -26,7 +26,8 @@
(KeyValue
(Array)
(Integer))
(Identifier)
(Send
(Identifier))
(Send
(Identifier))
(Function

6
test/fixtures/ruby/corpus/multiple-assignments.diffA-B.txt vendored
View File

@ -33,7 +33,8 @@
{-(Statements
{-(Identifier)-}
{-(Identifier)-})-}
{-(Identifier)-})-}
{-(Send
{-(Identifier)-})-})-}
{-(Assignment
{-(Statements
{-(Send
@ -56,4 +57,5 @@
{-(Statements
{-(Identifier)-}
{-(Identifier)-})-})-}
{-(Identifier)-})-})
{-(Send
{-(Identifier)-})-})-})

6
test/fixtures/ruby/corpus/multiple-assignments.diffB-A.txt vendored
View File

@ -33,7 +33,8 @@
{+(Statements
{+(Identifier)+}
{+(Identifier)+})+}
{+(Identifier)+})+}
{+(Send
{+(Identifier)+})+})+}
{+(Assignment
{+(Statements
{+(Send
@ -56,4 +57,5 @@
{+(Statements
{+(Identifier)+}
{+(Identifier)+})+})+}
{+(Identifier)+})+})
{+(Send
{+(Identifier)+})+})+})

6
test/fixtures/ruby/corpus/multiple-assignments.parseA.txt vendored
View File

@ -33,7 +33,8 @@
(Statements
(Identifier)
(Identifier))
(Identifier))
(Send
(Identifier)))
(Assignment
(Statements
(Send
@ -56,4 +57,5 @@
(Statements
(Identifier)
(Identifier)))
(Identifier)))
(Send
(Identifier))))