From 7d95d010cf4ebead98a0cbc22582e8261b0f0b2f Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Sun, 28 Jun 2020 10:54:54 +0800 Subject: [PATCH 1/3] Use java:serverMode to avoid conflicts Signed-off-by: Sheng Chen --- package.json | 4 ++-- src/extension.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d58d92a32..d66b0e271 100644 --- a/package.json +++ b/package.json @@ -741,11 +741,11 @@ }, { "command": "java.show.server.task.status", - "when": "serverMode != LightWeight" + "when": "java:serverMode != LightWeight" }, { "command": "java.server.mode.switch", - "when": "serverMode == LightWeight" + "when": "java:serverMode == LightWeight" } ] } diff --git a/src/extension.ts b/src/extension.ts index cf09fced3..be3f5107b 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -135,7 +135,9 @@ export function activate(context: ExtensionContext): Promise { const syntaxServerWorkspacePath = path.resolve(storagePath + '/ss_ws'); const serverMode = getJavaServerMode(); + // TODO: deptecated this in the future, use 'java:serverMode' instead commands.executeCommand('setContext', 'serverMode', serverMode); + commands.executeCommand('setContext', 'java:serverMode', serverMode); const isDebugModeByClientPort = !!process.env['SYNTAXLS_CLIENT_PORT'] || !!process.env['JDTLS_CLIENT_PORT']; const requireSyntaxServer = (serverMode !== ServerMode.STANDARD) && (!isDebugModeByClientPort || !!process.env['SYNTAXLS_CLIENT_PORT']); const requireStandardServer = (serverMode !== ServerMode.LIGHTWEIGHT) && (!isDebugModeByClientPort || !!process.env['JDTLS_CLIENT_PORT']); @@ -278,7 +280,9 @@ export function activate(context: ExtensionContext): Promise { snippetProvider.setActivation(false); fileEventHandler.setServerStatus(true); runtimeStatusBarProvider.initialize(context.storagePath); + // TODO: deptecated this in the future, use 'java:serverMode' instead commands.executeCommand('setContext', 'serverMode', event); + commands.executeCommand('setContext', 'java:serverMode', serverMode); } }); }); From 64018580f4d5a87064e6a31a5bbb225dece9de11 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Sun, 28 Jun 2020 12:53:47 +0800 Subject: [PATCH 2/3] Remove the context value serverMode Signed-off-by: Sheng Chen --- src/extension.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index be3f5107b..df7c42854 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -135,8 +135,6 @@ export function activate(context: ExtensionContext): Promise { const syntaxServerWorkspacePath = path.resolve(storagePath + '/ss_ws'); const serverMode = getJavaServerMode(); - // TODO: deptecated this in the future, use 'java:serverMode' instead - commands.executeCommand('setContext', 'serverMode', serverMode); commands.executeCommand('setContext', 'java:serverMode', serverMode); const isDebugModeByClientPort = !!process.env['SYNTAXLS_CLIENT_PORT'] || !!process.env['JDTLS_CLIENT_PORT']; const requireSyntaxServer = (serverMode !== ServerMode.STANDARD) && (!isDebugModeByClientPort || !!process.env['SYNTAXLS_CLIENT_PORT']); @@ -280,8 +278,6 @@ export function activate(context: ExtensionContext): Promise { snippetProvider.setActivation(false); fileEventHandler.setServerStatus(true); runtimeStatusBarProvider.initialize(context.storagePath); - // TODO: deptecated this in the future, use 'java:serverMode' instead - commands.executeCommand('setContext', 'serverMode', event); commands.executeCommand('setContext', 'java:serverMode', serverMode); } }); From 3dffec6ceeea05e4696bc7e429f3259448639a10 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Sun, 28 Jun 2020 13:13:04 +0800 Subject: [PATCH 3/3] Fix the value of serverMode Signed-off-by: Sheng Chen --- src/extension.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extension.ts b/src/extension.ts index df7c42854..496bc60a3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -278,7 +278,7 @@ export function activate(context: ExtensionContext): Promise { snippetProvider.setActivation(false); fileEventHandler.setServerStatus(true); runtimeStatusBarProvider.initialize(context.storagePath); - commands.executeCommand('setContext', 'java:serverMode', serverMode); + commands.executeCommand('setContext', 'java:serverMode', event); } }); });