Changeset 1450

Timestamp:

07/02/08 17:54:14 (5 months ago)

Author:

rob

Message:

Refs #18: Changed CTAGS to use line numbers to be able to jump to a file
* added BufferFrame?.findTabOrOpen to combine makeTabActive and open into a single convenience method
* added getNonInlineName for list actions so that they can have the ability to change their title when not an inlinelist
* added -n option to ctags so that it will use the line number as the address in the file

Location:

trunk/peppy

Files:

• actions/__init__.py (modified) (2 diffs)
• frame.py (modified) (1 diff)
• plugins/error_log.py (modified) (1 diff)
• plugins/project.py (modified) (3 diffs)

trunk/peppy/actions/__init__.py

@@ -375 +375 @@
         return self.id2index[id]
     
+    def getNonInlineName(self):
+        """When the list isn't an inline menu, get the name that should be used
+        as the indicator label for the menu.
+        """
+        return _(self.name)
+    
     def insertIntoMenu(self,menu,pos=None):
         self.cache.resetIndex()
@@ -393 +399 @@
             # Inline list should always use a localized name for the pop-right
             # indicator
-            self._insertMenu(menu, pos, child, _(self.name),True)
+            self._insertMenu(menu, pos, child, self.getNonInlineName(),True)
             self.topindex=pos
             pos=0

trunk/peppy/frame.py

@@ -694 +694 @@
             mode.showInitialPosition(url)
         return mode is not None
+    
+    def findTabOrOpen(self, url):
+        """Find a tab that contains this URL, otherwise open a new tab"""
+        if not self.makeTabActive(url):
+            self.open(url)
 
     def open(self, url, modecls=None, mode_to_replace=None, force_new_tab=False, created_from_url=None):

trunk/peppy/plugins/error_log.py

@@ -237 +237 @@
     
     def open(self, url):
-        if not self.major.frame.makeTabActive(url):
-            self.major.frame.open(url)
+        self.major.frame.findTabOrOpen(url)
 
 class ErrorLogPlugin(IPeppyPlugin):

trunk/peppy/plugins/project.py

@@ -159 +159 @@
     menumax = 20
 
+    def isEnabled(self):
+        return bool(self.mode.project_info) and hasattr(self, 'tags') and bool(self.tags)
+
+    def getNonInlineName(self):
+        lookup = self.mode.check_spelling[0]
+        dprint(lookup)
+        return lookup or "ctags unavailable"
+
     def getItems(self):
         # Because this is a popup action, we can save stuff to this object.
@@ -171 +179 @@
         return [_('No suggestions')]
     
-    def isEnabled(self):
-        return bool(self.mode.project_info) and hasattr(self, 'tags') and bool(self.tags)
-
-    def action(self, index=-1, multiplier=1):
-        dprint(self.tags[index])
+    def action(self, index=-1, multiplier=1):
+        file = self.tags[index][0]
+        addr = self.tags[index][1]
+        dprint("opening %s at line %s" % (file, addr))
+        try:
+            line = int(addr)
+            file = "%s#%d" % (file, line)
+        except:
+            pass
+        self.frame.findTabOrOpen(file)
 
 
@@ -348 +361 @@
         PathParam('ctags_command', 'exuberant-ctags', 'Path to ctags command', fullwidth=True),
         PathParam('ctags_tag_file_name', 'tags', 'name of the generated tags file', fullwidth=True),
-        StrParam('ctags_args', '-R ', 'extra arguments for the ctags command', fullwidth=True),
+        StrParam('ctags_args', '-R -n', 'extra arguments for the ctags command', fullwidth=True),
         )