Reformat stack entry output to improve distinction between file/line …

…and function.
mercurykd · Jan 6, 2018 · bb07894 · bb07894
1 parent db341c7
commit bb07894
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Xdebug.tmLanguage b/Xdebug.tmLanguage
@@ -90,16 +90,16 @@
 				<key>3</key>
 				<dict>
 					<key>name</key>
-					<string>string.quoted.xdebug.stack.where</string>
+					<string>string.quoted.xdebug.stack.lineno</string>
 				</dict>
 				<key>4</key>
 				<dict>
 					<key>name</key>
-					<string>variable.parameter.xdebug.stack.lineno</string>
+					<string>variable.parameter.xdebug.stack.where</string>
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^(\[\d+\])\s*(.*)(\..*)(\s*:.*\d+)</string>
+			<string>^(\[\d+\])\s(.*)(:\d+),\s(.*\(\))</string>
 			<key>name</key>
 			<string>meta.xdebug.stack.line</string>
 		</dict>
@@ -118,7 +118,7 @@
 				</dict>
 			</dict>
 			<key>match</key>
-			<string>^(\[.*?\])\s*(.*)</string>
+			<string>^(\[\D+\])\s(.*)</string>
 			<key>name</key>
 			<string>meta.xdebug.stack.exception</string>
 		</dict>

diff --git a/xdebug/view.py b/xdebug/view.py
@@ -167,15 +167,15 @@ def generate_stack_output(response):
                 stack_line = child.get(dbgp.STACK_LINENO, 0)
                 stack_where = child.get(dbgp.STACK_WHERE, '{unknown}')
                 # Append values
-                values += H.unicode_string('[{level}] {filename}.{where}:{lineno}\n'
+                values += H.unicode_string('[{level}] {filename}:{lineno}, {where}()\n'
                                            .format(level=stack_level, type=stack_type, where=stack_where, lineno=stack_line, filename=stack_file))
                 has_output = True
     except:
         pass
 
     # When no stack use values from exception
     if not has_output and S.BREAKPOINT_EXCEPTION:
-        values += H.unicode_string('[{level}] {filename}.{where}:{lineno}\n'
+        values += H.unicode_string('[{level}] {filename}:{lineno}, {where}()\n'
                                    .format(level=0, where='{unknown}', lineno=S.BREAKPOINT_EXCEPTION['lineno'], filename=S.BREAKPOINT_EXCEPTION['filename']))
 
     return values
@@ -871,7 +871,7 @@ def toggle_stack(view):
         if point.size() > 3 and sublime.score_selector(view.scope_name(point.a), 'meta.xdebug.stack.line'):
             # Get fileuri and line number from selected line in view
             line = view.substr(view.line(point))
-            pattern = re.compile('^(\[\d+\])\s*(?P<fileuri>.*)(\..*)(\s*:.*?(?P<lineno>\d+))\s*(\((.*?):.*\)|$)')
+            pattern = re.compile('^\[\d+\]\s(?P<fileuri>.*):(?P<lineno>\d+)')
             match = pattern.match(line)
             # Show file when it's a valid fileuri
             if match and match.group('fileuri'):