diff --git a/src/Language/TSX/Assignment.hs b/src/Language/TSX/Assignment.hs index f2886633c..83f1c7896 100644 --- a/src/Language/TSX/Assignment.hs +++ b/src/Language/TSX/Assignment.hs @@ -489,7 +489,7 @@ methodDefinition = makeMethod <$> callSignatureParts :: Assignment (Term, [Term], Term) callSignatureParts = contextualize' <$> Assignment.manyThrough comment (postContextualize' <$> callSignature' <*> many comment) where - callSignature' = symbol Grammar.CallSignature *> children ((,,) <$> (term typeParameters <|> emptyTerm) <*> formalParameters <*> (term typeAnnotation' <|> emptyTerm)) + callSignature' = children ((,,) <$> (term typeParameters <|> emptyTerm) <*> formalParameters <*> (term typeAnnotation' <|> emptyTerm)) contextualize' (cs, (typeParams, formalParams, annotation)) = case nonEmpty cs of Just cs -> (makeTerm1 (Syntax.Context cs typeParams), formalParams, annotation) Nothing -> (typeParams, formalParams, annotation) @@ -498,7 +498,7 @@ callSignatureParts = contextualize' <$> Assignment.manyThrough comment (postCont Nothing -> (typeParams, formalParams, annotation) callSignature :: Assignment Term -callSignature = makeTerm <$> symbol Grammar.CallSignature <*> children (TSX.Syntax.CallSignature <$> (fromMaybe <$> emptyTerm <*> optional (term typeParameters)) <*> formalParameters <*> (fromMaybe <$> emptyTerm <*> optional (term typeAnnotation'))) +callSignature = makeTerm <$> location <*> children (TSX.Syntax.CallSignature <$> (fromMaybe <$> emptyTerm <*> optional (term typeParameters)) <*> formalParameters <*> (fromMaybe <$> emptyTerm <*> optional (term typeAnnotation'))) constructSignature :: Assignment Term constructSignature = makeTerm <$> symbol Grammar.ConstructSignature <*> children (TSX.Syntax.ConstructSignature <$> (fromMaybe <$> emptyTerm <*> optional (term typeParameters)) <*> formalParameters <*> (fromMaybe <$> emptyTerm <*> optional (term typeAnnotation')))