Merge pull request #4 from PRL-PRG/fix-formatting

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Fix formatters so they apply to specific languages (apply)
+5f4ba7cd2c1dbfadabb122b93b3011f0db56ae95

.githooks/pre-commit.sh

@@ -1,2 +1,18 @@
 #!/bin/sh
-mvn spotless:apply
+
+everything_staged=$(git diff --name-only)
+
+if [ -z "$everything_staged" ]; then
+  # Don't commit because, after we reformat, the formatting will be unstaged, but it's too hard to determine (and maybe
+  # ambiguous) what are the formatting differences and what was originally unstaged.
+  mvn spotless:check || {
+    echo "*** ERROR ***"
+    echo "Detected a partial commit that doesn't have proper formatting."
+    echo "Run 'mvn spotless:apply', make sure every change you want to commit is added, and commit again."
+    exit 1
+  }
+else
+  # It's not ambiguous, just format and re-add everything tracked
+  mvn spotless:apply
+  git add -u
+fi

.githooks/pre-push.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-mvn verify
+mvn verify

.mvn/jvm.config

@@ -0,0 +1,6 @@
+--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

doc/design-decisions.md

@@ -168,4 +168,3 @@
     useful (`val`, `@Synchronized`, `@SneakyThrows`).
   - Also concerns with Lombok adding complexity, Lombok becoming unmaintained, Lombok not being supported by IDEs (
     although at least IntelliJ supports it), Lombok being confusing.
-