Mercurial Repositories > eric / file diff

--- a/src/eric7/Utilities/ClassBrowsers/rbclbr.py	Wed Jan 25 10:08:19 2023 +0100
+++ b/src/eric7/Utilities/ClassBrowsers/rbclbr.py	Wed Jan 25 13:43:10 2023 +0100
@@ -323,7 +323,7 @@
             break
         start, i = m.capturedStart(), m.capturedEnd()
 
-        if m.hasCaptured("Method"):
+        if m.captured("Method"):
             # found a method definition or function
             thisindent = indent
             indent += 1
@@ -387,14 +387,14 @@
             classstack.append((f, thisindent))  # Marker for nested fns
 
         elif (
-            m.hasCaptured("String")
-            or m.hasCaptured("Comment")
-            or m.hasCaptured("ClassIgnored")
-            or m.hasCaptured("BeginEnd")
+            m.captured("String")
+            or m.captured("Comment")
+            or m.captured("ClassIgnored")
+            or m.captured("BeginEnd")
         ):
             pass
 
-        elif m.hasCaptured("Class"):
+        elif m.captured("Class"):
             # we found a class definition
             thisindent = indent
             indent += 1
@@ -438,7 +438,7 @@
             acstack.append(["public", thisindent])
             # default access control is 'public'
 
-        elif m.hasCaptured("Module"):
+        elif m.captured("Module"):
             # we found a module definition
             thisindent = indent
             indent += 1
@@ -477,7 +477,7 @@
             acstack.append(["public", thisindent])
             # default access control is 'public'
 
-        elif m.hasCaptured("AccessControl"):
+        elif m.captured("AccessControl"):
             aclist = m.captured("AccessControlList")
             if not aclist:
                 index = -1
@@ -520,7 +520,7 @@
                     else:
                         index -= 1
 
-        elif m.hasCaptured("Attribute"):
+        elif m.captured("Attribute"):
             lineno += src.count("\n", last_lineno_pos, start)
             last_lineno_pos = start
             index = -1
@@ -539,7 +539,7 @@
                         lastGlobalEntry.setEndLine(lineno - 1)
                     lastGlobalEntry = None
 
-        elif m.hasCaptured("Attr"):
+        elif m.captured("Attr"):
             lineno += src.count("\n", last_lineno_pos, start)
             last_lineno_pos = start
             index = -1
@@ -586,11 +586,11 @@
                 else:
                     index -= 1
 
-        elif m.hasCaptured("Begin"):
+        elif m.captured("Begin"):
             # a begin of a block we are not interested in
             indent += 1
 
-        elif m.hasCaptured("End"):
+        elif m.captured("End"):
             # an end of a block
             indent -= 1
             if indent < 0:
@@ -601,7 +601,7 @@
                 else:
                     indent = 0
 
-        elif m.hasCaptured("CodingLine"):
+        elif m.captured("CodingLine"):
             # a coding statement
             coding = m.captured("Coding")
             lineno += src.count("\n", last_lineno_pos, start)