Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
suliangchun
dbeaver
提交
380820ad
D
dbeaver
项目概览
suliangchun
/
dbeaver
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dbeaver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
380820ad
编写于
6月 14, 2018
作者:
S
serge-rider
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#3631 SQL formatter: brackets formatting fix
Former-commit-id:
b458e2dc
上级
0d708a5a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
1 deletion
+6
-1
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
...ver/model/sql/format/tokenized/SQLFormatterTokenized.java
+6
-1
未找到文件。
plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/sql/format/tokenized/SQLFormatterTokenized.java
浏览文件 @
380820ad
...
@@ -161,6 +161,7 @@ public class SQLFormatterTokenized implements SQLFormatter {
...
@@ -161,6 +161,7 @@ public class SQLFormatterTokenized implements SQLFormatter {
final
List
<
Integer
>
bracketIndent
=
new
ArrayList
<>();
final
List
<
Integer
>
bracketIndent
=
new
ArrayList
<>();
FormatterToken
prev
=
new
FormatterToken
(
TokenType
.
SPACE
,
" "
);
//$NON-NLS-1$
FormatterToken
prev
=
new
FormatterToken
(
TokenType
.
SPACE
,
" "
);
//$NON-NLS-1$
boolean
encounterBetween
=
false
;
boolean
encounterBetween
=
false
;
int
bracketsDepth
=
0
;
for
(
int
index
=
0
;
index
<
argList
.
size
();
index
++)
{
for
(
int
index
=
0
;
index
<
argList
.
size
();
index
++)
{
token
=
argList
.
get
(
index
);
token
=
argList
.
get
(
index
);
String
tokenString
=
token
.
getString
().
toUpperCase
(
Locale
.
ENGLISH
);
String
tokenString
=
token
.
getString
().
toUpperCase
(
Locale
.
ENGLISH
);
...
@@ -168,6 +169,7 @@ public class SQLFormatterTokenized implements SQLFormatter {
...
@@ -168,6 +169,7 @@ public class SQLFormatterTokenized implements SQLFormatter {
if
(
tokenString
.
equals
(
"("
))
{
//$NON-NLS-1$
if
(
tokenString
.
equals
(
"("
))
{
//$NON-NLS-1$
functionBracket
.
add
(
formatterCfg
.
isFunction
(
prev
.
getString
())
?
Boolean
.
TRUE
:
Boolean
.
FALSE
);
functionBracket
.
add
(
formatterCfg
.
isFunction
(
prev
.
getString
())
?
Boolean
.
TRUE
:
Boolean
.
FALSE
);
bracketIndent
.
add
(
indent
);
bracketIndent
.
add
(
indent
);
bracketsDepth
++;
// Adding indent after ( makes result too verbose and too multiline
// Adding indent after ( makes result too verbose and too multiline
// if (!isCompact) {
// if (!isCompact) {
// indent++;
// indent++;
...
@@ -179,9 +181,12 @@ public class SQLFormatterTokenized implements SQLFormatter {
...
@@ -179,9 +181,12 @@ public class SQLFormatterTokenized implements SQLFormatter {
// index += insertReturnAndIndent(argList, index, indent);
// index += insertReturnAndIndent(argList, index, indent);
// }
// }
functionBracket
.
remove
(
functionBracket
.
size
()
-
1
);
functionBracket
.
remove
(
functionBracket
.
size
()
-
1
);
bracketsDepth
--;
}
else
if
(
tokenString
.
equals
(
","
))
{
//$NON-NLS-1$
}
else
if
(
tokenString
.
equals
(
","
))
{
//$NON-NLS-1$
if
(!
isCompact
)
{
if
(!
isCompact
)
{
index
+=
insertReturnAndIndent
(
argList
,
index
+
1
,
indent
);
if
(
bracketsDepth
<=
0
)
{
index
+=
insertReturnAndIndent
(
argList
,
index
+
1
,
indent
);
}
}
}
}
else
if
(
statementDelimiters
.
contains
(
tokenString
))
{
//$NON-NLS-1$
}
else
if
(
statementDelimiters
.
contains
(
tokenString
))
{
//$NON-NLS-1$
indent
=
0
;
indent
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录