Merge branch 'main' into run-in-terminal-new

Author: zobo

.github/workflows/build.yml

@@ -1,6 +1,6 @@
 name: build
 
-on: [push, pull_request]
+on: [push, pull_request, workflow_dispatch]
 
 env:
   FORCE_COLOR: 3
@@ -13,25 +13,25 @@ jobs:
       matrix:
         include:
           # Latest versions
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.2' # renovate:keep-up-to-date
             os: ubuntu-22.04
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.1' # renovate:keep-up-to-date
             os: windows-2022
-          - xdebug: xdebug-3.3.2 # renovate:keep-up-to-date
+          - xdebug: xdebug-3.4.2 # renovate:keep-up-to-date
             php: '8.2' # renovate:keep-up-to-date
-            os: macos-12
+            os: macos-14
           # Old versions
           - xdebug: xdebug-2.9.8
             php: '7.4'
             os: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.14.2' # renovate:keep-up-to-date
+          node-version: '20.18.2' # renovate:keep-up-to-date
       - name: Install npm dependencies
         run: npm ci
       - name: Prettier
@@ -60,17 +60,19 @@ jobs:
       - name: Generate coverage report
         run: ./node_modules/.bin/nyc report --reporter=json
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
   release:
     runs-on: ubuntu-22.04
     needs: test
-    if: github.repository_owner == 'xdebug' && github.event_name == 'push' && github.ref == 'refs/heads/main'
+    if: github.repository_owner == 'xdebug' && github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.14.2' # renovate:keep-up-to-date
+          node-version: '20.18.2' # renovate:keep-up-to-date
       - name: Install npm dependencies
         run: npm ci
       - name: Build VS Code extension

.vscode/launch.json

@@ -12,16 +12,18 @@
         "NODE_ENV": "development"
       },
       "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/out/**/*.js"]
+      "outFiles": ["${workspaceFolder}/out/**/*.js"],
+      "preLaunchTask": "npm: watch"
     },
     {
       "name": "Launch Extension",
       "type": "extensionHost",
       "request": "launch",
       "runtimeExecutable": "${execPath}",
-      "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+      "args": ["--extensionDevelopmentPath=${workspaceRoot}", "${workspaceFolder}/testproject"],
       "sourceMaps": true,
-      "outFiles": ["${workspaceFolder}/out/**/*.js"]
+      "outFiles": ["${workspaceFolder}/out/**/*.js"],
+      "preLaunchTask": "npm: watch"
     },
     {
       "name": "Mocha",

CHANGELOG.md

@@ -4,10 +4,25 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [1.36.0]
+## [1.37.0]
 
+- Expection info and support for virtual exception property (Xdebug 3.5.0)
 - Support for console option with internalConsole, integratedTerminal and externalTerminal options.
 
+## [1.36.2]
+
+- Revert watch handling to eval
+
+## [1.36.1]
+
+- Improve handling of watch for static properties
+
+## [1.36.0]
+
+- Implement copy to clipboard in var_export format
+- Improve watch eval to cache result or use property
+- Update docs
+
 ## [1.35.0]
 
 - Support for DBGp stream command

README.md

@@ -88,6 +88,7 @@ More general information on debugging with VS Code can be found on https://code.
   - `max_data`: max amount of variable data to initially retrieve.
   - `max_depth`: maximum depth that the debugger engine may return when sending arrays, hashes or object structures to the IDE (there should be no need to change this as depth is retrieved incrementally, large value can cause IDE to hang).
   - `show_hidden`: This feature can get set by the IDE if it wants to have more detailed internal information on properties (eg. private members of classes, etc.) Zero means that hidden members are not shown to the IDE.
+  - `breakpoint_include_return_value`: Determines whether to enable an additional "return from function" debugging step, allowing inspection of the return value when a function call returns.
 - `xdebugCloudToken`: Instead of listening locally, open a connection and register with Xdebug Cloud and accept debugging sessions on that connection.
 - `stream`: Allows to influence DBGp streams. Xdebug only supports `stdout` see [DBGp stdout](https://xdebug.org/docs/dbgp#stdout-stderr)
   - `stdout`: Redirect stdout stream: 0 (disable), 1 (copy), 2 (redirect)