Anonymous avatar Anonymous committed f2c0428

rope-show-calltip: using codeassist.get_calltip()

Comments (0)

Files changed (2)

 C-c r a f         rope-find-occurrences
 C-c r a ?         rope-lucky-assist
 C-c r a j         rope-jump-to-global
-C-c r a c         rope-show-call-doc
+C-c r a c         rope-show-calltip
                   rope-analyze-module
 
                   rope-auto-import

ropemacs/interface.py

     @decorators.local_command('a d', 'P', 'C-c d')
     def show_doc(self, prefix):
         self._check_project()
-        self._base_show_doc(prefix)
+        self._base_show_doc(prefix, codeassist.get_doc)
 
     @decorators.local_command('a c', 'P')
+    def show_calltip(self, prefix):
+        self._check_project()
+        self._base_show_doc(prefix, codeassist.get_calltip)
+
+    @decorators.local_command()
     def show_call_doc(self, prefix):
         self._check_project()
+        lisputils.message('ropemacs: use `rope-show-calltip\' instead!')
+
+    def _base_show_doc(self, prefix, get_doc):
+        maxfixes = lisp['ropemacs-codeassist-maxfixes'].value()
+        text = self._get_text()
         offset = self._get_offset()
-        text = self._get_text()
-        try:
-            offset = text.rindex('(', 0, offset) - 1
-            self._base_show_doc(prefix, text, offset)
-        except ValueError:
-            lisputils.message('Not inside a function')
-
-    def _base_show_doc(self, prefix, text=None, offset=None):
-        maxfixes = lisp['ropemacs-codeassist-maxfixes'].value()
-        if text is None:
-            text = self._get_text()
-        if offset is None:
-            offset = self._get_offset()
-        docs = codeassist.get_doc(self.project, text, offset,
-                                  self._get_resource(), maxfixes)
+        docs = get_doc(self.project, text, offset,
+                       self._get_resource(), maxfixes)
 
         use_minibuffer = not prefix
         if lisp['ropemacs-separate-doc-buffer'].value():
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.