From edbe461d595f9e8444a645a7dec4125795bc6e0e Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 3 Jun 2018 18:53:06 +0300
Subject: [PATCH] #3468 Single line comments formatting fix (LF before comment)

Former-commit-id: 95d856449b9e3f97c691320f8c3306050a3ed4b7
---
 .../model/sql/format/tokenized/SQLFormatterTokenized.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
index d138daa5b2..ea27f36808 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
@@ -229,10 +229,8 @@ public class SQLFormatterTokenized implements SQLFormatter {
                         }
                         break;
                     case "VALUES":  //$NON-NLS-1$
-                        indent--;
-                        index += insertReturnAndIndent(argList, index, indent);
-                        break;
                     case "END":  //$NON-NLS-1$
+                    case "LIMIT":  //$NON-NLS-1$
                         indent--;
                         index += insertReturnAndIndent(argList, index, indent);
                         break;
@@ -279,6 +277,7 @@ public class SQLFormatterTokenized implements SQLFormatter {
                 if (slComments != null) {
                     for (String slc : slComments) {
                         if (token.getString().startsWith(slc)) {
+                            index += insertReturnAndIndent(argList, index, indent);
                             isComment = true;
                             break;
                         }
-- 
GitLab