github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-23 08:27:56 +03:00
Code Issues Projects Releases Wiki Activity

Add bloboid (if exists) to proto output

Browse Source
This commit is contained in:
Timothy Clem 2019-04-12 15:48:49 -07:00
parent abd0bf08af
commit e381f4d95d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/semantic/api/v1/code_analysis.proto
View File

@ -165,6 +165,7 @@ message File {
string language = 2;
repeated Symbol symbols = 3;
repeated ParseError errors = 4;
string blob_oid = 5;
}
message Symbol {

4
src/Semantic/Api/Symbols.hs
View File

@ -65,7 +65,7 @@ parseSymbols blobs = ParseTreeSymbolResponse . V.fromList . toList <$> distribut
go :: (Member (Error SomeException) sig, Member Task sig, Carrier sig m) => Blob -> m File
go blob@Blob{..} = (doParse blob >>= withSomeTerm (renderToSymbols blob)) `catchError` (\(SomeException e) -> pure $ errorFile (show e))
where
errorFile e = File (pack blobPath) (bridging # blobLanguage) mempty (V.fromList [ParseError (T.pack e)])
errorFile e = File (pack blobPath) (bridging # blobLanguage) mempty (V.fromList [ParseError (T.pack e)]) blobOid
symbolsToSummarize :: [Text]
symbolsToSummarize = ["Function", "Method", "Class", "Module", "Call", "Send"]
@ -74,7 +74,7 @@ parseSymbols blobs = ParseTreeSymbolResponse . V.fromList . toList <$> distribut
renderToSymbols blob@Blob{..} term = pure $ either (errorFile . show) (tagsToFile blob) (runTagging blob symbolsToSummarize term)
tagsToFile :: Blob -> [Tag] -> File
tagsToFile Blob{..} tags = File (pack blobPath) (bridging # blobLanguage) (V.fromList (fmap tagToSymbol tags)) mempty
tagsToFile Blob{..} tags = File (pack blobPath) (bridging # blobLanguage) (V.fromList (fmap tagToSymbol tags)) mempty blobOid
tagToSymbol :: Tag -> Symbol
tagToSymbol Tag{..}

6
src/Semantic/Api/V1/CodeAnalysisPB.hs
View File

@ -1108,6 +1108,7 @@ data File = File
, language :: Text
, symbols :: Vector Symbol
, errors :: Vector ParseError
, blobOid :: Text
} deriving stock (Eq, Ord, Show, Generic)
deriving anyclass (Proto3.Named, NFData)
@ -1117,6 +1118,7 @@ instance FromJSONPB File where
<*> obj .: "language"
<*> obj .: "symbols"
<*> obj .: "errors"
<*> obj .: "blobOid"
instance ToJSONPB File where
toJSONPB File{..} = object
@ -1125,6 +1127,7 @@ instance ToJSONPB File where
, "language" .= language
, "symbols" .= symbols
, "errors" .= errors
, "blobOid" .= blobOid
]
toEncodingPB File{..} = pairs
[
@ -1132,6 +1135,7 @@ instance ToJSONPB File where
, "language" .= language
, "symbols" .= symbols
, "errors" .= errors
, "blobOid" .= blobOid
]
instance FromJSON File where
@ -1148,12 +1152,14 @@ instance Proto3.Message File where
, encodeMessageField 2 language
, encodeMessageField 3 (Proto3.NestedVec symbols)
, encodeMessageField 4 (Proto3.NestedVec errors)
, encodeMessageField 5 blobOid
]
decodeMessage _ = File
<$> at decodeMessageField 1
<*> at decodeMessageField 2
<*> (nestedvec <$> at decodeMessageField 3)
<*> (nestedvec <$> at decodeMessageField 4)
<*> at decodeMessageField 5
dotProto = undefined
data Symbol = Symbol