github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-05 14:11:33 +03:00
Code Issues Projects Releases Wiki Activity

Replace member expression with nested identifier

Browse Source
This commit is contained in:
joshvera 2018-02-16 16:32:32 -05:00
parent cb6df90b07
commit 0991bcdadc
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Language/TypeScript/Assignment.hs
View File

@ -144,7 +144,6 @@ type Syntax = '[
, TypeScript.Syntax.JsxClosingElement , TypeScript.Syntax.JsxClosingElement
, TypeScript.Syntax.JsxExpression , TypeScript.Syntax.JsxExpression
, TypeScript.Syntax.JsxAttribute , TypeScript.Syntax.JsxAttribute
, TypeScript.Syntax.JsxMemberExpression
, TypeScript.Syntax.JsxFragment , TypeScript.Syntax.JsxFragment
, TypeScript.Syntax.JsxNamespaceName , TypeScript.Syntax.JsxNamespaceName
, TypeScript.Syntax.OptionalParameter , TypeScript.Syntax.OptionalParameter
@ -376,14 +375,11 @@ jsxOpeningElement' :: Assignment
jsxOpeningElement' = makeTerm <$> symbol Grammar.JsxOpeningElement <*> children (TypeScript.Syntax.JsxOpeningElement <$> term jsxElementName <*> manyTerm jsxAttribute') jsxOpeningElement' = makeTerm <$> symbol Grammar.JsxOpeningElement <*> children (TypeScript.Syntax.JsxOpeningElement <$> term jsxElementName <*> manyTerm jsxAttribute')
jsxElementName :: Assignment jsxElementName :: Assignment
jsxElementName = choice [ identifier, jsxMemberExpression, jsxNamespaceName ] jsxElementName = choice [ identifier, nestedIdentifier, jsxNamespaceName ]
jsxNamespaceName :: Assignment jsxNamespaceName :: Assignment
jsxNamespaceName = makeTerm <$> symbol Grammar.JsxNamespaceName <*> children (TypeScript.Syntax.JsxNamespaceName <$> identifier <*> identifier) jsxNamespaceName = makeTerm <$> symbol Grammar.JsxNamespaceName <*> children (TypeScript.Syntax.JsxNamespaceName <$> identifier <*> identifier)
jsxMemberExpression :: Assignment
jsxMemberExpression = makeTerm <$> symbol Grammar.JsxMemberExpression <*> children (TypeScript.Syntax.JsxMemberExpression <$> manyTerm identifier)
jsxExpression' :: Assignment jsxExpression' :: Assignment
jsxExpression' = makeTerm <$> symbol Grammar.JsxExpression <*> children (TypeScript.Syntax.JsxExpression <$> term (expressions <|> spreadElement <|> emptyTerm)) jsxExpression' = makeTerm <$> symbol Grammar.JsxExpression <*> children (TypeScript.Syntax.JsxExpression <$> term (expressions <|> spreadElement <|> emptyTerm))

7
src/Language/TypeScript/Syntax.hs
View File

@ -507,10 +507,3 @@ data JsxNamespaceName a = JsxNamespaceName a a
instance Eq1 JsxNamespaceName where liftEq = genericLiftEq instance Eq1 JsxNamespaceName where liftEq = genericLiftEq
instance Ord1 JsxNamespaceName where liftCompare = genericLiftCompare instance Ord1 JsxNamespaceName where liftCompare = genericLiftCompare
instance Show1 JsxNamespaceName where liftShowsPrec = genericLiftShowsPrec instance Show1 JsxNamespaceName where liftShowsPrec = genericLiftShowsPrec
data JsxMemberExpression a = JsxMemberExpression [a]
deriving (Diffable, Eq, Foldable, Functor, GAlign, Generic1, Mergeable, Ord, Show, Traversable)
instance Eq1 JsxMemberExpression where liftEq = genericLiftEq
instance Ord1 JsxMemberExpression where liftCompare = genericLiftCompare
instance Show1 JsxMemberExpression where liftShowsPrec = genericLiftShowsPrec