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

Provide full expression call target context

Browse Source
This commit is contained in:
Timothy Clem 2018-01-25 14:23:37 -08:00
parent a0a90957b0
commit 20f94dbdf9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Analysis/Declaration.hs
View File

@ -7,6 +7,7 @@ module Analysis.Declaration
import Data.Algebra
import Data.Blob
import Data.Monoid
import Data.Error (Error(..), showExpectation)
import Data.Foldable (toList)
import Data.Language as Language
@ -33,7 +34,7 @@ data Declaration
| ImportDeclaration { declarationIdentifier :: T.Text, declarationAlias :: T.Text, declarationText :: T.Text, declarationLanguage :: Maybe Language }
| FunctionDeclaration { declarationIdentifier :: T.Text, declarationText :: T.Text, declarationLanguage :: Maybe Language }
| HeadingDeclaration { declarationIdentifier :: T.Text, declarationText :: T.Text, declarationLanguage :: Maybe Language, declarationLevel :: Int }
| CallReference { declarationIdentifier :: T.Text, declarationImportIdentifier :: Maybe T.Text }
| CallReference { declarationIdentifier :: T.Text, declarationImportIdentifier :: [T.Text] }
| ErrorDeclaration { declarationIdentifier :: T.Text, declarationText :: T.Text, declarationLanguage :: Maybe Language }
deriving (Eq, Generic, Show)
@ -130,9 +131,14 @@ instance CustomHasDeclaration Declaration.Import where
instance CustomHasDeclaration Expression.Call where
customToDeclaration Blob{..} _ (Expression.Call _ (Term (In fromAnn fromF), _) _ _)
| [Term (In modAnn _), Term (In idenAnn _)] <- toList fromF = Just $ CallReference (getSource idenAnn) (Just (getSource modAnn))
| otherwise = Just $ CallReference (getSource fromAnn) Nothing
where getSource = toText . flip Source.slice blobSource . getField
| [Term (In _ modF), Term (In idenAnn _)] <- toList fromF = Just $ CallReference (getSource idenAnn) (memberAccess modF)
| otherwise = Just $ CallReference (getSource fromAnn) []
where
memberAccess termFOut = case toList termFOut of
[Term (In idenA f), Term (In idenB _)] | null f -> [getSource idenA, getSource idenB]
| otherwise -> memberAccess f <> [getSource idenB]
_ -> []
getSource = toText . flip Source.slice blobSource . getField
-- | Produce a 'Declaration' for 'Union's using the 'HasDeclaration' instance & therefore using a 'CustomHasDeclaration' instance when one exists & the type is listed in 'DeclarationStrategy'.
instance Apply HasDeclaration fs => CustomHasDeclaration (Union fs) where

4
src/Rendering/Imports.hs
View File

@ -131,7 +131,7 @@ instance ToJSON ImportStatement where
data CallExpression = CallExpression
{ referenceName :: T.Text
, referenceTarget :: Maybe T.Text
, referenceTarget :: [T.Text]
, referenceKind :: T.Text
, referenceSpan :: Span
} deriving (Generic, Eq, Show)
@ -139,7 +139,7 @@ data CallExpression = CallExpression
instance ToJSON CallExpression where
toJSON CallExpression{..} = objectWithoutNulls
[ "name" .= referenceName
, "target" .= referenceTarget
, "targets" .= referenceTarget
, "kind" .= referenceKind
-- , "span" .= referenceSpan
]