Register the semantic token provider after standard server is ready

Signed-off-by: Sheng Chen <[email protected]>

src/extension.ts

@@ -21,6 +21,7 @@ import { StandardLanguageClient } from './standardLanguageClient';
 import { apiManager } from './apiManager';
 import { SnippetCompletionProvider } from './snippetCompletionProvider';
 import { runtimeStatusBarProvider } from './runtimeStatusBarProvider';
+import { registerSemanticTokensProvider } from './semanticTokenProvider';
 
 const syntaxClient: SyntaxLanguageClient = new SyntaxLanguageClient();
 const standardClient: StandardLanguageClient = new StandardLanguageClient();
@@ -278,8 +279,10 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 					snippetProvider.setActivation(false);
 					fileEventHandler.setServerStatus(true);
 					runtimeStatusBarProvider.initialize(context.storagePath);
-					commands.executeCommand('setContext', 'java:serverMode', event);
+					// temporary implementation Semantic Highlighting before it is part of LSP
+					registerSemanticTokensProvider(context);
 				}
+				commands.executeCommand('setContext', 'java:serverMode', event);
 			});
 		});
 	});

src/standardLanguageClient.ts

@@ -14,7 +14,6 @@ import { RequirementsData } from "./requirements";
 import * as net from 'net';
 import { getJavaConfiguration } from "./utils";
 import { logger } from "./log";
-import { registerSemanticTokensProvider } from "./semanticTokenProvider";
 import * as buildPath from './buildpath';
 import * as sourceAction from './sourceAction';
 import * as refactorAction from './refactorAction';
@@ -296,9 +295,6 @@ export class StandardLanguageClient {
 				});
 			}
 			excludeProjectSettingsFiles();
-
-			// temporary implementation Semantic Highlighting before it is part of LSP
-			registerSemanticTokensProvider(context);
 		});
 	}