From 42cecdabc28d0fea36f4b247bbd368b73c8b0505 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Wed, 22 Aug 2018 13:06:14 +0800 Subject: [PATCH] fix the issue that cannot generate the format setting file Signed-off-by: Sheng Chen --- src/extension.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 4de99cce9f..d20e603e66 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -430,7 +430,7 @@ function openServerLogFile(workspacePath): Thenable { } async function openFormatter(extensionPath) { - let defaultFormatter = extensionPath + '/formatters/eclipse-formatter.xml'; + let defaultFormatter = path.join(extensionPath, 'formatters', 'eclipse-formatter.xml'); let formatterUrl: string = getJavaConfiguration().get('format.settings.url'); if (formatterUrl && formatterUrl.length > 0) { if (isRemote(formatterUrl)) { @@ -447,7 +447,7 @@ async function openFormatter(extensionPath) { let file; let relativePath; if (!global) { - file = path.join(workspace.workspaceFolders[0].uri.path, fileName); + file = path.join(workspace.workspaceFolders[0].uri.fsPath, fileName); relativePath = fileName; } else { let root = path.join(extensionPath, '..', 'redhat.java'); @@ -522,7 +522,7 @@ async function addFormatter(extensionPath, formatterUrl, defaultFormatter, relat if (!path.isAbsolute(f)) { let fileName = f; if (!global) { - f = path.join(workspace.workspaceFolders[0].uri.path, fileName); + f = path.join(workspace.workspaceFolders[0].uri.fsPath, fileName); relativePath = fileName; } else { let root = path.join(extensionPath, '..', 'redhat.java'); @@ -541,8 +541,9 @@ async function addFormatter(extensionPath, formatterUrl, defaultFormatter, relat let action = 'Yes'; window.showWarningMessage(msg, action, 'No').then((selection) => { if (action === selection) { - fs.createReadStream(defaultFormatter).pipe(fs.createWriteStream(f)); - openDocument(extensionPath, f, defaultFormatter, relativePath); + fs.createReadStream(defaultFormatter) + .pipe(fs.createWriteStream(f)) + .on('finish', () => openDocument(extensionPath, f, defaultFormatter, relativePath)); } }); } else {