#11063 The conditions of the method are merged

Former-commit-id: f762fbcb

#11063 The conditions of the method are merged
Former-commit-id: f762fbcb
cf1a0da3 · Anastasiya Volkova · 56138b07 · cf1a0da3
隐藏空白更改
内联并排

Showing with 3 addition and 8 deletion

plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java ...s/dbeaver/model/sql/format/tokenized/IndentFormatter.java +3 -8

未找到文件。
--- a/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java
+++ b/plugins/org.jkiss.dbeaver.model.sql/src/org/jkiss/dbeaver/model/sql/format/tokenized/IndentFormatter.java
@@ -482,14 +482,9 @@ class IndentFormatter {
            FormatterToken token = argList.get(i);
            if (token.getType() == TokenType.KEYWORD) {
                String upperCaseToken = token.getString().toUpperCase(Locale.ENGLISH);
-                if (isCondition) {
-                    if (ArrayUtils.contains(CONDITION_KEYWORDS, upperCaseToken)) {
-                        return token.getString();
-                    }
-                } else {
-                    if (ArrayUtils.contains(DML_KEYWORD, upperCaseToken)) {
-                        return token.getString();
-                    }
+                if ((isCondition && ArrayUtils.contains(CONDITION_KEYWORDS, upperCaseToken)) ||
+                        (!isCondition && ArrayUtils.contains(DML_KEYWORD, upperCaseToken))) {
+                    return token.getString();
                }
            }
        }