fix for laurent22#906, 1) windows paths like C:\a\b weren't accepted …

…because backslashes were treated as escape sequences, 2) common paths like C:\Program Files\Foo\Foo.exe weren't accepted because of the space in the path

CliClient/run_test.sh

@@ -35,4 +35,5 @@ npm test tests-build/services_ResourceService.js
 npm test tests-build/urlUtils.js
 npm test tests-build/encryption.js
 npm test tests-build/services_rest_Api.js
+npm test tests-build/StringUtils.js
 npm test tests-build/synchronizer.js

CliClient/tests/StringUtils.js

@@ -0,0 +1,51 @@
+require('app-module-path').addPath(__dirname);
+
+const { removeDiacritics, escapeFilename, wrap, prepareCmdStringWindows, splitCommandString, padLeft, toTitleCase } = require('lib/string-utils.js');
+
+process.on('unhandledRejection', (reason, p) => {
+	console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
+});
+
+describe('StringUtils', function() {
+
+	beforeEach(async (done) => {
+		done();
+	});
+
+	it('adds quotes if whole string is an existing file', async (done) => {
+		let fnExists = async (fpath) => true;
+		let ret = await prepareCmdStringWindows('abc def /g', fnExists);
+		expect(ret).toBe('"abc def /g"');
+		ret = await prepareCmdStringWindows('abc def', fnExists);
+		expect(ret).toBe('"abc def"');
+		ret = await prepareCmdStringWindows('abc "def"', fnExists);
+		expect(ret).toBe('abc "def"');
+		ret = await prepareCmdStringWindows('abc', fnExists);
+		expect(ret).toBe('abc');
+		done();
+	});
+
+	it('doesn\'t add quotes if whole string is not an existing file', async (done) => {
+		let fnExists = async (fpath) => false;
+		let ret = await prepareCmdStringWindows('abc def /g', fnExists);
+		expect(ret).toBe('abc def /g');
+		ret = await prepareCmdStringWindows('abc def', fnExists);
+		expect(ret).toBe('abc def');
+		ret = await prepareCmdStringWindows('abc "def"', fnExists);
+		expect(ret).toBe('abc "def"');
+		ret = await prepareCmdStringWindows('abc', fnExists);
+		expect(ret).toBe('abc');
+		done();
+	});
+
+	it('doubles backslashes', async (done) => {
+		let fnExists = async (fpath) => false;
+		let ret = await prepareCmdStringWindows('C:\\Program Files\\Foo\\F', fnExists);
+		expect(ret).toBe('C:\\\\Program Files\\\\Foo\\\\F');
+		ret = await prepareCmdStringWindows('a/b/ c /d', fnExists);
+		expect(ret).toBe('a/b/ c /d');
+		ret = await prepareCmdStringWindows('a\\b c /d', fnExists);
+		expect(ret).toBe('a\\\\b c /d');
+		done();
+	});
+});

ReactNativeClient/lib/services/ExternalEditWatcher.js

@@ -4,7 +4,7 @@ const Setting = require('lib/models/Setting');
 const { shim } = require('lib/shim');
 const chokidar = require('chokidar');
 const EventEmitter = require('events');
-const { splitCommandString } = require('lib/string-utils');
+const { prepareCmdStringWindows, splitCommandString } = require('lib/string-utils');
 const spawn	= require('child_process').spawn;
 
 class ExternalEditWatcher {
@@ -123,10 +123,15 @@ class ExternalEditWatcher {
 		return false;
 	}
 
-	textEditorCommand() {
-		const editorCommand = Setting.value('editor');
+	async textEditorCommand() {
+		let editorCommand = Setting.value('editor');
 		if (!editorCommand) return null;
 
+		if (shim.isWindows()) {
+			editorCommand = await prepareCmdStringWindows(editorCommand,
+				(fpath) => shim.fsDriver().exists(fpath));
+		}
+
 		const s = splitCommandString(editorCommand);
 
 		const path = s.splice(0, 1);
@@ -166,7 +171,7 @@ class ExternalEditWatcher {
 		const filePath = await this.writeNoteToFile_(note);
 		this.watch(filePath);
 
-		const cmd = this.textEditorCommand();
+		const cmd = await this.textEditorCommand();
 		if (!cmd) {
 			bridge().openExternal('file://' + filePath);
 		} else {

ReactNativeClient/lib/string-utils.js

@@ -122,6 +122,20 @@ function wrap(text, indent, width) {
 	});
 }
 
+async function prepareCmdStringWindows(cmd, fnExists) {
+	// in windows, paths often contain spaces, so
+	// if there are spaces and the entire string points to an existing file,
+	// it's probably something like C:\Program Files\Foo\Foo.exe
+	if (cmd.indexOf(" ") != -1 && cmd.indexOf('"') == -1 && await fnExists(cmd)) {
+		cmd = '"' + cmd + '"';
+	}
+
+	// in windows, \ usually is a path delim, not an escape sequence
+	cmd = cmd.replace(/\\/g, '\\\\');
+
+	return cmd;
+}
+
 function splitCommandString(command) {
 	let args = [];
 	let state = "start"
@@ -210,4 +224,4 @@ function urlDecode(string) {
 	return decodeURIComponent((string+'').replace(/\+/g, '%20'));
 }
 
-module.exports = { removeDiacritics, escapeFilename, wrap, splitCommandString, padLeft, toTitleCase };
+module.exports = { removeDiacritics, escapeFilename, wrap, prepareCmdStringWindows, splitCommandString, padLeft, toTitleCase };