8000 Use clang-format for auto-format (replaces libastyle) by cmaglie · Pull Request #11543 · arduino/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Use clang-format for auto-format (replaces libastyle) #11543

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

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Use clang-format for auto-format (replaces libastyle) #11543

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4a1ef0f
First implementation of ClangFormat class
cmaglie May 19, 2021
7ef8b06
Added clang-format download in build.xml
cmaglie May 19, 2021
f20d512
ClangFormat is no more a Tool
cmaglie May 19, 2021
d33fc4e
Fixed some trivial warnings
cmaglie May 19, 2021
1f1dc7d
Removed libastyle
cmaglie May 19, 2021
7e76bc5
Renamed some build.xml ant task from libastyle to liblistserials
cmaglie May 19, 2021
66a001c
Handle cursor positioning
cmaglie May 20, 2021
c4c5558
Slightly simplify subroutine
cmaglie May 20, 2021
321eadb
Catch clang-format error and report to user interface
cmaglie May 20, 2021
752bcdb
Added default clang-format configuration and user-customizable config…
cmaglie May 20, 2021
09c6626
Autoformat keeps cursor position after Undo
cmaglie May 21, 2021
7754b7f
Fixed tests for new autoformat style
cmaglie May 19, 2021
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
Prev Previous commit
Next Next commit
Catch clang-format error and report to user interface
  • Loading branch information
@cmaglie
cmaglie committed May 21, 2021
commit 321eadbf0a85d2f385b0eb132c9639a50dcb8c4f
22 changes: 16 additions & 6 deletions app/src/cc/arduino/packages/formatter/clangformat/ClangFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,13 @@
import java.io.OutputStream;

import org.apache.commons.compress.utils.IOUtils;
import org.apache.logging.log4j.core.util.NullOutputStream;

import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;

import processing.app.Base;
import processing.app.Editor;
import processing.app.EditorTab;
import processing.app.helpers.ProcessUtils;

public class ClangFormat implements Runnable {

Expand Down Expand Up @@ -75,6 +73,8 @@ public void run() {
} catch (IOException | InterruptedException e) {
editor.statusError("Auto format error: " + e.getMessage());
e.printStackTrace();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Care to removee e.printStackTrace();?

} catch (ClangException e) {
editor.statusError("Auto format error: " + e.getMessage());
}
}

Expand All @@ -101,23 +101,27 @@ private Thread copyAndClose(InputStream input, OutputStream output) {
}

FormatResult runClangFormatOn(String source, int cursorOffset)
throws IOException, InterruptedException {
throws IOException, InterruptedException, ClangException {
String cmd[] = new String[] { clangExecutable, "--cursor=" + cursorOffset };

Process process = ProcessUtils.exec(cmd);
ByteArrayOutputStream clangOutput = new ByteArrayOutputStream();
ByteArrayOutputStream clangError = new ByteArrayOutputStream();
ByteArrayInputStream dataOut = new ByteArrayInputStream(source.getBytes());

Thread in = copyAndClose(dataOut, process.getOutputStream());
Thread err = copyAndClose(process.getErrorStream(),
NullOutputStream.getInstance());
Thread err = copyAndClose(process.getErrorStream(), clangError);
Thread out = copyAndClose(process.getInputStream(), clangOutput);

/* int r = */process.waitFor();
int r = process.waitFor();
in.join();
out.join();
err.join();

if (r != 0) {
throw new ClangException(clangError.toString());
}

// clang-format will output first a JSON object with:
// - the resulting cursor position and
// - a flag teling if the conversion was successful
Expand All @@ -141,6 +145,12 @@ FormatResult runClangFormatOn(String source, int cursorOffset)
}
}

class ClangException extends Exception {
public ClangException(String string) {
super(string);
}
}

class FormatResult {
public String FormattedText;
public int Cursor;
Expand Down
0