Author: Ebuka Ezike Date: 2026-01-06T18:50:21Z New Revision: 5f0f0fcd62227fb864203acc1a57e3ebf7a254a3
URL: https://github.com/llvm/llvm-project/commit/5f0f0fcd62227fb864203acc1a57e3ebf7a254a3 DIFF: https://github.com/llvm/llvm-project/commit/5f0f0fcd62227fb864203acc1a57e3ebf7a254a3.diff LOG: [lldb-dap] Add lldb-dap extension directory. (#174219) Move all lldb-dap vscode extension files to the extension directory. Follow up from https://github.com/llvm/llvm-project/pull/162635#discussion_r2482141750 Added: lldb/tools/lldb-dap/extension/.prettierrc.json lldb/tools/lldb-dap/extension/.vscode/launch.json lldb/tools/lldb-dap/extension/.vscode/tasks.json lldb/tools/lldb-dap/extension/.vscodeignore lldb/tools/lldb-dap/extension/LICENSE.TXT lldb/tools/lldb-dap/extension/llvm-logo.png lldb/tools/lldb-dap/extension/package-lock.json lldb/tools/lldb-dap/extension/package.json lldb/tools/lldb-dap/extension/src/debug-adapter-factory.ts lldb/tools/lldb-dap/extension/src/debug-configuration-provider.ts lldb/tools/lldb-dap/extension/src/debug-session-tracker.ts lldb/tools/lldb-dap/extension/src/disposable-context.ts lldb/tools/lldb-dap/extension/src/extension.ts lldb/tools/lldb-dap/extension/src/index.d.ts lldb/tools/lldb-dap/extension/src/lldb-dap-server.ts lldb/tools/lldb-dap/extension/src/logging.ts lldb/tools/lldb-dap/extension/src/ui/error-with-notification.ts lldb/tools/lldb-dap/extension/src/ui/modules-data-provider.ts lldb/tools/lldb-dap/extension/src/ui/show-error-message.ts lldb/tools/lldb-dap/extension/src/ui/symbols-provider.ts lldb/tools/lldb-dap/extension/src/ui/symbols-webview-html.ts lldb/tools/lldb-dap/extension/src/uri-launch-handler.ts lldb/tools/lldb-dap/extension/src/utils.ts lldb/tools/lldb-dap/extension/src/webview/symbols-table-view.ts lldb/tools/lldb-dap/extension/src/webview/tsconfig.json lldb/tools/lldb-dap/extension/syntaxes/arm.disasm lldb/tools/lldb-dap/extension/syntaxes/arm64.disasm lldb/tools/lldb-dap/extension/syntaxes/disassembly.json lldb/tools/lldb-dap/extension/syntaxes/x86.disasm lldb/tools/lldb-dap/extension/tsconfig.json Modified: lldb/docs/resources/lldbdap.md Removed: lldb/tools/lldb-dap/.prettierrc.json lldb/tools/lldb-dap/.vscode/launch.json lldb/tools/lldb-dap/.vscode/tasks.json lldb/tools/lldb-dap/.vscodeignore lldb/tools/lldb-dap/LICENSE.TXT lldb/tools/lldb-dap/llvm-logo.png lldb/tools/lldb-dap/package-lock.json lldb/tools/lldb-dap/package.json lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts lldb/tools/lldb-dap/src-ts/debug-session-tracker.ts lldb/tools/lldb-dap/src-ts/disposable-context.ts lldb/tools/lldb-dap/src-ts/extension.ts lldb/tools/lldb-dap/src-ts/index.d.ts lldb/tools/lldb-dap/src-ts/lldb-dap-server.ts lldb/tools/lldb-dap/src-ts/logging.ts lldb/tools/lldb-dap/src-ts/ui/error-with-notification.ts lldb/tools/lldb-dap/src-ts/ui/modules-data-provider.ts lldb/tools/lldb-dap/src-ts/ui/show-error-message.ts lldb/tools/lldb-dap/src-ts/ui/symbols-provider.ts lldb/tools/lldb-dap/src-ts/ui/symbols-webview-html.ts lldb/tools/lldb-dap/src-ts/uri-launch-handler.ts lldb/tools/lldb-dap/src-ts/utils.ts lldb/tools/lldb-dap/src-ts/webview/symbols-table-view.ts lldb/tools/lldb-dap/src-ts/webview/tsconfig.json lldb/tools/lldb-dap/syntaxes/arm.disasm lldb/tools/lldb-dap/syntaxes/arm64.disasm lldb/tools/lldb-dap/syntaxes/disassembly.json lldb/tools/lldb-dap/syntaxes/x86.disasm lldb/tools/lldb-dap/tsconfig.json ################################################################################ diff --git a/lldb/docs/resources/lldbdap.md b/lldb/docs/resources/lldbdap.md index 3838c82ab5dfb..858b4bd1e3cc0 100644 --- a/lldb/docs/resources/lldbdap.md +++ b/lldb/docs/resources/lldbdap.md @@ -99,7 +99,7 @@ changed. ### Packaging and installation ```bash -cd /path/to/lldb/tools/lldb-dap +cd /path/to/lldb/tools/lldb-dap/extension npm install npm run package # This also compiles the extension. npm run vscode-install diff --git a/lldb/tools/lldb-dap/.prettierrc.json b/lldb/tools/lldb-dap/extension/.prettierrc.json similarity index 100% rename from lldb/tools/lldb-dap/.prettierrc.json rename to lldb/tools/lldb-dap/extension/.prettierrc.json diff --git a/lldb/tools/lldb-dap/.vscode/launch.json b/lldb/tools/lldb-dap/extension/.vscode/launch.json similarity index 100% rename from lldb/tools/lldb-dap/.vscode/launch.json rename to lldb/tools/lldb-dap/extension/.vscode/launch.json diff --git a/lldb/tools/lldb-dap/.vscode/tasks.json b/lldb/tools/lldb-dap/extension/.vscode/tasks.json similarity index 100% rename from lldb/tools/lldb-dap/.vscode/tasks.json rename to lldb/tools/lldb-dap/extension/.vscode/tasks.json diff --git a/lldb/tools/lldb-dap/.vscodeignore b/lldb/tools/lldb-dap/extension/.vscodeignore similarity index 100% rename from lldb/tools/lldb-dap/.vscodeignore rename to lldb/tools/lldb-dap/extension/.vscodeignore diff --git a/lldb/tools/lldb-dap/LICENSE.TXT b/lldb/tools/lldb-dap/extension/LICENSE.TXT similarity index 100% rename from lldb/tools/lldb-dap/LICENSE.TXT rename to lldb/tools/lldb-dap/extension/LICENSE.TXT diff --git a/lldb/tools/lldb-dap/llvm-logo.png b/lldb/tools/lldb-dap/extension/llvm-logo.png similarity index 100% rename from lldb/tools/lldb-dap/llvm-logo.png rename to lldb/tools/lldb-dap/extension/llvm-logo.png diff --git a/lldb/tools/lldb-dap/package-lock.json b/lldb/tools/lldb-dap/extension/package-lock.json similarity index 100% rename from lldb/tools/lldb-dap/package-lock.json rename to lldb/tools/lldb-dap/extension/package-lock.json diff --git a/lldb/tools/lldb-dap/package.json b/lldb/tools/lldb-dap/extension/package.json similarity index 99% rename from lldb/tools/lldb-dap/package.json rename to lldb/tools/lldb-dap/extension/package.json index 33d89675a1a08..781ab65364bd4 100644 --- a/lldb/tools/lldb-dap/package.json +++ b/lldb/tools/lldb-dap/extension/package.json @@ -50,13 +50,13 @@ ], "main": "./out/extension", "scripts": { - "bundle-extension": "npx tsc -p ./ --noEmit && npx esbuild src-ts/extension.ts --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node --target=node22 --minify", - "bundle-symbols-table-view": "npx tsc -p src-ts/webview --noEmit && npx esbuild src-ts/webview/symbols-table-view.ts --bundle --format=iife --outdir=./out/webview", + "bundle-extension": "npx tsc -p ./ --noEmit && npx esbuild src/extension.ts --bundle --outfile=out/extension.js --external:vscode --format=cjs --platform=node --target=node22 --minify", + "bundle-symbols-table-view": "npx tsc -p src/webview --noEmit && npx esbuild src/webview/symbols-table-view.ts --bundle --format=iife --outdir=./out/webview", "bundle-tabulator": "cp node_modules/tabulator-tables/dist/js/tabulator.min.js ./out/webview/ && cp node_modules/tabulator-tables/dist/css/tabulator_midnight.min.css ./out/webview/ && cp node_modules/tabulator-tables/dist/css/tabulator_simple.min.css ./out/webview/", "bundle-webview": "npm run bundle-symbols-table-view && npm run bundle-tabulator", "vscode:prepublish": "npm run bundle-webview && npm run bundle-extension", "watch": "npm run bundle-webview && tsc -watch -p ./", - "format": "npx prettier './src-ts/' --write", + "format": "npx prettier './src/' --write", "package": "rm -rf ./out && vsce package --out ./out/lldb-dap.vsix", "publish": "vsce publish", "vscode-uninstall": "code --uninstall-extension llvm-vs-code-extensions.lldb-dap", diff --git a/lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts b/lldb/tools/lldb-dap/extension/src/debug-adapter-factory.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/debug-adapter-factory.ts rename to lldb/tools/lldb-dap/extension/src/debug-adapter-factory.ts diff --git a/lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts b/lldb/tools/lldb-dap/extension/src/debug-configuration-provider.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/debug-configuration-provider.ts rename to lldb/tools/lldb-dap/extension/src/debug-configuration-provider.ts diff --git a/lldb/tools/lldb-dap/src-ts/debug-session-tracker.ts b/lldb/tools/lldb-dap/extension/src/debug-session-tracker.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/debug-session-tracker.ts rename to lldb/tools/lldb-dap/extension/src/debug-session-tracker.ts diff --git a/lldb/tools/lldb-dap/src-ts/disposable-context.ts b/lldb/tools/lldb-dap/extension/src/disposable-context.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/disposable-context.ts rename to lldb/tools/lldb-dap/extension/src/disposable-context.ts diff --git a/lldb/tools/lldb-dap/src-ts/extension.ts b/lldb/tools/lldb-dap/extension/src/extension.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/extension.ts rename to lldb/tools/lldb-dap/extension/src/extension.ts diff --git a/lldb/tools/lldb-dap/src-ts/index.d.ts b/lldb/tools/lldb-dap/extension/src/index.d.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/index.d.ts rename to lldb/tools/lldb-dap/extension/src/index.d.ts diff --git a/lldb/tools/lldb-dap/src-ts/lldb-dap-server.ts b/lldb/tools/lldb-dap/extension/src/lldb-dap-server.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/lldb-dap-server.ts rename to lldb/tools/lldb-dap/extension/src/lldb-dap-server.ts diff --git a/lldb/tools/lldb-dap/src-ts/logging.ts b/lldb/tools/lldb-dap/extension/src/logging.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/logging.ts rename to lldb/tools/lldb-dap/extension/src/logging.ts diff --git a/lldb/tools/lldb-dap/src-ts/ui/error-with-notification.ts b/lldb/tools/lldb-dap/extension/src/ui/error-with-notification.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/ui/error-with-notification.ts rename to lldb/tools/lldb-dap/extension/src/ui/error-with-notification.ts diff --git a/lldb/tools/lldb-dap/src-ts/ui/modules-data-provider.ts b/lldb/tools/lldb-dap/extension/src/ui/modules-data-provider.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/ui/modules-data-provider.ts rename to lldb/tools/lldb-dap/extension/src/ui/modules-data-provider.ts diff --git a/lldb/tools/lldb-dap/src-ts/ui/show-error-message.ts b/lldb/tools/lldb-dap/extension/src/ui/show-error-message.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/ui/show-error-message.ts rename to lldb/tools/lldb-dap/extension/src/ui/show-error-message.ts diff --git a/lldb/tools/lldb-dap/src-ts/ui/symbols-provider.ts b/lldb/tools/lldb-dap/extension/src/ui/symbols-provider.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/ui/symbols-provider.ts rename to lldb/tools/lldb-dap/extension/src/ui/symbols-provider.ts diff --git a/lldb/tools/lldb-dap/src-ts/ui/symbols-webview-html.ts b/lldb/tools/lldb-dap/extension/src/ui/symbols-webview-html.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/ui/symbols-webview-html.ts rename to lldb/tools/lldb-dap/extension/src/ui/symbols-webview-html.ts diff --git a/lldb/tools/lldb-dap/src-ts/uri-launch-handler.ts b/lldb/tools/lldb-dap/extension/src/uri-launch-handler.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/uri-launch-handler.ts rename to lldb/tools/lldb-dap/extension/src/uri-launch-handler.ts diff --git a/lldb/tools/lldb-dap/src-ts/utils.ts b/lldb/tools/lldb-dap/extension/src/utils.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/utils.ts rename to lldb/tools/lldb-dap/extension/src/utils.ts diff --git a/lldb/tools/lldb-dap/src-ts/webview/symbols-table-view.ts b/lldb/tools/lldb-dap/extension/src/webview/symbols-table-view.ts similarity index 100% rename from lldb/tools/lldb-dap/src-ts/webview/symbols-table-view.ts rename to lldb/tools/lldb-dap/extension/src/webview/symbols-table-view.ts diff --git a/lldb/tools/lldb-dap/src-ts/webview/tsconfig.json b/lldb/tools/lldb-dap/extension/src/webview/tsconfig.json similarity index 100% rename from lldb/tools/lldb-dap/src-ts/webview/tsconfig.json rename to lldb/tools/lldb-dap/extension/src/webview/tsconfig.json diff --git a/lldb/tools/lldb-dap/syntaxes/arm.disasm b/lldb/tools/lldb-dap/extension/syntaxes/arm.disasm similarity index 100% rename from lldb/tools/lldb-dap/syntaxes/arm.disasm rename to lldb/tools/lldb-dap/extension/syntaxes/arm.disasm diff --git a/lldb/tools/lldb-dap/syntaxes/arm64.disasm b/lldb/tools/lldb-dap/extension/syntaxes/arm64.disasm similarity index 100% rename from lldb/tools/lldb-dap/syntaxes/arm64.disasm rename to lldb/tools/lldb-dap/extension/syntaxes/arm64.disasm diff --git a/lldb/tools/lldb-dap/syntaxes/disassembly.json b/lldb/tools/lldb-dap/extension/syntaxes/disassembly.json similarity index 100% rename from lldb/tools/lldb-dap/syntaxes/disassembly.json rename to lldb/tools/lldb-dap/extension/syntaxes/disassembly.json diff --git a/lldb/tools/lldb-dap/syntaxes/x86.disasm b/lldb/tools/lldb-dap/extension/syntaxes/x86.disasm similarity index 100% rename from lldb/tools/lldb-dap/syntaxes/x86.disasm rename to lldb/tools/lldb-dap/extension/syntaxes/x86.disasm diff --git a/lldb/tools/lldb-dap/tsconfig.json b/lldb/tools/lldb-dap/extension/tsconfig.json similarity index 79% rename from lldb/tools/lldb-dap/tsconfig.json rename to lldb/tools/lldb-dap/extension/tsconfig.json index 06a484a1fc263..c2d0f2d65a2ad 100644 --- a/lldb/tools/lldb-dap/tsconfig.json +++ b/lldb/tools/lldb-dap/extension/tsconfig.json @@ -3,16 +3,16 @@ "moduleResolution": "node", "module": "commonjs", "outDir": "out", - "rootDir": "src-ts", + "rootDir": "src", "sourceMap": true, "strict": true, "target": "es6" }, "include": [ - "src-ts" + "src" ], "exclude": [ "node_modules", - "src-ts/webview", + "src/webview", ] } _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
