From 92070bcd084423d735155037e67e245d4d7d074f Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Fri, 5 Mar 2021 13:17:40 +0800
Subject: [PATCH 1/2] Adopt new 'run' menu in editor title

Signed-off-by: Sheng Chen <sheche@microsoft.com>
---
 package-lock.json |  8 ++++----
 package.json      | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 54081f44..f5923078 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -103,9 +103,9 @@
             "dev": true
         },
         "@types/vscode": {
-            "version": "1.49.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.49.0.tgz",
-            "integrity": "sha512-wfNQmLmm1VdMBr6iuNdprWmC1YdrgZ9dQzadv+l2eSjJlElOdJw8OTm4RU4oGTBcfvG6RZI2jOcppkdSS18mZw==",
+            "version": "1.54.0",
+            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.54.0.tgz",
+            "integrity": "sha512-sHHw9HG4bTrnKhLGgmEiOS88OLO/2RQytUN4COX9Djv81zc0FSZsSiYaVyjNidDzUSpXsySKBkZ31lk2/FbdCg==",
             "dev": true
         },
         "@webassemblyjs/ast": {
@@ -456,7 +456,7 @@
         "arr-flatten": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-            "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+            "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
             "dev": true
         },
         "arr-map": {
diff --git a/package.json b/package.json
index d5e79358..e703d0fe 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "debugger"
   ],
   "engines": {
-    "vscode": "^1.49.0"
+    "vscode": "^1.54.0"
   },
   "license": "SEE LICENSE IN LICENSE.txt",
   "repository": {
@@ -60,12 +60,12 @@
       },
       {
         "command": "java.debug.runJavaFile",
-        "title": "Run",
+        "title": "Run Java",
         "icon": "$(play)"
       },
       {
         "command": "java.debug.debugJavaFile",
-        "title": "Debug",
+        "title": "Debug Java",
         "icon": "$(debug-alt-small)"
       },
       {
@@ -136,16 +136,16 @@
           "group": "javadebug@2"
         }
       ],
-      "editor/title": [
+      "editor/title/run": [
         {
           "command": "java.debug.runJavaFile",
           "when": "resourceExtname == .java",
-          "group": "1_run@10"
+          "group": "javadebug@10"
         },
         {
           "command": "java.debug.debugJavaFile",
           "when": "resourceExtname == .java",
-          "group": "1_run@20"
+          "group": "javadebug@20"
         }
       ],
       "debug/toolBar": [
@@ -768,7 +768,7 @@
     "@types/mocha": "^5.2.7",
     "@types/node": "^14.14.10",
     "@types/uuid": "^8.3.0",
-    "@types/vscode": "1.49.0",
+    "@types/vscode": "1.54.0",
     "cross-env": "^5.2.0",
     "gulp": "^4.0.2",
     "gulp-tslint": "^8.1.4",

From 2eff8dc0fa5f9b5bd6b0e8124d0f4db123b5187c Mon Sep 17 00:00:00 2001
From: Sheng Chen <sheche@microsoft.com>
Date: Thu, 11 Mar 2021 15:29:37 +0800
Subject: [PATCH 2/2] Update command name and group name

Signed-off-by: Sheng Chen <sheche@microsoft.com>
---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e703d0fe..c92632f1 100644
--- a/package.json
+++ b/package.json
@@ -60,12 +60,12 @@
       },
       {
         "command": "java.debug.runJavaFile",
-        "title": "Run Java",
+        "title": "Run with Java Debugger",
         "icon": "$(play)"
       },
       {
         "command": "java.debug.debugJavaFile",
-        "title": "Debug Java",
+        "title": "Debug with Java Debugger",
         "icon": "$(debug-alt-small)"
       },
       {
@@ -140,12 +140,12 @@
         {
           "command": "java.debug.runJavaFile",
           "when": "resourceExtname == .java",
-          "group": "javadebug@10"
+          "group": "1_javadebug@10"
         },
         {
           "command": "java.debug.debugJavaFile",
           "when": "resourceExtname == .java",
-          "group": "javadebug@20"
+          "group": "1_javadebug@20"
         }
       ],
       "debug/toolBar": [