Skip to content

IntelliJ: Format on save when using PJF #1151

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
bulldozer-bot merged 16 commits into from
Jan 9, 2020
Merged

IntelliJ: Format on save when using PJF #1151

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88d6148
Suggest and preconfigure save-actions if PJF is enabled
dansanduleac Jan 8, 2020
b01f17a
rename
dansanduleac Jan 8, 2020
9058c1b
Separate groovy and java because sigh
dansanduleac Jan 8, 2020
6859e25
fix
dansanduleac Jan 8, 2020
f8461cd
fix
dansanduleac Jan 8, 2020
9a5618d
verify that IPR is configured
dansanduleac Jan 8, 2020
092f321
add no-op test as well, rename for clarity
dansanduleac Jan 8, 2020
7eaae0a
Move stuff to BaselineIdea and only apply on root!!!
dansanduleac Jan 8, 2020
ce47937
use the right id... WOT
dansanduleac Jan 8, 2020
905a038
Add generated changelog entries
dansanduleac Jan 8, 2020
3cfdc27
fix root project configuration being applied for each subproject
dansanduleac Jan 9, 2020
40d6bb8
be more defensive
dansanduleac Jan 9, 2020
1aaef47
chomp down arguments
dansanduleac Jan 9, 2020
06581c9
lol
dansanduleac Jan 9, 2020
43e1337
fix style, pull out constant
dansanduleac Jan 9, 2020
ab105c2
workspace stuff still needs to be in afterEvaluate
dansanduleac Jan 9, 2020
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
rename
  • Loading branch information
@dansanduleac
dansanduleac committed Jan 8, 2020
commit b01f17a39c1e5e895377103eb23808ca86f5f165
8 changes: 4 additions & 4 deletions gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ private static void configureLegacyIdea(Project project) {
IdeaModel ideaModel = project.getExtensions().getByType(IdeaModel.class);
ideaModel.getProject().getIpr().withXml(xmlProvider -> {
// this block is lazy
BaselineFormatConfigureXml.configureSaveActions(xmlProvider.asNode());
BaselineFormatConfigureXml.configureExternalDependencies(xmlProvider.asNode());
BaselineFormatIntellijConfiguration.configureSaveActions(xmlProvider.asNode());
BaselineFormatIntellijConfiguration.configureExternalDependencies(xmlProvider.asNode());
});
}

Expand All @@ -129,8 +129,8 @@ private static void configureIntelliJImport(Project project) {
return;
}
XmlUtils.createOrUpdateXmlFile(
project.file(".idea/externalDependencies.xml"), BaselineFormatConfigureXml::configureSaveActions);
XmlUtils.createOrUpdateXmlFile(project.file(".idea/saveactions_settings.xml"), BaselineFormatConfigureXml
project.file(".idea/externalDependencies.xml"), BaselineFormatIntellijConfiguration::configureSaveActions);
XmlUtils.createOrUpdateXmlFile(project.file(".idea/saveactions_settings.xml"), BaselineFormatIntellijConfiguration
::configureExternalDependencies);
}

Expand Down
4 changes: 2 additions & 2 deletions ...plugins/BaselineFormatConfigureXml.groovy → ...aselineFormatIntellijConfiguration.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package com.palantir.baseline.plugins

import static com.palantir.baseline.plugins.XmlUtils.matchOrCreateChild

final class BaselineFormatConfigureXml {
private BaselineFormatConfigureXml() {}
final class BaselineFormatIntellijConfiguration {
private BaselineFormatIntellijConfiguration() {}

/**
* Configures some defaults on the save-actions plugin, but only if it hasn't been configured before.
Expand Down