Merge branch 'master' into log-file-paths-part-duex

proto/semantic/api/v1/code_analysis.proto

@@ -187,6 +187,11 @@ message Symbol {
   string kind = 2;
   string line = 3;
   Span span = 4;
+  Docstring docs = 5;
+}
+
+message Docstring {
+  string docstring = 1;
 }
 
 message Position {

src/Semantic/Api/Symbols.hs

@@ -76,4 +76,5 @@ parseSymbols blobs = ParseTreeSymbolResponse . V.fromList . toList <$> distribut
           , kind = kind
           , line = fromMaybe mempty line
           , span = spanToSpan span
+          , docs = fmap Docstring docs
           }

src/Semantic/Api/V1/CodeAnalysisPB.hs

@@ -470,6 +470,7 @@ data Symbol = Symbol
   , kind :: Text
   , line :: Text
   , span :: Maybe Span
+  , docs :: Maybe Docstring
   } deriving stock (Eq, Ord, Show, Generic)
     deriving anyclass (Named, FromJSON, ToJSON)
 
@@ -479,12 +480,27 @@ instance Message Symbol where
     , encodeMessageField 2 kind
     , encodeMessageField 3 line
     , encodeMessageField 4 (Nested span)
+    , encodeMessageField 5 (Nested docs)
     ]
   decodeMessage _ = Symbol
     <$> at decodeMessageField 1
     <*> at decodeMessageField 2
     <*> at decodeMessageField 3
     <*> at decodeMessageField 4
+    <*> at decodeMessageField 5
+  dotProto = undefined
+
+data Docstring = Docstring
+  { docstring :: Text
+  } deriving stock (Eq, Ord, Show, Generic)
+    deriving anyclass (Named, FromJSON, ToJSON)
+
+instance Message Docstring where
+  encodeMessage _ Docstring{..} = mconcat
+    [ encodeMessageField 1 docstring
+    ]
+  decodeMessage _ = Docstring
+    <$> at decodeMessageField 1
   dotProto = undefined
 
 data Position = Position