Skip to content

Do not consider preprocessed section as part of the sketch. #69

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
merged 5 commits into from
Mar 26, 2021
Merged

Do not consider preprocessed section as part of the sketch. #69

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
63e2721
Do not consider preprocessed section as part of the sketch.
cmaglie Feb 22, 2021
2b471cf
Force a different clang-formatter configuration on autoformat
cmaglie Feb 23, 2021
59f0539
Use custom .clang-format file in sketch if present
cmaglie Feb 24, 2021
08de1bd
Added -format-conf-path flag
cmaglie Feb 26, 2021
4083356
Update default formatter configuration
cmaglie Mar 26, 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
Use custom .clang-format file in sketch if present
  • Loading branch information
@cmaglie
cmaglie committed Mar 25, 2021
commit 59f0539dd4e714a22949b46e5be146cf91959b1a
12 changes: 12 additions & 0 deletions handler/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1768,6 +1768,18 @@ func (handler *InoHandler) createClangdFormatterConfig(cppuri lsp.DocumentURI) (
config := `
Copy link
Contributor

Choose a reason for hiding this comment

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

I tried it out and it works fine for me.

Would it be possible to load the clang-format configuration from a file. Ideally from somewhere like ~/.arduinoIDE/.clang-format or ~/.arduino15/.clang-format to allow the users to easily customize the auto format configuration, as they can do in the Java IDE via ~/.arduino15/formatter.conf?

Would it be possible to copy .clang-format (if the user added one) from the sketch origin folder to the temporary folder used by the language server, then only write the default .clang-format to that folder if a user-provided one isn't present? This allows bundling a formatter configuration with the sketch so it will be done consistently by all collaborators. Not something any beginner cares about, but worth adding for the advanced users if it doesn't require much effort to implement and maintain.

Copy link
Member Author

Choose a reason for hiding this comment

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

Good idea, I'll try to implement it exactly as you described.

AllowShortFunctionsOnASingleLine: None
`

// If a custom config is present in the sketch folder, use that one
customConfigFile := handler.sketchRoot.Join(".clang-format")
if customConfigFile.Exist() {
if c, err := customConfigFile.ReadFile(); err != nil {
log.Printf(" error reading custom formatter config file %s: %s", customConfigFile, err)
} else {
log.Printf(" using custom formatter config file %s", customConfigFile)
config = string(c)
}
}

targetFile := cppuri.AsPath()
if targetFile.IsNotDir() {
targetFile = targetFile.Parent()
Expand Down