From a02c916048c01027980eaf97d1d6a8fa93403b6b Mon Sep 17 00:00:00 2001 From: Jinbo Wang Date: Fri, 31 Jul 2020 10:53:19 +0800 Subject: [PATCH 1/2] Add play/debug buttons to editor title bar for single file debugging Signed-off-by: Jinbo Wang --- .gitignore | 3 ++- .vscodeignore | 3 ++- package-lock.json | 6 +++--- package.json | 22 ++++++++++++++++++---- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9f6be895..98790543 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ node_modules .vscode-test/ vscode-java-debug-*.vsix packages/ -dist \ No newline at end of file +dist +.DS_Store \ No newline at end of file diff --git a/.vscodeignore b/.vscodeignore index 538d224d..4021d8a9 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -17,4 +17,5 @@ tslint.json packages package-lock.json node_modules -webpack.config.js \ No newline at end of file +webpack.config.js +.DS_Store \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 934aabee..8fe9fcba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -49,9 +49,9 @@ "dev": true }, "@types/vscode": { - "version": "1.42.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.42.0.tgz", - "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==", + "version": "1.47.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz", + "integrity": "sha512-nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA==", "dev": true }, "@webassemblyjs/ast": { diff --git a/package.json b/package.json index d1b1aff9..e0ddc8c2 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "debugger" ], "engines": { - "vscode": "^1.42.0" + "vscode": "^1.47.3" }, "license": "SEE LICENSE IN LICENSE.txt", "repository": { @@ -60,11 +60,13 @@ }, { "command": "java.debug.runJavaFile", - "title": "Run" + "title": "Run", + "icon": "$(play)" }, { "command": "java.debug.debugJavaFile", - "title": "Debug" + "title": "Debug", + "icon": "$(debug-alt-small)" }, { "command": "java.debug.continueAll", @@ -108,6 +110,18 @@ "group": "javadebug@2" } ], + "editor/title": [ + { + "command": "java.debug.runJavaFile", + "when": "editorLangId == java && resourceExtname == .java", + "group": "1_run@10" + }, + { + "command": "java.debug.debugJavaFile", + "when": "editorLangId == java && resourceExtname == .java", + "group": "1_run@20" + } + ], "debug/toolBar": [ { "command": "java.debug.hotCodeReplace", @@ -686,7 +700,7 @@ "@types/lodash": "^4.14.137", "@types/mocha": "^5.2.7", "@types/node": "^8.10.51", - "@types/vscode": "1.42.0", + "@types/vscode": "1.47.0", "cross-env": "^5.2.0", "gulp": "^4.0.2", "gulp-tslint": "^8.1.4", From 451a672cbad889e36272758b588a2130bf02ec42 Mon Sep 17 00:00:00 2001 From: Jinbo Wang Date: Fri, 31 Jul 2020 14:29:02 +0800 Subject: [PATCH 2/2] address review comments Signed-off-by: Jinbo Wang --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e0ddc8c2..90a44597 100644 --- a/package.json +++ b/package.json @@ -113,12 +113,12 @@ "editor/title": [ { "command": "java.debug.runJavaFile", - "when": "editorLangId == java && resourceExtname == .java", + "when": "resourceExtname == .java", "group": "1_run@10" }, { "command": "java.debug.debugJavaFile", - "when": "editorLangId == java && resourceExtname == .java", + "when": "resourceExtname == .java", "group": "1_run@20" } ],