From 426b130e3b0e103cc2a61486c1f294addc96b1aa Mon Sep 17 00:00:00 2001
From: Mike Cifelli <michael.cifelli@gmail.com>
Date: Mon, 19 Mar 2018 08:13:40 -0400
Subject: [PATCH] Update code formatting rules

---
 .idea/codeStyles/Project.xml                     | 3 ++-
 .idea/kotlinc.xml                                | 7 +++++++
 src/main/java/error/Severity.kt                  | 6 +++---
 src/main/java/function/builtin/special/LAMBDA.kt | 1 -
 src/main/java/terminal/LispTerminal.java         | 3 +--
 5 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 6caeb2f..d619137 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,6 +31,8 @@
       <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
     </JetCodeStyleSettings>
     <XML>
+      <option name="XML_ATTRIBUTE_WRAP" value="4" />
+      <option name="XML_KEEP_BLANK_LINES" value="1" />
       <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
     </XML>
     <codeStyleSettings language="JAVA">
@@ -39,7 +41,6 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
-      <option name="ELSE_ON_NEW_LINE" value="true" />
       <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
       <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
       <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..5806fb3
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+    <option name="sourceMapPrefix" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/error/Severity.kt b/src/main/java/error/Severity.kt
index fe146ae..3fd2cce 100644
--- a/src/main/java/error/Severity.kt
+++ b/src/main/java/error/Severity.kt
@@ -6,21 +6,21 @@ enum class Severity {
 
     WARNING {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateWarningOutput(output)
+            environment.decorateWarningOutput(output)
 
         override fun toDisplayString() = "warning"
     },
 
     ERROR {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateErrorOutput(output)
+            environment.decorateErrorOutput(output)
 
         override fun toDisplayString() = "error"
     },
 
     CRITICAL {
         override fun decorate(output: String, environment: RuntimeEnvironment): String =
-                environment.decorateCriticalOutput(output)
+            environment.decorateCriticalOutput(output)
 
         override fun toDisplayString() = "critical"
     };
diff --git a/src/main/java/function/builtin/special/LAMBDA.kt b/src/main/java/function/builtin/special/LAMBDA.kt
index 262e995..580f5d4 100644
--- a/src/main/java/function/builtin/special/LAMBDA.kt
+++ b/src/main/java/function/builtin/special/LAMBDA.kt
@@ -13,7 +13,6 @@ import sexpression.Symbol
 @FunctionNames("LAMBDA", "Λ")
 class LAMBDA(name: String) : LispSpecialFunction() {
 
-
     private val argumentValidator: ArgumentValidator = ArgumentValidator(name)
     private val lambdaListValidator: ArgumentValidator = ArgumentValidator("$name|lambda-list|")
 
diff --git a/src/main/java/terminal/LispTerminal.java b/src/main/java/terminal/LispTerminal.java
index 77e24e8..99dee32 100644
--- a/src/main/java/terminal/LispTerminal.java
+++ b/src/main/java/terminal/LispTerminal.java
@@ -209,8 +209,7 @@ public class LispTerminal {
             TerminalPosition cursorPosition = terminal.getCursorPosition();
             terminal.putCharacter(character);
             moveCursorToNextRow(cursorPosition);
-        }
-        else
+        } else
             terminal.putCharacter(character);
     }