Run from Read-Only Location - fix dev mode

Signed-off-by: Snjezana Peco <[email protected]>

Author: snjeza

src/extension.ts

@@ -21,7 +21,7 @@ import * as sourceAction from './sourceAction';
 import * as refactorAction from './refactorAction';
 import * as pasteAction from './pasteAction';
 import * as net from 'net';
-import { getJavaConfiguration } from './utils';
+import { getJavaConfiguration, deleteDirectory } from './utils';
 import { onConfigurationChange, excludeProjectSettingsFiles } from './settings';
 import { logger, initializeLogFile } from './log';
 import glob = require('glob');
@@ -621,20 +621,6 @@ async function cleanWorkspace(workspacePath) {
 	});
 }
 
-function deleteDirectory(dir) {
-	if (fs.existsSync(dir)) {
-		fs.readdirSync(dir).forEach((child) => {
-			const entry = path.join(dir, child);
-			if (fs.lstatSync(entry).isDirectory()) {
-				deleteDirectory(entry);
-			} else {
-				fs.unlinkSync(entry);
-			}
-		});
-		fs.rmdirSync(dir);
-	}
-}
-
 function openServerLogFile(workspacePath, column: ViewColumn = ViewColumn.Active): Thenable<boolean> {
 	const serverLogFile = path.join(workspacePath, '.metadata', '.log');
 	return openLogFile(serverLogFile, 'Could not open Java Language Server log file', column);

src/javaServerStarter.ts

@@ -8,7 +8,7 @@ import { StreamInfo, Executable, ExecutableOptions } from 'vscode-languageclient
 import { RequirementsData } from './requirements';
 import { getJavaEncoding, IS_WORKSPACE_VMARGS_ALLOWED, getKey, getJavaagentFlag } from './settings';
 import { logger } from './log';
-import { getJavaConfiguration } from './utils';
+import { getJavaConfiguration, deleteDirectory, ensureExists, getTimestamp } from './utils';
 import { workspace, ExtensionContext } from 'vscode';
 
 declare var v8debug;
@@ -137,19 +137,20 @@ function resolveConfiguration(context, configDir) {
 	ensureExists(configuration);
 	const configIniName = "config.ini";
 	const configIni = path.resolve(configuration, configIniName);
+	const ini = path.resolve(__dirname, '../server', configDir, configIniName);
 	if (!fs.existsSync(configIni)) {
-		const ini = path.resolve(__dirname, '../server', configDir, configIniName);
 		fs.copyFileSync(ini, configIni);
+	} else {
+		const configIniTime = getTimestamp(configIni);
+		const iniTime = getTimestamp(ini);
+		if (iniTime > configIniTime) {
+			deleteDirectory(configuration);
+			resolveConfiguration(context, configDir);
+		}
 	}
 	return configuration;
 }
 
-function ensureExists(folder) {
-	if (!fs.existsSync(folder)) {
-		fs.mkdirSync(folder);
-	}
-}
-
 function startedInDebugMode(): boolean {
 	const args = (process as any).execArgv;
 	if (args) {

src/utils.ts

@@ -1,7 +1,37 @@
 'use strict';
 
+import * as fs from 'fs';
+import * as path from 'path';
 import { workspace, WorkspaceConfiguration } from 'vscode';
 
 export function getJavaConfiguration(): WorkspaceConfiguration {
 	return workspace.getConfiguration('java');
 }
+
+export function deleteDirectory(dir) {
+	if (fs.existsSync(dir)) {
+		fs.readdirSync(dir).forEach((child) => {
+			const entry = path.join(dir, child);
+			if (fs.lstatSync(entry).isDirectory()) {
+				deleteDirectory(entry);
+			} else {
+				fs.unlinkSync(entry);
+			}
+		});
+		fs.rmdirSync(dir);
+	}
+}
+
+export function getTimestamp(file) {
+	if (!fs.existsSync(file)) {
+		return -1;
+	}
+	const stat = fs.statSync(file);
+	return stat.mtimeMs;
+}
+
+export function ensureExists(folder) {
+	if (!fs.existsSync(folder)) {
+		fs.mkdirSync(folder);
+	}
+}