bash-dap 0.1__tar.gz → 0.2__tar.gz

{bash_dap-0.1 → bash_dap-0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bash-dap
-Version: 0.1
+Version: 0.2
 Summary: A debug adapter (Debug Adapter Protocol) for bash scripts, written in bash and Python
 Author-email: Ilia Maslakov <il.smind@gmail.com>
 License: GPL-3.0-or-later
@@ -18,7 +18,8 @@ Dynamic: license-file
 # bash-dap
 
 A debug adapter of the [Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol/)
-for bash scripts: breakpoints, steps into, over and out of functions, the call stack, the
+for bash scripts: breakpoints on lines and on functions, steps into, over and out of functions,
+the call stack, the
 variables (arrays and associative arrays as trees), expressions, pause.
 
 It needs nothing but bash 4.1 or newer and Python 3.8 or newer: no bashdb, no Node.js.  (The bash
@@ -75,13 +76,16 @@ subshell is a process of its own, so what is said to one, a step, a breakpoint,
 others through files of that directory, which every process looks at, at a test of two files a
 command.  A script under the debugger runs some 25 times slower than by itself.
 
+A breakpoint on a function stops at its first command, at each call, in a subshell too;
+what the script defines later, or a file it sources, is found as well, as the name is all
+the debugger looks for.
+
 When the session ends the adapter ends the script by its process group, the session it has to
 itself; never by a parent, never anything else.
 
 ## Not yet
 
-Conditional breakpoints, breakpoints on functions, a script that another script runs with a
-new bash.
+Conditional breakpoints, a script that another script runs with a new bash.
 
 ## License
 

{bash_dap-0.1 → bash_dap-0.2}/README.md

@@ -1,7 +1,8 @@
 # bash-dap
 
 A debug adapter of the [Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol/)
-for bash scripts: breakpoints, steps into, over and out of functions, the call stack, the
+for bash scripts: breakpoints on lines and on functions, steps into, over and out of functions,
+the call stack, the
 variables (arrays and associative arrays as trees), expressions, pause.
 
 It needs nothing but bash 4.1 or newer and Python 3.8 or newer: no bashdb, no Node.js.  (The bash
@@ -58,13 +59,16 @@ subshell is a process of its own, so what is said to one, a step, a breakpoint,
 others through files of that directory, which every process looks at, at a test of two files a
 command.  A script under the debugger runs some 25 times slower than by itself.
 
+A breakpoint on a function stops at its first command, at each call, in a subshell too;
+what the script defines later, or a file it sources, is found as well, as the name is all
+the debugger looks for.
+
 When the session ends the adapter ends the script by its process group, the session it has to
 itself; never by a parent, never anything else.
 
 ## Not yet
 
-Conditional breakpoints, breakpoints on functions, a script that another script runs with a
-new bash.
+Conditional breakpoints, a script that another script runs with a new bash.
 
 ## License
 

{bash_dap-0.1 → bash_dap-0.2}/bash_dap/__init__.py

@@ -1,3 +1,3 @@
 """bash-dap: a debug adapter of the Debug Adapter Protocol for bash scripts."""
 
-__version__ = "0.1"
+__version__ = "0.2"

{bash_dap-0.1 → bash_dap-0.2}/bash_dap/adapter.py

@@ -15,7 +15,11 @@ import tempfile
 import threading
 import time
 
+from . import __version__
+
 HARNESS = os.path.join(os.path.dirname(os.path.abspath(__file__)), "harness.sh")
+# a name of a function of bash, as a breakpoint takes it: no space, no quote, no parenthesis
+FUNCTION_NAME = re.compile(r"^[^\s()$`'\"\\]+$")
 VARIABLES_REF = 1  # the reference of the variables of a stop
 
 
@@ -108,6 +112,7 @@ class Adapter:
         self.alive = False
         self.pause_asked = False
         self.breaks = {}
+        self.functions = []
         self.gen = 0
         self.refs = {}
         self.next_ref = VARIABLES_REF + 1
@@ -196,6 +201,8 @@ class Adapter:
             for path, lines in self.breaks.items():
                 for line in lines:
                     f.write("%s:%d\n" % (path, line))
+            for name in self.functions:
+                f.write("%s()\n" % name)
         self.gen += 1
         open(os.path.join(self.dir, "gen.%d" % self.gen), "w").close()
 
@@ -255,6 +262,8 @@ class Adapter:
             return
         if self.pause_asked and reason == "step":
             reason = "pause"
+        elif reason == "function":
+            reason = "function breakpoint"
         self.pause_asked = False
         self.event("stopped", {"reason": reason, "threadId": 1, "allThreadsStopped": True})
 
@@ -287,6 +296,7 @@ class Adapter:
         self.client = request.get("arguments", {})
         self.respond(request, {
             "supportsConfigurationDoneRequest": True,
+            "supportsFunctionBreakpoints": True,
             "supportsEvaluateForHovers": True,
             "supportsTerminateRequest": True,
         })
@@ -353,9 +363,20 @@ class Adapter:
             for i, line in enumerate(lines)]})
 
     def on_setFunctionBreakpoints(self, request):
-        self.respond(request, {"breakpoints": [
-            {"verified": False, "message": "bash-dap has breakpoints on lines only"}
-            for _ in request.get("arguments", {}).get("breakpoints", [])]})
+        """The functions to stop in at their first command; a name that is no name of a
+        function of bash is not taken"""
+        answers = []
+        self.functions = []
+        for b in request.get("arguments", {}).get("breakpoints", []):
+            name = b.get("name", "")
+            if FUNCTION_NAME.match(name):
+                self.functions.append(name)
+                answers.append({"id": 1000 + len(self.functions), "verified": True})
+            else:
+                answers.append({"verified": False,
+                                "message": "no name of a function of bash: %s" % name})
+        self.save_breaks()
+        self.respond(request, {"breakpoints": answers})
 
     def on_setExceptionBreakpoints(self, request):
         self.respond(request, {"breakpoints": []})
@@ -527,7 +548,7 @@ def main():
               "on stdin and stdout")
         return 0
     if len(sys.argv) > 1 and sys.argv[1] == "--version":
-        print("bash-dap 0.1")
+        print("bash-dap %s" % __version__)
         return 0
     Adapter(sys.stdin.buffer, sys.stdout.buffer).run()
     return 0

{bash_dap-0.1 → bash_dap-0.2}/bash_dap/harness.sh

@@ -9,14 +9,15 @@
 # "replies", which it reads what the debugger says from, a line each:
 #
 #   commands:  run | step | next | finish | print EXPRESSION | vars | stack
-#   replies:   stopped REASON LINE FUNCTION FILE      (REASON: entry, breakpoint, step)
+#   replies:   stopped REASON LINE FUNCTION FILE      (REASON: entry, breakpoint, function, step)
 #              value TEXT | var NAME TEXT | frame LEVEL FUNCTION LINE FILE | error TEXT
 #              done, after the reply to a command | exited CODE
 #
 # TEXT is quoted as printf %q does, so that a reply is one line.  A command is read only while
 # the script is stopped.  At any time the adapter may write the breakpoints to the file "breaks",
 # FILE:LINE a line, then make the empty file "gen.N" of the next generation N; and stop the
-# script at its next command by writing "step 0" to the file "state".
+# script at its next command by writing "step 0" to the file "state".  A line NAME() of
+# "breaks" is a breakpoint on the function NAME: the script stops at its first command.
 #
 # A subshell is a process of its own: what it is told, a step, a breakpoint, goes to the others
 # through these files.  The names of the debugger begin with __bdap_.
@@ -33,11 +34,14 @@ __bdap_state=$__bdap_dir/state
 __bdap_mode=run
 __bdap_depth=0
 # the breakpoints by FILE:LINE, and the generation of the file they came from; __bdap_names has
-# NAME:LINE, the name of the file only, that the trap tests at each command
-declare -A __bdap_breaks=() __bdap_names=()
+# NAME:LINE, the name of the file only, that the trap tests at each command; __bdap_funcs has
+# NAME() of the functions to stop in
+declare -A __bdap_breaks=() __bdap_names=() __bdap_funcs=()
 __bdap_gen=0
 __bdap_inside=
 __bdap_prev=  # the place of the command before: a line stops when it is come to, not again
+__bdap_fdepth=0  # the depth of the calls at the command before: more is a function entered
+__bdap_fenter=  # a function to stop in is entered: its first command is next
 
 # the variables of bash itself, and those it makes for a function: not shown
 __bdap_known=" $(compgen -v | tr '\n' ' ') FUNCNAME BASH_ARGC BASH_ARGV BASH_LINENO BASH_SOURCE COLUMNS LINES "
@@ -93,8 +97,13 @@ __bdap_breaks_load () {
     done
     __bdap_breaks=()
     __bdap_names=()
+    __bdap_funcs=()
     while read -r __bdap_place; do
         [[ -z $__bdap_place ]] && continue
+        if [[ $__bdap_place == *"()" ]]; then
+            __bdap_funcs["$__bdap_place"]=1
+            continue
+        fi
         __bdap_breaks["$__bdap_place"]=1
         __bdap_names["${__bdap_place##*/}"]=1
     done <"$__bdap_dir/breaks"
@@ -126,6 +135,7 @@ __bdap_wait () {
     __bdap_resume run 0
     __bdap_breaks=()
     __bdap_names=()
+    __bdap_funcs=()
     trap - DEBUG
 }
 
@@ -172,6 +182,16 @@ __bdap_check () {
     if [[ -z $__bdap_reason && -n ${__bdap_breaks["$__bdap_file:$__bdap_line"]-} ]] && __bdap_on_line; then
         __bdap_reason=breakpoint
     fi
+    # the first command of a function to stop in: the calls are deeper than at the command
+    # before; bash comes first to the line that defines it, with the call as the command
+    if [[ -z $__bdap_reason && -n ${__bdap_funcs["${FUNCNAME[2]-}()"]-} ]]; then
+        if ((__bdap_d - 1 > __bdap_fdepth)) && [[ $__bdap_command == "${FUNCNAME[2]}"* ]]; then
+            __bdap_fenter=1
+        elif ((__bdap_d - 1 > __bdap_fdepth)) || [[ -n $__bdap_fenter ]]; then
+            __bdap_reason=function
+        fi
+    fi
+    [[ -n $__bdap_reason ]] && __bdap_fenter=
     # the next command of a line is no new place to stop at
     [[ -z $__bdap_reason || $__bdap_prev == "$__bdap_line:${BASH_SOURCE[2]}" ]] && return 0
     # the lines of the frames, the one stopped in first
@@ -195,12 +215,14 @@ trap '__bdap_say "exited $?"' EXIT
 shopt -s extdebug
 set -o functrace
 # the hook only when there may be something to do: a step, a breakpoint in a file of that name
-# on the line, what another process has said; else a command costs a test of two files.  One
-# line: a second one would have LINENO one more
-# (with set -u of the script it runs too: nothing unset is read, BASH_SOURCE is empty at the end)
+# on the line or on the function, what another process has said; else a command costs a test
+# of two files.  One line: a second one would have LINENO one more
+# (with set -u of the script it runs too: nothing unset is read, BASH_SOURCE is empty at the end,
+# FUNCNAME unset out of any function)
 __bdap_trap='[[ -n $__bdap_inside || ( $__bdap_mode == run'
 __bdap_trap+=' && -z ${__bdap_names["${BASH_SOURCE[0]:+${BASH_SOURCE[0]##*/}}:$LINENO"]-}'
+__bdap_trap+=' && -z ${__bdap_funcs["${FUNCNAME[0]-}()"]-}'
 __bdap_trap+=' && ! -e $__bdap_state && ! -e $__bdap_dir/gen.$((__bdap_gen + 1)) ) ]] || __bdap_hook "$BASH_COMMAND";'
-__bdap_trap+=' __bdap_prev=$LINENO:${BASH_SOURCE[0]-}'
+__bdap_trap+=' __bdap_prev=$LINENO:${BASH_SOURCE[0]-} __bdap_fdepth=${FUNCNAME[0]+${#FUNCNAME[@]}}'
 trap "$__bdap_trap" DEBUG
 . "$0" "$@"

{bash_dap-0.1 → bash_dap-0.2}/bash_dap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bash-dap
-Version: 0.1
+Version: 0.2
 Summary: A debug adapter (Debug Adapter Protocol) for bash scripts, written in bash and Python
 Author-email: Ilia Maslakov <il.smind@gmail.com>
 License: GPL-3.0-or-later
@@ -18,7 +18,8 @@ Dynamic: license-file
 # bash-dap
 
 A debug adapter of the [Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol/)
-for bash scripts: breakpoints, steps into, over and out of functions, the call stack, the
+for bash scripts: breakpoints on lines and on functions, steps into, over and out of functions,
+the call stack, the
 variables (arrays and associative arrays as trees), expressions, pause.
 
 It needs nothing but bash 4.1 or newer and Python 3.8 or newer: no bashdb, no Node.js.  (The bash
@@ -75,13 +76,16 @@ subshell is a process of its own, so what is said to one, a step, a breakpoint,
 others through files of that directory, which every process looks at, at a test of two files a
 command.  A script under the debugger runs some 25 times slower than by itself.
 
+A breakpoint on a function stops at its first command, at each call, in a subshell too;
+what the script defines later, or a file it sources, is found as well, as the name is all
+the debugger looks for.
+
 When the session ends the adapter ends the script by its process group, the session it has to
 itself; never by a parent, never anything else.
 
 ## Not yet
 
-Conditional breakpoints, breakpoints on functions, a script that another script runs with a
-new bash.
+Conditional breakpoints, a script that another script runs with a new bash.
 
 ## License
 

{bash_dap-0.1 → bash_dap-0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "bash-dap"
-version = "0.1"
+version = "0.2"
 description = "A debug adapter (Debug Adapter Protocol) for bash scripts, written in bash and Python"
 readme = "README.md"
 license = { text = "GPL-3.0-or-later" }

{bash_dap-0.1 → bash_dap-0.2}/tests/test_adapter.py

@@ -198,6 +198,31 @@ class SessionTest(unittest.TestCase):
         c.wait_event("terminated")
         self.assertIn("3 files, 2800 bytes", c.output())
 
+    def test_function_breakpoints(self):
+        c = self.client = Client()
+        c.request("initialize", {"adapterID": "bash-dap", "linesStartAt1": True})
+        c.request("launch", {"program": script("backup.sh"), "cwd": SCRIPTS})
+        c.wait_event("initialized")
+        response = c.request("setFunctionBreakpoints", {"breakpoints": [
+            {"name": "size_of"}, {"name": "not a name"}]})
+        verified = [b["verified"] for b in response["body"]["breakpoints"]]
+        self.assertEqual(verified, [True, False])
+        c.request("configurationDone")
+        # at the first command of the function, in the subshell of $(...)
+        self.assertEqual(c.wait_event("stopped")["body"]["reason"], "function breakpoint")
+        self.assertEqual(c.stop_place(), [("size_of", "backup.sh", 7), ("main", "backup.sh", 15)])
+        # once a call, not at each of its commands
+        c.request("next", {"threadId": 1})
+        c.wait_event("stopped")
+        self.assertEqual(c.stop_place()[0], ("size_of", "backup.sh", 8))
+        c.request("continue", {"threadId": 1})
+        c.wait_event("stopped")
+        self.assertEqual(c.evaluate("$f")["body"]["result"], "photo.jpg")
+        # taken off, the script runs to its end
+        c.request("setFunctionBreakpoints", {"breakpoints": []})
+        c.request("continue", {"threadId": 1})
+        self.assertEqual(c.wait_event("exited")["body"]["exitCode"], 3)
+
     def test_pipe_sourced_file_and_dollar_zero(self):
         c = self.client = Client()
         c.start(script("pipe.sh"), [(script("lib.sh"), 3), (script("pipe.sh"), 6)])