Add 'Open Java extension log file' command

Signed-off-by: Fred Bricon <fbricon@gmail.com>

Author: fbricon

package.json

@@ -390,7 +390,12 @@
       },
       {
         "command": "java.open.serverLog",
-        "title": "Open Java Language Server log file",
+        "title": "Open Java language server log file",
+        "category": "Java"
+      },
+      {
+        "command": "java.open.clientLog",
+        "title": "Open Java extension log file",
         "category": "Java"
       },
       {

src/commands.ts

@@ -74,6 +74,12 @@ export namespace Commands {
     */
     export const OPEN_SERVER_LOG = 'java.open.serverLog';
 
+    /**
+    * Open Java client Log file
+    */
+    export const OPEN_CLIENT_LOG = 'java.open.clientLog';
+
+    
     /**
      * Open Java formatter settings
      */

src/extension.ts

@@ -26,15 +26,16 @@ let lastStatus;
 let languageClient: LanguageClient;
 const jdtEventEmitter = new EventEmitter<Uri>();
 const cleanWorkspaceFileName = '.cleanWorkspace';
+let clientLogFile;
 
 export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 
 	let storagePath = context.storagePath;
 	if (!storagePath) {
 		storagePath = getTempWorkspace();
 	}
-
-	initializeLogFile(path.join(storagePath, 'client.log'));
+	clientLogFile = path.join(storagePath, 'client.log');
+	initializeLogFile(clientLogFile);
 
 	enableJavadocSymbols();
 
@@ -331,6 +332,8 @@ export function activate(context: ExtensionContext): Promise<ExtensionAPI> {
 
 				context.subscriptions.push(commands.registerCommand(Commands.OPEN_SERVER_LOG, () => openServerLogFile(workspacePath)));
 
+				context.subscriptions.push(commands.registerCommand(Commands.OPEN_CLIENT_LOG, () => openClientLogFile(clientLogFile)));
+
 				const extensionPath = context.extensionPath;
 				context.subscriptions.push(commands.registerCommand(Commands.OPEN_FORMATTER, async () => openFormatter(extensionPath)));
 
@@ -491,11 +494,20 @@ function deleteDirectory(dir) {
 
 function openServerLogFile(workspacePath): Thenable<boolean> {
 	const serverLogFile = path.join(workspacePath, '.metadata', '.log');
-	if (!fs.existsSync(serverLogFile)) {
-		return window.showWarningMessage('Java Language Server has not started logging.').then(() => false);
+	return openLogFile(serverLogFile, 'Could not open Java Language Server log file');
+}
+
+function openClientLogFile(logFile): Thenable<boolean> {
+	return openLogFile(logFile, 'Could not open Java extension log file');
+}
+
+
+function openLogFile(logFile, openingFailureWarning:string ): Thenable<boolean> {
+	if (!fs.existsSync(logFile)) {
+		return window.showWarningMessage('No log file available').then(() => false);
 	}
 
-	return workspace.openTextDocument(serverLogFile)
+	return workspace.openTextDocument(logFile)
 		.then(doc => {
 			if (!doc) {
 				return false;
@@ -506,7 +518,7 @@ function openServerLogFile(workspacePath): Thenable<boolean> {
 		}, () => false)
 		.then(didOpen => {
 			if (!didOpen) {
-				window.showWarningMessage('Could not open Java Language Server log file');
+				window.showWarningMessage(openingFailureWarning);
 			}
 			return didOpen;
 		});

test/extension.test.ts

@@ -34,6 +34,7 @@ suite('Java Language Extension', () => {
 				Commands.APPLY_WORKSPACE_EDIT,
 				Commands.EXECUTE_WORKSPACE_COMMAND,
 				Commands.OPEN_SERVER_LOG,
+				Commands.OPEN_CLIENT_LOG,
 				Commands.COMPILE_WORKSPACE,
 				Commands.OPEN_FORMATTER,
 				Commands.CLEAN_WORKSPACE,