Skip to content

[lldb-dap] Fix machine-overridable scope #137723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 29, 2025

Conversation

JDevlieghere
Copy link
Member

My previous commit was a bit sloppy, I didn't spot that lldb-dap.executable-path already had a scope and I didn't consider that lldb-dap.log-path should have the same scope.

This PR addresses both:

  • Fix duplicate scope for lldb-dap.executable-path.
  • Change scope of lldb-dap.log-path to machine-overridable too.

My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
@llvmbot
Copy link
Member

llvmbot commented Apr 28, 2025

@llvm/pr-subscribers-lldb

Author: Jonas Devlieghere (JDevlieghere)

Changes

My previous commit was a bit sloppy, I didn't spot that lldb-dap.executable-path already had a scope and I didn't consider that lldb-dap.log-path should have the same scope.

This PR addresses both:

  • Fix duplicate scope for lldb-dap.executable-path.
  • Change scope of lldb-dap.log-path to machine-overridable too.

Full diff: https://github.com/llvm/llvm-project/pull/137723.diff

1 Files Affected:

  • (modified) lldb/tools/lldb-dap/package.json (+2-3)
diff --git a/lldb/tools/lldb-dap/package.json b/lldb/tools/lldb-dap/package.json
index adbb5b2bcf722..5cfd79849b17f 100644
--- a/lldb/tools/lldb-dap/package.json
+++ b/lldb/tools/lldb-dap/package.json
@@ -73,9 +73,8 @@
       "title": "lldb-dap",
       "properties": {
         "lldb-dap.executable-path": {
-          "scope": "resource",
-          "type": "string",
           "scope": "machine-overridable",
+          "type": "string",
           "description": "The path to the lldb-dap binary, e.g. /usr/local/bin/lldb-dap"
         },
         "lldb-dap.arguments": {
@@ -88,7 +87,7 @@
           "description": "The list of additional arguments used to launch the debug adapter executable."
         },
         "lldb-dap.log-path": {
-          "scope": "resource",
+          "scope": "machine-overridable",
           "type": "string",
           "description": "The log path for lldb-dap (if any)"
         },

@JDevlieghere JDevlieghere merged commit 82ab359 into llvm:main Apr 29, 2025
11 of 13 checks passed
@JDevlieghere JDevlieghere deleted the machine-overridable branch April 29, 2025 00:01
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
IanWood1 pushed a commit to IanWood1/llvm-project that referenced this pull request May 6, 2025
My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
GeorgeARM pushed a commit to GeorgeARM/llvm-project that referenced this pull request May 7, 2025
My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
Ankur-0429 pushed a commit to Ankur-0429/llvm-project that referenced this pull request May 9, 2025
My previous commit was a bit sloppy, I didn't spot that
`lldb-dap.executable-path` already had a scope and I didn't consider
that `lldb-dap.log-path` should have the same scope.

This PR addresses both:

 - Fix duplicate scope for `lldb-dap.executable-path`.
 - Change scope of `lldb-dap.log-path` to `machine-overridable` too.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants