From e2ccb342e391393c883476571dacad20f7fb82c5 Mon Sep 17 00:00:00 2001 From: Mitchell Smith Date: Thu, 20 Jun 2024 00:40:10 +0900 Subject: [PATCH] edits --- .../brains/lang/formatting/QCodeStyleSettings.java | 4 ++-- .../inside/brains/lang/formatting/QSpacingStrategy.java | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/kdb/inside/brains/lang/formatting/QCodeStyleSettings.java b/src/main/java/org/kdb/inside/brains/lang/formatting/QCodeStyleSettings.java index 77052fb..2cc7d1c 100644 --- a/src/main/java/org/kdb/inside/brains/lang/formatting/QCodeStyleSettings.java +++ b/src/main/java/org/kdb/inside/brains/lang/formatting/QCodeStyleSettings.java @@ -78,10 +78,10 @@ public class QCodeStyleSettings extends CustomCodeStyleSettings { public boolean PARENTHESES_SPACE_BEFORE_SEMICOLON = false; // Assignment - public boolean SPACE_AROUND_ASSIGNMENT_OPERATORS = false; + public boolean SPACE_AROUND_ASSIGNMENT_OPERATORS = true; // Operators - public boolean SPACE_AFTER_OPERATOR_COMMA = false; + public boolean SPACE_AFTER_OPERATOR_COMMA = true; public boolean SPACE_AROUND_OPERATOR_CUT = false; public boolean SPACE_AROUND_OPERATOR_ORDER = false; public boolean SPACE_AROUND_OPERATOR_WEIGHT = true; diff --git a/src/main/java/org/kdb/inside/brains/lang/formatting/QSpacingStrategy.java b/src/main/java/org/kdb/inside/brains/lang/formatting/QSpacingStrategy.java index 3a021ce..8b1aab9 100644 --- a/src/main/java/org/kdb/inside/brains/lang/formatting/QSpacingStrategy.java +++ b/src/main/java/org/kdb/inside/brains/lang/formatting/QSpacingStrategy.java @@ -96,9 +96,12 @@ public QSpacingStrategy(@NotNull CodeStyleSettings codeStyleSettings) { } // Operators - builder.around(VAR_ASSIGNMENT_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); - builder.around(VAR_ACCUMULATOR_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); - builder.around(COLUMN_ASSIGNMENT_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); + builder.before(VAR_ASSIGNMENT_TYPE).spaces(0); + builder.before(VAR_ACCUMULATOR_TYPE).spaces(0); + builder.before(COLUMN_ASSIGNMENT_TYPE).spaces(0); + builder.after(VAR_ASSIGNMENT_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); + builder.after(VAR_ACCUMULATOR_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); + builder.after(COLUMN_ASSIGNMENT_TYPE).spaceIf(custom.SPACE_AROUND_ASSIGNMENT_OPERATORS); // Special case - cut can't go between a var builder.between(VAR_REFERENCE, OPERATOR_CUT).spaces(1);