Skip to content

fix the issue that cannot generate the format setting file #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snjeza merged 1 commit into from
Aug 22, 2018
Merged

fix the issue that cannot generate the format setting file #613

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ function openServerLogFile(workspacePath): Thenable<boolean> {
}

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)) {
Expand All @@ -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');
Expand Down Expand Up @@ -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');
Expand All @@ -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 {
Expand Down