Merge pull request #21 from phux/echodoc-compatibility

Added compatibility with echodoc.vim

Author: pbogut

README.md

@@ -110,6 +110,28 @@ command! StopPadawan call deoplete#sources#padawan#StopServer()
 command! RestartPadawan call deoplete#sources#padawan#RestartServer()
 ```
 
+## Compatibility with other plugins
+
+### echodoc.vim
+
+This plugin is compatible with [echodoc.vim](https://github.com/Shougo/echodoc.vim).
+
+**Note**: If you change `g:deoplete#sources#padawan#add_parentheses` from default `0` to `1`, you have to add `$` to deoplete's `skip_chars`.
+Otherwise the popup menu which is triggered after you type `$` will disable echodoc's functionality.
+
+Examples of working setups:
+
+```vim
+let g:deoplete#sources#padawan#add_parentheses = 0
+```
+
+or
+
+```vim
+let g:deoplete#sources#padawan#add_parentheses = 1
+let g:deoplete#skip_chars = ['$']
+```
+
 ## Todo
 - [x] Update configuration section
 - [x] Provide actions to start and stop padawan.php server

rplugin/python3/deoplete/sources/deoplete_padawan.py

@@ -113,12 +113,18 @@ def gather_candidates(self, context):
             candidate = {'word': self.get_candidate_word(item),
                          'abbr': self.get_candidate_abbr(item),
                          'kind': self.get_candidate_signature(item),
-                         'info': item['description'],
+                         'info': self.get_candidate_info(item),
                          'dup': 1}
             candidates.append(candidate)
 
         return candidates
 
+    def get_candidate_info(self, item):
+        abbr = self.get_candidate_abbr(item)
+        signature = self.get_candidate_signature(item)
+
+        return abbr + signature
+
     def get_candidate_abbr(self, item):
         if 'menu' in item and item['menu']:
             abbr = item['menu']