Changeset 214

Timestamp:

29-04-07 20:14:43 (6 years ago)

Author:

thomas

Message:

• moap/util/ctags.py (CTags.getTags): Make count include the given line, which makes more sense compared to how a diff counts.
• moap/test/test_util_ctags.py (TestCTags.testGetManyTags, TestCTags.testGetBeforeFirstTag, TestCTags.testGetWithFirstTag, TestCTags.testGetTagBeforeTagLine, TestCTags.testGetTagOnTagLine, TestCTags.testGetTagAfterTagLine, TestCTags.testGetLastTwo, TestCTags.testGetLastTag): Update tests for new getTags behaviour

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/test/test_util_ctags.py (modified) (4 diffs)
• moap/util/ctags.py (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-04-29  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+        * moap/util/ctags.py (CTags.getTags):
+          Make count include the given line, which makes more sense
+          compared to how a diff counts.
+        * moap/test/test_util_ctags.py (TestCTags.testGetManyTags,
+          TestCTags.testGetBeforeFirstTag, TestCTags.testGetWithFirstTag,
+          TestCTags.testGetTagBeforeTagLine, TestCTags.testGetTagOnTagLine,
+          TestCTags.testGetTagAfterTagLine, TestCTags.testGetLastTwo,
+          TestCTags.testGetLastTag):
+          Update tests for new getTags behaviour
+
 2007-04-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 

trunk/moap/test/test_util_ctags.py

@@ -30 +30 @@
 
     def testGetManyTags(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 93, 10)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 93, 11)
         self.assertEquals(tags[0].name, 'commit')
         self.assertEquals(tags[1].name, 'diff')
@@ -36 +36 @@
     def testGetBeforeFirstTag(self):
         # asking for tags before there are any should return no tags
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 5, 5)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 5, 6)
         self.failIf(tags)
 
     def testGetWithFirstTag(self):
         # asking for tags before and in first tag should give first tag
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 15, 5)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 15, 6)
         self.assertEquals(len(tags), 1)
         self.assertEquals(tags[0].name, 'detect')
 
     def testGetTagBeforeTagLine(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 15, 0)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 15)
         self.failIf(tags)
 
     def testGetTagOnTagLine(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 16, 0)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 16)
         self.assertEquals(len(tags), 1)
         self.assertEquals(tags[0].name, 'detect')
 
     def testGetTagAfterTagLine(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 17, 0)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 17)
         self.assertEquals(len(tags), 1)
         self.assertEquals(tags[0].name, 'detect')
@@ -61 +61 @@
     def testGetLastTwo(self):
         # update starts on 106
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 105, 1)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 105, 2)
         self.assertEquals(len(tags), 2)
         self.assertEquals(tags[0].name, 'diff')
@@ -67 +67 @@
 
     def testGetLastTag(self):
-        tags = self.ctags.getTags('moap/vcs/cvs.py', 106, 0)
+        tags = self.ctags.getTags('moap/vcs/cvs.py', 106)
         self.assertEquals(len(tags), 1)
         self.assertEquals(tags[0].name, 'update')

trunk/moap/util/ctags.py

@@ -82 +82 @@
             self._files[t.file][t.line] = t
 
-    def getTags(self, file, line, count=0):
+    def getTags(self, file, line, count=1):
         """
         Get all tags for the given file, starting at the given line number,
-        optionally counting count lines further.
+        covered by the given count of lines from that point.
 
         @returns: list of L{Tag}
         """
         ret = []
+        if count < 1:
+            return ret
+
         tags = self._files[file]
         starts = tags.keys()
@@ -121 +124 @@
         # now find all tags in the given range and append
         # it is possible we are already past the end of starts
-        while count and tags[starts[i]].line <= line + count:
+        while count > 1 and tags[starts[i]].line < line + count:
             startLine = starts[i]
             t = tags[startLine]