From e689afed6822d21359199474df6191b0fa0f0e28 Mon Sep 17 00:00:00 2001
From: Anthony C <anthonycicc@gmail.com>
Date: Tue, 25 Jul 2017 13:41:02 -0400
Subject: [PATCH] Kotlin - Diamond complete

---
 .../3.5-rc-2/file-changes/last-build.bin      | Bin 1 -> 0 bytes
 .../3.5-rc-2/taskHistory/taskHistory.lock     | Bin 17 -> 0 bytes
 .../.gradle/4.0.1/fileHashes/fileHashes.bin   | Bin 18597 -> 18597 bytes
 .../.gradle/4.0.1/fileHashes/fileHashes.lock  | Bin 17 -> 17 bytes
 .../buildOutputCleanup/cache.properties       |   4 +-
 kotlin/diamond/.idea/encodings.xml            |   6 -
 kotlin/diamond/.idea/gradle.xml               |   4 +-
 kotlin/diamond/.idea/misc.xml                 |   2 +-
 kotlin/diamond/.idea/modules/diamond_test.iml |   4 +-
 kotlin/diamond/.idea/workspace.xml            | 332 +++++++++++-------
 .../production/classes/DiamondPrinter.class   | Bin 2898 -> 3510 bytes
 .../out/test/classes/DiamondPrinterTest.class | Bin 4479 -> 4442 bytes
 .../diamond/src/main/kotlin/DiamondPrinter.kt |  29 +-
 .../src/test/kotlin/DiamondPrinterTest.kt     |   4 -
 14 files changed, 228 insertions(+), 157 deletions(-)
 delete mode 100644 kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin
 delete mode 100644 kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock
 delete mode 100644 kotlin/diamond/.idea/encodings.xml

diff --git a/kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin b/kotlin/diamond/.gradle/3.5-rc-2/file-changes/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock b/kotlin/diamond/.gradle/3.5-rc-2/taskHistory/taskHistory.lock
deleted file mode 100644
index 87133cc8ae026346b40827a3fc044cd5a9b1c952..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZR69vy6b=j07@1}FdkIOGI~

diff --git a/kotlin/diamond/.gradle/4.0.1/fileHashes/fileHashes.bin b/kotlin/diamond/.gradle/4.0.1/fileHashes/fileHashes.bin
index d49c61a2bdf11803d7d818176817069489d4f8f1..f78dce1b899601bfb79bcc1aaa53b76262bb8a39 100644
GIT binary patch
delta 101
zcmZ2Fk#Xrn#to(t3at-rZ(K9aZ94-PcohGKg1~uq^DhS<__R4x;+MX{d++<gYw9iu
pl&-rgTAX;uh=GAIw#v5TCqx(b&dK>6Y64Y8&t5|WnDl_O9sqUsD5(Gd

delta 101
zcmZ2Fk#Xrn#to(t3bT9vo)i7Lbt3~9cohGK0v7&Bb$8b-W7r%j@k?J}s{5=2x5{ta
p#gS7V{@jyuh=GAIwkTF|8blXY=j413HGv|73Lc06lOB-P0|5LCC5-?8

diff --git a/kotlin/diamond/.gradle/4.0.1/fileHashes/fileHashes.lock b/kotlin/diamond/.gradle/4.0.1/fileHashes/fileHashes.lock
index db68580e77d0c8bb30383bc584e4033824d62d31..3311807b511a776eb0b9cbcbb4386a2d42b19ce6 100644
GIT binary patch
literal 17
UcmZR6dPA3QVaLWu1_)pQ05#hLGXMYp

literal 17
UcmZR!l{%}mMQueQ0|c-D04A9OF#rGn

diff --git a/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties b/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
index 77367f7..dea8164 100644
--- a/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
+++ b/kotlin/diamond/.gradle/buildOutputCleanup/cache.properties
@@ -1,2 +1,2 @@
-#Sun Jul 23 23:51:11 EDT 2017
-gradle.version=3.5-rc-2
+#Tue Jul 25 10:54:12 EDT 2017
+gradle.version=4.0.1
diff --git a/kotlin/diamond/.idea/encodings.xml b/kotlin/diamond/.idea/encodings.xml
deleted file mode 100644
index 97626ba..0000000
--- a/kotlin/diamond/.idea/encodings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/kotlin/diamond/.idea/gradle.xml b/kotlin/diamond/.idea/gradle.xml
index 6867fa6..0b86376 100644
--- a/kotlin/diamond/.idea/gradle.xml
+++ b/kotlin/diamond/.idea/gradle.xml
@@ -5,8 +5,8 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="G:/Gradle/gradle-4.0.1" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleHome" value="C:/Gradle/gradle-4.0.1" />
+        <option name="gradleJvm" value="Java 1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/kotlin/diamond/.idea/misc.xml b/kotlin/diamond/.idea/misc.xml
index bd152bd..bb3b391 100644
--- a/kotlin/diamond/.idea/misc.xml
+++ b/kotlin/diamond/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="Java 1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
 </project>
\ No newline at end of file
diff --git a/kotlin/diamond/.idea/modules/diamond_test.iml b/kotlin/diamond/.idea/modules/diamond_test.iml
index 583ac04..a94095a 100644
--- a/kotlin/diamond/.idea/modules/diamond_test.iml
+++ b/kotlin/diamond/.idea/modules/diamond_test.iml
@@ -34,12 +34,12 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="diamond_main" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-stdlib:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.12" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test-junit:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
-    <orderEntry type="library" name="Gradle: org.jetbrains.kotlin:kotlin-test:1.1.1" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="diamond_main" />
 </module>
\ No newline at end of file
diff --git a/kotlin/diamond/.idea/workspace.xml b/kotlin/diamond/.idea/workspace.xml
index fa3bb9e..b4167da 100644
--- a/kotlin/diamond/.idea/workspace.xml
+++ b/kotlin/diamond/.idea/workspace.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="9a8d58c0-3b05-4264-87e9-ddb2f0e187c5" name="Default" comment="" />
+    <list default="true" id="6e9558df-3eec-4e80-99b4-2b253950bb01" name="Default" comment="" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
     <ignored path="$PROJECT_DIR$/build/" />
     <ignored path="$PROJECT_DIR$/out/" />
@@ -18,12 +18,12 @@
     </projectState>
   </component>
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="DiamondPrinterTest.kt" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="248">
-              <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
+            <state relative-caret-position="194">
+              <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
               <folding />
             </state>
           </provider>
@@ -32,8 +32,8 @@
       <file leaf-file-name="DiamondPrinter.kt" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+            <state relative-caret-position="459">
+              <caret line="27" column="33" lean-forward="false" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
               <folding />
             </state>
           </provider>
@@ -54,15 +54,23 @@
       </file>
     </leaf>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>@ignore\n</find>
+    </findStrings>
+    <replaceStrings>
+      <replace>\t</replace>
+    </replaceStrings>
+  </component>
   <component name="GradleLocalSettings">
     <option name="myGradleHomes">
       <map>
-        <entry key="$PROJECT_DIR$" value="$USER_HOME$/.gradle/wrapper/dists/gradle-3.5-rc-2-bin/7ktl4k9rdug30mawecgppf5ms/gradle-3.5-rc-2" />
+        <entry key="$PROJECT_DIR$" value="C:\Gradle\gradle-4.0.1" />
       </map>
     </option>
     <option name="myGradleVersions">
       <map>
-        <entry key="$PROJECT_DIR$" value="3.5" />
+        <entry key="$PROJECT_DIR$" value="4.0.1" />
       </map>
     </option>
     <option name="availableProjects">
@@ -250,7 +258,7 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="1500866124000" />
+        <entry key="$PROJECT_DIR$" value="1500993742571" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -296,6 +304,75 @@
               <option name="name" value="diamond" />
               <option name="projectBuildClasspath">
                 <list>
+                  <option value="C:/Gradle/gradle-4.0.1/lib/ant-1.9.6.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/ant-launcher-1.9.6.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-base-services-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-base-services-groovy-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-cli-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-core-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-docs-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-installation-beacon-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-jvm-services-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-launcher-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-logging-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-messaging-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-model-core-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-model-groovy-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-native-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-process-services-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-resources-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-runtime-api-info-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-0.9.0.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-compiler-plugin-0.9.0.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-tooling-builders-0.9.0.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-script-kotlin-tooling-models-0.9.0.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-tooling-api-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/gradle-wrapper-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/groovy-all-2.4.11.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-announce-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-antlr-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-cache-http-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-comparison-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-build-init-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-code-quality-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-composite-builds-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-dependency-management-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-diagnostics-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-ear-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-native-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-ide-play-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-ivy-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-jacoco-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-javascript-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-groovy-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-java-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-jvm-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-native-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-language-scala-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-maven-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-osgi-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-base-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-jvm-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-native-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-platform-play-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugin-development-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugin-use-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-plugins-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-publish-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-reporting-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-http-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-s3-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-resources-sftp-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-scala-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-signing-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-test-kit-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-base-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-jvm-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-testing-native-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-tooling-api-builders-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/gradle-workers-4.0.1.jar" />
+                  <option value="C:/Gradle/gradle-4.0.1/lib/plugins/ivy-2.2.0.jar" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/java" />
                   <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" />
                 </list>
@@ -312,17 +389,12 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt" />
         <option value="$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt" />
       </list>
     </option>
   </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="width" value="2552" />
     <option name="height" value="1390" />
   </component>
@@ -341,6 +413,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -348,22 +421,47 @@
               <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
               <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
             </path>
+            <path>
+              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
+              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
+              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
+              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
+              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="diamond" type="b2602c69:ProjectViewProjectNode" />
+              <item name="diamond" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="kotlin" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
-      <pane id="AndroidView" />
       <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="last_opened_file_path" value="$USER_HOME$/emerald-randomizer/code/EmeraldRandomizer" />
-    <property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -438,12 +536,6 @@
       <envs />
       <patterns />
     </configuration>
-    <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
-      <module name="" />
-      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
-      <option name="PROGRAM_PARAMETERS" />
-      <predefined_log_file id="idea.log" enabled="true" />
-    </configuration>
     <configuration default="true" type="Remote" factoryName="Remote">
       <option name="USE_SOCKET_TRANSPORT" value="true" />
       <option name="SERVER_MODE" value="false" />
@@ -464,7 +556,7 @@
       <option name="TEST_OBJECT" value="CLASS" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
       <option name="OUTPUT_DIRECTORY" />
       <option name="ANNOTATION_TYPE" />
       <option name="ENV_VARIABLES" />
@@ -478,6 +570,53 @@
       <properties />
       <listeners />
     </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <option name="_new_regexPattern" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Unittests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="py.test">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="" />
+      <option name="_new_keywords" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+    </configuration>
     <recent_temporary>
       <list size="1">
         <item index="0" class="java.lang.String" itemvalue="JUnit.DiamondPrinterTest" />
@@ -485,7 +624,7 @@
     </recent_temporary>
   </component>
   <component name="SbtLocalSettings">
-    <option name="lastUpdateTimestamp" value="1500868273966" />
+    <option name="lastUpdateTimestamp" value="1500994456390" />
     <option name="externalProjectsViewState">
       <projects_view />
     </option>
@@ -495,88 +634,75 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="9a8d58c0-3b05-4264-87e9-ddb2f0e187c5" name="Default" comment="" />
-      <created>1500868261705</created>
+      <changelist id="6e9558df-3eec-4e80-99b4-2b253950bb01" name="Default" comment="" />
+      <created>1500994371090</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1500868261705</updated>
-      <workItem from="1500868263266" duration="684000" />
-      <workItem from="1500869075625" duration="115000" />
-      <workItem from="1500947742119" duration="2219000" />
+      <updated>1500994371090</updated>
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 22h 59m 48s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 10h 56m 12s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 18s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 21m 31s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 36s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 22m 04s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 44s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 22m 42s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 00m 58s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 22m 54s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 07s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 23m 46s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 23s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 24m 15s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 01m 30s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 38m 00s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 02m 30s.xml">
+    <history-entry file="DiamondPrinterTest - 2017.07.25 at 13h 38m 06s.xml">
       <configuration name="DiamondPrinterTest" configurationId="JUnit" />
     </history-entry>
-    <history-entry file="DiamondPrinterTest - 2017.07.24 at 23h 02m 36s.xml">
-      <configuration name="DiamondPrinterTest" configurationId="JUnit" />
-    </history-entry>
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="3018000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="2552" height="1390" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3292683" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32980973" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24980392" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33020833" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
-      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="SBT" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="sbt-shell-toolwindow" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
@@ -587,16 +713,16 @@
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
+        <state relative-caret-position="0">
+          <caret line="0" column="6" lean-forward="false" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
           <folding />
         </state>
       </provider>
@@ -614,70 +740,16 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="194">
+          <caret line="27" column="0" lean-forward="false" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="17" column="0" lean-forward="true" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="66">
-          <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/kotlin/DiamondPrinterTest.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="248">
-          <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="0">
-            <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-            <folding />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/kotlin/DiamondPrinter.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="13" column="41" lean-forward="true" selection-start-line="13" selection-start-column="41" selection-end-line="13" selection-end-column="41" />
+        <state relative-caret-position="459">
+          <caret line="27" column="33" lean-forward="false" selection-start-line="27" selection-start-column="33" selection-end-line="27" selection-end-column="33" />
           <folding />
         </state>
       </provider>
@@ -687,7 +759,7 @@
     <states>
       <state key="ProjectJDKs.UI">
         <settings>
-          <last-edited>1.8</last-edited>
+          <last-edited>Java 1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/kotlin/diamond/out/production/classes/DiamondPrinter.class b/kotlin/diamond/out/production/classes/DiamondPrinter.class
index 29bfe550731b62dfff9bf5bd6e428fb088c12200..9906e27e92196b94cec46648f39dbf3a88ac89e1 100644
GIT binary patch
delta 1736
zcmb_cOKcle6g_Y3vEvy#4zVX;D1y?M=7ZDV-?W*A(v~!kk`f?w(ljk;96LYqDREi}
z3CTiY!GZ;nB_sqD<s$`@1x=BXhN6gWP=wSCV!;Mgs)U3DU7)f-e8PDXXQWaVERg2S
zJ@3AI&V6(5wZExb*`a;?*XQd1l2};Q-c{0dP2D|HBj-ojrblMS+j?_Th0%rm&HX{x
z*smju4gueMVP@`pA&3LmC0&n~zfz9(1apP4x%ooh*^$vgQ6LnXjE%%nv5v{v$%O;k
z`}9Bd8FwF?nat;>EA(=cr>Q*ad0BLQ_M_(=5t;(j@8Lxqpk&K$s>zZPX*JX}#1wpq
z-79FZ{DxPZ@aC<mtB4P-qSX!<{+dG<@qyu`S2F{4t)YFP+PcRI8X8?8BWQ#^M5Cz_
z1g&Z-YDa2zT80@hqK1)`r|%)~T2L%*-Y|7LV%D0G6(kJ*3extO|3_?K5x*H;L(R)8
z8dZj-PUO|RrJI3rzpq!*dEcOiH`U9Z`t0%rUsZX~*I62f$Jek^K%KTCcI{PIgJxhA
z?RM0xH6mto4Uc*7A3_Y(@X0S!#p0j0-S{;eR4@>~#F6meML;azVZ06nhj19x5|!`-
zVHjiRKqpZRreWa-x}f6~JcK9d3*uXsBGFS0<Fd=R;xaZ|Mh<VGn{k@RRJdUW9hEsm
zq{6*Nl*|e_D4Hweka*RlNc6Nr8FncJmvPQzTz44~^*D?rm$B?JuDOgbZsHgYm!JzT
zZf)HaS#cB3pceu3h@bE*Wvb9AZsR#T4?ogM2z~UaoYVx46M1pJ(vB?pSzcW^iUA@;
zjx|nTkVTj1B)NiBh1kPSk&Vz~wB%B$6qCX-jZDg;ERRmH<T>^y$98Pluw%!ti$V=-
zOpLv&Mw$2`cH?8>B{uOA<1eETSI~qFG_!3rxIz3g9>K4~zoV8P8xdg`T&A=ozV59!
z>MOR+u@S_DiB`5{4?AawgT%-1sK^qZK%F>^dNGWIC?F}$A;qTEi#LehMn=3({1J6O
zVUi_SVi|kIHS81Dx&My%2iW2k@h>Rd$JY)e%oSxZlU#e@S32>4(uW5z!-8#~dXpvc
z`=JOw!hD1fz$Rxia)(dwIL<XBkHNaefrdZONKeBiOQhW$jS_WQ|5e8ox<jXtN;;x<
zD>3DER_2q}<H+0*#w*QoDVW1qS|8*6oHiPbk^=l+L>sM?QCn7VYT1eA&z9rhI4e`d
zS#sEt>cLA+)FkG)9WSp3)-$P;ozV6r8<O#iol3i?eH*1+U)uF$$``b*5~CAVLqhV}
zwPeCUj83Mu5Pca3Wzt&95e-GA?&T#;bC6#cf~On9&T|GM+q)bc7?rR55JV9Lj13`B
U#9$HQMd(GS4j?{RgqLRGZ>a+i;{X5v

delta 1127
zcmZXT%WD%+6vn?ZlS!JHq>t1QqxDe}s+MSNQb#-1XY0GRYFletUuhFHwKifzM1`P;
ze}Gvk>Ov5AiqQI^D2Rv)7lIoX{sDqZHzKXy9h-s(Gjo6U-1D7#&v%oFMW5%JAE#eV
z0Z1bM)V!-LvsZSGrZ1(N#?s@bo4SWbvm+Nbt{M!%#YPKNXe)iydMm^6Ts$35#oKb@
zxr>`iSM-&2p>w%RW-QxtK0T5x2tvczQ~3+C)6xU|s<c0=^WBkf7SO-Ihxve9FTFF8
zebTksHeMjE;SCxl(C7qgpK->QaVl(|ZDgFFU10|qIGNEOqH1pP2tM60Um-CtiPf$Z
zwcLmud~LWP-3i;l(we}nQeB|J{3qlV`x9>D6`X;nHHlWYHX4c6zQ868{kCEI?<08A
zkVn(c6Hn-fj#E6N9}9608a87K+gG%eRE=wB!!}Y4Zot8Iv?GMus7D85VSJxcDB9sE
zK2TBoEBQ1h`Bs*QQ<iwNQ%PiAc@tS!R!C!6fy?-XUDyo^dC{?l3KKoD6njZQbV>vE
zkt)z3YtV`P2%x1XyV1p<fw&w)H_3-O$>IPGvR_Ls;SfnvcY_}E(gj6*6bnvs@(C%=
z8B=8|t*Qh+T3Eb;TXk~d9v<T)SI6kcIdYzUTt+3|2#SB9W;RegJ63t)H7uZ+QQD|1
zuf${W1h<$Xzoq%_Y5NB(<{_5g8<x`KYW&0!(NHfY-3p^dB8bqn<@75?r{eT7BHPGa
zXpqB*6lD;#GRF4;{8EICGwf#==8S3~08Ij@;v*u!G}d$6Dl=@c_MbI|nV1ORu*zfa
z2_W_xD;S8ah|OT_f3=Wfo`%6uoF({aXMm&79*bZ8DbU1G6*C$q(f^d7sox(x^n$au
zq3%G5l~kw0Dl0>mAzMnntf~5B%563`BxA|MIyc!eN3CT_m41YF=DE`B#F|x3tJ%E4
zqg0F8xWmLaOLnvP5nk-T5cEA5^qwIcEzgcIfaB_OVhB>;U8jc-ETFf5;R37z3=hbC
H9*q0}DN(QY

diff --git a/kotlin/diamond/out/test/classes/DiamondPrinterTest.class b/kotlin/diamond/out/test/classes/DiamondPrinterTest.class
index be614d2c11175e9ec806de9d26cfc4c87439f582..9d98c8ca6c94b9922325921087c59afbd771a293 100644
GIT binary patch
delta 1747
zcmaJ>S!`5Q82%13bLY-<;r4Wc4z!ncI)y?v3T3E3clH+Ow58L%Y%Nd<^j1`g6kKq_
zjRO@lF){JU_#iO~aZBXMsL^PABF121d{Q5LFg~H*IW38?fy~Tz|Ly$$cg}a`{8M<l
zF#P4+k3Ivi8gE<=|GXgP92q_}TroC0K2njGoH#r_62v+IpWEQtSWlzTZM5-_iuqPq
z8^b8VCe`hW<~9ffT&7smM6=0t-6k6?O8H_Nw+e*l>#WQCcH^1~?e5fWGczvHMjPE0
z<GF5&jos=m-*%Bu4gR?3B<88h{(P~Q)?)Rwzd$5uEmHn~D|%_=stti<qMufdnhX?*
zL0Z}B-9V8Trj@0B2}H$yTA8Zc%1~uimj9qYwMtqA%Juuzs3paSnzG{l!#ez}6;Wq{
zVfCZsh@<LvD=v<ySTHV*t3l#Pb(QF;?}!hpupLi%go|dGcc{<p;&8{TW8*P(#*T-k
z=F(lNDzw7x(n%YSt3T{`aN4B0)mx!5t6PW9tD#Ul@Fc@MI;h$Cdu%-Y{`a8?(Rqb(
z)xrnCXKLxkNJ-v6`Uh~X(_erY9i7b~1Crir{DqkT9HcOIm6pYd5T6;ygw5O)buFbz
z%&4zYB5QShI{O3J%;ul~xwtmFrZvb8_ts~b^)++rBdJAhJn56QiKJg{NF)QaZldlc
z%5I`sQ}ba)4Wvd|bo+b+i4nG6g2h-$KcDYX0ZQms!hOKF`nhqpQj1FUxJEs$S&!SC
zNLtzoGB$7U!n8=M9vm~fj&g7@2gf+JgoBs!vjSx(MHS<<Sor_~TjmH%r9~Swfo+<=
z4o#p{6WFB*>`5eTZ8??>IzgRxY?jXBbtf&-uX)uVjaWfmmB=HD0{$VRs3xm5D92h_
zHHc#!HW8b#9@|*gPNw(QrG1WPUwU*}^X$+(yEM;k&9g`I?9)6449_9MbD!aPfEbd8
zh+#QOOp!;3sd9{%CdY~C@&s|AoFF=Kl9(Y+5v6>Tm?=*av*a0Kwmh4dPC7aA9GzVG
z1aXmkinv%_Am$l6V&Y3o%~CE%I{9XCfobHLrpwHLLNlz$42~KS#fDJKkSj4nmmAV6
z%mzv&H&f@VlzL~Yq~2wj*>Snvyi=ji!Ku_o;#BF=aaQx7=Bf1Q!pO8%=_e`xYLJOK
zs#H&v8mLkuRcfM2%~Yv{`fO&!7J6H;ojUC%c3}tluoL^xicz#-9J?^d%xUbwIqG-;
z30y=6E}@hEt}eWZy?7hlcn3+mhaP;0-f4Wo7PrukFED^_Fo+*8gxeU#9k%@y`|%qN
z;7=UH-#CQ37!iJqiZBif2S-E>j*2B16NNY?mSbF$<G5IZ6QUL;MLi}&3+hB0y!*aR
z0@JB{p9J*XQ^BXcdjh35@XY@&oxp!C9ev5nUOlh#xd4~V)zQo7vk2h1Uih}*dGmb%
v7w>s5GJuyfyv#}uui({Qq<Jw&50^aH9s(XL4?*K@@zCxe(?h+78V~AUL-|4n

delta 1863
zcmaJ>NpMs}82*~s-b^OpO=n{ZdC9~ige*WX41^^sFaZK#2+1Ts2wO-96Ua+~A~K+e
z8@SL4E|hxkq8FtsHD#d(PnHM0c(6EFa`9w&@Z<^ox+eh)rB%uI{;mK1zW#gqPU+vJ
zq3`c~^$mbkxOppdcV461J~lp7H!_(To~VltrN+jOHVW7ygHwZbql2lTy2QlzaB3)k
zn1IJ=b}X!;(c-jNSg#_UYX8O%qS&NbJ!OS00zQW+7PZlAbsVSF!e({eQ@$ZC5TviO
z4)fcLYbvz6L%VIvI7ACO>9!lsaoR0(sk@#Iu}9gyLgje9YKyl>>^0swZ;9wN*5|bP
zjP(bteY9fY0I@&~_)5h=TKVdRFDeev%2Pl3%DhJe>Q&HRq89k`#4%Olk9m*lP}*Ol
zioF4K)gKWf>V1DqjH;iBDHRFC#3|Jgh~<p4aE71bbSYsKt4{)9F`;e;V&SO=$%Hy>
zMY9q!r52u0wN@;2cDA5f-L)!$-6n0}och3uS?4p!9@Q0Gp54Qgg$pLs%ScUDuMRw;
z14;U|Aty=y68%2y23X%`;qqr+2gilDu2y6ft+~Nrhan6`Ao+cZ{~^pH+Q>o#Z`1O#
zBFJw9xv-eKt}bP*?9yus=;b0CtMRz$;;?46OAb7&$Y;I)#VEu(nNB+b>^s{v&vb2=
z>FN(howZ4iY)mA*azi5Nqcx4DY1B-k{uWC;xS`_V#c@q?DFVbLY+r<h^p<jyC>&JK
zUxAWGw$q~4a7AXz=9w)&3P;m=%T~Q*yWVn3BI(ywfU&uob9qK_<$cAC4=FA;r&LZ#
z6{J*2O3O&8iq>+}pc*R~Uq|cTCsCL=@CV$s&Tu=BU1qp-Xl~mzw@%G%m*%!Rk+igB
z`*qL`=)7&oj{m0Ibf0qKA<7LLp8mb(q8^J_QOrS>p@GELpcb)>46j9utT&<&ZCH;u
zBfGI-j)u7s5;GDSb21XTwS*omA*m(wYYF?cgaIRA&`3CJBpf9M<q$C>hlyG81Tid6
z60_wPF-M*z&X+FHmXpMYJVTW7Nn);iikK&#Cg#g@BAv7g<V8A#@>${n`5bYfe4e<-
z*o#ekiK!{#f~39FEG{;U9MiPKY*1=8i<*tg42j1Kp>jj6!Vs-Aq?Z{1Rgz*h*~_I?
zRxP#48l$*Yi?{3aIoK=ok=QHs>Da4e_ag&TH|H-->kI#jxxOtNRVzo;#!<C%RGT@f
zEgaQW&Lz%Cb#PMKnB7im2X>(od$AMyXdOZqj&pV?Brt(JIE!vvVD>V4a0R`%h9rOe
zeRvQ3_>e0;#(sQ?1NZ_1Y23y^e2YPR$2LFUFn+=j+`&=&ievZ<L-?Jo|HLr<!U*o+
zgz#cigm6;WNQnZBi6uBCN^x3LVqDb16{|5J)?rdKVM?^4RdnLa|6Hjw__~C7rv$F^
zB<lFpZ<ep>OT3`pg?Z4AQRX4@J#@SE!<D(3@0zMN&BN2r=!@{-rG9wgc-j12!PQys
s6$bFChSyl>;&oiB>PNN<=|Z`%T=-o0T?CA~)kVTZu8U?D4KCjJ2RdIztN;K2

diff --git a/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt b/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
index 7be6d6b..e9bc4c4 100644
--- a/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
+++ b/kotlin/diamond/src/main/kotlin/DiamondPrinter.kt
@@ -7,18 +7,27 @@ class DiamondPrinter {
         for (i in 0..length - 1){
             val testChar: Char = charList[i]
             val totalLength: Int = (length * 2) - 1
-            val beforeSpaces: Int = length - i
-            val middleSpaces: Int = if (totalLength - ((beforeSpaces * 2) + 1) > 0){
-                totalLength - ((beforeSpaces * 2) + 1)
-            } else {0}
             val builder = StringBuilder()
-            builder.append(CharArray(beforeSpaces, {' '}))
-                    .append(testChar)
-                    .append(CharArray(middleSpaces, {' '}))
-                    .append(testChar)
-                    .append(CharArray(beforeSpaces, {' '}))
-            returnList.add(String(builder))
+            if (testChar == 'A'){
+                val beforeSpaces: Int = length - 1
+
+                builder.append(CharArray(beforeSpaces, {' '}))
+                        .append(testChar)
+                        .append(CharArray(beforeSpaces, {' '}))
+            } else {
+                val beforeSpaces: Int = length - i - 1
+                val middleSpaces: Int = totalLength - (beforeSpaces * 2) - 2
+
+                builder.append(CharArray(beforeSpaces, {' '}))
+                        .append(testChar)
+                        .append(CharArray(middleSpaces, {' '}))
+                        .append(testChar)
+                        .append(CharArray(beforeSpaces, {' '}))
+            }
+            returnList.add(index = (returnList.size/2), element = String(builder))
+            returnList.add(index = (returnList.size/2), element = String(builder))
         }
+        returnList.removeAt(returnList.size/2)
         return returnList
     }
 }
\ No newline at end of file
diff --git a/kotlin/diamond/src/test/kotlin/DiamondPrinterTest.kt b/kotlin/diamond/src/test/kotlin/DiamondPrinterTest.kt
index 2a563b6..c9125ce 100644
--- a/kotlin/diamond/src/test/kotlin/DiamondPrinterTest.kt
+++ b/kotlin/diamond/src/test/kotlin/DiamondPrinterTest.kt
@@ -22,7 +22,6 @@ class DiamondPrinterTest {
         assertThat(output, `is`(listOf("A")))
     }
 
-    @Ignore
     @Test
     fun testTwoByTwoDiamond() {
         val output = diamondPrinter.printToList('B')
@@ -32,7 +31,6 @@ class DiamondPrinterTest {
                 " A ")))
     }
 
-    @Ignore
     @Test
     fun testThreeByThreeDiamond() {
         val output = diamondPrinter.printToList('C')
@@ -44,7 +42,6 @@ class DiamondPrinterTest {
                 "  A  ")))
     }
 
-    @Ignore
     @Test
     fun testFiveByFiveDiamond() {
         val output = diamondPrinter.printToList('E')
@@ -60,7 +57,6 @@ class DiamondPrinterTest {
                 "    A    ")))
     }
 
-    @Ignore
     @Test
     fun testFullDiamond() {
         val output = diamondPrinter.printToList('Z')