mike
/
transcendental-lisp
1
1
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

Update code formatting rules

This commit is contained in:
Mike Cifelli 2018-03-19 08:13:40 -04:00
parent b5d817a8ac
commit 426b130e3b
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/codeStyles/Project.xml
View File

@ -31,6 +31,8 @@
<option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" /> <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
</JetCodeStyleSettings> </JetCodeStyleSettings>
<XML> <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" /> <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
</XML> </XML>
<codeStyleSettings language="JAVA"> <codeStyleSettings language="JAVA">
@ -39,7 +41,6 @@
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" /> <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" /> <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_CHAINED_METHODS" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" /> <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" /> <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />

7
.idea/kotlinc.xml Normal file
View File

@ -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>

6
src/main/java/error/Severity.kt
View File

@ -6,21 +6,21 @@ enum class Severity {
WARNING { WARNING {
override fun decorate(output: String, environment: RuntimeEnvironment): String = override fun decorate(output: String, environment: RuntimeEnvironment): String =
environment.decorateWarningOutput(output) environment.decorateWarningOutput(output)
override fun toDisplayString() = "warning" override fun toDisplayString() = "warning"
}, },
ERROR { ERROR {
override fun decorate(output: String, environment: RuntimeEnvironment): String = override fun decorate(output: String, environment: RuntimeEnvironment): String =
environment.decorateErrorOutput(output) environment.decorateErrorOutput(output)
override fun toDisplayString() = "error" override fun toDisplayString() = "error"
}, },
CRITICAL { CRITICAL {
override fun decorate(output: String, environment: RuntimeEnvironment): String = override fun decorate(output: String, environment: RuntimeEnvironment): String =
environment.decorateCriticalOutput(output) environment.decorateCriticalOutput(output)
override fun toDisplayString() = "critical" override fun toDisplayString() = "critical"
}; };

1
src/main/java/function/builtin/special/LAMBDA.kt
View File

@ -13,7 +13,6 @@ import sexpression.Symbol
@FunctionNames("LAMBDA", "Λ") @FunctionNames("LAMBDA", "Λ")
class LAMBDA(name: String) : LispSpecialFunction() { class LAMBDA(name: String) : LispSpecialFunction() {
private val argumentValidator: ArgumentValidator = ArgumentValidator(name) private val argumentValidator: ArgumentValidator = ArgumentValidator(name)
private val lambdaListValidator: ArgumentValidator = ArgumentValidator("$name|lambda-list|") private val lambdaListValidator: ArgumentValidator = ArgumentValidator("$name|lambda-list|")

3
src/main/java/terminal/LispTerminal.java
View File

@ -209,8 +209,7 @@ public class LispTerminal {
TerminalPosition cursorPosition = terminal.getCursorPosition(); TerminalPosition cursorPosition = terminal.getCursorPosition();
terminal.putCharacter(character); terminal.putCharacter(character);
moveCursorToNextRow(cursorPosition); moveCursorToNextRow(cursorPosition);
} } else
else
terminal.putCharacter(character); terminal.putCharacter(character);
} }